bzr branch
http://bzr.recompile.se/loggerhead/mandos/trunk
| 359
by Teddy Hogeborn * plugins-runner.c (main): Bug fix: Close config file. | 1 | /*  -*- coding: utf-8; mode: c; mode: orgtbl -*- */
 | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 2 | /*
 | 
| 3 |  * Mandos plugin runner - Run Mandos plugins
 | |
| 4 |  *
 | |
| 923
by Teddy Hogeborn Update copyright year to 2018 | 5 |  * Copyright © 2008-2018 Teddy Hogeborn
 | 
| 6 |  * Copyright © 2008-2018 Björn Påhlsson
 | |
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 7 |  * 
 | 
| 907
by Teddy Hogeborn Alter copyright notices slightly. Actual license is unchanged! | 8 |  * This file is part of Mandos.
 | 
| 9 |  * 
 | |
| 10 |  * Mandos is free software: you can redistribute it and/or modify it
 | |
| 11 |  * under the terms of the GNU General Public License as published by
 | |
| 12 |  * the Free Software Foundation, either version 3 of the License, or
 | |
| 13 |  * (at your option) any later version.
 | |
| 14 |  * 
 | |
| 15 |  * Mandos is distributed in the hope that it will be useful, but
 | |
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 16 |  * WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
| 17 |  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 | |
| 18 |  * General Public License for more details.
 | |
| 19 |  * 
 | |
| 20 |  * You should have received a copy of the GNU General Public License
 | |
| 907
by Teddy Hogeborn Alter copyright notices slightly. Actual license is unchanged! | 21 |  * along with Mandos.  If not, see <http://www.gnu.org/licenses/>.
 | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 22 |  * 
 | 
| 505.1.2
by Teddy Hogeborn Change "fukt.bsnet.se" to "recompile.se" throughout. | 23 |  * Contact the authors at <mandos@recompile.se>.
 | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 24 |  */
 | 
| 25 | ||
| 78
by Teddy Hogeborn Add feature to specify custom environment variables for plugins. | 26 | #define _GNU_SOURCE /* TEMP_FAILURE_RETRY(), getline(), | 
| 703
by Teddy Hogeborn In plugin-runner, do scandirat() or scandir() instead of readdir(). | 27 | 				   O_CLOEXEC, pipe2() */
 | 
| 24.1.26
by Björn Påhlsson tally count of used symbols | 28 | #include <stddef.h> /* size_t, NULL */ | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 29 | #include <stdlib.h> /* malloc(), exit(), EXIT_SUCCESS, | 
| 30 | realloc() */ | |
| 24.1.26
by Björn Påhlsson tally count of used symbols | 31 | #include <stdbool.h> /* bool, true, false */ | 
| 24.1.155
by Björn Påhlsson mandos server: Added debuglevel that adjust at what level information | 32 | #include <stdio.h> /* fileno(), fprintf(), | 
| 675
by Teddy Hogeborn Use openat() etc. in plugin-runner. Also one less useless warning. | 33 | stderr, STDOUT_FILENO, fclose() */ | 
| 703
by Teddy Hogeborn In plugin-runner, do scandirat() or scandir() instead of readdir(). | 34 | #include <sys/types.h> /* fstat(), struct stat, waitpid(), | 
| 35 | WIFEXITED(), WEXITSTATUS(), wait(), | |
| 36 | pid_t, uid_t, gid_t, getuid(), | |
| 37 | getgid() */ | |
| 24.1.26
by Björn Påhlsson tally count of used symbols | 38 | #include <sys/select.h> /* fd_set, select(), FD_ZERO(), | 
| 39 | FD_SET(), FD_ISSET(), FD_CLR */ | |
| 40 | #include <sys/wait.h> /* wait(), waitpid(), WIFEXITED(), | |
| 834
by Teddy Hogeborn Client: Remove dead code in plugin-runner | 41 | WEXITSTATUS(), WTERMSIG() */ | 
| 675
by Teddy Hogeborn Use openat() etc. in plugin-runner. Also one less useless warning. | 42 | #include <sys/stat.h> /* struct stat, fstat(), S_ISREG() */ | 
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 43 | #include <iso646.h> /* and, or, not */ | 
| 703
by Teddy Hogeborn In plugin-runner, do scandirat() or scandir() instead of readdir(). | 44 | #include <dirent.h> /* struct dirent, scandirat() */ | 
| 675
by Teddy Hogeborn Use openat() etc. in plugin-runner. Also one less useless warning. | 45 | #include <unistd.h> /* fcntl(), F_GETFD, F_SETFD, | 
| 46 | FD_CLOEXEC, write(), STDOUT_FILENO, | |
| 47 | struct stat, fstat(), close(), | |
| 48 | setgid(), setuid(), S_ISREG(), | |
| 703
by Teddy Hogeborn In plugin-runner, do scandirat() or scandir() instead of readdir(). | 49 | faccessat() pipe2(), fork(), | 
| 675
by Teddy Hogeborn Use openat() etc. in plugin-runner. Also one less useless warning. | 50 | _exit(), dup2(), fexecve(), read() | 
| 51 | */ | |
| 24.1.26
by Björn Påhlsson tally count of used symbols | 52 | #include <fcntl.h> /* fcntl(), F_GETFD, F_SETFD, | 
| 703
by Teddy Hogeborn In plugin-runner, do scandirat() or scandir() instead of readdir(). | 53 | FD_CLOEXEC, openat(), scandirat(), | 
| 54 | pipe2() */ | |
| 675
by Teddy Hogeborn Use openat() etc. in plugin-runner. Also one less useless warning. | 55 | #include <string.h> /* strsep, strlen(), strsignal(), | 
| 56 | strcmp(), strncmp() */ | |
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 57 | #include <errno.h> /* errno */ | 
| 24.1.26
by Björn Påhlsson tally count of used symbols | 58 | #include <argp.h> /* struct argp_option, struct | 
| 59 | argp_state, struct argp, | |
| 60 | argp_parse(), ARGP_ERR_UNKNOWN, | |
| 102
by Teddy Hogeborn * plugin-runner.c (process): Set "completed" and "status" as volatile. | 61 | ARGP_KEY_END, ARGP_KEY_ARG, | 
| 62 | error_t */ | |
| 24.1.26
by Björn Påhlsson tally count of used symbols | 63 | #include <signal.h> /* struct sigaction, sigemptyset(), | 
| 64 | sigaddset(), sigaction(), | |
| 65 | sigprocmask(), SIG_BLOCK, SIGCHLD, | |
| 308
by Teddy Hogeborn * plugin-runner.c: Comment change. | 66 | SIG_UNBLOCK, kill(), sig_atomic_t | 
| 67 | */ | |
| 24.1.26
by Björn Påhlsson tally count of used symbols | 68 | #include <errno.h> /* errno, EBADF */ | 
| 311
by Teddy Hogeborn Overflows are not detected by sscanf(), so stop using it: | 69 | #include <inttypes.h> /* intmax_t, PRIdMAX, strtoimax() */ | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 70 | #include <sysexits.h> /* EX_OSERR, EX_USAGE, EX_IOERR, | 
| 71 | EX_CONFIG, EX_UNAVAILABLE, EX_OK */ | |
| 24.1.155
by Björn Påhlsson mandos server: Added debuglevel that adjust at what level information | 72 | #include <errno.h> /* errno */ | 
| 73 | #include <error.h> /* error() */ | |
| 676
by Teddy Hogeborn Use fnmatch()in plugin-runner. | 74 | #include <fnmatch.h> /* fnmatch() */ | 
| 13
by Björn Påhlsson Added following support: | 75 | |
| 37
by Teddy Hogeborn Non-tested commit for merge purposes. | 76 | #define BUFFER_SIZE 256
 | 
| 24.1.69
by Björn Påhlsson added configfile as a optional argument to plugin-runner | 77 | |
| 78 | #define PDIR "/lib/mandos/plugins.d"
 | |
| 738.1.1
by Teddy Hogeborn Add a plugin helper directory, available to all plugins. | 79 | #define PHDIR "/lib/mandos/plugin-helpers"
 | 
| 24.1.69
by Björn Påhlsson added configfile as a optional argument to plugin-runner | 80 | #define AFILE "/conf/conf.d/mandos/plugin-runner.conf"
 | 
| 37
by Teddy Hogeborn Non-tested commit for merge purposes. | 81 | |
| 217
by Teddy Hogeborn * .bzrignore: Added "man" directory (created by "make install-html"). | 82 | const char *argp_program_version = "plugin-runner " VERSION; | 
| 505.1.2
by Teddy Hogeborn Change "fukt.bsnet.se" to "recompile.se" throughout. | 83 | const char *argp_program_bug_address = "<mandos@recompile.se>"; | 
| 24.1.35
by Björn Påhlsson version 1.0 | 84 | |
| 24.1.76
by Björn Påhlsson Rearranged so plugins and processes is the same thing | 85 | typedef struct plugin{ | 
| 86 | char *name; /* can be NULL or any plugin name */ | |
| 87 | char **argv; | |
| 88 | int argc; | |
| 89 | char **environ; | |
| 90 | int envc; | |
| 91 | bool disabled; | |
| 312
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 92 |   
 | 
| 24.1.76
by Björn Påhlsson Rearranged so plugins and processes is the same thing | 93 | /* Variables used for running processes*/ | 
| 13
by Björn Påhlsson Added following support: | 94 | pid_t pid; | 
| 95 | int fd; | |
| 96 | char *buffer; | |
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 97 | size_t buffer_size; | 
| 98 | size_t buffer_length; | |
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 99 | bool eof; | 
| 296
by Teddy Hogeborn * plugin-runner.c (struct plugin.completed): Changed type to "volatile | 100 | volatile sig_atomic_t completed; | 
| 297
by Teddy Hogeborn * plugin-runner.c (struct plugin.status): Changed type to "int". | 101 | int status; | 
| 24.1.1
by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they | 102 | struct plugin *next; | 
| 103 | } plugin; | |
| 104 | ||
| 24.1.76
by Björn Påhlsson Rearranged so plugins and processes is the same thing | 105 | static plugin *plugin_list = NULL; | 
| 106 | ||
| 24.1.90
by Björn Påhlsson fixed two bugs: | 107 | /* Gets an existing plugin based on name,
 | 
| 24.1.76
by Björn Påhlsson Rearranged so plugins and processes is the same thing | 108 |    or if none is found, creates a new one */
 | 
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 109 | __attribute__((warn_unused_result)) | 
| 24.1.76
by Björn Påhlsson Rearranged so plugins and processes is the same thing | 110 | static plugin *getplugin(char *name){ | 
| 394
by Teddy Hogeborn Convert some programs to use the exit codes from <sysexits.h>. Change | 111 | /* Check for existing plugin with that name */ | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 112 | for(plugin *p = plugin_list; p != NULL; p = p->next){ | 
| 113 | if((p->name == name) | |
| 114 | or (p->name and name and (strcmp(p->name, name) == 0))){ | |
| 24.1.1
by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they | 115 | return p; | 
| 116 | } | |
| 117 | } | |
| 118 | /* Create a new plugin */ | |
| 362
by Teddy Hogeborn * plugin-runner.c (getplugin, add_environment, main): Handle EINTR | 119 | plugin *new_plugin = NULL; | 
| 363
by Teddy Hogeborn * plugin-runner.c: Minor stylistic changes. | 120 | do { | 
| 362
by Teddy Hogeborn * plugin-runner.c (getplugin, add_environment, main): Handle EINTR | 121 | new_plugin = malloc(sizeof(plugin)); | 
| 363
by Teddy Hogeborn * plugin-runner.c: Minor stylistic changes. | 122 | } while(new_plugin == NULL and errno == EINTR); | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 123 | if(new_plugin == NULL){ | 
| 78
by Teddy Hogeborn Add feature to specify custom environment variables for plugins. | 124 | return NULL; | 
| 24.1.1
by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they | 125 | } | 
| 24.1.62
by Björn Påhlsson merge + small bugfix | 126 | char *copy_name = NULL; | 
| 127 | if(name != NULL){ | |
| 363
by Teddy Hogeborn * plugin-runner.c: Minor stylistic changes. | 128 | do { | 
| 362
by Teddy Hogeborn * plugin-runner.c (getplugin, add_environment, main): Handle EINTR | 129 | copy_name = strdup(name); | 
| 363
by Teddy Hogeborn * plugin-runner.c: Minor stylistic changes. | 130 | } while(copy_name == NULL and errno == EINTR); | 
| 98
by Teddy Hogeborn * plugin-runner.c (getplugin): Only copy "name" if not NULL. Free | 131 | if(copy_name == NULL){ | 
| 394
by Teddy Hogeborn Convert some programs to use the exit codes from <sysexits.h>. Change | 132 | int e = errno; | 
| 272
by Teddy Hogeborn Fix problem found using cppcheck, thanks to George Danchev | 133 | free(new_plugin); | 
| 394
by Teddy Hogeborn Convert some programs to use the exit codes from <sysexits.h>. Change | 134 | errno = e; | 
| 98
by Teddy Hogeborn * plugin-runner.c (getplugin): Only copy "name" if not NULL. Free | 135 | return NULL; | 
| 136 | } | |
| 24.1.54
by Björn Påhlsson plugin-runner | 137 | } | 
| 24.1.90
by Björn Påhlsson fixed two bugs: | 138 |   
 | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 139 | *new_plugin = (plugin){ .name = copy_name, | 
| 140 | .argc = 1, | |
| 141 | .disabled = false, | |
| 142 | .next = plugin_list }; | |
| 78
by Teddy Hogeborn Add feature to specify custom environment variables for plugins. | 143 |   
 | 
| 363
by Teddy Hogeborn * plugin-runner.c: Minor stylistic changes. | 144 | do { | 
| 362
by Teddy Hogeborn * plugin-runner.c (getplugin, add_environment, main): Handle EINTR | 145 | new_plugin->argv = malloc(sizeof(char *) * 2); | 
| 363
by Teddy Hogeborn * plugin-runner.c: Minor stylistic changes. | 146 | } while(new_plugin->argv == NULL and errno == EINTR); | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 147 | if(new_plugin->argv == NULL){ | 
| 394
by Teddy Hogeborn Convert some programs to use the exit codes from <sysexits.h>. Change | 148 | int e = errno; | 
| 24.1.62
by Björn Påhlsson merge + small bugfix | 149 | free(copy_name); | 
| 78
by Teddy Hogeborn Add feature to specify custom environment variables for plugins. | 150 | free(new_plugin); | 
| 394
by Teddy Hogeborn Convert some programs to use the exit codes from <sysexits.h>. Change | 151 | errno = e; | 
| 78
by Teddy Hogeborn Add feature to specify custom environment variables for plugins. | 152 | return NULL; | 
| 24.1.1
by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they | 153 | } | 
| 24.1.54
by Björn Påhlsson plugin-runner | 154 | new_plugin->argv[0] = copy_name; | 
| 24.1.1
by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they | 155 | new_plugin->argv[1] = NULL; | 
| 135
by Teddy Hogeborn * plugin-runner.c (add_environment): Never insert existing environment | 156 |   
 | 
| 363
by Teddy Hogeborn * plugin-runner.c: Minor stylistic changes. | 157 | do { | 
| 362
by Teddy Hogeborn * plugin-runner.c (getplugin, add_environment, main): Handle EINTR | 158 | new_plugin->environ = malloc(sizeof(char *)); | 
| 363
by Teddy Hogeborn * plugin-runner.c: Minor stylistic changes. | 159 | } while(new_plugin->environ == NULL and errno == EINTR); | 
| 78
by Teddy Hogeborn Add feature to specify custom environment variables for plugins. | 160 | if(new_plugin->environ == NULL){ | 
| 394
by Teddy Hogeborn Convert some programs to use the exit codes from <sysexits.h>. Change | 161 | int e = errno; | 
| 24.1.62
by Björn Påhlsson merge + small bugfix | 162 | free(copy_name); | 
| 78
by Teddy Hogeborn Add feature to specify custom environment variables for plugins. | 163 | free(new_plugin->argv); | 
| 164 | free(new_plugin); | |
| 394
by Teddy Hogeborn Convert some programs to use the exit codes from <sysexits.h>. Change | 165 | errno = e; | 
| 78
by Teddy Hogeborn Add feature to specify custom environment variables for plugins. | 166 | return NULL; | 
| 167 | } | |
| 168 | new_plugin->environ[0] = NULL; | |
| 135
by Teddy Hogeborn * plugin-runner.c (add_environment): Never insert existing environment | 169 |   
 | 
| 24.1.1
by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they | 170 | /* Append the new plugin to the list */ | 
| 24.1.76
by Björn Påhlsson Rearranged so plugins and processes is the same thing | 171 | plugin_list = new_plugin; | 
| 24.1.1
by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they | 172 | return new_plugin; | 
| 173 | }
 | |
