/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

  • Committer: Teddy Hogeborn
  • Date: 2017-02-22 21:45:35 UTC
  • Revision ID: teddy@recompile.se-20170222214535-milf6w0b1krwpaex
http://bugs.debian.org/855589
Server bug fix: Use the mandos.conf "zeroconf" and "restore" options

Allow the "zeroconf" and "restore" options to actually work from the
mandos.conf file, in addition to command line options.

Closes: 855589
Reported-by: Pablo Abelenda <pabelenda@igalia.com>
Suggested-by: Pablo Abelenda <pabelenda@igalia.com>

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin-runner.c
37
37
#include <sys/select.h>         /* fd_set, select(), FD_ZERO(),
38
38
                                   FD_SET(), FD_ISSET(), FD_CLR */
39
39
#include <sys/wait.h>           /* wait(), waitpid(), WIFEXITED(),
40
 
                                   WEXITSTATUS(), WTERMSIG(),
41
 
                                   WCOREDUMP() */
 
40
                                   WEXITSTATUS(), WTERMSIG() */
42
41
#include <sys/stat.h>           /* struct stat, fstat(), S_ISREG() */
43
42
#include <iso646.h>             /* and, or, not */
44
43
#include <dirent.h>             /* struct dirent, scandirat() */
793
792
  }
794
793
  
795
794
  if(debug){
796
 
    for(plugin *p = plugin_list; p != NULL; p=p->next){
 
795
    for(plugin *p = plugin_list; p != NULL; p = p->next){
797
796
      fprintf(stderr, "Plugin: %s has %d arguments\n",
798
797
              p->name ? p->name : "Global", p->argc - 1);
799
798
      for(char **a = p->argv; *a != NULL; a++){
808
807
  
809
808
  if(getuid() == 0){
810
809
    /* Work around Debian bug #633582:
811
 
       <http://bugs.debian.org/633582> */
 
810
       <https://bugs.debian.org/633582> */
812
811
    int plugindir_fd = open(/* plugindir or */ PDIR, O_RDONLY);
813
812
    if(plugindir_fd == -1){
814
813
      if(errno != ENOENT){
1159
1158
                      (intmax_t) (proc->pid),
1160
1159
                      WTERMSIG(proc->status),
1161
1160
                      strsignal(WTERMSIG(proc->status)));
1162
 
            } else if(WCOREDUMP(proc->status)){
1163
 
              fprintf(stderr, "Plugin %s [%" PRIdMAX "] dumped"
1164
 
                      " core\n", proc->name, (intmax_t) (proc->pid));
1165
1161
            }
1166
1162
          }
1167
1163