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