bzr branch
http://bzr.recompile.se/loggerhead/mandos/trunk
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 1 | /*  -*- coding: utf-8 -*- */
 | 
| 2 | /*
 | |
| 3 |  * Mandos plugin runner - Run Mandos plugins
 | |
| 4 |  *
 | |
| 28
by Teddy Hogeborn * server.conf: New file. | 5 |  * Copyright © 2007-2008 Teddy Hogeborn & Björn Påhlsson
 | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 6 |  * 
 | 
| 7 |  * This program is free software: you can redistribute it and/or
 | |
| 8 |  * modify it under the terms of the GNU General Public License as
 | |
| 9 |  * published by the Free Software Foundation, either version 3 of the
 | |
| 10 |  * License, or (at your option) any later version.
 | |
| 11 |  * 
 | |
| 12 |  * This program is distributed in the hope that it will be useful, but
 | |
| 13 |  * WITHOUT ANY WARRANTY; without even the implied warranty of
 | |
| 14 |  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 | |
| 15 |  * General Public License for more details.
 | |
| 16 |  * 
 | |
| 17 |  * You should have received a copy of the GNU General Public License
 | |
| 18 |  * along with this program.  If not, see
 | |
| 19 |  * <http://www.gnu.org/licenses/>.
 | |
| 20 |  * 
 | |
| 28
by Teddy Hogeborn * server.conf: New file. | 21 |  * Contact the authors at <mandos@fukt.bsnet.se>.
 | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 22 |  */
 | 
| 23 | ||
| 34
by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set | 24 | #define _GNU_SOURCE /* TEMP_FAILURE_RETRY() */ | 
| 25 | ||
| 24.1.26
by Björn Påhlsson tally count of used symbols | 26 | #include <stddef.h> /* size_t, NULL */ | 
| 27 | #include <stdlib.h> /* malloc(), exit(), EXIT_FAILURE, | |
| 28 | EXIT_SUCCESS, realloc() */ | |
| 29 | #include <stdbool.h> /* bool, true, false */ | |
| 30 | #include <stdio.h> /* perror, popen(), fileno(), | |
| 31 | fprintf(), stderr, STDOUT_FILENO */ | |
| 32 | #include <sys/types.h> /* DIR, opendir(), stat(), struct | |
| 33 | stat, waitpid(), WIFEXITED(), | |
| 34 | WEXITSTATUS(), wait(), pid_t, | |
| 35 | uid_t, gid_t, getuid(), getgid(), | |
| 36 | dirfd() */ | |
| 37 | #include <sys/select.h> /* fd_set, select(), FD_ZERO(), | |
| 38 | FD_SET(), FD_ISSET(), FD_CLR */ | |
| 39 | #include <sys/wait.h> /* wait(), waitpid(), WIFEXITED(), | |
| 40 | WEXITSTATUS() */ | |
| 41 | #include <sys/stat.h> /* struct stat, stat(), S_ISREG() */ | |
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 42 | #include <iso646.h> /* and, or, not */ | 
| 43 | #include <dirent.h> /* DIR, struct dirent, opendir(), | |
| 24.1.26
by Björn Påhlsson tally count of used symbols | 44 | readdir(), closedir(), dirfd() */ | 
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 45 | #include <unistd.h> /* struct stat, stat(), S_ISREG(), | 
| 24.1.26
by Björn Påhlsson tally count of used symbols | 46 | fcntl(), setuid(), setgid(), | 
| 47 | F_GETFD, F_SETFD, FD_CLOEXEC, | |
| 48 | access(), pipe(), fork(), close() | |
| 49 | dup2, STDOUT_FILENO, _exit(), | |
| 50 | execv(), write(), read(), | |
| 51 | close() */ | |
| 52 | #include <fcntl.h> /* fcntl(), F_GETFD, F_SETFD, | |
| 53 | FD_CLOEXEC */ | |
| 54 | #include <string.h> /* strtok, strlen(), strcpy(), | |
| 55 | strcat() */ | |
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 56 | #include <errno.h> /* errno */ | 
| 24.1.26
by Björn Påhlsson tally count of used symbols | 57 | #include <argp.h> /* struct argp_option, struct | 
| 58 | argp_state, struct argp, | |
| 59 | argp_parse(), ARGP_ERR_UNKNOWN, | |
| 60 | ARGP_KEY_END, ARGP_KEY_ARG, error_t */ | |
| 61 | #include <signal.h> /* struct sigaction, sigemptyset(), | |
| 62 | sigaddset(), sigaction(), | |
| 63 | sigprocmask(), SIG_BLOCK, SIGCHLD, | |
| 64 | SIG_UNBLOCK, kill() */ | |
| 65 | #include <errno.h> /* errno, EBADF */ | |
| 13
by Björn Påhlsson Added following support: | 66 | |
| 37
by Teddy Hogeborn Non-tested commit for merge purposes. | 67 | #define BUFFER_SIZE 256
 | 
