/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 plugin-runner.c

* initramfs-tools-hook-conf: Security bug fix: Add code to handle
                             being called by "mkinitramfs-kpkg"
                             instead of "update-initramfs".

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin-runner.c
457
457
      plugindir = strdup(arg);
458
458
      if(plugindir == NULL){
459
459
        perror("strdup");
460
 
      }
 
460
      }      
461
461
      break;
462
462
    case 129:                   /* --config-file */
463
463
      /* This is already done by parse_opt_config_file() */
527
527
      if(argfile == NULL){
528
528
        perror("strdup");
529
529
      }
530
 
      break;
 
530
      break;      
531
531
    case 130:                   /* --userid */
532
532
    case 131:                   /* --groupid */
533
533
    case 132:                   /* --debug */
562
562
    conffp = fopen(AFILE, "r");
563
563
  } else {
564
564
    conffp = fopen(argfile, "r");
565
 
  }
 
565
  }  
566
566
  if(conffp != NULL){
567
567
    char *org_line = NULL;
568
568
    char *p, *arg, *new_arg, *line;
612
612
          goto fallback;
613
613
        }
614
614
        custom_argv[custom_argc-1] = new_arg;
615
 
        custom_argv[custom_argc] = NULL;
 
615
        custom_argv[custom_argc] = NULL;        
616
616
      }
617
617
    }
618
618
    free(org_line);