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

: (revision 24.1.135)

To get this branch, use:

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

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