| 68 | ||
| 13
by Björn Påhlsson Added following support: | 69 | struct process; | 
| 70 | ||
| 71 | typedef struct process{ | |
| 72 | pid_t pid; | |
| 73 | int fd; | |
| 74 | char *buffer; | |
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 75 | size_t buffer_size; | 
| 76 | size_t buffer_length; | |
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 77 | bool eof; | 
| 78 | bool completed; | |
| 79 | int status; | |
| 13
by Björn Påhlsson Added following support: | 80 | struct process *next; | 
| 81 | } process; | |
| 82 | ||
| 24.1.1
by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they | 83 | typedef struct plugin{ | 
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 84 | char *name; /* can be NULL or any plugin name */ | 
| 24.1.1
by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they | 85 | char **argv; | 
| 86 | int argc; | |
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 87 | bool disabled; | 
| 24.1.1
by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they | 88 | struct plugin *next; | 
| 89 | } plugin; | |
| 90 | ||
| 37
by Teddy Hogeborn Non-tested commit for merge purposes. | 91 | static plugin *getplugin(char *name, plugin **plugin_list){ | 
| 24.1.1
by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they | 92 | for (plugin *p = *plugin_list; p != NULL; p = p->next){ | 
| 93 | if ((p->name == name) | |
| 94 | or (p->name and name and (strcmp(p->name, name) == 0))){ | |
| 95 | return p; | |
| 96 | } | |
| 97 | } | |
| 98 | /* Create a new plugin */ | |
| 99 | plugin *new_plugin = malloc(sizeof(plugin)); | |
| 100 | if (new_plugin == NULL){ | |
| 101 | perror("malloc"); | |
| 102 | exit(EXIT_FAILURE); | |
| 103 | } | |
| 104 | new_plugin->name = name; | |
| 105 | new_plugin->argv = malloc(sizeof(char *) * 2); | |
| 106 | if (new_plugin->argv == NULL){ | |
| 107 | perror("malloc"); | |
| 108 | exit(EXIT_FAILURE); | |
| 109 | } | |
| 110 | new_plugin->argv[0] = name; | |
| 111 | new_plugin->argv[1] = NULL; | |
| 112 | new_plugin->argc = 1; | |
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 113 | new_plugin->disabled = false; | 
| 24.1.5
by Björn Påhlsson plugbasedclient: | 114 | new_plugin->next = *plugin_list; | 
| 24.1.1
by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they | 115 | /* Append the new plugin to the list */ | 
| 116 | *plugin_list = new_plugin; | |
| 117 | return new_plugin; | |
| 118 | }
 | |
| 119 | ||
| 37
by Teddy Hogeborn Non-tested commit for merge purposes. | 120 | static void addargument(plugin *p, char *arg){ | 
| 24.1.1
by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they | 121 | p->argv[p->argc] = arg; | 
| 122 | p->argv = realloc(p->argv, sizeof(char *) * (size_t)(p->argc + 2)); | |
| 123 | if (p->argv == NULL){ | |
| 124 | perror("malloc"); | |
| 125 | exit(EXIT_FAILURE); | |
| 126 | } | |
| 127 | p->argc++; | |
| 128 | p->argv[p->argc] = NULL; | |
| 129 | }
 | |
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 130 | |
| 32
by Teddy Hogeborn * plugins.d/plugbasedclient.c (set_cloexec_flag): New function. | 131 | /*
 | 
| 132 |  * Based on the example in the GNU LibC manual chapter 13.13 "File
 | |
| 133 |  * Descriptor Flags".
 | |
| 134 |  * *Note File Descriptor Flags:(libc)Descriptor Flags.
 | |
| 135 |  */
 | |
| 37
by Teddy Hogeborn Non-tested commit for merge purposes. | 136 | static int set_cloexec_flag(int fd) | 
| 32
by Teddy Hogeborn * plugins.d/plugbasedclient.c (set_cloexec_flag): New function. | 137 | {
 | 
| 138 | int ret = fcntl(fd, F_GETFD, 0); | |
| 139 | /* If reading the flags failed, return error indication now. */ | |
| 140 | if(ret < 0){ | |
| 141 | return ret; | |
| 142 | } | |
| 143 | /* Store modified flag word in the descriptor. */ | |
| 144 | return fcntl(fd, F_SETFD, ret | FD_CLOEXEC); | |
| 145 | }
 | |
| 146 | ||
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 147 | const char *argp_program_version = "plugbasedclient 0.9"; | 
| 148 | const char *argp_program_bug_address = "<mandos@fukt.bsnet.se>"; | |
| 149 | ||
| 150 | process *process_list = NULL; | |
| 151 | ||
| 152 | /* Mark a process as completed when it exits, and save its exit
 | |
| 153 |    status. */
 | |
| 154 | void handle_sigchld(__attribute__((unused)) int sig){ | |
| 155 | process *proc = process_list; | |
| 156 | int status; | |
| 157 | pid_t pid = wait(&status); | |
| 24.1.26
by Björn Påhlsson tally count of used symbols | 158 | if(pid == -1){ | 
| 159 | perror("wait"); | |
| 160 | return; | |
| 161 | } | |
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 162 | while(proc != NULL and proc->pid != pid){ | 
| 24.1.8
by Björn Påhlsson plugbasedclient | 163 | proc = proc->next; | 
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 164 | } | 
| 165 | if(proc == NULL){ | |
| 166 | /* Process not found in process list */ | |
| 167 | return; | |
| 168 | } | |
| 169 | proc->status = status; | |
| 170 | proc->completed = true; | |
| 171 | }
 | |
