/mandos/trunk

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

« back to all changes in this revision

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

  • Committer: Teddy Hogeborn
  • Date: 2012-06-09 23:41:07 UTC
  • mto: This revision was merged to the branch mainline in revision 596.
  • Revision ID: teddy@recompile.se-20120609234107-vm6zilzz0y6aihsm
* plugins.d/mandos-client.c (raise_privileges,
  raise_privileges_permanently, lower_privileges): Return error_t and
                                                   save old errno
                                                   before calling any
                                                   other function.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins.d/password-prompt.c
2
2
/*
3
3
 * Password-prompt - Read a password from the terminal and print it
4
4
 * 
5
 
 * Copyright © 2008-2016 Teddy Hogeborn
6
 
 * Copyright © 2008-2016 Björn Påhlsson
 
5
 * Copyright © 2008-2012 Teddy Hogeborn
 
6
 * Copyright © 2008-2012 Björn Påhlsson
7
7
 * 
8
8
 * This program is free software: you can redistribute it and/or
9
9
 * modify it under the terms of the GNU General Public License as
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 TEMP_FAILURE_RETRY(vfprintf(stream, format, ap));
 
83
}
 
84
 
75
85
/* Function to use when printing errors */
76
86
__attribute__((format (gnu_printf, 3, 4)))
77
87
void error_plus(int status, int errnum, const char *formatstring,
82
92
  
83
93
  va_start(ap, formatstring);
84
94
  ret = vasprintf(&text, formatstring, ap);
85
 
  if(ret == -1){
 
95
  if (ret == -1){
86
96
    fprintf(stderr, "Mandos plugin %s: ",
87
97
            program_invocation_short_name);
88
98
    vfprintf(stderr, formatstring, ap);
212
222
  struct dirent **direntries = NULL;
213
223
  int ret;
214
224
  ret = scandir("/proc", &direntries, is_plymouth, alphasort);
215
 
  if(ret == -1){
 
225
  if (ret == -1){
216
226
    error_plus(1, errno, "scandir");
217
227
  }
218
228
  free(direntries);
303
313
    fprintf(stderr, "Starting %s\n", argv[0]);
304
314
  }
305
315
 
306
 
  if(conflict_detection()){
 
316
  if (conflict_detection()){
307
317
    if(debug){
308
318
      fprintf(stderr, "Stopping %s because of conflict\n", argv[0]);
309
319
    }