| 174 | ||
| 78
by Teddy Hogeborn Add feature to specify custom environment variables for plugins. | 175 | /* Helper function for add_argument and add_environment */
 | 
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 176 | __attribute__((nonnull, warn_unused_result)) | 
| 78
by Teddy Hogeborn Add feature to specify custom environment variables for plugins. | 177 | static bool add_to_char_array(const char *new, char ***array, | 
| 178 | int *len){ | |
| 179 | /* Resize the pointed-to array to hold one more pointer */ | |
| 666
by Teddy Hogeborn Bug fix: Free all memory and give better messages when memory is full. | 180 | char **new_array = NULL; | 
| 363
by Teddy Hogeborn * plugin-runner.c: Minor stylistic changes. | 181 | do { | 
| 666
by Teddy Hogeborn Bug fix: Free all memory and give better messages when memory is full. | 182 | new_array = realloc(*array, sizeof(char *) | 
| 183 | * (size_t) ((*len) + 2)); | |
| 184 | } while(new_array == NULL and errno == EINTR); | |
| 78
by Teddy Hogeborn Add feature to specify custom environment variables for plugins. | 185 | /* Malloc check */ | 
| 666
by Teddy Hogeborn Bug fix: Free all memory and give better messages when memory is full. | 186 | if(new_array == NULL){ | 
| 78
by Teddy Hogeborn Add feature to specify custom environment variables for plugins. | 187 | return false; | 
| 188 | } | |
| 666
by Teddy Hogeborn Bug fix: Free all memory and give better messages when memory is full. | 189 | *array = new_array; | 
| 78
by Teddy Hogeborn Add feature to specify custom environment variables for plugins. | 190 | /* Make a copy of the new string */ | 
| 362
by Teddy Hogeborn * plugin-runner.c (getplugin, add_environment, main): Handle EINTR | 191 | char *copy; | 
| 363
by Teddy Hogeborn * plugin-runner.c: Minor stylistic changes. | 192 | do { | 
| 362
by Teddy Hogeborn * plugin-runner.c (getplugin, add_environment, main): Handle EINTR | 193 | copy = strdup(new); | 
| 363
by Teddy Hogeborn * plugin-runner.c: Minor stylistic changes. | 194 | } while(copy == NULL and errno == EINTR); | 
| 78
by Teddy Hogeborn Add feature to specify custom environment variables for plugins. | 195 | if(copy == NULL){ | 
| 196 | return false; | |
| 197 | } | |
| 198 | /* Insert the copy */ | |
| 199 | (*array)[*len] = copy; | |
| 200 | (*len)++; | |
| 201 | /* Add a new terminating NULL pointer to the last element */ | |
| 202 | (*array)[*len] = NULL; | |
| 203 | return true; | |
| 204 | }
 | |
| 205 | ||
| 206 | /* Add to a plugin's argument vector */
 | |
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 207 | __attribute__((nonnull(2), warn_unused_result)) | 
| 78
by Teddy Hogeborn Add feature to specify custom environment variables for plugins. | 208 | static bool add_argument(plugin *p, const char *arg){ | 
| 209 | if(p == NULL){ | |
| 210 | return false; | |
| 211 | } | |
| 212 | return add_to_char_array(arg, &(p->argv), &(p->argc)); | |
| 213 | }
 | |
| 214 | ||
| 215 | /* Add to a plugin's environment */
 | |
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 216 | __attribute__((nonnull(2), warn_unused_result)) | 
| 136
by Teddy Hogeborn * plugin-runner.c (add_environment): Override existing environment | 217 | static bool add_environment(plugin *p, const char *def, bool replace){ | 
| 78
by Teddy Hogeborn Add feature to specify custom environment variables for plugins. | 218 | if(p == NULL){ | 
| 219 | return false; | |
| 220 | } | |
| 135
by Teddy Hogeborn * plugin-runner.c (add_environment): Never insert existing environment | 221 | /* namelen = length of name of environment variable */ | 
| 222 | size_t namelen = (size_t)(strchrnul(def, '=') - def); | |
| 223 | /* Search for this environment variable */ | |
| 666
by Teddy Hogeborn Bug fix: Free all memory and give better messages when memory is full. | 224 | for(char **envdef = p->environ; *envdef != NULL; envdef++){ | 
| 225 | if(strncmp(*envdef, def, namelen + 1) == 0){ | |
| 136
by Teddy Hogeborn * plugin-runner.c (add_environment): Override existing environment | 226 | /* It already exists */ | 
| 227 | if(replace){ | |
| 666
by Teddy Hogeborn Bug fix: Free all memory and give better messages when memory is full. | 228 | char *new_envdef; | 
| 363
by Teddy Hogeborn * plugin-runner.c: Minor stylistic changes. | 229 | do { | 
| 666
by Teddy Hogeborn Bug fix: Free all memory and give better messages when memory is full. | 230 | new_envdef = realloc(*envdef, strlen(def) + 1); | 
| 231 | } while(new_envdef == NULL and errno == EINTR); | |
| 232 | if(new_envdef == NULL){ | |
| 136
by Teddy Hogeborn * plugin-runner.c (add_environment): Override existing environment | 233 | return false; | 
| 234 | } | |
| 666
by Teddy Hogeborn Bug fix: Free all memory and give better messages when memory is full. | 235 | *envdef = new_envdef; | 
| 236 | strcpy(*envdef, def); | |
| 136
by Teddy Hogeborn * plugin-runner.c (add_environment): Override existing environment | 237 | } | 
| 135
by Teddy Hogeborn * plugin-runner.c (add_environment): Never insert existing environment | 238 | return true; | 
| 239 | } | |
| 240 | } | |
| 78
by Teddy Hogeborn Add feature to specify custom environment variables for plugins. | 241 | return add_to_char_array(def, &(p->environ), &(p->envc)); | 
| 242 | }
 | |
| 243 | ||
| 703
by Teddy Hogeborn In plugin-runner, do scandirat() or scandir() instead of readdir(). | 244 | #ifndef O_CLOEXEC
 | 
| 32
by Teddy Hogeborn * plugins.d/plugbasedclient.c (set_cloexec_flag): New function. | 245 | /*
 | 
| 246 |  * Based on the example in the GNU LibC manual chapter 13.13 "File
 | |
| 247 |  * Descriptor Flags".
 | |
| 359
by Teddy Hogeborn * plugins-runner.c (main): Bug fix: Close config file. | 248 |  | [[info:libc:Descriptor%20Flags][File Descriptor Flags]] |
 | 
| 32
by Teddy Hogeborn * plugins.d/plugbasedclient.c (set_cloexec_flag): New function. | 249 |  */
 | 
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 250 | __attribute__((warn_unused_result)) | 
| 187
by Teddy Hogeborn * debian/mandos-client.README.Debian: Document "eth0" default and how | 251 | static int set_cloexec_flag(int fd){ | 
| 367
by Teddy Hogeborn * init.d-mandos: Bug fix: Correct the LSB header. | 252 | int ret = (int)TEMP_FAILURE_RETRY(fcntl(fd, F_GETFD, 0)); | 
| 32
by Teddy Hogeborn * plugins.d/plugbasedclient.c (set_cloexec_flag): New function. | 253 | /* If reading the flags failed, return error indication now. */ | 
| 254 | if(ret < 0){ | |
| 255 | return ret; | |
| 256 | } | |
| 257 | /* Store modified flag word in the descriptor. */ | |
| 367
by Teddy Hogeborn * init.d-mandos: Bug fix: Correct the LSB header. | 258 | return (int)TEMP_FAILURE_RETRY(fcntl(fd, F_SETFD, | 
| 259 | ret | FD_CLOEXEC)); | |
| 32
by Teddy Hogeborn * plugins.d/plugbasedclient.c (set_cloexec_flag): New function. | 260 | }
 | 
| 703
by Teddy Hogeborn In plugin-runner, do scandirat() or scandir() instead of readdir(). | 261 | #endif /* not O_CLOEXEC */ | 
| 32
by Teddy Hogeborn * plugins.d/plugbasedclient.c (set_cloexec_flag): New function. | 262 | |
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 263 | |
| 102
by Teddy Hogeborn * plugin-runner.c (process): Set "completed" and "status" as volatile. | 264 | /* Mark processes as completed when they exit, and save their exit
 | 
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 265 |    status. */
 | 
| 187
by Teddy Hogeborn * debian/mandos-client.README.Debian: Document "eth0" default and how | 266 | static void handle_sigchld(__attribute__((unused)) int sig){ | 
| 298
by Teddy Hogeborn * plugin-runner.c (handle_sigchld): Bug fix: Save and restore "errno". | 267 | int old_errno = errno; | 
| 24.1.65
by Björn Påhlsson * plugin-runner.c (handle_sigchld): Loop until all exited children | 268 | while(true){ | 
| 24.1.76
by Björn Påhlsson Rearranged so plugins and processes is the same thing | 269 | plugin *proc = plugin_list; | 
| 24.1.65
by Björn Påhlsson * plugin-runner.c (handle_sigchld): Loop until all exited children | 270 | int status; | 
| 271 | pid_t pid = waitpid(-1, &status, WNOHANG); | |
| 272 | if(pid == 0){ | |
| 102
by Teddy Hogeborn * plugin-runner.c (process): Set "completed" and "status" as volatile. | 273 | /* Only still running child processes */ | 
| 24.1.65
by Björn Påhlsson * plugin-runner.c (handle_sigchld): Loop until all exited children | 274 | break; | 
| 275 | } | |
| 276 | if(pid == -1){ | |
| 295
by Teddy Hogeborn * plugin-runner.c (handle_sigchld): Clarify logic. | 277 | if(errno == ECHILD){ | 
| 278 | /* No child processes */ | |
| 279 | break; | |
| 24.1.65
by Björn Påhlsson * plugin-runner.c (handle_sigchld): Loop until all exited children | 280 | } | 
| 24.1.155
by Björn Påhlsson mandos server: Added debuglevel that adjust at what level information | 281 | error(0, errno, "waitpid"); | 
| 24.1.65
by Björn Påhlsson * plugin-runner.c (handle_sigchld): Loop until all exited children | 282 | } | 
| 24.1.90
by Björn Påhlsson fixed two bugs: | 283 |     
 | 
| 102
by Teddy Hogeborn * plugin-runner.c (process): Set "completed" and "status" as volatile. | 284 | /* A child exited, find it in process_list */ | 
| 24.1.65
by Björn Påhlsson * plugin-runner.c (handle_sigchld): Loop until all exited children | 285 | while(proc != NULL and proc->pid != pid){ | 
| 286 | proc = proc->next; | |
| 287 | } | |
| 288 | if(proc == NULL){ | |
| 289 | /* Process not found in process list */ | |
| 290 | continue; | |
| 291 | } | |
| 292 | proc->status = status; | |
| 296
by Teddy Hogeborn * plugin-runner.c (struct plugin.completed): Changed type to "volatile | 293 | proc->completed = 1; | 
| 24.1.65
by Björn Påhlsson * plugin-runner.c (handle_sigchld): Loop until all exited children | 294 | } | 
| 298
by Teddy Hogeborn * plugin-runner.c (handle_sigchld): Bug fix: Save and restore "errno". | 295 | errno = old_errno; | 
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 296 | }
 | 