| 24.1.1
by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they | 172 | |
| 13
by Björn Påhlsson Added following support: | 173 | int main(int argc, char *argv[]){ | 
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 174 | const char *plugindir = "/conf/conf.d/mandos/plugins.d"; | 
| 24.1.5
by Björn Påhlsson plugbasedclient: | 175 | size_t d_name_len; | 
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 176 | DIR *dir = NULL; | 
| 13
by Björn Påhlsson Added following support: | 177 | struct dirent *dirst; | 
| 178 | struct stat st; | |
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 179 | fd_set rfds_all; | 
| 13
by Björn Påhlsson Added following support: | 180 | int ret, maxfd = 0; | 
| 24.1.6
by Björn Påhlsson plugbasedclient | 181 | uid_t uid = 65534; | 
| 182 | gid_t gid = 65534; | |
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 183 | bool debug = false; | 
| 184 | int exitstatus = EXIT_SUCCESS; | |
| 24.1.7
by Björn Påhlsson merge | 185 | struct sigaction old_sigchld_action; | 
| 186 | struct sigaction sigchld_action = { .sa_handler = handle_sigchld, | |
| 187 | .sa_flags = SA_NOCLDSTOP }; | |
| 24.1.8
by Björn Påhlsson plugbasedclient | 188 | char *plus_options = NULL; | 
| 189 | char **plus_argv = NULL; | |
| 190 |   
 | |
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 191 | /* Establish a signal handler */ | 
| 192 | sigemptyset(&sigchld_action.sa_mask); | |
| 193 | ret = sigaddset(&sigchld_action.sa_mask, SIGCHLD); | |
| 194 | if(ret < 0){ | |
| 195 | perror("sigaddset"); | |
| 196 | exit(EXIT_FAILURE); | |
| 197 | } | |
| 198 | ret = sigaction(SIGCHLD, &sigchld_action, &old_sigchld_action); | |
| 199 | if(ret < 0){ | |
| 200 | perror("sigaction"); | |
| 201 | exit(EXIT_FAILURE); | |
| 202 | } | |
| 203 |   
 | |
| 24.1.1
by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they | 204 | /* The options we understand. */ | 
| 205 | struct argp_option options[] = { | |
| 206 | { .name = "global-options", .key = 'g', | |
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 207 | .arg = "OPTION[,OPTION[,...]]", | 
| 208 | .doc = "Options passed to all plugins" }, | |
| 24.1.1
by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they | 209 | { .name = "options-for", .key = 'o', | 
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 210 | .arg = "PLUGIN:OPTION[,OPTION[,...]]", | 
| 211 | .doc = "Options passed only to specified plugin" }, | |
| 212 | { .name = "disable", .key = 'd', | |
| 213 | .arg = "PLUGIN", | |
| 214 | .doc = "Disable a specific plugin", .group = 1 }, | |
| 24.1.5
by Björn Påhlsson plugbasedclient: | 215 | { .name = "plugin-dir", .key = 128, | 
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 216 | .arg = "DIRECTORY", | 
| 217 | .doc = "Specify a different plugin directory", .group = 2 }, | |
| 24.1.6
by Björn Påhlsson plugbasedclient | 218 | { .name = "userid", .key = 129, | 
| 24.1.7
by Björn Påhlsson merge | 219 | .arg = "ID", .flags = 0, | 
| 220 | .doc = "User ID the plugins will run as", .group = 2 }, | |
| 24.1.6
by Björn Påhlsson plugbasedclient | 221 | { .name = "groupid", .key = 130, | 
| 24.1.7
by Björn Påhlsson merge | 222 | .arg = "ID", .flags = 0, | 
| 223 | .doc = "Group ID the plugins will run as", .group = 2 }, | |
| 224 | { .name = "debug", .key = 131, | |
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 225 | .doc = "Debug mode", .group = 3 }, | 
| 24.1.1
by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they | 226 | { .name = NULL } | 
| 227 | }; | |
| 228 |   
 | |
| 229 | error_t parse_opt (int key, char *arg, struct argp_state *state) { | |
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 230 | /* Get the INPUT argument from `argp_parse', which we know is a | 
| 231 |        pointer to our plugin list pointer. */
 | |
| 24.1.1
by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they | 232 | plugin **plugins = state->input; | 
| 233 | switch (key) { | |
| 234 | case 'g': | |
| 235 | if (arg != NULL){ | |
| 236 | char *p = strtok(arg, ","); | |
| 237 | do{ | |
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 238 | addargument(getplugin(NULL, plugins), p); | 
| 24.1.1
by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they | 239 | p = strtok(NULL, ","); | 
| 24.1.8
by Björn Påhlsson plugbasedclient | 240 | } while (p != NULL); | 
| 24.1.1
by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they | 241 | } | 
| 242 | break; | |
| 243 | case 'o': | |
| 244 | if (arg != NULL){ | |
| 245 | char *name = strtok(arg, ":"); | |
| 246 | char *p = strtok(NULL, ":"); | |
| 24.1.8
by Björn Påhlsson plugbasedclient | 247 | if(p != NULL){ | 
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 248 | p = strtok(p, ","); | 
| 249 | do{ | |
| 250 | addargument(getplugin(name, plugins), p); | |
| 251 | p = strtok(NULL, ","); | |
| 24.1.8
by Björn Påhlsson plugbasedclient | 252 | } while (p != NULL); | 
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 253 | } | 
| 24.1.1
by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they | 254 | } | 
| 255 | break; | |
| 24.1.5
by Björn Påhlsson plugbasedclient: | 256 | case 'd': | 
| 257 | if (arg != NULL){ | |
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 258 | getplugin(arg, plugins)->disabled = true; | 
| 24.1.5
by Björn Påhlsson plugbasedclient: | 259 | } | 
| 260 | break; | |
| 261 | case 128: | |
| 262 | plugindir = arg; | |
| 263 | break; | |
| 24.1.6
by Björn Påhlsson plugbasedclient | 264 | case 129: | 
| 265 | uid = (uid_t)strtol(arg, NULL, 10); | |
| 266 | break; | |
| 267 | case 130: | |
| 268 | gid = (gid_t)strtol(arg, NULL, 10); | |
| 269 | break; | |
| 24.1.7
by Björn Påhlsson merge | 270 | case 131: | 
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 271 | debug = true; | 
| 272 | break; | |
| 24.1.1
by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they | 273 | case ARGP_KEY_ARG: | 
| 24.1.8
by Björn Påhlsson plugbasedclient | 274 | if(plus_options != NULL or arg == NULL or arg[0] != '+'){ | 
| 275 | argp_usage (state); | |
| 276 | } | |
| 277 | plus_options = arg; | |
| 24.1.1
by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they | 278 | break; | 
| 279 | case ARGP_KEY_END: | |
| 280 | break; | |
| 281 | default: | |
| 282 | return ARGP_ERR_UNKNOWN; | |
| 283 | } | |
| 284 | return 0; | |
| 285 | } | |
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 286 |   
 | 
| 24.1.1
by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they | 287 | plugin *plugin_list = NULL; | 
| 288 |   
 | |
| 289 | struct argp argp = { .options = options, .parser = parse_opt, | |
| 24.1.8
by Björn Påhlsson plugbasedclient | 290 | .args_doc = "[+PLUS_SEPARATED_OPTIONS]", | 
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 291 | .doc = "Mandos plugin runner -- Run plugins" }; | 
| 292 |   
 | |
| 24.1.26
by Björn Påhlsson tally count of used symbols | 293 | ret = argp_parse (&argp, argc, argv, 0, 0, &plugin_list); | 
| 294 | if (ret == ARGP_ERR_UNKNOWN){ | |
| 24.1.29
by Björn Påhlsson Added more header file comments | 295 | fprintf(stderr, "Unkown error while parsing arguments\n"); | 
| 24.1.26
by Björn Påhlsson tally count of used symbols | 296 | exitstatus = EXIT_FAILURE; | 
| 297 | goto end; | |
| 298 | } | |
| 24.1.8
by Björn Påhlsson plugbasedclient | 299 |   
 | 
| 300 | if(plus_options){ | |
| 301 | /* This is a mangled argument in the form of | |
| 302 |      "+--option+--other-option=parameter+--yet-another-option", etc */
 | |
| 303 | /* Make new argc and argv vars, and call argp_parse() again. */ | |
| 304 | plus_options++; /* skip the first '+' character */ | |
| 305 | const char delims[] = "+"; | |
| 306 | char *arg; | |
| 307 | int new_argc = 1; | |
| 308 | plus_argv = malloc(sizeof(char*) * 2); | |
| 309 | if(plus_argv == NULL){ | |
| 310 | perror("malloc"); | |
| 311 | exitstatus = EXIT_FAILURE; | |
| 312 | goto end; | |
| 313 | } | |
| 314 | plus_argv[0] = argv[0]; | |
| 315 | plus_argv[1] = NULL; | |
| 316 | arg = strtok(plus_options, delims); /* Get first argument */ | |
| 317 | while(arg != NULL){ | |
| 318 | new_argc++; | |
| 319 | plus_argv = realloc(plus_argv, sizeof(char *) | |
| 320 | * ((unsigned int) new_argc + 1)); | |
| 321 | if(plus_argv == NULL){ | |
| 24.1.26
by Björn Påhlsson tally count of used symbols | 322 | perror("realloc"); | 
| 24.1.8
by Björn Påhlsson plugbasedclient | 323 | exitstatus = EXIT_FAILURE; | 
| 324 | goto end; | |
| 325 | } | |
| 326 | plus_argv[new_argc-1] = arg; | |
| 327 | plus_argv[new_argc] = NULL; | |
| 328 | arg = strtok(NULL, delims); /* Get next argument */ | |
| 329 | } | |
| 24.1.26
by Björn Påhlsson tally count of used symbols | 330 | ret = argp_parse (&argp, new_argc, plus_argv, 0, 0, &plugin_list); | 
| 331 | if (ret == ARGP_ERR_UNKNOWN){ | |
| 24.1.29
by Björn Påhlsson Added more header file comments | 332 | fprintf(stderr, "Unkown error while parsing arguments\n"); | 
| 24.1.26
by Björn Påhlsson tally count of used symbols | 333 | exitstatus = EXIT_FAILURE; | 
| 334 | goto end; | |
| 335 | } | |
| 24.1.8
by Björn Påhlsson plugbasedclient | 336 | } | 
| 337 |   
 | |
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 338 | if(debug){ | 
| 339 | for(plugin *p = plugin_list; p != NULL; p=p->next){ | |
| 340 | fprintf(stderr, "Plugin: %s has %d arguments\n", | |
| 32
by Teddy Hogeborn * plugins.d/plugbasedclient.c (set_cloexec_flag): New function. | 341 | p->name ? p->name : "Global", p->argc - 1); | 
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 342 | for(char **a = p->argv; *a != NULL; a++){ | 
| 343 | fprintf(stderr, "\tArg: %s\n", *a); | |
| 344 | } | |
| 345 | } | |
| 346 | } | |
| 24.1.8
by Björn Påhlsson plugbasedclient | 347 |   
 | 
| 24.1.6
by Björn Påhlsson plugbasedclient | 348 | ret = setuid(uid); | 
| 349 | if (ret == -1){ | |
| 350 | perror("setuid"); | |
| 351 | } | |
| 24.1.7
by Björn Påhlsson merge | 352 |   
 | 
| 24.1.6
by Björn Påhlsson plugbasedclient | 353 | setgid(gid); | 
| 354 | if (ret == -1){ | |
| 39
by Teddy Hogeborn * plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables. | 355 | perror("setgid"); | 
| 24.1.6
by Björn Påhlsson plugbasedclient | 356 | } | 
| 357 |   
 | |
| 13
by Björn Påhlsson Added following support: | 358 | dir = opendir(plugindir); | 
| 34
by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set | 359 | if(dir == NULL){ | 
| 360 | perror("Could not open plugin dir"); | |
| 361 | exitstatus = EXIT_FAILURE; | |
| 32
by Teddy Hogeborn * plugins.d/plugbasedclient.c (set_cloexec_flag): New function. | 362 | goto end; | 
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 363 | } | 
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 364 |   
 | 
| 34
by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set | 365 | /* Set the FD_CLOEXEC flag on the directory, if possible */ | 
| 366 | { | |
| 367 | int dir_fd = dirfd(dir); | |
| 368 | if(dir_fd >= 0){ | |
| 369 | ret = set_cloexec_flag(dir_fd); | |
| 370 | if(ret < 0){ | |
| 371 | perror("set_cloexec_flag"); | |
| 372 | exitstatus = EXIT_FAILURE; | |
| 373 | goto end; | |
| 374 | } | |
| 375 | } | |
| 376 | } | |
| 24.1.1
by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they | 377 |   
 | 
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 378 | FD_ZERO(&rfds_all); | 
| 13
by Björn Påhlsson Added following support: | 379 |   
 | 
| 380 | while(true){ | |
| 381 | dirst = readdir(dir); | |
| 382 |     
 | |
| 383 | // All directory entries have been processed | |
| 384 | if(dirst == NULL){ | |
| 24.1.26
by Björn Påhlsson tally count of used symbols | 385 | if (errno == EBADF){ | 
| 386 | perror("readdir"); | |
| 387 | exitstatus = EXIT_FAILURE; | |
| 388 | goto end; | |
| 389 | } | |
| 13
by Björn Påhlsson Added following support: | 390 | break; | 
| 391 | } | |
| 392 |     
 | |
| 393 | d_name_len = strlen(dirst->d_name); | |
| 394 |     
 | |
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 395 | // Ignore dotfiles, backup files and other junk | 
| 396 | { | |
| 397 | bool bad_name = false; | |
| 398 |       
 | |
| 399 | const char const *bad_prefixes[] = { ".", "#", NULL }; | |
| 400 |       
 | |
| 401 | const char const *bad_suffixes[] = { "~", "#", ".dpkg-new", | |
| 402 | ".dpkg-old", | |
| 403 | ".dpkg-divert", NULL }; | |
| 404 | for(const char **pre = bad_prefixes; *pre != NULL; pre++){ | |
| 405 | size_t pre_len = strlen(*pre); | |
| 406 | if((d_name_len >= pre_len) | |
| 407 | and strncmp((dirst->d_name), *pre, pre_len) == 0){ | |
| 408 | if(debug){ | |
| 34
by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set | 409 | fprintf(stderr, "Ignoring plugin dir entry \"%s\"" | 
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 410 | " with bad prefix %s\n", dirst->d_name, *pre); | 
| 411 | } | |
| 412 | bad_name = true; | |
| 413 | break; | |
| 414 | } | |
| 415 | } | |
| 416 |       
 | |
| 417 | if(bad_name){ | |
| 418 | continue; | |
| 419 | } | |
| 420 |       
 | |
| 421 | for(const char **suf = bad_suffixes; *suf != NULL; suf++){ | |
| 422 | size_t suf_len = strlen(*suf); | |
| 423 | if((d_name_len >= suf_len) | |
| 424 | and (strcmp((dirst->d_name)+d_name_len-suf_len, *suf) | |
| 425 | == 0)){ | |
| 426 | if(debug){ | |
| 34
by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set | 427 | fprintf(stderr, "Ignoring plugin dir entry \"%s\"" | 
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 428 | " with bad suffix %s\n", dirst->d_name, *suf); | 
| 429 | } | |
| 430 | bad_name = true; | |
| 431 | break; | |
| 432 | } | |
| 433 | } | |
| 434 |       
 | |
| 435 | if(bad_name){ | |
| 436 | continue; | |
| 437 | } | |
| 13
by Björn Påhlsson Added following support: | 438 | } | 
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 439 |     
 | 
| 24.1.5
by Björn Påhlsson plugbasedclient: | 440 | char *filename = malloc(d_name_len + strlen(plugindir) + 2); | 
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 441 | if (filename == NULL){ | 
| 442 | perror("malloc"); | |
| 34
by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set | 443 | exitstatus = EXIT_FAILURE; | 
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 444 | goto end; | 
| 445 | } | |
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 446 | strcpy(filename, plugindir); /* Spurious warning */ | 
| 447 | strcat(filename, "/"); /* Spurious warning */ | |
| 448 | strcat(filename, dirst->d_name); /* Spurious warning */ | |
| 449 |     
 | |
| 24.1.26
by Björn Påhlsson tally count of used symbols | 450 | ret = stat(filename, &st); | 
| 451 | if (ret == -1){ | |
| 452 | perror("stat"); | |
| 453 | exitstatus = EXIT_FAILURE; | |
| 454 | goto end; | |
| 455 | } | |
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 456 |     
 | 
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 457 | if (not S_ISREG(st.st_mode) or (access(filename, X_OK) != 0)){ | 
| 458 | if(debug){ | |
| 34
by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set | 459 | fprintf(stderr, "Ignoring plugin dir entry \"%s\"" | 
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 460 | " with bad type or mode\n", filename); | 
| 461 | } | |
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 462 | free(filename); | 
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 463 | continue; | 
| 464 | } | |
| 465 | if(getplugin(dirst->d_name, &plugin_list)->disabled){ | |
| 466 | if(debug){ | |
| 34
by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set | 467 | fprintf(stderr, "Ignoring disabled plugin \"%s\"\n", | 
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 468 | dirst->d_name); | 
| 469 | } | |
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 470 | free(filename); | 
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 471 | continue; | 
| 472 | } | |
| 32
by Teddy Hogeborn * plugins.d/plugbasedclient.c (set_cloexec_flag): New function. | 473 | plugin *p = getplugin(dirst->d_name, &plugin_list); | 
| 474 | { | |
| 475 | /* Add global arguments to argument list for this plugin */ | |
| 476 | plugin *g = getplugin(NULL, &plugin_list); | |
| 477 | for(char **a = g->argv + 1; *a != NULL; a++){ | |
| 478 | addargument(p, *a); | |
| 479 | } | |
| 480 | } | |
| 34
by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set | 481 | int pipefd[2]; | 
| 482 | ret = pipe(pipefd); | |
| 483 | if (ret == -1){ | |
| 484 | perror("pipe"); | |
| 485 | exitstatus = EXIT_FAILURE; | |
| 486 | goto end; | |
| 487 | } | |
| 488 | ret = set_cloexec_flag(pipefd[0]); | |
| 489 | if(ret < 0){ | |
| 490 | perror("set_cloexec_flag"); | |
| 491 | exitstatus = EXIT_FAILURE; | |
| 492 | goto end; | |
| 493 | } | |
| 494 | ret = set_cloexec_flag(pipefd[1]); | |
| 495 | if(ret < 0){ | |
| 496 | perror("set_cloexec_flag"); | |
| 497 | exitstatus = EXIT_FAILURE; | |
| 498 | goto end; | |
| 499 | } | |
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 500 | /* Block SIGCHLD until process is safely in process list */ | 
| 501 | ret = sigprocmask (SIG_BLOCK, &sigchld_action.sa_mask, NULL); | |
| 502 | if(ret < 0){ | |
| 503 | perror("sigprocmask"); | |
| 504 | exitstatus = EXIT_FAILURE; | |
| 505 | goto end; | |
| 506 | } | |
| 34
by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set | 507 | // Starting a new process to be watched | 
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 508 | pid_t pid = fork(); | 
| 509 | if(pid == 0){ | |
| 510 | /* this is the child process */ | |
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 511 | ret = sigaction(SIGCHLD, &old_sigchld_action, NULL); | 
| 512 | if(ret < 0){ | |
| 513 | perror("sigaction"); | |
| 514 | _exit(EXIT_FAILURE); | |
| 515 | } | |
| 516 | ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL); | |
| 517 | if(ret < 0){ | |
| 518 | perror("sigprocmask"); | |
| 519 | _exit(EXIT_FAILURE); | |
| 520 | } | |
| 24.1.26
by Björn Påhlsson tally count of used symbols | 521 | |
| 522 | ret = dup2(pipefd[1], STDOUT_FILENO); /* replace our stdout */ | |
| 523 | if(ret == -1){ | |
| 524 | perror("dup2"); | |
| 525 | _exit(EXIT_FAILURE); | |
| 526 | } | |
| 34
by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set | 527 |       
 | 
| 528 | if(dirfd(dir) < 0){ | |
| 529 | /* If dir has no file descriptor, we could not set FD_CLOEXEC | |
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 530 | 	   above and must now close it manually here. */
 | 
| 34
by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set | 531 | closedir(dir); | 
| 33
by Teddy Hogeborn * plugins.d/plugbasedclient.c (main): Close the pipe fd after dup2:ing | 532 | } | 
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 533 | if(execv(filename, p->argv) < 0){ | 
| 34
by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set | 534 | perror("execv"); | 
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 535 | _exit(EXIT_FAILURE); | 
| 536 | } | |
| 537 | /* no return */ | |
| 538 | } | |
| 34
by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set | 539 | /* parent process */ | 
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 540 | free(filename); | 
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 541 | close(pipefd[1]); /* close unused write end of pipe */ | 
| 542 | process *new_process = malloc(sizeof(process)); | |
| 543 | if (new_process == NULL){ | |
| 544 | perror("malloc"); | |
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 545 | ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL); | 
| 546 | if(ret < 0){ | |
| 547 | perror("sigprocmask"); | |
| 548 | } | |
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 549 | exitstatus = EXIT_FAILURE; | 
| 550 | goto end; | |
| 551 | } | |
| 552 |     
 | |
