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

: (revision 708)

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