| 24.1.1
by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they | 297 | |
| 24.1.76
by Björn Påhlsson Rearranged so plugins and processes is the same thing | 298 | /* Prints out a password to stdout */
 | 
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 299 | __attribute__((nonnull, warn_unused_result)) | 
| 187
by Teddy Hogeborn * debian/mandos-client.README.Debian: Document "eth0" default and how | 300 | static bool print_out_password(const char *buffer, size_t length){ | 
| 64
by Teddy Hogeborn * mandos-client.c (print_out_password): Strip trailing '\n'. | 301 | ssize_t ret; | 
| 302 | for(size_t written = 0; written < length; written += (size_t)ret){ | |
| 24.1.42
by Björn Påhlsson Added fallback to mandos-client | 303 | ret = TEMP_FAILURE_RETRY(write(STDOUT_FILENO, buffer + written, | 
| 304 | length - written)); | |
| 305 | if(ret < 0){ | |
| 306 | return false; | |
| 307 | } | |
| 308 | } | |
| 309 | return true; | |
| 310 | }
 | |
| 311 | ||
| 24.1.76
by Björn Påhlsson Rearranged so plugins and processes is the same thing | 312 | /* Removes and free a plugin from the plugin list */
 | 
| 534
by teddy at bsnet * plugin-runner.c (add_to_char_array): Added "nonnull" attribute. | 313 | __attribute__((nonnull)) | 
| 24.1.76
by Björn Påhlsson Rearranged so plugins and processes is the same thing | 314 | static void free_plugin(plugin *plugin_node){ | 
| 315 |   
 | |
| 316 | for(char **arg = plugin_node->argv; *arg != NULL; arg++){ | |
| 317 | free(*arg); | |
| 318 | } | |
| 319 | free(plugin_node->argv); | |
| 320 | for(char **env = plugin_node->environ; *env != NULL; env++){ | |
| 321 | free(*env); | |
| 322 | } | |
| 323 | free(plugin_node->environ); | |
| 324 | free(plugin_node->buffer); | |
| 312
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 325 |   
 | 
| 24.1.76
by Björn Påhlsson Rearranged so plugins and processes is the same thing | 326 | /* Removes the plugin from the singly-linked list */ | 
| 327 | if(plugin_node == plugin_list){ | |
| 328 | /* First one - simple */ | |
| 329 | plugin_list = plugin_list->next; | |
| 330 | } else { | |
| 331 | /* Second one or later */ | |
| 332 | for(plugin *p = plugin_list; p != NULL; p = p->next){ | |
| 333 | if(p->next == plugin_node){ | |
| 334 | p->next = plugin_node->next; | |
| 335 | break; | |
| 336 | } | |
| 337 | } | |
| 338 | } | |
| 339 |   
 | |
| 340 | free(plugin_node); | |
| 341 | }
 | |
| 342 | ||
| 343 | static void free_plugin_list(void){ | |
| 344 | while(plugin_list != NULL){ | |
| 345 | free_plugin(plugin_list); | |
| 98
by Teddy Hogeborn * plugin-runner.c (getplugin): Only copy "name" if not NULL. Free | 346 | } | 
| 24.1.54
by Björn Påhlsson plugin-runner | 347 | }
 | 
