/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 at bsnet
  • Date: 2011-03-01 20:32:33 UTC
  • mto: This revision was merged to the branch mainline in revision 470.
  • Revision ID: teddy@fukt.bsnet.se-20110301203233-ojyyx28voh5xht2i
* plugins.d/password-prompt.c: Some white space fixes.  Break some
                               long lines.  Add more debug output.

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
 
72
74
 
73
75
static void termination_handler(int signum){
74
76
  if(quit_now){
165
167
      cmdline_base = cmdline;
166
168
    }
167
169
    
168
 
    if(strcmp(cmdline_base, plymouth_name) != 0){
 
170
    if((strcmp(cmdline_base, plymouth_name) != 0)
 
171
       and (strcmp(cmdline_base, plymouth_alt_name) != 0)){
169
172
      if(debug){
170
 
        fprintf(stderr, "\"%s\" is not \"%s\"\n", cmdline_base,
171
 
                plymouth_name);
 
173
        fprintf(stderr, "\"%s\" is not \"%s\" or \"%s\"\n",
 
174
                cmdline_base, plymouth_name, plymouth_alt_name);
172
175
      }
173
176
      free(cmdline);
174
177
      return 0;
175
178
    }
176
 
    if(debug){
177
 
      fprintf(stderr, "\"%s\" equals \"%s\"\n", cmdline_base,
178
 
              plymouth_name);
179
 
    }
 
179
    fprintf(stderr, "\"%s\" equals \"%s\" or \"%s\"\n",
 
180
            cmdline_base, plymouth_name, plymouth_alt_name);
180
181
    free(cmdline);
181
182
    return 1;
182
183
  }