/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: 2011-02-27 18:57:58 UTC
  • Revision ID: teddy@fukt.bsnet.se-20110227185758-vie4xhfaevhpqtr6
* 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
67
67
const char *argp_program_version = "password-prompt " VERSION;
68
68
const char *argp_program_bug_address = "<mandos@fukt.bsnet.se>";
69
69
 
70
 
/* Needed for conflic resolution */
71
 
const char plymouthd_name[] = "plymouthd";
 
70
/* Needed for conflict resolution */
 
71
const char plymouth_name[] = "plymouthd";
 
72
const char plymouth_alt_name[] = "plymouthd";
72
73
 
73
74
 
74
75
static void termination_handler(int signum){
165
166
      cmdline_base = cmdline;
166
167
    }
167
168
    
168
 
    if(strcmp(cmdline_base, plymouthd_name) != 0){
 
169
    if((strcmp(cmdline_base, plymouth_name) != 0)
 
170
       and (strcmp(cmdline_base, plymouth_alt_name) != 0)){
169
171
      free(cmdline);
170
172
      return 0;
171
173
    }