| 348 | ||
| 13
by Björn Påhlsson Added following support: | 349 | int main(int argc, char *argv[]){ | 
| 24.1.69
by Björn Påhlsson added configfile as a optional argument to plugin-runner | 350 | char *plugindir = NULL; | 
| 738.1.1
by Teddy Hogeborn Add a plugin helper directory, available to all plugins. | 351 | char *pluginhelperdir = NULL; | 
| 24.1.69
by Björn Påhlsson added configfile as a optional argument to plugin-runner | 352 | char *argfile = NULL; | 
| 24.1.51
by Björn Påhlsson Added configuration files support for mandos-client | 353 | FILE *conffp; | 
| 705
by Teddy Hogeborn plugin-runner: Release memory and close FD's correctly in all cases. | 354 | struct dirent **direntries = NULL; | 
| 13
by Björn Påhlsson Added following support: | 355 | struct stat st; | 
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 356 | fd_set rfds_all; | 
| 311
by Teddy Hogeborn Overflows are not detected by sscanf(), so stop using it: | 357 | int ret, maxfd = 0; | 
| 254
by Teddy Hogeborn Eliminate warning on 64-bit systems, thanks to Frans Pop | 358 | ssize_t sret; | 
| 24.1.6
by Björn Påhlsson plugbasedclient | 359 | uid_t uid = 65534; | 
| 360 | gid_t gid = 65534; | |
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 361 | bool debug = false; | 
| 362 | int exitstatus = EXIT_SUCCESS; | |
| 24.1.7
by Björn Påhlsson merge | 363 | struct sigaction old_sigchld_action; | 
| 364 | struct sigaction sigchld_action = { .sa_handler = handle_sigchld, | |
| 365 | .sa_flags = SA_NOCLDSTOP }; | |
| 24.1.51
by Björn Påhlsson Added configuration files support for mandos-client | 366 | char **custom_argv = NULL; | 
| 367 | int custom_argc = 0; | |
| 703
by Teddy Hogeborn In plugin-runner, do scandirat() or scandir() instead of readdir(). | 368 | int dir_fd = -1; | 
| 24.1.51
by Björn Påhlsson Added configuration files support for mandos-client | 369 |   
 | 
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 370 | /* Establish a signal handler */ | 
| 371 | sigemptyset(&sigchld_action.sa_mask); | |
| 372 | ret = sigaddset(&sigchld_action.sa_mask, SIGCHLD); | |
| 24.1.54
by Björn Påhlsson plugin-runner | 373 | if(ret == -1){ | 
| 24.1.155
by Björn Påhlsson mandos server: Added debuglevel that adjust at what level information | 374 | error(0, errno, "sigaddset"); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 375 | exitstatus = EX_OSERR; | 
| 24.1.54
by Björn Påhlsson plugin-runner | 376 | goto fallback; | 
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 377 | } | 
| 378 | ret = sigaction(SIGCHLD, &sigchld_action, &old_sigchld_action); | |
| 24.1.54
by Björn Påhlsson plugin-runner | 379 | if(ret == -1){ | 
| 24.1.155
by Björn Påhlsson mandos server: Added debuglevel that adjust at what level information | 380 | error(0, errno, "sigaction"); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 381 | exitstatus = EX_OSERR; | 
| 24.1.54
by Björn Påhlsson plugin-runner | 382 | goto fallback; | 
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 383 | } | 
| 384 |   
 | |
| 24.1.1
by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they | 385 | /* The options we understand. */ | 
| 386 | struct argp_option options[] = { | |
| 387 | { .name = "global-options", .key = 'g', | |
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 388 | .arg = "OPTION[,OPTION[,...]]", | 
| 389 | .doc = "Options passed to all plugins" }, | |
| 138
by Teddy Hogeborn * plugin-runner.c: Changed short option for "--global-env" to "-G", | 390 | { .name = "global-env", .key = 'G', | 
| 78
by Teddy Hogeborn Add feature to specify custom environment variables for plugins. | 391 | .arg = "VAR=value", | 
| 392 | .doc = "Environment variable passed to all plugins" }, | |
| 24.1.1
by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they | 393 | { .name = "options-for", .key = 'o', | 
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 394 | .arg = "PLUGIN:OPTION[,OPTION[,...]]", | 
| 395 | .doc = "Options passed only to specified plugin" }, | |
| 138
by Teddy Hogeborn * plugin-runner.c: Changed short option for "--global-env" to "-G", | 396 | { .name = "env-for", .key = 'E', | 
| 78
by Teddy Hogeborn Add feature to specify custom environment variables for plugins. | 397 | .arg = "PLUGIN:ENV=value", | 
| 398 | .doc = "Environment variable passed to specified plugin" }, | |
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 399 | { .name = "disable", .key = 'd', | 
| 400 | .arg = "PLUGIN", | |
| 401 | .doc = "Disable a specific plugin", .group = 1 }, | |
| 138
by Teddy Hogeborn * plugin-runner.c: Changed short option for "--global-env" to "-G", | 402 | { .name = "enable", .key = 'e', | 
| 403 | .arg = "PLUGIN", | |
| 404 | .doc = "Enable a specific plugin", .group = 1 }, | |
| 24.1.5
by Björn Påhlsson plugbasedclient: | 405 | { .name = "plugin-dir", .key = 128, | 
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 406 | .arg = "DIRECTORY", | 
| 407 | .doc = "Specify a different plugin directory", .group = 2 }, | |
| 24.1.69
by Björn Påhlsson added configfile as a optional argument to plugin-runner | 408 | { .name = "config-file", .key = 129, | 
| 409 | .arg = "FILE", | |
| 410 | .doc = "Specify a different configuration file", .group = 2 }, | |
| 411 | { .name = "userid", .key = 130, | |
| 412 | .arg = "ID", .flags = 0, | |
| 413 | .doc = "User ID the plugins will run as", .group = 3 }, | |
| 414 | { .name = "groupid", .key = 131, | |
| 415 | .arg = "ID", .flags = 0, | |
| 416 | .doc = "Group ID the plugins will run as", .group = 3 }, | |
| 417 | { .name = "debug", .key = 132, | |
| 418 | .doc = "Debug mode", .group = 4 }, | |
| 738.1.1
by Teddy Hogeborn Add a plugin helper directory, available to all plugins. | 419 | { .name = "plugin-helper-dir", .key = 133, | 
| 420 | .arg = "DIRECTORY", | |
| 421 | .doc = "Specify a different plugin helper directory", | |
| 422 | .group = 2 }, | |
| 394
by Teddy Hogeborn Convert some programs to use the exit codes from <sysexits.h>. Change | 423 | /* | 
| 424 |      * These reproduce what we would get without ARGP_NO_HELP
 | |
| 425 |      */
 | |
| 426 | { .name = "help", .key = '?', | |
| 427 | .doc = "Give this help list", .group = -1 }, | |
| 428 | { .name = "usage", .key = -3, | |
| 429 | .doc = "Give a short usage message", .group = -1 }, | |
| 430 | { .name = "version", .key = 'V', | |
| 431 | .doc = "Print program version", .group = -1 }, | |
| 24.1.1
by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they | 432 | { .name = NULL } | 
| 433 | }; | |
| 434 |   
 | |
| 534
by teddy at bsnet * plugin-runner.c (add_to_char_array): Added "nonnull" attribute. | 435 | __attribute__((nonnull(3))) | 
| 394
by Teddy Hogeborn Convert some programs to use the exit codes from <sysexits.h>. Change | 436 | error_t parse_opt(int key, char *arg, struct argp_state *state){ | 
| 437 | errno = 0; | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 438 | switch(key){ | 
| 360
by Teddy Hogeborn * plugin-runner.c (main): Move variables "tmpmax" and "tmp" into | 439 | char *tmp; | 
| 536
by Björn Påhlsson renamed some foomax values to what they actually represent | 440 | intmax_t tmp_id; | 
| 24.1.76
by Björn Påhlsson Rearranged so plugins and processes is the same thing | 441 | case 'g': /* --global-options */ | 
| 394
by Teddy Hogeborn Convert some programs to use the exit codes from <sysexits.h>. Change | 442 | { | 
| 24.1.134
by Björn Påhlsson plugin-runner: Added support for empty string arguments | 443 | char *plugin_option; | 
| 444 | while((plugin_option = strsep(&arg, ",")) != NULL){ | |
| 445 | if(not add_argument(getplugin(NULL), plugin_option)){ | |
| 394
by Teddy Hogeborn Convert some programs to use the exit codes from <sysexits.h>. Change | 446 | break; | 
| 78
by Teddy Hogeborn Add feature to specify custom environment variables for plugins. | 447 | } | 
| 448 | } | |
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 449 | errno = 0; | 
| 78
by Teddy Hogeborn Add feature to specify custom environment variables for plugins. | 450 | } | 
| 451 | break; | |
| 138
by Teddy Hogeborn * plugin-runner.c: Changed short option for "--global-env" to "-G", | 452 | case 'G': /* --global-env */ | 
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 453 | if(add_environment(getplugin(NULL), arg, true)){ | 
| 454 | errno = 0; | |
| 455 | } | |
| 24.1.1
by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they | 456 | break; | 
| 24.1.76
by Björn Påhlsson Rearranged so plugins and processes is the same thing | 457 | case 'o': /* --options-for */ | 
| 394
by Teddy Hogeborn Convert some programs to use the exit codes from <sysexits.h>. Change | 458 | { | 
| 459 | char *option_list = strchr(arg, ':'); | |
| 460 | if(option_list == NULL){ | |
| 461 | argp_error(state, "No colon in \"%s\"", arg); | |
| 462 | errno = EINVAL; | |
| 463 | break; | |
| 464 | } | |
| 465 | *option_list = '\0'; | |
| 466 | option_list++; | |
| 467 | if(arg[0] == '\0'){ | |
| 468 | argp_error(state, "Empty plugin name"); | |
| 469 | errno = EINVAL; | |
| 470 | break; | |
| 471 | } | |
| 472 | char *option; | |
| 473 | while((option = strsep(&option_list, ",")) != NULL){ | |
| 474 | if(not add_argument(getplugin(arg), option)){ | |
| 475 | break; | |
| 24.1.50
by Björn Påhlsson changed from using strtok to strsep | 476 | } | 
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 477 | } | 
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 478 | errno = 0; | 
| 24.1.1
by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they | 479 | } | 
| 480 | break; | |
| 138
by Teddy Hogeborn * plugin-runner.c: Changed short option for "--global-env" to "-G", | 481 | case 'E': /* --env-for */ | 
| 78
by Teddy Hogeborn Add feature to specify custom environment variables for plugins. | 482 | { | 
| 483 | char *envdef = strchr(arg, ':'); | |
| 484 | if(envdef == NULL){ | |
| 394
by Teddy Hogeborn Convert some programs to use the exit codes from <sysexits.h>. Change | 485 | argp_error(state, "No colon in \"%s\"", arg); | 
| 486 | errno = EINVAL; | |
| 78
by Teddy Hogeborn Add feature to specify custom environment variables for plugins. | 487 | break; | 
| 488 | } | |
| 24.1.92
by Björn Påhlsson Several memory leaks detected by valgrind fixed | 489 | *envdef = '\0'; | 
| 394
by Teddy Hogeborn Convert some programs to use the exit codes from <sysexits.h>. Change | 490 | envdef++; | 
| 491 | if(arg[0] == '\0'){ | |
| 492 | argp_error(state, "Empty plugin name"); | |
| 493 | errno = EINVAL; | |
| 494 | break; | |
| 78
by Teddy Hogeborn Add feature to specify custom environment variables for plugins. | 495 | } | 
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 496 | if(add_environment(getplugin(arg), envdef, true)){ | 
| 497 | errno = 0; | |
| 498 | } | |
| 78
by Teddy Hogeborn Add feature to specify custom environment variables for plugins. | 499 | } | 
| 500 | break; | |
| 24.1.76
by Björn Påhlsson Rearranged so plugins and processes is the same thing | 501 | case 'd': /* --disable */ | 
| 394
by Teddy Hogeborn Convert some programs to use the exit codes from <sysexits.h>. Change | 502 | { | 
| 24.1.76
by Björn Påhlsson Rearranged so plugins and processes is the same thing | 503 | plugin *p = getplugin(arg); | 
| 394
by Teddy Hogeborn Convert some programs to use the exit codes from <sysexits.h>. Change | 504 | if(p != NULL){ | 
| 505 | p->disabled = true; | |
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 506 | errno = 0; | 
| 78
by Teddy Hogeborn Add feature to specify custom environment variables for plugins. | 507 | } | 
| 24.1.5
by Björn Påhlsson plugbasedclient: | 508 | } | 
| 509 | break; | |
| 138
by Teddy Hogeborn * plugin-runner.c: Changed short option for "--global-env" to "-G", | 510 | case 'e': /* --enable */ | 
| 394
by Teddy Hogeborn Convert some programs to use the exit codes from <sysexits.h>. Change | 511 | { | 
| 138
by Teddy Hogeborn * plugin-runner.c: Changed short option for "--global-env" to "-G", | 512 | plugin *p = getplugin(arg); | 
| 394
by Teddy Hogeborn Convert some programs to use the exit codes from <sysexits.h>. Change | 513 | if(p != NULL){ | 
| 514 | p->disabled = false; | |
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 515 | errno = 0; | 
| 138
by Teddy Hogeborn * plugin-runner.c: Changed short option for "--global-env" to "-G", | 516 | } | 
| 517 | } | |
| 518 | break; | |
| 24.1.76
by Björn Påhlsson Rearranged so plugins and processes is the same thing | 519 | case 128: /* --plugin-dir */ | 
| 24.1.92
by Björn Påhlsson Several memory leaks detected by valgrind fixed | 520 | free(plugindir); | 
| 24.1.69
by Björn Påhlsson added configfile as a optional argument to plugin-runner | 521 | plugindir = strdup(arg); | 
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 522 | if(plugindir != NULL){ | 
| 523 | errno = 0; | |
| 524 | } | |
| 24.1.5
by Björn Påhlsson plugbasedclient: | 525 | break; | 
| 24.1.76
by Björn Påhlsson Rearranged so plugins and processes is the same thing | 526 | case 129: /* --config-file */ | 
| 137
by Teddy Hogeborn * plugin-runner.c (main/parse_opt): Removed code for "--config-file". | 527 | /* This is already done by parse_opt_config_file() */ | 
| 528 | break; | |
| 24.1.76
by Björn Påhlsson Rearranged so plugins and processes is the same thing | 529 | case 130: /* --userid */ | 
| 536
by Björn Påhlsson renamed some foomax values to what they actually represent | 530 | tmp_id = strtoimax(arg, &tmp, 10); | 
| 311
by Teddy Hogeborn Overflows are not detected by sscanf(), so stop using it: | 531 | if(errno != 0 or tmp == arg or *tmp != '\0' | 
| 536
by Björn Påhlsson renamed some foomax values to what they actually represent | 532 | or tmp_id != (uid_t)tmp_id){ | 
| 394
by Teddy Hogeborn Convert some programs to use the exit codes from <sysexits.h>. Change | 533 | argp_error(state, "Bad user ID number: \"%s\", using %" | 
| 534 | PRIdMAX, arg, (intmax_t)uid); | |
| 535 | break; | |
| 264
by Teddy Hogeborn * plugin-runner.c (main): Use "sscanf" instead of "strtol"; using the | 536 | } | 
| 536
by Björn Påhlsson renamed some foomax values to what they actually represent | 537 | uid = (uid_t)tmp_id; | 
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 538 | errno = 0; | 
| 24.1.6
by Björn Påhlsson plugbasedclient | 539 | break; | 
| 24.1.76
by Björn Påhlsson Rearranged so plugins and processes is the same thing | 540 | case 131: /* --groupid */ | 
| 536
by Björn Påhlsson renamed some foomax values to what they actually represent | 541 | tmp_id = strtoimax(arg, &tmp, 10); | 
| 311
by Teddy Hogeborn Overflows are not detected by sscanf(), so stop using it: | 542 | if(errno != 0 or tmp == arg or *tmp != '\0' | 
| 536
by Björn Påhlsson renamed some foomax values to what they actually represent | 543 | or tmp_id != (gid_t)tmp_id){ | 
| 394
by Teddy Hogeborn Convert some programs to use the exit codes from <sysexits.h>. Change | 544 | argp_error(state, "Bad group ID number: \"%s\", using %" | 
| 545 | PRIdMAX, arg, (intmax_t)gid); | |
| 546 | break; | |
| 264
by Teddy Hogeborn * plugin-runner.c (main): Use "sscanf" instead of "strtol"; using the | 547 | } | 
| 536
by Björn Påhlsson renamed some foomax values to what they actually represent | 548 | gid = (gid_t)tmp_id; | 
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 549 | errno = 0; | 
| 24.1.6
by Björn Påhlsson plugbasedclient | 550 | break; | 
| 24.1.76
by Björn Påhlsson Rearranged so plugins and processes is the same thing | 551 | case 132: /* --debug */ | 
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 552 | debug = true; | 
| 553 | break; | |
| 738.1.1
by Teddy Hogeborn Add a plugin helper directory, available to all plugins. | 554 | case 133: /* --plugin-helper-dir */ | 
| 555 | free(pluginhelperdir); | |
| 556 | pluginhelperdir = strdup(arg); | |
| 557 | if(pluginhelperdir != NULL){ | |
| 558 | errno = 0; | |
| 559 | } | |
| 560 | break; | |
| 394
by Teddy Hogeborn Convert some programs to use the exit codes from <sysexits.h>. Change | 561 | /* | 
| 562 |        * These reproduce what we would get without ARGP_NO_HELP
 | |
| 563 |        */
 | |
| 564 | case '?': /* --help */ | |
| 565 | state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */ | |
| 566 | argp_state_help(state, state->out_stream, ARGP_HELP_STD_HELP); | |
| 567 | case -3: /* --usage */ | |
| 568 | state->flags &= ~(unsigned int)ARGP_NO_EXIT; /* force exit */ | |
| 569 | argp_state_help(state, state->out_stream, | |
| 570 | ARGP_HELP_USAGE | ARGP_HELP_EXIT_OK); | |
| 571 | case 'V': /* --version */ | |
| 572 | fprintf(state->out_stream, "%s\n", argp_program_version); | |
| 573 | exit(EXIT_SUCCESS); | |
| 574 | break; | |
| 264
by Teddy Hogeborn * plugin-runner.c (main): Use "sscanf" instead of "strtol"; using the | 575 | /*
 | 
| 576 |  * When adding more options before this line, remember to also add a
 | |
| 577 |  * "case" to the "parse_opt_config_file" function below.
 | |
| 578 |  */
 | |
| 24.1.1
by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they | 579 | case ARGP_KEY_ARG: | 
| 178
by Teddy Hogeborn * initramfs-tools-script: Fix permissions of "/tmp" in initrd. | 580 | /* Cryptsetup always passes an argument, which is an empty | 
| 581 | 	 string if "none" was specified in /etc/crypttab.  So if
 | |
| 582 | 	 argument was empty, we ignore it silently. */
 | |
| 394
by Teddy Hogeborn Convert some programs to use the exit codes from <sysexits.h>. Change | 583 | if(arg[0] == '\0'){ | 
| 584 | break; | |
| 178
by Teddy Hogeborn * initramfs-tools-script: Fix permissions of "/tmp" in initrd. | 585 | } | 
| 942
by Teddy Hogeborn Mark fallthrough case with comment | 586 | /* FALLTHROUGH */ | 
| 24.1.1
by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they | 587 | default: | 
| 588 | return ARGP_ERR_UNKNOWN; | |
| 589 | } | |
| 394
by Teddy Hogeborn Convert some programs to use the exit codes from <sysexits.h>. Change | 590 | return errno; /* Set to 0 at start */ | 
| 24.1.1
by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they | 591 | } | 
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 592 |   
 | 
| 137
by Teddy Hogeborn * plugin-runner.c (main/parse_opt): Removed code for "--config-file". | 593 | /* This option parser is the same as parse_opt() above, except it | 
| 594 |      ignores everything but the --config-file option. */
 | |
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 595 | error_t parse_opt_config_file(int key, char *arg, | 
| 596 | __attribute__((unused)) | |
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 597 | struct argp_state *state){ | 
| 394
by Teddy Hogeborn Convert some programs to use the exit codes from <sysexits.h>. Change | 598 | errno = 0; | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 599 | switch(key){ | 
| 137
by Teddy Hogeborn * plugin-runner.c (main/parse_opt): Removed code for "--config-file". | 600 | case 'g': /* --global-options */ | 
| 138
by Teddy Hogeborn * plugin-runner.c: Changed short option for "--global-env" to "-G", | 601 | case 'G': /* --global-env */ | 
| 137
by Teddy Hogeborn * plugin-runner.c (main/parse_opt): Removed code for "--config-file". | 602 | case 'o': /* --options-for */ | 
| 138
by Teddy Hogeborn * plugin-runner.c: Changed short option for "--global-env" to "-G", | 603 | case 'E': /* --env-for */ | 
| 137
by Teddy Hogeborn * plugin-runner.c (main/parse_opt): Removed code for "--config-file". | 604 | case 'd': /* --disable */ | 
| 138
by Teddy Hogeborn * plugin-runner.c: Changed short option for "--global-env" to "-G", | 605 | case 'e': /* --enable */ | 
| 137
by Teddy Hogeborn * plugin-runner.c (main/parse_opt): Removed code for "--config-file". | 606 | case 128: /* --plugin-dir */ | 
| 607 | break; | |
| 608 | case 129: /* --config-file */ | |
| 24.1.92
by Björn Påhlsson Several memory leaks detected by valgrind fixed | 609 | free(argfile); | 
| 137
by Teddy Hogeborn * plugin-runner.c (main/parse_opt): Removed code for "--config-file". | 610 | argfile = strdup(arg); | 
| 672
by Teddy Hogeborn Update GCC warning flags and function attributes to GCC 4.7. | 611 | if(argfile != NULL){ | 
| 612 | errno = 0; | |
| 613 | } | |
| 355
by Teddy Hogeborn * mandos: White-space fixes only. | 614 | break; | 
| 137
by Teddy Hogeborn * plugin-runner.c (main/parse_opt): Removed code for "--config-file". | 615 | case 130: /* --userid */ | 
| 616 | case 131: /* --groupid */ | |
| 617 | case 132: /* --debug */ | |
| 738.1.1
by Teddy Hogeborn Add a plugin helper directory, available to all plugins. | 618 | case 133: /* --plugin-helper-dir */ | 
| 394
by Teddy Hogeborn Convert some programs to use the exit codes from <sysexits.h>. Change | 619 | case '?': /* --help */ | 
| 620 | case -3: /* --usage */ | |
| 621 | case 'V': /* --version */ | |
| 137
by Teddy Hogeborn * plugin-runner.c (main/parse_opt): Removed code for "--config-file". | 622 | case ARGP_KEY_ARG: | 
| 623 | break; | |
| 624 | default: | |
| 625 | return ARGP_ERR_UNKNOWN; | |
| 626 | } | |
| 394
by Teddy Hogeborn Convert some programs to use the exit codes from <sysexits.h>. Change | 627 | return errno; | 
| 137
by Teddy Hogeborn * plugin-runner.c (main/parse_opt): Removed code for "--config-file". | 628 | } | 
| 629 |   
 | |
| 630 | struct argp argp = { .options = options, | |
| 631 | .parser = parse_opt_config_file, | |
| 136
by Teddy Hogeborn * plugin-runner.c (add_environment): Override existing environment | 632 | .args_doc = "", | 
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 633 | .doc = "Mandos plugin runner -- Run plugins" }; | 
| 634 |   
 | |
| 265
by Teddy Hogeborn * plugin-runner.c (main): Bug fix; do not accept a "d" character after | 635 | /* Parse using parse_opt_config_file() in order to get the custom | 
| 137
by Teddy Hogeborn * plugin-runner.c (main/parse_opt): Removed code for "--config-file". | 636 |      config file location, if any. */
 | 
| 394
by Teddy Hogeborn Convert some programs to use the exit codes from <sysexits.h>. Change | 637 | ret = argp_parse(&argp, argc, argv, | 
| 638 | ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP, | |
| 639 | NULL, NULL); | |
| 640 | switch(ret){ | |
| 641 | case 0: | |
| 642 | break; | |
| 643 | case ENOMEM: | |
| 644 | default: | |
| 645 | errno = ret; | |
| 24.1.155
by Björn Påhlsson mandos server: Added debuglevel that adjust at what level information | 646 | error(0, errno, "argp_parse"); | 
| 394
by Teddy Hogeborn Convert some programs to use the exit codes from <sysexits.h>. Change | 647 | exitstatus = EX_OSERR; | 
| 648 | goto fallback; | |
| 649 | case EINVAL: | |
| 650 | exitstatus = EX_USAGE; | |
| 137
by Teddy Hogeborn * plugin-runner.c (main/parse_opt): Removed code for "--config-file". | 651 | goto fallback; | 
| 652 | } | |
| 653 |   
 | |
| 654 | /* Reset to the normal argument parser */ | |
| 655 | argp.parser = parse_opt; | |
| 656 |   
 | |
| 136
by Teddy Hogeborn * plugin-runner.c (add_environment): Override existing environment | 657 | /* Open the configfile if available */ | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 658 | if(argfile == NULL){ | 
| 24.1.69
by Björn Påhlsson added configfile as a optional argument to plugin-runner | 659 | conffp = fopen(AFILE, "r"); | 
| 660 | } else { | |
| 661 | conffp = fopen(argfile, "r"); | |
| 355
by Teddy Hogeborn * mandos: White-space fixes only. | 662 | } | 
| 24.1.51
by Björn Påhlsson Added configuration files support for mandos-client | 663 | if(conffp != NULL){ | 
| 664 | char *org_line = NULL; | |
| 24.1.54
by Björn Påhlsson plugin-runner | 665 | char *p, *arg, *new_arg, *line; | 
| 24.1.51
by Björn Påhlsson Added configuration files support for mandos-client | 666 | size_t size = 0; | 
| 667 | const char whitespace_delims[] = " \r\t\f\v\n"; | |
| 668 | const char comment_delim[] = "#"; | |
| 312
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 669 |     
 | 
| 24.1.67
by Björn Påhlsson transformed a function to a part of main | 670 | custom_argc = 1; | 
| 671 | custom_argv = malloc(sizeof(char*) * 2); | |
| 672 | if(custom_argv == NULL){ | |
| 24.1.155
by Björn Påhlsson mandos server: Added debuglevel that adjust at what level information | 673 | error(0, errno, "malloc"); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 674 | exitstatus = EX_OSERR; | 
| 24.1.67
by Björn Påhlsson transformed a function to a part of main | 675 | goto fallback; | 
| 676 | } | |
| 677 | custom_argv[0] = argv[0]; | |
| 678 | custom_argv[1] = NULL; | |
| 312
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 679 |     
 | 
| 133
by Teddy Hogeborn * plugin-runner.c: Break a couple of long lines. | 680 | /* for each line in the config file, strip whitespace and ignore | 
| 681 |        commented text */
 | |
| 24.1.51
by Björn Påhlsson Added configuration files support for mandos-client | 682 | while(true){ | 
| 683 | sret = getline(&org_line, &size, conffp); | |
| 684 | if(sret == -1){ | |
| 685 | break; | |
| 686 | } | |
| 312
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 687 |       
 | 
| 24.1.51
by Björn Påhlsson Added configuration files support for mandos-client | 688 | line = org_line; | 
| 689 | arg = strsep(&line, comment_delim); | |
| 690 | while((p = strsep(&arg, whitespace_delims)) != NULL){ | |
| 691 | if(p[0] == '\0'){ | |
| 692 | continue; | |
| 693 | } | |
| 694 | new_arg = strdup(p); | |
| 24.1.69
by Björn Påhlsson added configfile as a optional argument to plugin-runner | 695 | if(new_arg == NULL){ | 
| 24.1.155
by Björn Påhlsson mandos server: Added debuglevel that adjust at what level information | 696 | error(0, errno, "strdup"); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 697 | exitstatus = EX_OSERR; | 
| 24.1.69
by Björn Påhlsson added configfile as a optional argument to plugin-runner | 698 | free(org_line); | 
| 699 | goto fallback; | |
| 700 | } | |
| 701 | 	
 | |
| 24.1.67
by Björn Påhlsson transformed a function to a part of main | 702 | custom_argc += 1; | 
| 666
by Teddy Hogeborn Bug fix: Free all memory and give better messages when memory is full. | 703 | { | 
| 704 | char **new_argv = realloc(custom_argv, sizeof(char *) | |
| 797
by Teddy Hogeborn plugin-runner.c: Use size_t to realloc() for custom plugin args. | 705 | * ((size_t)custom_argc + 1)); | 
| 666
by Teddy Hogeborn Bug fix: Free all memory and give better messages when memory is full. | 706 | if(new_argv == NULL){ | 
| 707 | error(0, errno, "realloc"); | |
| 708 | exitstatus = EX_OSERR; | |
| 709 | free(new_arg); | |
| 710 | free(org_line); | |
| 711 | goto fallback; | |
| 712 | } else { | |
| 713 | custom_argv = new_argv; | |
| 714 | } | |
| 24.1.51
by Björn Påhlsson Added configuration files support for mandos-client | 715 | } | 
| 24.1.67
by Björn Påhlsson transformed a function to a part of main | 716 | custom_argv[custom_argc-1] = new_arg; | 
| 355
by Teddy Hogeborn * mandos: White-space fixes only. | 717 | custom_argv[custom_argc] = NULL; | 
| 24.1.51
by Björn Påhlsson Added configuration files support for mandos-client | 718 | } | 
| 719 | } | |
| 363
by Teddy Hogeborn * plugin-runner.c: Minor stylistic changes. | 720 | do { | 
| 359
by Teddy Hogeborn * plugins-runner.c (main): Bug fix: Close config file. | 721 | ret = fclose(conffp); | 
| 363
by Teddy Hogeborn * plugin-runner.c: Minor stylistic changes. | 722 | } while(ret == EOF and errno == EINTR); | 
| 359
by Teddy Hogeborn * plugins-runner.c (main): Bug fix: Close config file. | 723 | if(ret == EOF){ | 
| 24.1.155
by Björn Påhlsson mandos server: Added debuglevel that adjust at what level information | 724 | error(0, errno, "fclose"); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 725 | exitstatus = EX_IOERR; | 
| 359
by Teddy Hogeborn * plugins-runner.c (main): Bug fix: Close config file. | 726 | goto fallback; | 
| 727 | } | |
| 24.1.51
by Björn Påhlsson Added configuration files support for mandos-client | 728 | free(org_line); | 
| 136
by Teddy Hogeborn * plugin-runner.c (add_environment): Override existing environment | 729 | } else { | 
| 24.1.52
by Björn Påhlsson merge + minor adjustments | 730 | /* Check for harmful errors and go to fallback. Other errors might | 
| 731 |        not affect opening plugins */
 | |
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 732 | if(errno == EMFILE or errno == ENFILE or errno == ENOMEM){ | 
| 24.1.155
by Björn Påhlsson mandos server: Added debuglevel that adjust at what level information | 733 | error(0, errno, "fopen"); | 
| 402
by Teddy Hogeborn * mandos (Client.disable): Rename keyword argument "log" to "quiet", | 734 | exitstatus = EX_OSERR; | 
| 24.1.54
by Björn Påhlsson plugin-runner | 735 | goto fallback; | 
| 24.1.8
by Björn Påhlsson plugbasedclient | 736 | } | 
| 24.1.51
by Björn Påhlsson Added configuration files support for mandos-client | 737 | } | 
| 394
by Teddy Hogeborn Convert some programs to use the exit codes from <sysexits.h>. Change | 738 | /* If there were any arguments from the configuration file, pass | 
| 739 |      them to parser as command line arguments */
 | |
| 24.1.51
by Björn Påhlsson Added configuration files support for mandos-client | 740 | if(custom_argv != NULL){ | 
| 394
by Teddy Hogeborn Convert some programs to use the exit codes from <sysexits.h>. Change | 741 | ret = argp_parse(&argp, custom_argc, custom_argv, | 
| 742 | ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP, | |
| 743 | NULL, NULL); | |
| 744 | switch(ret){ | |
| 745 | case 0: | |
| 746 | break; | |
| 747 | case ENOMEM: | |
| 748 | default: | |
| 749 | errno = ret; | |
| 24.1.155
by Björn Påhlsson mandos server: Added debuglevel that adjust at what level information | 750 | error(0, errno, "argp_parse"); | 
| 394
by Teddy Hogeborn Convert some programs to use the exit codes from <sysexits.h>. Change | 751 | exitstatus = EX_OSERR; | 
| 752 | goto fallback; | |
| 753 | case EINVAL: | |
| 754 | exitstatus = EX_CONFIG; | |
| 24.1.54
by Björn Påhlsson plugin-runner | 755 | goto fallback; | 
| 24.1.26
by Björn Påhlsson tally count of used symbols | 756 | } | 
| 24.1.8
by Björn Påhlsson plugbasedclient | 757 | } | 
| 758 |   
 | |
| 136
by Teddy Hogeborn * plugin-runner.c (add_environment): Override existing environment | 759 | /* Parse actual command line arguments, to let them override the | 
| 760 |      config file */
 | |
| 394
by Teddy Hogeborn Convert some programs to use the exit codes from <sysexits.h>. Change | 761 | ret = argp_parse(&argp, argc, argv, | 
| 762 | ARGP_IN_ORDER | ARGP_NO_EXIT | ARGP_NO_HELP, | |
| 763 | NULL, NULL); | |
| 764 | switch(ret){ | |
| 765 | case 0: | |
| 766 | break; | |
| 767 | case ENOMEM: | |
| 768 | default: | |
| 769 | errno = ret; | |
| 24.1.155
by Björn Påhlsson mandos server: Added debuglevel that adjust at what level information | 770 | error(0, errno, "argp_parse"); | 
| 394
by Teddy Hogeborn Convert some programs to use the exit codes from <sysexits.h>. Change | 771 | exitstatus = EX_OSERR; | 
| 772 | goto fallback; | |
| 773 | case EINVAL: | |
| 774 | exitstatus = EX_USAGE; | |
| 136
by Teddy Hogeborn * plugin-runner.c (add_environment): Override existing environment | 775 | goto fallback; | 
| 776 | } | |
| 777 |   
 | |
| 738.1.1
by Teddy Hogeborn Add a plugin helper directory, available to all plugins. | 778 | { | 
| 779 | char *pluginhelperenv; | |
| 780 | bool bret = true; | |
| 781 | ret = asprintf(&pluginhelperenv, "MANDOSPLUGINHELPERDIR=%s", | |
| 782 | pluginhelperdir != NULL ? pluginhelperdir : PHDIR); | |
| 783 | if(ret != -1){ | |
| 784 | bret = add_environment(getplugin(NULL), pluginhelperenv, true); | |
| 785 | } | |
| 786 | if(ret == -1 or not bret){ | |
| 787 | error(0, errno, "Failed to set MANDOSPLUGINHELPERDIR" | |
| 788 | " environment variable to \"%s\" for all plugins\n", | |
| 789 | pluginhelperdir != NULL ? pluginhelperdir : PHDIR); | |
| 790 | } | |
| 791 | if(ret != -1){ | |
| 792 | free(pluginhelperenv); | |
| 793 | } | |
| 794 | } | |
| 795 |   
 | |
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 796 | if(debug){ | 
| 890
by Teddy Hogeborn Add spaces around all '=' signs in all C code. | 797 | for(plugin *p = plugin_list; p != NULL; p = p->next){ | 
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 798 | fprintf(stderr, "Plugin: %s has %d arguments\n", | 
| 32
by Teddy Hogeborn * plugins.d/plugbasedclient.c (set_cloexec_flag): New function. | 799 | p->name ? p->name : "Global", p->argc - 1); | 
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 800 | for(char **a = p->argv; *a != NULL; a++){ | 
| 801 | fprintf(stderr, "\tArg: %s\n", *a); | |
| 802 | } | |
| 268
by Teddy Hogeborn Fixes for sscanf usage: | 803 | fprintf(stderr, "...and %d environment variables\n", p->envc); | 
| 78
by Teddy Hogeborn Add feature to specify custom environment variables for plugins. | 804 | for(char **a = p->environ; *a != NULL; a++){ | 
| 805 | fprintf(stderr, "\t%s\n", *a); | |
| 806 | } | |
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 807 | } | 
| 808 | } | |
| 136
by Teddy Hogeborn * plugin-runner.c (add_environment): Override existing environment | 809 |   
 | 
| 505.3.11
by Teddy Hogeborn * Makefile (run-client): Add "--network-hook-dir" option. | 810 | if(getuid() == 0){ | 
| 487
by Teddy Hogeborn * initramfs-tools-script: Abort if plugin-runner is missing. Removed | 811 | /* Work around Debian bug #633582: | 
| 868
by Teddy Hogeborn Change all http:// URLs to https:// wherever possible. | 812 |        <https://bugs.debian.org/633582> */
 | 
| 487
by Teddy Hogeborn * initramfs-tools-script: Abort if plugin-runner is missing. Removed | 813 | int plugindir_fd = open(/* plugindir or */ PDIR, O_RDONLY); | 
| 814 | if(plugindir_fd == -1){ | |
| 675
by Teddy Hogeborn Use openat() etc. in plugin-runner. Also one less useless warning. | 815 | if(errno != ENOENT){ | 
| 816 | error(0, errno, "open(\"" PDIR "\")"); | |
| 817 | } | |
| 487
by Teddy Hogeborn * initramfs-tools-script: Abort if plugin-runner is missing. Removed | 818 | } else { | 
| 819 | ret = (int)TEMP_FAILURE_RETRY(fstat(plugindir_fd, &st)); | |
| 820 | if(ret == -1){ | |
| 821 | error(0, errno, "fstat"); | |
| 822 | } else { | |
| 823 | if(S_ISDIR(st.st_mode) and st.st_uid == 0 and st.st_gid == 0){ | |
| 824 | ret = fchown(plugindir_fd, uid, gid); | |
| 825 | if(ret == -1){ | |
| 826 | error(0, errno, "fchown"); | |
| 827 | } | |
| 828 | } | |
| 829 | } | |
| 774
by Teddy Hogeborn Don't use TEMP_FAILURE_RETRY around close(). | 830 | close(plugindir_fd); | 
| 487
by Teddy Hogeborn * initramfs-tools-script: Abort if plugin-runner is missing. Removed | 831 | } | 
| 832 | } | |
| 833 |   
 | |
| 834 | /* Lower permissions */ | |
| 620
by Teddy Hogeborn * plugin-runner.c (main): Bug fix; do not ignore return value of | 835 | ret = setgid(gid); | 
| 299
by Teddy Hogeborn * plugin-runner.c (main): Bug fix: Do setgid before setuid. | 836 | if(ret == -1){ | 
| 24.1.155
by Björn Påhlsson mandos server: Added debuglevel that adjust at what level information | 837 | error(0, errno, "setgid"); | 
| 299
by Teddy Hogeborn * plugin-runner.c (main): Bug fix: Do setgid before setuid. | 838 | } | 
| 24.1.6
by Björn Påhlsson plugbasedclient | 839 | ret = setuid(uid); | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 840 | if(ret == -1){ | 
| 24.1.155
by Björn Påhlsson mandos server: Added debuglevel that adjust at what level information | 841 | error(0, errno, "setuid"); | 
| 24.1.6
by Björn Påhlsson plugbasedclient | 842 | } | 
| 136
by Teddy Hogeborn * plugin-runner.c (add_environment): Override existing environment | 843 |   
 | 
| 384
by Teddy Hogeborn * plugin-runner.c (main): Use the O_CLOEXEC flag, if available, when | 844 | /* Open plugin directory with close_on_exec flag */ | 
| 34
by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set | 845 | { | 
| 675
by Teddy Hogeborn Use openat() etc. in plugin-runner. Also one less useless warning. | 846 | dir_fd = open(plugindir != NULL ? plugindir : PDIR, O_RDONLY | | 
| 847 | #ifdef O_CLOEXEC
 | |
| 848 | O_CLOEXEC | |
| 849 | #else /* not O_CLOEXEC */ | |
| 850 | 0 | |
| 851 | #endif /* not O_CLOEXEC */ | |
| 852 | ); | |
| 384
by Teddy Hogeborn * plugin-runner.c (main): Use the O_CLOEXEC flag, if available, when | 853 | if(dir_fd == -1){ | 
| 24.1.155
by Björn Påhlsson mandos server: Added debuglevel that adjust at what level information | 854 | error(0, errno, "Could not open plugin dir"); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 855 | exitstatus = EX_UNAVAILABLE; | 
| 384
by Teddy Hogeborn * plugin-runner.c (main): Use the O_CLOEXEC flag, if available, when | 856 | goto fallback; | 
| 857 | } | |
| 858 |     
 | |
| 859 | #ifndef O_CLOEXEC
 | |
| 860 | /* Set the FD_CLOEXEC flag on the directory */ | |
| 861 | ret = set_cloexec_flag(dir_fd); | |
| 862 | if(ret < 0){ | |
| 24.1.155
by Björn Påhlsson mandos server: Added debuglevel that adjust at what level information | 863 | error(0, errno, "set_cloexec_flag"); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 864 | exitstatus = EX_OSERR; | 
| 384
by Teddy Hogeborn * plugin-runner.c (main): Use the O_CLOEXEC flag, if available, when | 865 | goto fallback; | 
| 866 | } | |
| 867 | #endif /* O_CLOEXEC */ | |
| 703
by Teddy Hogeborn In plugin-runner, do scandirat() or scandir() instead of readdir(). | 868 | } | 
| 869 |   
 | |
| 870 | int good_name(const struct dirent * const dirent){ | |
| 871 | const char * const patterns[] = { ".*", "#*#", "*~", "*.dpkg-new", | |
| 872 | "*.dpkg-old", "*.dpkg-bak", | |
| 873 | "*.dpkg-divert", NULL }; | |
| 874 | #ifdef __GNUC__
 | |
| 875 | #pragma GCC diagnostic push
 | |
| 876 | #pragma GCC diagnostic ignored "-Wcast-qual"
 | |
| 877 | #endif
 | |
| 878 | for(const char **pat = (const char **)patterns; | |
| 879 | *pat != NULL; pat++){ | |
| 880 | #ifdef __GNUC__
 | |
| 881 | #pragma GCC diagnostic pop
 | |
| 882 | #endif
 | |
| 883 | if(fnmatch(*pat, dirent->d_name, FNM_FILE_NAME | FNM_PERIOD) | |
| 884 | != FNM_NOMATCH){ | |
| 885 | if(debug){ | |
| 886 | fprintf(stderr, "Ignoring plugin dir entry \"%s\"" | |
| 887 | " matching pattern %s\n", dirent->d_name, *pat); | |
| 888 | } | |
| 889 | return 0; | |
| 890 | } | |
| 34
by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set | 891 | } | 
| 703
by Teddy Hogeborn In plugin-runner, do scandirat() or scandir() instead of readdir(). | 892 | return 1; | 
| 893 | } | |
| 894 |   
 | |
| 895 | int numplugins = scandirat(dir_fd, ".", &direntries, good_name, | |
| 896 | alphasort); | |
| 897 | if(numplugins == -1){ | |
| 898 | error(0, errno, "Could not scan plugin dir"); | |
| 705
by Teddy Hogeborn plugin-runner: Release memory and close FD's correctly in all cases. | 899 | direntries = NULL; | 
| 703
by Teddy Hogeborn In plugin-runner, do scandirat() or scandir() instead of readdir(). | 900 | exitstatus = EX_OSERR; | 
| 901 | goto fallback; | |
| 34
by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set | 902 | } | 
| 24.1.1
by Björn Påhlsson Added syntax and support for plugbasedclient arguments and how they | 903 |   
 | 
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 904 | FD_ZERO(&rfds_all); | 
| 136
by Teddy Hogeborn * plugin-runner.c (add_environment): Override existing environment | 905 |   
 | 
| 24.1.76
by Björn Påhlsson Rearranged so plugins and processes is the same thing | 906 | /* Read and execute any executable in the plugin directory*/ | 
| 703
by Teddy Hogeborn In plugin-runner, do scandirat() or scandir() instead of readdir(). | 907 | for(int i = 0; i < numplugins; i++){ | 
| 908 |     
 | |
| 909 | int plugin_fd = openat(dir_fd, direntries[i]->d_name, O_RDONLY); | |
| 675
by Teddy Hogeborn Use openat() etc. in plugin-runner. Also one less useless warning. | 910 | if(plugin_fd == -1){ | 
| 911 | error(0, errno, "Could not open plugin"); | |
| 716
by Teddy Hogeborn plugin-runner: Bug Fix: Fix some memory leaks. | 912 | free(direntries[i]); | 
| 675
by Teddy Hogeborn Use openat() etc. in plugin-runner. Also one less useless warning. | 913 | continue; | 
| 169
by Teddy Hogeborn * plugin-runner.c (main): Bug fix: use built-in default value if | 914 | } | 
| 675
by Teddy Hogeborn Use openat() etc. in plugin-runner. Also one less useless warning. | 915 | ret = (int)TEMP_FAILURE_RETRY(fstat(plugin_fd, &st)); | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 916 | if(ret == -1){ | 
| 24.1.155
by Björn Påhlsson mandos server: Added debuglevel that adjust at what level information | 917 | error(0, errno, "stat"); | 
| 774
by Teddy Hogeborn Don't use TEMP_FAILURE_RETRY around close(). | 918 | close(plugin_fd); | 
| 716
by Teddy Hogeborn plugin-runner: Bug Fix: Fix some memory leaks. | 919 | free(direntries[i]); | 
| 24.1.46
by Björn Påhlsson mandos-client | 920 | continue; | 
| 24.1.26
by Björn Påhlsson tally count of used symbols | 921 | } | 
| 312
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 922 |     
 | 
| 24.1.76
by Björn Påhlsson Rearranged so plugins and processes is the same thing | 923 | /* Ignore non-executable files */ | 
| 362
by Teddy Hogeborn * plugin-runner.c (getplugin, add_environment, main): Handle EINTR | 924 | if(not S_ISREG(st.st_mode) | 
| 703
by Teddy Hogeborn In plugin-runner, do scandirat() or scandir() instead of readdir(). | 925 | or (TEMP_FAILURE_RETRY(faccessat(dir_fd, direntries[i]->d_name, | 
| 926 | X_OK, 0)) != 0)){ | |
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 927 | if(debug){ | 
| 675
by Teddy Hogeborn Use openat() etc. in plugin-runner. Also one less useless warning. | 928 | fprintf(stderr, "Ignoring plugin dir entry \"%s/%s\"" | 
| 929 | " with bad type or mode\n", | |
| 703
by Teddy Hogeborn In plugin-runner, do scandirat() or scandir() instead of readdir(). | 930 | plugindir != NULL ? plugindir : PDIR, | 
| 931 | direntries[i]->d_name); | |
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 932 | } | 
| 774
by Teddy Hogeborn Don't use TEMP_FAILURE_RETRY around close(). | 933 | close(plugin_fd); | 
| 716
by Teddy Hogeborn plugin-runner: Bug Fix: Fix some memory leaks. | 934 | free(direntries[i]); | 
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 935 | continue; | 
| 936 | } | |
| 24.1.76
by Björn Påhlsson Rearranged so plugins and processes is the same thing | 937 |     
 | 
| 703
by Teddy Hogeborn In plugin-runner, do scandirat() or scandir() instead of readdir(). | 938 | plugin *p = getplugin(direntries[i]->d_name); | 
| 78
by Teddy Hogeborn Add feature to specify custom environment variables for plugins. | 939 | if(p == NULL){ | 
| 24.1.155
by Björn Påhlsson mandos server: Added debuglevel that adjust at what level information | 940 | error(0, errno, "getplugin"); | 
| 774
by Teddy Hogeborn Don't use TEMP_FAILURE_RETRY around close(). | 941 | close(plugin_fd); | 
| 716
by Teddy Hogeborn plugin-runner: Bug Fix: Fix some memory leaks. | 942 | free(direntries[i]); | 
| 78
by Teddy Hogeborn Add feature to specify custom environment variables for plugins. | 943 | continue; | 
| 944 | } | |
| 945 | if(p->disabled){ | |
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 946 | if(debug){ | 
| 34
by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set | 947 | fprintf(stderr, "Ignoring disabled plugin \"%s\"\n", | 
| 703
by Teddy Hogeborn In plugin-runner, do scandirat() or scandir() instead of readdir(). | 948 | direntries[i]->d_name); | 
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 949 | } | 
| 774
by Teddy Hogeborn Don't use TEMP_FAILURE_RETRY around close(). | 950 | close(plugin_fd); | 
| 716
by Teddy Hogeborn plugin-runner: Bug Fix: Fix some memory leaks. | 951 | free(direntries[i]); | 
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 952 | continue; | 
| 953 | } | |
| 32
by Teddy Hogeborn * plugins.d/plugbasedclient.c (set_cloexec_flag): New function. | 954 | { | 
| 955 | /* Add global arguments to argument list for this plugin */ | |
| 24.1.76
by Björn Påhlsson Rearranged so plugins and processes is the same thing | 956 | plugin *g = getplugin(NULL); | 
| 78
by Teddy Hogeborn Add feature to specify custom environment variables for plugins. | 957 | if(g != NULL){ | 
| 958 | for(char **a = g->argv + 1; *a != NULL; a++){ | |
| 959 | if(not add_argument(p, *a)){ | |
| 24.1.155
by Björn Påhlsson mandos server: Added debuglevel that adjust at what level information | 960 | error(0, errno, "add_argument"); | 
| 78
by Teddy Hogeborn Add feature to specify custom environment variables for plugins. | 961 | } | 
| 962 | } | |
| 963 | /* Add global environment variables */ | |
| 964 | for(char **e = g->environ; *e != NULL; e++){ | |
| 136
by Teddy Hogeborn * plugin-runner.c (add_environment): Override existing environment | 965 | if(not add_environment(p, *e, false)){ | 
| 24.1.155
by Björn Påhlsson mandos server: Added debuglevel that adjust at what level information | 966 | error(0, errno, "add_environment"); | 
| 78
by Teddy Hogeborn Add feature to specify custom environment variables for plugins. | 967 | } | 
| 968 | } | |
| 969 | } | |
| 970 | } | |
| 675
by Teddy Hogeborn Use openat() etc. in plugin-runner. Also one less useless warning. | 971 | /* If this plugin has any environment variables, we need to | 
| 972 |        duplicate the environment from this process, too. */
 | |
| 78
by Teddy Hogeborn Add feature to specify custom environment variables for plugins. | 973 | if(p->environ[0] != NULL){ | 
| 974 | for(char **e = environ; *e != NULL; e++){ | |
| 136
by Teddy Hogeborn * plugin-runner.c (add_environment): Override existing environment | 975 | if(not add_environment(p, *e, false)){ | 
| 24.1.155
by Björn Påhlsson mandos server: Added debuglevel that adjust at what level information | 976 | error(0, errno, "add_environment"); | 
| 78
by Teddy Hogeborn Add feature to specify custom environment variables for plugins. | 977 | } | 
| 978 | } | |
| 979 | } | |
| 980 |     
 | |
| 98
by Teddy Hogeborn * plugin-runner.c (getplugin): Only copy "name" if not NULL. Free | 981 | int pipefd[2]; | 
| 703
by Teddy Hogeborn In plugin-runner, do scandirat() or scandir() instead of readdir(). | 982 | #ifndef O_CLOEXEC
 | 
| 367
by Teddy Hogeborn * init.d-mandos: Bug fix: Correct the LSB header. | 983 | ret = (int)TEMP_FAILURE_RETRY(pipe(pipefd)); | 
| 703
by Teddy Hogeborn In plugin-runner, do scandirat() or scandir() instead of readdir(). | 984 | #else /* O_CLOEXEC */ | 
| 985 | ret = (int)TEMP_FAILURE_RETRY(pipe2(pipefd, O_CLOEXEC)); | |
| 986 | #endif /* O_CLOEXEC */ | |
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 987 | if(ret == -1){ | 
| 24.1.155
by Björn Påhlsson mandos server: Added debuglevel that adjust at what level information | 988 | error(0, errno, "pipe"); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 989 | exitstatus = EX_OSERR; | 
| 716
by Teddy Hogeborn plugin-runner: Bug Fix: Fix some memory leaks. | 990 | free(direntries[i]); | 
| 24.1.54
by Björn Påhlsson plugin-runner | 991 | goto fallback; | 
| 34
by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set | 992 | } | 
| 702
by Teddy Hogeborn In plugin-runner, protect against a larger FD_SETSIZE than fd_set. | 993 | if(pipefd[0] >= FD_SETSIZE){ | 
| 994 | fprintf(stderr, "pipe()[0] (%d) >= FD_SETSIZE (%d)", pipefd[0], | |
| 995 | FD_SETSIZE); | |
| 774
by Teddy Hogeborn Don't use TEMP_FAILURE_RETRY around close(). | 996 | close(pipefd[0]); | 
| 997 | close(pipefd[1]); | |
| 702
by Teddy Hogeborn In plugin-runner, protect against a larger FD_SETSIZE than fd_set. | 998 | exitstatus = EX_OSERR; | 
| 716
by Teddy Hogeborn plugin-runner: Bug Fix: Fix some memory leaks. | 999 | free(direntries[i]); | 
| 702
by Teddy Hogeborn In plugin-runner, protect against a larger FD_SETSIZE than fd_set. | 1000 | goto fallback; | 
| 1001 | } | |
| 703
by Teddy Hogeborn In plugin-runner, do scandirat() or scandir() instead of readdir(). | 1002 | #ifndef O_CLOEXEC
 | 
| 24.1.76
by Björn Påhlsson Rearranged so plugins and processes is the same thing | 1003 | /* Ask OS to automatic close the pipe on exec */ | 
| 34
by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set | 1004 | ret = set_cloexec_flag(pipefd[0]); | 
| 1005 | if(ret < 0){ | |
| 24.1.155
by Björn Påhlsson mandos server: Added debuglevel that adjust at what level information | 1006 | error(0, errno, "set_cloexec_flag"); | 
| 774
by Teddy Hogeborn Don't use TEMP_FAILURE_RETRY around close(). | 1007 | close(pipefd[0]); | 
| 1008 | close(pipefd[1]); | |
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1009 | exitstatus = EX_OSERR; | 
| 716
by Teddy Hogeborn plugin-runner: Bug Fix: Fix some memory leaks. | 1010 | free(direntries[i]); | 
| 24.1.54
by Björn Påhlsson plugin-runner | 1011 | goto fallback; | 
| 34
by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set | 1012 | } | 
| 1013 | ret = set_cloexec_flag(pipefd[1]); | |
| 1014 | if(ret < 0){ | |
| 24.1.155
by Björn Påhlsson mandos server: Added debuglevel that adjust at what level information | 1015 | error(0, errno, "set_cloexec_flag"); | 
| 774
by Teddy Hogeborn Don't use TEMP_FAILURE_RETRY around close(). | 1016 | close(pipefd[0]); | 
| 1017 | close(pipefd[1]); | |
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1018 | exitstatus = EX_OSERR; | 
| 716
by Teddy Hogeborn plugin-runner: Bug Fix: Fix some memory leaks. | 1019 | free(direntries[i]); | 
| 24.1.54
by Björn Påhlsson plugin-runner | 1020 | goto fallback; | 
| 34
by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set | 1021 | } | 
| 703
by Teddy Hogeborn In plugin-runner, do scandirat() or scandir() instead of readdir(). | 1022 | #endif /* not O_CLOEXEC */ | 
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 1023 | /* Block SIGCHLD until process is safely in process list */ | 
| 367
by Teddy Hogeborn * init.d-mandos: Bug fix: Correct the LSB header. | 1024 | ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_BLOCK, | 
| 1025 | &sigchld_action.sa_mask, | |
| 1026 | NULL)); | |
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 1027 | if(ret < 0){ | 
| 24.1.155
by Björn Påhlsson mandos server: Added debuglevel that adjust at what level information | 1028 | error(0, errno, "sigprocmask"); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1029 | exitstatus = EX_OSERR; | 
| 716
by Teddy Hogeborn plugin-runner: Bug Fix: Fix some memory leaks. | 1030 | free(direntries[i]); | 
| 24.1.54
by Björn Påhlsson plugin-runner | 1031 | goto fallback; | 
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 1032 | } | 
| 136
by Teddy Hogeborn * plugin-runner.c (add_environment): Override existing environment | 1033 | /* Starting a new process to be watched */ | 
| 362
by Teddy Hogeborn * plugin-runner.c (getplugin, add_environment, main): Handle EINTR | 1034 | pid_t pid; | 
| 363
by Teddy Hogeborn * plugin-runner.c: Minor stylistic changes. | 1035 | do { | 
| 362
by Teddy Hogeborn * plugin-runner.c (getplugin, add_environment, main): Handle EINTR | 1036 | pid = fork(); | 
| 363
by Teddy Hogeborn * plugin-runner.c: Minor stylistic changes. | 1037 | } while(pid == -1 and errno == EINTR); | 
| 24.1.46
by Björn Påhlsson mandos-client | 1038 | if(pid == -1){ | 
| 24.1.155
by Björn Påhlsson mandos server: Added debuglevel that adjust at what level information | 1039 | error(0, errno, "fork"); | 
| 701
by Teddy Hogeborn plugin-runner: Restore resources correctly if fork() fails. | 1040 | TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK, | 
| 1041 | &sigchld_action.sa_mask, NULL)); | |
| 774
by Teddy Hogeborn Don't use TEMP_FAILURE_RETRY around close(). | 1042 | close(pipefd[0]); | 
| 1043 | close(pipefd[1]); | |
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1044 | exitstatus = EX_OSERR; | 
| 716
by Teddy Hogeborn plugin-runner: Bug Fix: Fix some memory leaks. | 1045 | free(direntries[i]); | 
| 24.1.54
by Björn Påhlsson plugin-runner | 1046 | goto fallback; | 
| 24.1.46
by Björn Påhlsson mandos-client | 1047 | } | 
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 1048 | if(pid == 0){ | 
| 1049 | /* this is the child process */ | |
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 1050 | ret = sigaction(SIGCHLD, &old_sigchld_action, NULL); | 
| 1051 | if(ret < 0){ | |
| 24.1.155
by Björn Påhlsson mandos server: Added debuglevel that adjust at what level information | 1052 | error(0, errno, "sigaction"); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1053 | _exit(EX_OSERR); | 
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 1054 | } | 
| 210
by Teddy Hogeborn * debian/mandos-client.postinst: Change home directory to | 1055 | ret = sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, NULL); | 
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 1056 | if(ret < 0){ | 
| 24.1.155
by Björn Påhlsson mandos server: Added debuglevel that adjust at what level information | 1057 | error(0, errno, "sigprocmask"); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1058 | _exit(EX_OSERR); | 
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 1059 | } | 
| 210
by Teddy Hogeborn * debian/mandos-client.postinst: Change home directory to | 1060 |       
 | 
