/mandos/trunk : contents of plugin-runner.c at revision 668

: (revision 668)

To get this branch, use:

bzr branch
http://bzr.recompile.se/loggerhead/mandos/trunk

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