| 34
by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set | 553 | *new_process = (struct process){ .pid = pid, | 
| 554 | .fd = pipefd[0], | |
| 555 | .next = process_list }; | |
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 556 | // List handling | 
| 557 | process_list = new_process; | |
| 558 | /* Unblock SIGCHLD so signal handler can be run if this process | |
| 559 |        has already completed */
 | |
| 560 | ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, NULL); | |
| 561 | if(ret < 0){ | |
| 562 | perror("sigprocmask"); | |
| 563 | exitstatus = EXIT_FAILURE; | |
| 564 | goto end; | |
| 565 | } | |
| 566 |     
 | |
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 567 | FD_SET(new_process->fd, &rfds_all); | 
| 34
by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set | 568 |     
 | 
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 569 | if (maxfd < new_process->fd){ | 
| 570 | maxfd = new_process->fd; | |
| 571 | } | |
| 572 |     
 | |
| 13
by Björn Påhlsson Added following support: | 573 | } | 
| 574 |   
 | |
| 34
by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set | 575 | /* Free the plugin list */ | 
| 576 | for(plugin *next; plugin_list != NULL; plugin_list = next){ | |
| 577 | next = plugin_list->next; | |
| 578 | free(plugin_list->argv); | |
| 579 | free(plugin_list); | |
| 580 | } | |
| 581 |   
 | |