| 24.1.26
by Björn Påhlsson tally count of used symbols | 1061 | ret = dup2(pipefd[1], STDOUT_FILENO); /* replace our stdout */ | 
| 1062 | if(ret == -1){ | |
| 24.1.155
by Björn Påhlsson mandos server: Added debuglevel that adjust at what level information | 1063 | error(0, errno, "dup2"); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1064 | _exit(EX_OSERR); | 
| 24.1.26
by Björn Påhlsson tally count of used symbols | 1065 | } | 
| 34
by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set | 1066 |       
 | 
| 675
by Teddy Hogeborn Use openat() etc. in plugin-runner. Also one less useless warning. | 1067 | if(fexecve(plugin_fd, p->argv, | 
| 674
by Teddy Hogeborn Improve error message when working around Debian bug #633582. | 1068 | (p->environ[0] != NULL) ? p->environ : environ) < 0){ | 
| 675
by Teddy Hogeborn Use openat() etc. in plugin-runner. Also one less useless warning. | 1069 | error(0, errno, "fexecve for %s/%s", | 
| 703
by Teddy Hogeborn In plugin-runner, do scandirat() or scandir() instead of readdir(). | 1070 | plugindir != NULL ? plugindir : PDIR, | 
| 1071 | direntries[i]->d_name); | |
| 674
by Teddy Hogeborn Improve error message when working around Debian bug #633582. | 1072 | _exit(EX_OSERR); | 
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 1073 | } | 
| 1074 | /* no return */ | |
| 1075 | } | |
| 24.1.76
by Björn Påhlsson Rearranged so plugins and processes is the same thing | 1076 | /* Parent process */ | 
| 774
by Teddy Hogeborn Don't use TEMP_FAILURE_RETRY around close(). | 1077 | close(pipefd[1]); /* Close unused write end of pipe */ | 
| 1078 | close(plugin_fd); | |
| 703
by Teddy Hogeborn In plugin-runner, do scandirat() or scandir() instead of readdir(). | 1079 | plugin *new_plugin = getplugin(direntries[i]->d_name); | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 1080 | if(new_plugin == NULL){ | 
| 24.1.155
by Björn Påhlsson mandos server: Added debuglevel that adjust at what level information | 1081 | error(0, errno, "getplugin"); | 
| 367
by Teddy Hogeborn * init.d-mandos: Bug fix: Correct the LSB header. | 1082 | ret = (int)(TEMP_FAILURE_RETRY | 
| 1083 | (sigprocmask(SIG_UNBLOCK, &sigchld_action.sa_mask, | |
| 1084 | NULL))); | |
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 1085 | if(ret < 0){ | 
| 24.1.155
by Björn Påhlsson mandos server: Added debuglevel that adjust at what level information | 1086 | error(0, errno, "sigprocmask"); | 
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 1087 | } | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1088 | exitstatus = EX_OSERR; | 
| 716
by Teddy Hogeborn plugin-runner: Bug Fix: Fix some memory leaks. | 1089 | free(direntries[i]); | 
| 24.1.54
by Björn Påhlsson plugin-runner | 1090 | goto fallback; | 
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 1091 | } | 
| 716
by Teddy Hogeborn plugin-runner: Bug Fix: Fix some memory leaks. | 1092 | free(direntries[i]); | 
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 1093 |     
 | 
