/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: 2016-03-05 21:05:11 UTC
  • Revision ID: teddy@recompile.se-20160305210511-pbehwc5ap85cfhdm
Rename "gobject" to "GObject"; prefer the new python-gi

* debian/control (Source: mandos/Build-Depends-Indep): Change
  "python-gobject | python-gi" to "python-gi | python-gobject"
  (Package: mandos/Depends): - '' -
* mandos: Prefer "gi" module over "gobject" module.  Import "gobject"
  as "GObject"; change spelling throughout.
* mandos-monitor: - '' -

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() */
 
40
                                   WEXITSTATUS(), WTERMSIG(),
 
41
                                   WCOREDUMP() */
41
42
#include <sys/stat.h>           /* struct stat, fstat(), S_ISREG() */
42
43
#include <iso646.h>             /* and, or, not */
43
44
#include <dirent.h>             /* struct dirent, scandirat() */
792
793
  }
793
794
  
794
795
  if(debug){
795
 
    for(plugin *p = plugin_list; p != NULL; p = p->next){
 
796
    for(plugin *p = plugin_list; p != NULL; p=p->next){
796
797
      fprintf(stderr, "Plugin: %s has %d arguments\n",
797
798
              p->name ? p->name : "Global", p->argc - 1);
798
799
      for(char **a = p->argv; *a != NULL; a++){
807
808
  
808
809
  if(getuid() == 0){
809
810
    /* Work around Debian bug #633582:
810
 
       <https://bugs.debian.org/633582> */
 
811
       <http://bugs.debian.org/633582> */
811
812
    int plugindir_fd = open(/* plugindir or */ PDIR, O_RDONLY);
812
813
    if(plugindir_fd == -1){
813
814
      if(errno != ENOENT){
1158
1159
                      (intmax_t) (proc->pid),
1159
1160
                      WTERMSIG(proc->status),
1160
1161
                      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));
1161
1165
            }
1162
1166
          }
1163
1167