/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to plugins.d/password-prompt.c

  • Committer: Teddy Hogeborn
  • Date: 2014-03-23 20:48:58 UTC
  • mto: (237.7.272 trunk)
  • mto: This revision was merged to the branch mainline in revision 311.
  • Revision ID: teddy@recompile.se-20140323204858-l1x3aiick21oog4y
Improve error message when working around Debian bug #633582.

* plugins-runner.c (main): Improve error message when failing to work
                           around Debian bug #633582.  Also simplify
                           code to always use execve().

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins.d/password-prompt.c
72
72
/* Needed for conflict resolution */
73
73
const char plymouth_name[] = "plymouthd";
74
74
 
75
 
__attribute__((format (gnu_printf, 2, 3), nonnull(1)))
76
 
int fprintf_plus(FILE *stream, const char *format, ...){
77
 
  va_list ap;
78
 
  va_start (ap, format);
79
 
  
80
 
  TEMP_FAILURE_RETRY(fprintf(stream, "Mandos plugin %s: ",
81
 
                             program_invocation_short_name));
82
 
  return (int)TEMP_FAILURE_RETRY(vfprintf(stream, format, ap));
83
 
}
84
 
 
85
75
/* Function to use when printing errors */
86
76
__attribute__((format (gnu_printf, 3, 4)))
87
77
void error_plus(int status, int errnum, const char *formatstring,
92
82
  
93
83
  va_start(ap, formatstring);
94
84
  ret = vasprintf(&text, formatstring, ap);
95
 
  if (ret == -1){
 
85
  if(ret == -1){
96
86
    fprintf(stderr, "Mandos plugin %s: ",
97
87
            program_invocation_short_name);
98
88
    vfprintf(stderr, formatstring, ap);
222
212
  struct dirent **direntries = NULL;
223
213
  int ret;
224
214
  ret = scandir("/proc", &direntries, is_plymouth, alphasort);
225
 
  if (ret == -1){
 
215
  if(ret == -1){
226
216
    error_plus(1, errno, "scandir");
227
217
  }
228
218
  free(direntries);
313
303
    fprintf(stderr, "Starting %s\n", argv[0]);
314
304
  }
315
305
 
316
 
  if (conflict_detection()){
 
306
  if(conflict_detection()){
317
307
    if(debug){
318
308
      fprintf(stderr, "Stopping %s because of conflict\n", argv[0]);
319
309
    }