| 24.1.76
by Björn Påhlsson Rearranged so plugins and processes is the same thing | 1094 | new_plugin->pid = pid; | 
| 1095 | new_plugin->fd = pipefd[0]; | |
| 952
by Teddy Hogeborn plugin-runner: More debug output | 1096 | |
| 1097 | if(debug){ | |
| 1098 | fprintf(stderr, "Plugin %s started (PID %" PRIdMAX ")\n", | |
| 1099 | new_plugin->name, (intmax_t) (new_plugin->pid)); | |
| 1100 | } | |
| 1101 | ||
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 1102 | /* Unblock SIGCHLD so signal handler can be run if this process | 
| 1103 |        has already completed */
 | |
| 367
by Teddy Hogeborn * init.d-mandos: Bug fix: Correct the LSB header. | 1104 | ret = (int)TEMP_FAILURE_RETRY(sigprocmask(SIG_UNBLOCK, | 
| 1105 | &sigchld_action.sa_mask, | |
| 1106 | NULL)); | |
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 1107 | if(ret < 0){ | 
| 24.1.155
by Björn Påhlsson mandos server: Added debuglevel that adjust at what level information | 1108 | error(0, errno, "sigprocmask"); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1109 | exitstatus = EX_OSERR; | 
| 24.1.54
by Björn Påhlsson plugin-runner | 1110 | goto fallback; | 
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 1111 | } | 
| 1112 |     
 | |
