/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

* plugins.d/password-prompt.c (conflict_detection): Check for both
                                                    "plymouth" and
                                                    "plymouthd".

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins.d/password-prompt.c
69
69
 
70
70
/* Needed for conflict resolution */
71
71
const char plymouth_name[] = "plymouthd";
72
 
const char plymouth_alt_name[] = "plymouthd";
73
 
 
74
72
 
75
73
static void termination_handler(int signum){
76
74
  if(quit_now){
167
165
      cmdline_base = cmdline;
168
166
    }
169
167
    
170
 
    if((strcmp(cmdline_base, plymouth_name) != 0)
171
 
       and (strcmp(cmdline_base, plymouth_alt_name) != 0)){
 
168
    if(strcmp(cmdline_base, plymouth_name) != 0){
172
169
      if(debug){
173
 
        fprintf(stderr, "\"%s\" is not \"%s\" or \"%s\"\n",
174
 
                cmdline_base, plymouth_name, plymouth_alt_name);
 
170
        fprintf(stderr, "\"%s\" is not \"%s\"\n", cmdline_base,
 
171
                plymouth_name);
175
172
      }
176
173
      free(cmdline);
177
174
      return 0;
178
175
    }
179
 
    fprintf(stderr, "\"%s\" equals \"%s\" or \"%s\"\n",
180
 
            cmdline_base, plymouth_name, plymouth_alt_name);
 
176
    if(debug){
 
177
      fprintf(stderr, "\"%s\" equals \"%s\"\n", cmdline_base,
 
178
              plymouth_name);
 
179
    }
181
180
    free(cmdline);
182
181
    return 1;
183
182
  }