| 13
by Björn Påhlsson Added following support: | 582 | closedir(dir); | 
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 583 | dir = NULL; | 
| 24.1.26
by Björn Påhlsson tally count of used symbols | 584 |     
 | 
| 34
by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set | 585 | if (process_list == NULL){ | 
| 586 | fprintf(stderr, "No plugin processes started, exiting\n"); | |
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 587 | exitstatus = EXIT_FAILURE; | 
| 588 | goto end; | |
| 34
by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set | 589 | } | 
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 590 | while(process_list){ | 
| 34
by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set | 591 | fd_set rfds = rfds_all; | 
| 592 | int select_ret = select(maxfd+1, &rfds, NULL, NULL, NULL); | |
| 593 | if (select_ret == -1){ | |
| 594 | perror("select"); | |
| 595 | exitstatus = EXIT_FAILURE; | |
| 596 | goto end; | |
| 597 | } | |
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 598 | /* OK, now either a process completed, or something can be read | 
| 599 |        from one of them */
 | |
| 34
by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set | 600 | for(process *proc = process_list; proc ; proc = proc->next){ | 
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 601 | /* Is this process completely done? */ | 
| 602 | if(proc->eof and proc->completed){ | |
| 603 | /* Only accept the plugin output if it exited cleanly */ | |
| 604 | if(not WIFEXITED(proc->status) | |
| 605 | or WEXITSTATUS(proc->status) != 0){ | |
| 606 | /* Bad exit by plugin */ | |
| 607 | if(debug){ | |
| 608 | if(WIFEXITED(proc->status)){ | |
| 609 | fprintf(stderr, "Plugin %d exited with status %d\n", | |
| 610 | proc->pid, WEXITSTATUS(proc->status)); | |
| 611 | } else if(WIFSIGNALED(proc->status)) { | |
| 612 | fprintf(stderr, "Plugin %d killed by signal %d\n", | |
| 613 | proc->pid, WTERMSIG(proc->status)); | |
| 614 | } else if(WCOREDUMP(proc->status)){ | |
| 615 | fprintf(stderr, "Plugin %d dumped core\n", proc->pid); | |
| 616 | } | |
| 617 | } | |
| 618 | /* Remove the plugin */ | |
| 619 | FD_CLR(proc->fd, &rfds_all); | |
| 620 | /* Block signal while modifying process_list */ | |
| 621 | ret = sigprocmask (SIG_BLOCK, &sigchld_action.sa_mask, NULL); | |
| 622 | if(ret < 0){ | |
| 623 | perror("sigprocmask"); | |
| 624 | exitstatus = EXIT_FAILURE; | |
| 625 | goto end; | |
| 626 | } | |
| 627 | /* Delete this process entry from the list */ | |
| 628 | if(process_list == proc){ | |
| 629 | /* First one - simple */ | |
| 630 | process_list = proc->next; | |
| 631 | } else { | |
| 632 | /* Second one or later */ | |
| 633 | for(process *p = process_list; p != NULL; p = p->next){ | |
| 634 | if(p->next == proc){ | |
| 635 | p->next = proc->next; | |
| 636 | break; | |
| 637 | } | |
| 638 | } | |
| 639 | } | |
| 640 | /* We are done modifying process list, so unblock signal */ | |
| 641 | ret = sigprocmask (SIG_UNBLOCK, &sigchld_action.sa_mask, | |
| 642 | NULL); | |
| 643 | if(ret < 0){ | |
| 644 | perror("sigprocmask"); | |
| 645 | } | |
| 646 | free(proc->buffer); | |
| 647 | free(proc); | |
| 648 | /* We deleted this process from the list, so we can't go | |
| 649 | 	     proc->next.  Therefore, start over from the beginning of
 | |
| 650 | 	     the process list */
 | |
| 651 | break; | |
| 652 | } | |
| 653 | /* This process exited nicely, so print its buffer */ | |
| 654 | for(size_t written = 0; written < proc->buffer_length; | |
| 655 | written += (size_t)ret){ | |
| 656 | ret = TEMP_FAILURE_RETRY(write(STDOUT_FILENO, | |
| 657 | proc->buffer + written, | |
| 658 | proc->buffer_length | |
| 659 | - written)); | |
| 660 | if(ret < 0){ | |
| 661 | perror("write"); | |
| 662 | exitstatus = EXIT_FAILURE; | |
| 663 | goto end; | |
| 664 | } | |
| 665 | } | |
| 666 | goto end; | |
| 667 | } | |
| 668 | /* This process has not completed. Does it have any output? */ | |
| 669 | if(proc->eof or not FD_ISSET(proc->fd, &rfds)){ | |
| 670 | /* This process had nothing to say at this time */ | |
| 34
by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set | 671 | continue; | 
| 672 | } | |
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 673 | /* Before reading, make the process' data buffer large enough */ | 
| 34
by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set | 674 | if(proc->buffer_length + BUFFER_SIZE > proc->buffer_size){ | 
| 675 | proc->buffer = realloc(proc->buffer, proc->buffer_size | |
| 676 | + (size_t) BUFFER_SIZE); | |
| 677 | if (proc->buffer == NULL){ | |
| 678 | perror("malloc"); | |
| 679 | exitstatus = EXIT_FAILURE; | |
| 680 | goto end; | |
| 681 | } | |
| 682 | proc->buffer_size += BUFFER_SIZE; | |
| 683 | } | |
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 684 | /* Read from the process */ | 
| 34
by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set | 685 | ret = read(proc->fd, proc->buffer + proc->buffer_length, | 
| 686 | BUFFER_SIZE); | |
| 687 | if(ret < 0){ | |
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 688 | /* Read error from this process; ignore the error */ | 
| 34
by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set | 689 | continue; | 
| 690 | } | |
| 691 | if(ret == 0){ | |
| 692 | /* got EOF */ | |
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 693 | proc->eof = true; | 
| 694 | } else { | |
| 695 | proc->buffer_length += (size_t) ret; | |
| 13
by Björn Påhlsson Added following support: | 696 | } | 
| 697 | } | |
| 698 | } | |
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 699 | if(process_list == NULL){ | 
| 700 | fprintf(stderr, "All plugin processes failed, exiting\n"); | |
| 701 | exitstatus = EXIT_FAILURE; | |
| 702 | } | |
| 13
by Björn Påhlsson Added following support: | 703 |   
 | 