| 810
by Teddy Hogeborn Depend on the GNU C Library 2.16 or later | 1113 | FD_SET(new_plugin->fd, &rfds_all); | 
| 34
by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set | 1114 |     
 | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 1115 | if(maxfd < new_plugin->fd){ | 
| 24.1.76
by Björn Påhlsson Rearranged so plugins and processes is the same thing | 1116 | maxfd = new_plugin->fd; | 
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 1117 | } | 
| 13
by Björn Påhlsson Added following support: | 1118 | } | 
| 34
by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set | 1119 |   
 | 
| 705
by Teddy Hogeborn plugin-runner: Release memory and close FD's correctly in all cases. | 1120 | free(direntries); | 
| 1121 | direntries = NULL; | |
| 774
by Teddy Hogeborn Don't use TEMP_FAILURE_RETRY around close(). | 1122 | close(dir_fd); | 
| 705
by Teddy Hogeborn plugin-runner: Release memory and close FD's correctly in all cases. | 1123 | dir_fd = -1; | 
| 24.1.132
by Björn Påhlsson Fixed a bug in fallback handling | 1124 | free_plugin(getplugin(NULL)); | 
| 210
by Teddy Hogeborn * debian/mandos-client.postinst: Change home directory to | 1125 |   
 | 
| 24.1.76
by Björn Påhlsson Rearranged so plugins and processes is the same thing | 1126 | for(plugin *p = plugin_list; p != NULL; p = p->next){ | 
| 1127 | if(p->pid != 0){ | |
| 1128 | break; | |
| 1129 | } | |
| 1130 | if(p->next == NULL){ | |
| 1131 | fprintf(stderr, "No plugin processes started. Incorrect plugin" | |
| 1132 | " directory?\n"); | |
| 1133 | free_plugin_list(); | |
| 1134 | } | |
| 34
by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set | 1135 | } | 
| 210
by Teddy Hogeborn * debian/mandos-client.postinst: Change home directory to | 1136 |   
 | 
| 24.1.76
by Björn Påhlsson Rearranged so plugins and processes is the same thing | 1137 | /* Main loop while running plugins exist */ | 
| 1138 | while(plugin_list){ | |
| 34
by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set | 1139 | fd_set rfds = rfds_all; | 
| 1140 | int select_ret = select(maxfd+1, &rfds, NULL, NULL, NULL); | |
| 362
by Teddy Hogeborn * plugin-runner.c (getplugin, add_environment, main): Handle EINTR | 1141 | if(select_ret == -1 and errno != EINTR){ | 
| 24.1.155
by Björn Påhlsson mandos server: Added debuglevel that adjust at what level information | 1142 | error(0, errno, "select"); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1143 | exitstatus = EX_OSERR; | 
| 24.1.54
by Björn Påhlsson plugin-runner | 1144 | goto fallback; | 
| 34
by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set | 1145 | } | 
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 1146 | /* OK, now either a process completed, or something can be read | 
| 1147 |        from one of them */
 | |
| 24.1.92
by Björn Påhlsson Several memory leaks detected by valgrind fixed | 1148 | for(plugin *proc = plugin_list; proc != NULL;){ | 
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 1149 | /* Is this process completely done? */ | 
| 297
by Teddy Hogeborn * plugin-runner.c (struct plugin.status): Changed type to "int". | 1150 | if(proc->completed and proc->eof){ | 
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 1151 | /* Only accept the plugin output if it exited cleanly */ | 
| 1152 | if(not WIFEXITED(proc->status) | |
| 1153 | or WEXITSTATUS(proc->status) != 0){ | |
| 1154 | /* Bad exit by plugin */ | |
| 312
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 1155 | 	  
 | 
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 1156 | if(debug){ | 
| 1157 | if(WIFEXITED(proc->status)){ | |
| 301
by Teddy Hogeborn * plugin-runner.c (main): If debugging, print name of failed plugins. | 1158 | fprintf(stderr, "Plugin %s [%" PRIdMAX "] exited with" | 
| 1159 | " status %d\n", proc->name, | |
| 1160 | (intmax_t) (proc->pid), | |
| 60
by Teddy Hogeborn * mandos-client.c (main): Cast pid_t to unsigned int before printing. | 1161 | WEXITSTATUS(proc->status)); | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 1162 | } else if(WIFSIGNALED(proc->status)){ | 
| 301
by Teddy Hogeborn * plugin-runner.c (main): If debugging, print name of failed plugins. | 1163 | fprintf(stderr, "Plugin %s [%" PRIdMAX "] killed by" | 
| 356
by Teddy Hogeborn * plugin-runner.c (main): When a plugin is killed by a signal, show | 1164 | " signal %d: %s\n", proc->name, | 
| 301
by Teddy Hogeborn * plugin-runner.c (main): If debugging, print name of failed plugins. | 1165 | (intmax_t) (proc->pid), | 
| 356
by Teddy Hogeborn * plugin-runner.c (main): When a plugin is killed by a signal, show | 1166 | WTERMSIG(proc->status), | 
| 1167 | strsignal(WTERMSIG(proc->status))); | |
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 1168 | } | 
| 1169 | } | |
| 24.1.76
by Björn Påhlsson Rearranged so plugins and processes is the same thing | 1170 | 	  
 | 
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 1171 | /* Remove the plugin */ | 
| 810
by Teddy Hogeborn Depend on the GNU C Library 2.16 or later | 1172 | FD_CLR(proc->fd, &rfds_all); | 
| 312
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 1173 | 	  
 | 
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 1174 | /* Block signal while modifying process_list */ | 
| 367
by Teddy Hogeborn * init.d-mandos: Bug fix: Correct the LSB header. | 1175 | ret = (int)TEMP_FAILURE_RETRY(sigprocmask | 
| 1176 | (SIG_BLOCK, | |
| 1177 | &sigchld_action.sa_mask, | |
| 1178 | NULL)); | |
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 1179 | if(ret < 0){ | 
| 24.1.155
by Björn Påhlsson mandos server: Added debuglevel that adjust at what level information | 1180 | error(0, errno, "sigprocmask"); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1181 | exitstatus = EX_OSERR; | 
| 24.1.54
by Björn Påhlsson plugin-runner | 1182 | goto fallback; | 
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 1183 | } | 
| 24.1.92
by Björn Påhlsson Several memory leaks detected by valgrind fixed | 1184 | 	  
 | 
| 210
by Teddy Hogeborn * debian/mandos-client.postinst: Change home directory to | 1185 | plugin *next_plugin = proc->next; | 
| 1186 | free_plugin(proc); | |
| 1187 | proc = next_plugin; | |
| 1188 | 	  
 | |
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 1189 | /* We are done modifying process list, so unblock signal */ | 
| 367
by Teddy Hogeborn * init.d-mandos: Bug fix: Correct the LSB header. | 1190 | ret = (int)(TEMP_FAILURE_RETRY | 
| 1191 | (sigprocmask(SIG_UNBLOCK, | |
| 1192 | &sigchld_action.sa_mask, NULL))); | |
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 1193 | if(ret < 0){ | 
| 24.1.155
by Björn Påhlsson mandos server: Added debuglevel that adjust at what level information | 1194 | error(0, errno, "sigprocmask"); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1195 | exitstatus = EX_OSERR; | 
| 24.1.76
by Björn Påhlsson Rearranged so plugins and processes is the same thing | 1196 | goto fallback; | 
| 1197 | } | |
| 1198 | 	  
 | |
| 1199 | if(plugin_list == NULL){ | |
| 1200 | break; | |
| 1201 | } | |
| 24.1.92
by Björn Påhlsson Several memory leaks detected by valgrind fixed | 1202 | 	  
 | 
| 24.1.76
by Björn Påhlsson Rearranged so plugins and processes is the same thing | 1203 | continue; | 
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 1204 | } | 
| 24.1.76
by Björn Påhlsson Rearranged so plugins and processes is the same thing | 1205 | 	
 | 
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 1206 | /* This process exited nicely, so print its buffer */ | 
| 210
by Teddy Hogeborn * debian/mandos-client.postinst: Change home directory to | 1207 | 	
 | 
| 102
by Teddy Hogeborn * plugin-runner.c (process): Set "completed" and "status" as volatile. | 1208 | bool bret = print_out_password(proc->buffer, | 
| 1209 | proc->buffer_length); | |
| 24.1.42
by Björn Påhlsson Added fallback to mandos-client | 1210 | if(not bret){ | 
| 24.1.155
by Björn Påhlsson mandos server: Added debuglevel that adjust at what level information | 1211 | error(0, errno, "print_out_password"); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1212 | exitstatus = EX_IOERR; | 
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 1213 | } | 
| 24.1.54
by Björn Påhlsson plugin-runner | 1214 | goto fallback; | 
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 1215 | } | 
| 24.1.76
by Björn Påhlsson Rearranged so plugins and processes is the same thing | 1216 |       
 | 
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 1217 | /* This process has not completed. Does it have any output? */ | 
| 810
by Teddy Hogeborn Depend on the GNU C Library 2.16 or later | 1218 | if(proc->eof or not FD_ISSET(proc->fd, &rfds)){ | 
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 1219 | /* This process had nothing to say at this time */ | 
| 24.1.92
by Björn Påhlsson Several memory leaks detected by valgrind fixed | 1220 | proc = proc->next; | 
| 34
by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set | 1221 | continue; | 
| 1222 | } | |
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 1223 | /* Before reading, make the process' data buffer large enough */ | 
| 34
by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set | 1224 | if(proc->buffer_length + BUFFER_SIZE > proc->buffer_size){ | 
| 666
by Teddy Hogeborn Bug fix: Free all memory and give better messages when memory is full. | 1225 | char *new_buffer = realloc(proc->buffer, proc->buffer_size | 
| 1226 | + (size_t) BUFFER_SIZE); | |
| 1227 | if(new_buffer == NULL){ | |
| 24.1.155
by Björn Påhlsson mandos server: Added debuglevel that adjust at what level information | 1228 | error(0, errno, "malloc"); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1229 | exitstatus = EX_OSERR; | 
| 24.1.54
by Björn Påhlsson plugin-runner | 1230 | goto fallback; | 
| 34
by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set | 1231 | } | 
| 666
by Teddy Hogeborn Bug fix: Free all memory and give better messages when memory is full. | 1232 | proc->buffer = new_buffer; | 
| 34
by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set | 1233 | proc->buffer_size += BUFFER_SIZE; | 
| 1234 | } | |
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 1235 | /* Read from the process */ | 
| 362
by Teddy Hogeborn * plugin-runner.c (getplugin, add_environment, main): Handle EINTR | 1236 | sret = TEMP_FAILURE_RETRY(read(proc->fd, | 
| 1237 | proc->buffer | |
| 1238 | + proc->buffer_length, | |
| 1239 | BUFFER_SIZE)); | |
| 254
by Teddy Hogeborn Eliminate warning on 64-bit systems, thanks to Frans Pop | 1240 | if(sret < 0){ | 
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 1241 | /* Read error from this process; ignore the error */ | 
| 24.1.92
by Björn Påhlsson Several memory leaks detected by valgrind fixed | 1242 | proc = proc->next; | 
| 34
by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set | 1243 | continue; | 
| 1244 | } | |
| 254
by Teddy Hogeborn Eliminate warning on 64-bit systems, thanks to Frans Pop | 1245 | if(sret == 0){ | 
| 34
by Teddy Hogeborn * plugbasedclient.c (main): Check if plugin dir could be opened. Set | 1246 | /* got EOF */ | 
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 1247 | proc->eof = true; | 
| 1248 | } else { | |
| 254
by Teddy Hogeborn Eliminate warning on 64-bit systems, thanks to Frans Pop | 1249 | proc->buffer_length += (size_t) sret; | 
| 13
by Björn Påhlsson Added following support: | 1250 | } | 
| 1251 | } | |
| 1252 | } | |
| 312
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 1253 |   
 | 
| 1254 |   
 | |
| 24.1.54
by Björn Påhlsson plugin-runner | 1255 | fallback: | 
| 24.1.42
by Björn Påhlsson Added fallback to mandos-client | 1256 |   
 | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1257 | if(plugin_list == NULL or (exitstatus != EXIT_SUCCESS | 
| 1258 | and exitstatus != EX_OK)){ | |
| 102
by Teddy Hogeborn * plugin-runner.c (process): Set "completed" and "status" as volatile. | 1259 | /* Fallback if all plugins failed, none are found or an error | 
| 1260 |        occured */
 | |
| 24.1.42
by Björn Påhlsson Added fallback to mandos-client | 1261 | bool bret; | 
| 1262 | fprintf(stderr, "Going to fallback mode using getpass(3)\n"); | |
| 1263 | char *passwordbuffer = getpass("Password: "); | |
| 168
by Teddy Hogeborn * initramfs-tools-hook: Use long options where available. Use only | 1264 | size_t len = strlen(passwordbuffer); | 
| 1265 | /* Strip trailing newline */ | |
| 1266 | if(len > 0 and passwordbuffer[len-1] == '\n'){ | |
| 1267 | passwordbuffer[len-1] = '\0'; /* not strictly necessary */ | |
| 1268 | len--; | |
| 1269 | } | |
| 1270 | bret = print_out_password(passwordbuffer, len); | |
| 24.1.42
by Björn Påhlsson Added fallback to mandos-client | 1271 | if(not bret){ | 
| 24.1.155
by Björn Påhlsson mandos server: Added debuglevel that adjust at what level information | 1272 | error(0, errno, "print_out_password"); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1273 | exitstatus = EX_IOERR; | 
| 24.1.42
by Björn Påhlsson Added fallback to mandos-client | 1274 | } | 
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 1275 | } | 
| 24.1.42
by Björn Påhlsson Added fallback to mandos-client | 1276 |   
 | 
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 1277 | /* Restore old signal handler */ | 
| 24.1.54
by Björn Påhlsson plugin-runner | 1278 | ret = sigaction(SIGCHLD, &old_sigchld_action, NULL); | 
| 1279 | if(ret == -1){ | |
| 24.1.155
by Björn Påhlsson mandos server: Added debuglevel that adjust at what level information | 1280 | error(0, errno, "sigaction"); | 
| 399
by Teddy Hogeborn * Makefile (BROKEN_PIE): Add comment. | 1281 | exitstatus = EX_OSERR; | 
| 24.1.54
by Björn Påhlsson plugin-runner | 1282 | } | 
| 210
by Teddy Hogeborn * debian/mandos-client.postinst: Change home directory to | 1283 |   
 | 
| 24.1.54
by Björn Påhlsson plugin-runner | 1284 | if(custom_argv != NULL){ | 
| 24.1.67
by Björn Påhlsson transformed a function to a part of main | 1285 | for(char **arg = custom_argv+1; *arg != NULL; arg++){ | 
| 24.1.54
by Björn Påhlsson plugin-runner | 1286 | free(*arg); | 
| 78
by Teddy Hogeborn Add feature to specify custom environment variables for plugins. | 1287 | } | 
| 24.1.54
by Björn Påhlsson plugin-runner | 1288 | free(custom_argv); | 
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 1289 | } | 
| 1290 |   
 | |
| 705
by Teddy Hogeborn plugin-runner: Release memory and close FD's correctly in all cases. | 1291 | free(direntries); | 
| 1292 |   
 | |
| 703
by Teddy Hogeborn In plugin-runner, do scandirat() or scandir() instead of readdir(). | 1293 | if(dir_fd != -1){ | 
| 774
by Teddy Hogeborn Don't use TEMP_FAILURE_RETRY around close(). | 1294 | close(dir_fd); | 
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 1295 | } | 
| 1296 |   
 | |
| 210
by Teddy Hogeborn * debian/mandos-client.postinst: Change home directory to | 1297 | /* Kill the processes */ | 
| 24.1.76
by Björn Påhlsson Rearranged so plugins and processes is the same thing | 1298 | for(plugin *p = plugin_list; p != NULL; p = p->next){ | 
| 1299 | if(p->pid != 0){ | |
| 1300 | close(p->fd); | |
| 1301 | ret = kill(p->pid, SIGTERM); | |
| 1302 | if(ret == -1 and errno != ESRCH){ | |
| 1303 | /* Set-uid proccesses might not get closed */ | |
| 24.1.155
by Björn Påhlsson mandos server: Added debuglevel that adjust at what level information | 1304 | error(0, errno, "kill"); | 
| 24.1.76
by Björn Påhlsson Rearranged so plugins and processes is the same thing | 1305 | } | 
| 24.1.26
by Björn Påhlsson tally count of used symbols | 1306 | } | 
| 13
by Björn Påhlsson Added following support: | 1307 | } | 
| 1308 |   
 | |
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 1309 | /* Wait for any remaining child processes to terminate */ | 
| 363
by Teddy Hogeborn * plugin-runner.c: Minor stylistic changes. | 1310 | do { | 
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 1311 | ret = wait(NULL); | 
| 1312 | } while(ret >= 0); | |
| 1313 | if(errno != ECHILD){ | |
| 24.1.155
by Björn Påhlsson mandos server: Added debuglevel that adjust at what level information | 1314 | error(0, errno, "wait"); | 
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 1315 | } | 
| 210
by Teddy Hogeborn * debian/mandos-client.postinst: Change home directory to | 1316 |   
 | 
| 24.1.76
by Björn Påhlsson Rearranged so plugins and processes is the same thing | 1317 | free_plugin_list(); | 
| 1318 |   
 | |
| 24.1.69
by Björn Påhlsson added configfile as a optional argument to plugin-runner | 1319 | free(plugindir); | 
| 738.1.1
by Teddy Hogeborn Add a plugin helper directory, available to all plugins. | 1320 | free(pluginhelperdir); | 
| 24.1.69
by Björn Påhlsson added configfile as a optional argument to plugin-runner | 1321 | free(argfile); | 
| 35
by Teddy Hogeborn * plugbasedclient.c (struct process): New fields "eof", "completed", | 1322 |   
 | 
| 31
by Teddy Hogeborn * plugins.d/plugbasedclient.c: Update include file comments. | 1323 | return exitstatus; | 
| 13
by Björn Påhlsson Added following support: | 1324 | }
 |