| 704 | end: | |
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 705 | /* Restore old signal handler */ | 
| 706 | sigaction(SIGCHLD, &old_sigchld_action, NULL); | |
| 707 |   
 | |
| 24.1.8
by Björn Påhlsson plugbasedclient | 708 | free(plus_argv); | 
| 709 |   
 | |
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 710 | /* Free the plugin list */ | 
| 711 | for(plugin *next; plugin_list != NULL; plugin_list = next){ | |
| 712 | next = plugin_list->next; | |
| 713 | free(plugin_list->argv); | |
| 714 | free(plugin_list); | |
| 715 | } | |
| 716 |   
 | |
| 717 | if(dir != NULL){ | |
| 718 | closedir(dir); | |
| 719 | } | |
| 720 |   
 | |
| 721 | /* Free the process list and kill the processes */ | |
| 34
by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set | 722 | for(process *next; process_list != NULL; process_list = next){ | 
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 723 | next = process_list->next; | 
| 34
by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set | 724 | close(process_list->fd); | 
| 24.1.26
by Björn Påhlsson tally count of used symbols | 725 | ret = kill(process_list->pid, SIGTERM); | 
| 726 | if(ret == -1 and errno != ESRCH){ | |
| 727 | /* set-uid proccesses migth not get closed */ | |
| 728 | perror("kill"); | |
| 729 | } | |
| 34
by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set | 730 | free(process_list->buffer); | 
| 731 | free(process_list); | |
| 13
by Björn Påhlsson Added following support: | 732 | } | 
| 733 |   
 | |
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 734 | /* Wait for any remaining child processes to terminate */ | 
| 735 | do{ | |
| 736 | ret = wait(NULL); | |
| 737 | } while(ret >= 0); | |
| 738 | if(errno != ECHILD){ | |
| 739 | perror("wait"); | |
| 740 | } | |
| 741 |   
 | |
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 742 | return exitstatus; | 
| 13
by Björn Påhlsson Added following support: | 743 | }
 |