bzr branch
http://bzr.recompile.se/loggerhead/mandos/trunk
| 237.1.2
by Teddy Hogeborn Further steps towards a D-Bus server interface, plus minor syntax | 1 | /*  -*- coding: utf-8 -*- */
 | 
| 2 | /*
 | |
| 261
by Teddy Hogeborn * plugins.d/askpass-fifo.c: Fix name in header. | 3 |  * Splashy - Read a password from splashy and output it
 | 
| 237.1.2
by Teddy Hogeborn Further steps towards a D-Bus server interface, plus minor syntax | 4 |  * 
 | 
| 923
by Teddy Hogeborn Update copyright year to 2018 | 5 |  * Copyright © 2008-2018 Teddy Hogeborn
 | 
| 6 |  * Copyright © 2008-2018 Björn Påhlsson
 | |
| 237.1.2
by Teddy Hogeborn Further steps towards a D-Bus server interface, plus minor syntax | 7 |  * 
 | 
| 907
by Teddy Hogeborn Alter copyright notices slightly. Actual license is unchanged! | 8 |  * This file is part of Mandos.
 | 
| 9 |  * 
 | |
| 10 |  * Mandos is free software: you can redistribute it and/or modify it
 | |
| 11 |  * under the terms of the GNU General Public License as published by
 | |
| 12 |  * the Free Software Foundation, either version 3 of the License, or
 | |
| 13 |  * (at your option) any later version.
 | |
| 14 |  * 
 | |
| 15 |  * Mandos is distributed in the hope that it will be useful, but
 | |
| 237.1.2
by Teddy Hogeborn Further steps towards a D-Bus server interface, plus minor syntax | 16 |  * WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
| 17 |  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 | |
| 18 |  * General Public License for more details.
 | |
| 19 |  * 
 | |
| 20 |  * You should have received a copy of the GNU General Public License
 | |
| 907
by Teddy Hogeborn Alter copyright notices slightly. Actual license is unchanged! | 21 |  * along with Mandos.  If not, see <http://www.gnu.org/licenses/>.
 | 
| 237.1.2
by Teddy Hogeborn Further steps towards a D-Bus server interface, plus minor syntax | 22 |  * 
 | 
| 505.1.2
by Teddy Hogeborn Change "fukt.bsnet.se" to "recompile.se" throughout. | 23 |  * Contact the authors at <mandos@recompile.se>.
 | 
| 237.1.2
by Teddy Hogeborn Further steps towards a D-Bus server interface, plus minor syntax | 24 |  */
 | 
| 25 | ||
| 363
by Teddy Hogeborn * plugin-runner.c: Minor stylistic changes. | 26 | #define _GNU_SOURCE /* TEMP_FAILURE_RETRY(), asprintf() */ | 
| 205
by Teddy Hogeborn * Makefile (PLUGINS, uninstall-client, | 27 | #include <signal.h> /* sig_atomic_t, struct sigaction, | 
| 223
by Teddy Hogeborn * .bzrignore (plugins.d/askpass-fifo): Added. | 28 | sigemptyset(), sigaddset(), SIGINT, | 
| 29 | SIGHUP, SIGTERM, sigaction, | |
| 30 | SIG_IGN, kill(), SIGKILL */ | |
| 205
by Teddy Hogeborn * Makefile (PLUGINS, uninstall-client, | 31 | #include <stddef.h> /* NULL */ | 
| 32 | #include <stdlib.h> /* getenv() */ | |
| 485
by Teddy Hogeborn Merge from Björn. | 33 | #include <stdio.h> /* asprintf(), vasprintf(), vprintf(), | 
| 34 | fprintf() */ | |
| 264
by Teddy Hogeborn * plugin-runner.c (main): Use "sscanf" instead of "strtol"; using the | 35 | #include <stdlib.h> /* EXIT_FAILURE, free(), | 
| 223
by Teddy Hogeborn * .bzrignore (plugins.d/askpass-fifo): Added. | 36 | EXIT_SUCCESS */ | 
| 205
by Teddy Hogeborn * Makefile (PLUGINS, uninstall-client, | 37 | #include <sys/types.h> /* pid_t, DIR, struct dirent, | 
| 38 | ssize_t */ | |
| 39 | #include <dirent.h> /* opendir(), readdir(), closedir() */ | |
| 311
by Teddy Hogeborn Overflows are not detected by sscanf(), so stop using it: | 40 | #include <inttypes.h> /* intmax_t, strtoimax() */ | 
| 223
by Teddy Hogeborn * .bzrignore (plugins.d/askpass-fifo): Added. | 41 | #include <sys/stat.h> /* struct stat, lstat(), S_ISLNK */ | 
| 42 | #include <iso646.h> /* not, or, and */ | |
| 205
by Teddy Hogeborn * Makefile (PLUGINS, uninstall-client, | 43 | #include <unistd.h> /* readlink(), fork(), execl(), | 
| 223
by Teddy Hogeborn * .bzrignore (plugins.d/askpass-fifo): Added. | 44 | sleep(), dup2() STDERR_FILENO, | 
| 363
by Teddy Hogeborn * plugin-runner.c: Minor stylistic changes. | 45 | STDOUT_FILENO, _exit(), | 
| 46 | pause() */ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 47 | #include <string.h> /* memcmp(), strerror() */ | 
| 390
by Teddy Hogeborn * plugins.d/askpass-fifo.c: Do close(STDOUT_FILENO) before exiting to | 48 | #include <errno.h> /* errno, EACCES, ENOTDIR, ELOOP, | 
| 49 | ENOENT, ENAMETOOLONG, EMFILE, | |
| 50 | ENFILE, ENOMEM, ENOEXEC, EINVAL, | |
| 51 | E2BIG, EFAULT, EIO, ETXTBSY, | |
| 52 | EISDIR, ELIBBAD, EPERM, EINTR, | |
| 53 | ECHILD */ | |
| 24.1.155
by Björn Påhlsson mandos server: Added debuglevel that adjust at what level information | 54 | #include <error.h> /* error() */ | 
| 205
by Teddy Hogeborn * Makefile (PLUGINS, uninstall-client, | 55 | #include <sys/wait.h> /* waitpid(), WIFEXITED(), | 
| 56 | WEXITSTATUS() */ | |
| 389
by Teddy Hogeborn * plugins.d/splashy.c: Use exit codes from <sysexits.h>. | 57 | #include <sysexits.h> /* EX_OSERR, EX_OSFILE, | 
| 58 | EX_UNAVAILABLE */ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 59 | #include <stdarg.h> /* va_list, va_start(), ... */ | 
| 389
by Teddy Hogeborn * plugins.d/splashy.c: Use exit codes from <sysexits.h>. | 60 | |
| 205
by Teddy Hogeborn * Makefile (PLUGINS, uninstall-client, | 61 | sig_atomic_t interrupted_by_signal = 0; | 
| 362
by Teddy Hogeborn * plugin-runner.c (getplugin, add_environment, main): Handle EINTR | 62 | int signal_received; | 
| 205
by Teddy Hogeborn * Makefile (PLUGINS, uninstall-client, | 63 | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 64 | /* Function to use when printing errors */
 | 
| 533
by teddy at bsnet * plugins.d/splashy.c (error_plus): Check format string. | 65 | __attribute__((format (gnu_printf, 3, 4))) | 
| 485
by Teddy Hogeborn Merge from Björn. | 66 | void error_plus(int status, int errnum, const char *formatstring, | 
| 67 | ...){ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 68 | va_list ap; | 
| 69 | char *text; | |
| 70 | int ret; | |
| 71 |   
 | |
| 72 | va_start(ap, formatstring); | |
| 73 | ret = vasprintf(&text, formatstring, ap); | |
| 670
by Teddy Hogeborn White space fix: change "if (" to "if(" in C code. | 74 | if(ret == -1){ | 
| 485
by Teddy Hogeborn Merge from Björn. | 75 | fprintf(stderr, "Mandos plugin %s: ", | 
| 76 | program_invocation_short_name); | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 77 | vfprintf(stderr, formatstring, ap); | 
| 78 | fprintf(stderr, ": "); | |
| 79 | fprintf(stderr, "%s\n", strerror(errnum)); | |
| 80 | error(status, errno, "vasprintf while printing error"); | |
| 81 | return; | |
| 82 | } | |
| 83 | fprintf(stderr, "Mandos plugin "); | |
| 84 | error(status, errnum, "%s", text); | |
| 85 | free(text); | |
| 86 | }
 | |
| 87 | ||
| 88 | ||
| 362
by Teddy Hogeborn * plugin-runner.c (getplugin, add_environment, main): Handle EINTR | 89 | static void termination_handler(int signum){ | 
| 90 | if(interrupted_by_signal){ | |
| 91 | return; | |
| 92 | } | |
| 205
by Teddy Hogeborn * Makefile (PLUGINS, uninstall-client, | 93 | interrupted_by_signal = 1; | 
| 362
by Teddy Hogeborn * plugin-runner.c (getplugin, add_environment, main): Handle EINTR | 94 | signal_received = signum; | 
| 205
by Teddy Hogeborn * Makefile (PLUGINS, uninstall-client, | 95 | }
 | 
| 96 | ||
| 208
by Teddy Hogeborn * Makefile (PLUGINS): Added "plugins.d/usplash". | 97 | int main(__attribute__((unused))int argc, | 
| 98 | __attribute__((unused))char **argv){ | |
| 205
by Teddy Hogeborn * Makefile (PLUGINS, uninstall-client, | 99 | int ret = 0; | 
| 363
by Teddy Hogeborn * plugin-runner.c: Minor stylistic changes. | 100 | char *prompt = NULL; | 
| 101 | DIR *proc_dir = NULL; | |
| 102 | pid_t splashy_pid = 0; | |
| 103 | pid_t splashy_command_pid = 0; | |
| 389
by Teddy Hogeborn * plugins.d/splashy.c: Use exit codes from <sysexits.h>. | 104 | int exitstatus = EXIT_FAILURE; | 
| 205
by Teddy Hogeborn * Makefile (PLUGINS, uninstall-client, | 105 |   
 | 
| 106 | /* Create prompt string */ | |
| 107 | { | |
| 108 | const char *const cryptsource = getenv("cryptsource"); | |
| 109 | const char *const crypttarget = getenv("crypttarget"); | |
| 110 | const char *const prompt_start = "getpass " | |
| 111 | "Enter passphrase to unlock the disk"; | |
| 112 |     
 | |
| 113 | if(cryptsource == NULL){ | |
| 114 | if(crypttarget == NULL){ | |
| 115 | ret = asprintf(&prompt, "%s: ", prompt_start); | |
| 116 | } else { | |
| 117 | ret = asprintf(&prompt, "%s (%s): ", prompt_start, | |
| 118 | crypttarget); | |
| 119 | } | |
| 120 | } else { | |
| 121 | if(crypttarget == NULL){ | |
| 122 | ret = asprintf(&prompt, "%s %s: ", prompt_start, cryptsource); | |
| 123 | } else { | |
| 124 | ret = asprintf(&prompt, "%s %s (%s): ", prompt_start, | |
| 125 | cryptsource, crypttarget); | |
| 126 | } | |
| 127 | } | |
| 128 | if(ret == -1){ | |
| 363
by Teddy Hogeborn * plugin-runner.c: Minor stylistic changes. | 129 | prompt = NULL; | 
| 389
by Teddy Hogeborn * plugins.d/splashy.c: Use exit codes from <sysexits.h>. | 130 | exitstatus = EX_OSERR; | 
| 363
by Teddy Hogeborn * plugin-runner.c: Minor stylistic changes. | 131 | goto failure; | 
| 205
by Teddy Hogeborn * Makefile (PLUGINS, uninstall-client, | 132 | } | 
| 133 | } | |
| 134 |   
 | |
| 135 | /* Find splashy process */ | |
| 136 | { | |
| 137 | const char splashy_name[] = "/sbin/splashy"; | |
| 363
by Teddy Hogeborn * plugin-runner.c: Minor stylistic changes. | 138 | proc_dir = opendir("/proc"); | 
| 205
by Teddy Hogeborn * Makefile (PLUGINS, uninstall-client, | 139 | if(proc_dir == NULL){ | 
| 389
by Teddy Hogeborn * plugins.d/splashy.c: Use exit codes from <sysexits.h>. | 140 | int e = errno; | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 141 | error_plus(0, errno, "opendir"); | 
| 389
by Teddy Hogeborn * plugins.d/splashy.c: Use exit codes from <sysexits.h>. | 142 | switch(e){ | 
| 143 | case EACCES: | |
| 144 | case ENOTDIR: | |
| 145 | case ELOOP: | |
| 146 | case ENOENT: | |
| 147 | default: | |
| 148 | exitstatus = EX_OSFILE; | |
| 149 | break; | |
| 150 | case ENAMETOOLONG: | |
| 151 | case EMFILE: | |
| 152 | case ENFILE: | |
| 153 | case ENOMEM: | |
| 154 | exitstatus = EX_OSERR; | |
| 155 | break; | |
| 156 | } | |
| 363
by Teddy Hogeborn * plugin-runner.c: Minor stylistic changes. | 157 | goto failure; | 
| 205
by Teddy Hogeborn * Makefile (PLUGINS, uninstall-client, | 158 | } | 
| 159 | for(struct dirent *proc_ent = readdir(proc_dir); | |
| 160 | proc_ent != NULL; | |
| 161 | proc_ent = readdir(proc_dir)){ | |
| 264
by Teddy Hogeborn * plugin-runner.c (main): Use "sscanf" instead of "strtol"; using the | 162 | pid_t pid; | 
| 268
by Teddy Hogeborn Fixes for sscanf usage: | 163 | { | 
| 164 | intmax_t tmpmax; | |
| 311
by Teddy Hogeborn Overflows are not detected by sscanf(), so stop using it: | 165 | char *tmp; | 
| 166 | errno = 0; | |
| 167 | tmpmax = strtoimax(proc_ent->d_name, &tmp, 10); | |
| 168 | if(errno != 0 or tmp == proc_ent->d_name or *tmp != '\0' | |
| 169 | or tmpmax != (pid_t)tmpmax){ | |
| 268
by Teddy Hogeborn Fixes for sscanf usage: | 170 | /* Not a process */ | 
| 171 | continue; | |
| 172 | } | |
| 173 | pid = (pid_t)tmpmax; | |
| 205
by Teddy Hogeborn * Makefile (PLUGINS, uninstall-client, | 174 | } | 
| 175 | /* Find the executable name by doing readlink() on the | |
| 176 | 	 /proc/<pid>/exe link */
 | |
| 177 | char exe_target[sizeof(splashy_name)]; | |
| 208
by Teddy Hogeborn * Makefile (PLUGINS): Added "plugins.d/usplash". | 178 | ssize_t sret; | 
| 179 | { | |
| 180 | char *exe_link; | |
| 181 | ret = asprintf(&exe_link, "/proc/%s/exe", proc_ent->d_name); | |
| 182 | if(ret == -1){ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 183 | error_plus(0, errno, "asprintf"); | 
| 389
by Teddy Hogeborn * plugins.d/splashy.c: Use exit codes from <sysexits.h>. | 184 | exitstatus = EX_OSERR; | 
| 363
by Teddy Hogeborn * plugin-runner.c: Minor stylistic changes. | 185 | goto failure; | 
| 208
by Teddy Hogeborn * Makefile (PLUGINS): Added "plugins.d/usplash". | 186 | } | 
| 223
by Teddy Hogeborn * .bzrignore (plugins.d/askpass-fifo): Added. | 187 | 	
 | 
| 188 | /* Check that it refers to a symlink owned by root:root */ | |
| 189 | struct stat exe_stat; | |
| 190 | ret = lstat(exe_link, &exe_stat); | |
| 191 | if(ret == -1){ | |
| 262
by Teddy Hogeborn * plugins.d/splashy.c (main): Do not abort if a process vanishes while | 192 | if(errno == ENOENT){ | 
| 193 | free(exe_link); | |
| 194 | continue; | |
| 195 | } | |
| 389
by Teddy Hogeborn * plugins.d/splashy.c: Use exit codes from <sysexits.h>. | 196 | int e = errno; | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 197 | error_plus(0, errno, "lstat"); | 
| 223
by Teddy Hogeborn * .bzrignore (plugins.d/askpass-fifo): Added. | 198 | free(exe_link); | 
| 389
by Teddy Hogeborn * plugins.d/splashy.c: Use exit codes from <sysexits.h>. | 199 | switch(e){ | 
| 200 | case EACCES: | |
| 201 | case ENOTDIR: | |
| 202 | case ELOOP: | |
| 203 | default: | |
| 204 | exitstatus = EX_OSFILE; | |
| 205 | break; | |
| 206 | case ENAMETOOLONG: | |
| 207 | exitstatus = EX_OSERR; | |
| 208 | break; | |
| 209 | } | |
| 363
by Teddy Hogeborn * plugin-runner.c: Minor stylistic changes. | 210 | goto failure; | 
| 223
by Teddy Hogeborn * .bzrignore (plugins.d/askpass-fifo): Added. | 211 | } | 
| 212 | if(not S_ISLNK(exe_stat.st_mode) | |
| 213 | or exe_stat.st_uid != 0 | |
| 214 | or exe_stat.st_gid != 0){ | |
| 215 | free(exe_link); | |
| 216 | continue; | |
| 217 | } | |
| 218 | 	
 | |
| 208
by Teddy Hogeborn * Makefile (PLUGINS): Added "plugins.d/usplash". | 219 | sret = readlink(exe_link, exe_target, sizeof(exe_target)); | 
| 220 | free(exe_link); | |
| 221 | } | |
| 205
by Teddy Hogeborn * Makefile (PLUGINS, uninstall-client, | 222 | if((sret == ((ssize_t)sizeof(exe_target)-1)) | 
| 223 | and (memcmp(splashy_name, exe_target, | |
| 224 | sizeof(exe_target)-1) == 0)){ | |
| 225 | splashy_pid = pid; | |
| 226 | break; | |
| 227 | } | |
| 228 | } | |
| 229 | closedir(proc_dir); | |
| 363
by Teddy Hogeborn * plugin-runner.c: Minor stylistic changes. | 230 | proc_dir = NULL; | 
| 205
by Teddy Hogeborn * Makefile (PLUGINS, uninstall-client, | 231 | } | 
| 232 | if(splashy_pid == 0){ | |
| 389
by Teddy Hogeborn * plugins.d/splashy.c: Use exit codes from <sysexits.h>. | 233 | exitstatus = EX_UNAVAILABLE; | 
| 363
by Teddy Hogeborn * plugin-runner.c: Minor stylistic changes. | 234 | goto failure; | 
| 205
by Teddy Hogeborn * Makefile (PLUGINS, uninstall-client, | 235 | } | 
| 236 |   
 | |
| 237 | /* Set up the signal handler */ | |
| 238 | { | |
| 239 | struct sigaction old_action, | |
| 240 | new_action = { .sa_handler = termination_handler, | |
| 241 | .sa_flags = 0 }; | |
| 242 | sigemptyset(&new_action.sa_mask); | |
| 369
by Teddy Hogeborn * init.d-mandos (Required-Start, Required-Stop): Bug fix: Added | 243 | ret = sigaddset(&new_action.sa_mask, SIGINT); | 
| 244 | if(ret == -1){ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 245 | error_plus(0, errno, "sigaddset"); | 
| 389
by Teddy Hogeborn * plugins.d/splashy.c: Use exit codes from <sysexits.h>. | 246 | exitstatus = EX_OSERR; | 
| 369
by Teddy Hogeborn * init.d-mandos (Required-Start, Required-Stop): Bug fix: Added | 247 | goto failure; | 
| 248 | } | |
| 249 | ret = sigaddset(&new_action.sa_mask, SIGHUP); | |
| 250 | if(ret == -1){ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 251 | error_plus(0, errno, "sigaddset"); | 
| 389
by Teddy Hogeborn * plugins.d/splashy.c: Use exit codes from <sysexits.h>. | 252 | exitstatus = EX_OSERR; | 
| 369
by Teddy Hogeborn * init.d-mandos (Required-Start, Required-Stop): Bug fix: Added | 253 | goto failure; | 
| 254 | } | |
| 255 | ret = sigaddset(&new_action.sa_mask, SIGTERM); | |
| 362
by Teddy Hogeborn * plugin-runner.c (getplugin, add_environment, main): Handle EINTR | 256 | if(ret == -1){ | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 257 | error_plus(0, errno, "sigaddset"); | 
| 389
by Teddy Hogeborn * plugins.d/splashy.c: Use exit codes from <sysexits.h>. | 258 | exitstatus = EX_OSERR; | 
| 363
by Teddy Hogeborn * plugin-runner.c: Minor stylistic changes. | 259 | goto failure; | 
| 362
by Teddy Hogeborn * plugin-runner.c (getplugin, add_environment, main): Handle EINTR | 260 | } | 
| 205
by Teddy Hogeborn * Makefile (PLUGINS, uninstall-client, | 261 | ret = sigaction(SIGINT, NULL, &old_action); | 
| 262 | if(ret == -1){ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 263 | error_plus(0, errno, "sigaction"); | 
| 389
by Teddy Hogeborn * plugins.d/splashy.c: Use exit codes from <sysexits.h>. | 264 | exitstatus = EX_OSERR; | 
| 363
by Teddy Hogeborn * plugin-runner.c: Minor stylistic changes. | 265 | goto failure; | 
| 205
by Teddy Hogeborn * Makefile (PLUGINS, uninstall-client, | 266 | } | 
| 223
by Teddy Hogeborn * .bzrignore (plugins.d/askpass-fifo): Added. | 267 | if(old_action.sa_handler != SIG_IGN){ | 
| 205
by Teddy Hogeborn * Makefile (PLUGINS, uninstall-client, | 268 | ret = sigaction(SIGINT, &new_action, NULL); | 
| 269 | if(ret == -1){ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 270 | error_plus(0, errno, "sigaction"); | 
| 389
by Teddy Hogeborn * plugins.d/splashy.c: Use exit codes from <sysexits.h>. | 271 | exitstatus = EX_OSERR; | 
| 363
by Teddy Hogeborn * plugin-runner.c: Minor stylistic changes. | 272 | goto failure; | 
| 205
by Teddy Hogeborn * Makefile (PLUGINS, uninstall-client, | 273 | } | 
| 274 | } | |
| 275 | ret = sigaction(SIGHUP, NULL, &old_action); | |
| 276 | if(ret == -1){ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 277 | error_plus(0, errno, "sigaction"); | 
| 389
by Teddy Hogeborn * plugins.d/splashy.c: Use exit codes from <sysexits.h>. | 278 | exitstatus = EX_OSERR; | 
| 363
by Teddy Hogeborn * plugin-runner.c: Minor stylistic changes. | 279 | goto failure; | 
| 205
by Teddy Hogeborn * Makefile (PLUGINS, uninstall-client, | 280 | } | 
| 223
by Teddy Hogeborn * .bzrignore (plugins.d/askpass-fifo): Added. | 281 | if(old_action.sa_handler != SIG_IGN){ | 
| 205
by Teddy Hogeborn * Makefile (PLUGINS, uninstall-client, | 282 | ret = sigaction(SIGHUP, &new_action, NULL); | 
| 283 | if(ret == -1){ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 284 | error_plus(0, errno, "sigaction"); | 
| 389
by Teddy Hogeborn * plugins.d/splashy.c: Use exit codes from <sysexits.h>. | 285 | exitstatus = EX_OSERR; | 
| 363
by Teddy Hogeborn * plugin-runner.c: Minor stylistic changes. | 286 | goto failure; | 
| 205
by Teddy Hogeborn * Makefile (PLUGINS, uninstall-client, | 287 | } | 
| 288 | } | |
| 289 | ret = sigaction(SIGTERM, NULL, &old_action); | |
| 290 | if(ret == -1){ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 291 | error_plus(0, errno, "sigaction"); | 
| 389
by Teddy Hogeborn * plugins.d/splashy.c: Use exit codes from <sysexits.h>. | 292 | exitstatus = EX_OSERR; | 
| 363
by Teddy Hogeborn * plugin-runner.c: Minor stylistic changes. | 293 | goto failure; | 
| 205
by Teddy Hogeborn * Makefile (PLUGINS, uninstall-client, | 294 | } | 
| 223
by Teddy Hogeborn * .bzrignore (plugins.d/askpass-fifo): Added. | 295 | if(old_action.sa_handler != SIG_IGN){ | 
| 205
by Teddy Hogeborn * Makefile (PLUGINS, uninstall-client, | 296 | ret = sigaction(SIGTERM, &new_action, NULL); | 
| 297 | if(ret == -1){ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 298 | error_plus(0, errno, "sigaction"); | 
| 389
by Teddy Hogeborn * plugins.d/splashy.c: Use exit codes from <sysexits.h>. | 299 | exitstatus = EX_OSERR; | 
| 363
by Teddy Hogeborn * plugin-runner.c: Minor stylistic changes. | 300 | goto failure; | 
| 205
by Teddy Hogeborn * Makefile (PLUGINS, uninstall-client, | 301 | } | 
| 302 | } | |
| 303 | } | |
| 304 |   
 | |
| 363
by Teddy Hogeborn * plugin-runner.c: Minor stylistic changes. | 305 | if(interrupted_by_signal){ | 
| 306 | goto failure; | |
| 307 | } | |
| 308 |   
 | |
| 205
by Teddy Hogeborn * Makefile (PLUGINS, uninstall-client, | 309 | /* Fork off the splashy command to prompt for password */ | 
| 363
by Teddy Hogeborn * plugin-runner.c: Minor stylistic changes. | 310 | splashy_command_pid = fork(); | 
| 311 | if(splashy_command_pid != 0 and interrupted_by_signal){ | |
| 312 | goto failure; | |
| 313 | } | |
| 314 | if(splashy_command_pid == -1){ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 315 | error_plus(0, errno, "fork"); | 
| 389
by Teddy Hogeborn * plugins.d/splashy.c: Use exit codes from <sysexits.h>. | 316 | exitstatus = EX_OSERR; | 
| 363
by Teddy Hogeborn * plugin-runner.c: Minor stylistic changes. | 317 | goto failure; | 
| 318 | } | |
| 319 | /* Child */ | |
| 320 | if(splashy_command_pid == 0){ | |
| 321 | if(not interrupted_by_signal){ | |
| 205
by Teddy Hogeborn * Makefile (PLUGINS, uninstall-client, | 322 | const char splashy_command[] = "/sbin/splashy_update"; | 
| 363
by Teddy Hogeborn * plugin-runner.c: Minor stylistic changes. | 323 | execl(splashy_command, splashy_command, prompt, (char *)NULL); | 
| 390
by Teddy Hogeborn * plugins.d/askpass-fifo.c: Do close(STDOUT_FILENO) before exiting to | 324 | int e = errno; | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 325 | error_plus(0, errno, "execl"); | 
| 390
by Teddy Hogeborn * plugins.d/askpass-fifo.c: Do close(STDOUT_FILENO) before exiting to | 326 | switch(e){ | 
| 327 | case EACCES: | |
| 328 | case ENOENT: | |
| 329 | case ENOEXEC: | |
| 330 | case EINVAL: | |
| 331 | _exit(EX_UNAVAILABLE); | |
| 332 | case ENAMETOOLONG: | |
| 333 | case E2BIG: | |
| 334 | case ENOMEM: | |
| 335 | case EFAULT: | |
| 336 | case EIO: | |
| 337 | case EMFILE: | |
| 338 | case ENFILE: | |
| 339 | case ETXTBSY: | |
| 340 | default: | |
| 341 | _exit(EX_OSERR); | |
| 342 | case ENOTDIR: | |
| 343 | case ELOOP: | |
| 344 | case EISDIR: | |
| 456
by Teddy Hogeborn * plugins.d/splashy.c (main): Bug fix: Only use ELIBBAD if defined. | 345 | #ifdef ELIBBAD
 | 
| 346 | case ELIBBAD: /* Linux only */ | |
| 347 | #endif
 | |
| 390
by Teddy Hogeborn * plugins.d/askpass-fifo.c: Do close(STDOUT_FILENO) before exiting to | 348 | case EPERM: | 
| 349 | _exit(EX_OSFILE); | |
| 350 | } | |
| 205
by Teddy Hogeborn * Makefile (PLUGINS, uninstall-client, | 351 | } | 
| 363
by Teddy Hogeborn * plugin-runner.c: Minor stylistic changes. | 352 | free(prompt); | 
| 353 | _exit(EXIT_FAILURE); | |
| 205
by Teddy Hogeborn * Makefile (PLUGINS, uninstall-client, | 354 | } | 
| 355 |   
 | |
| 356 | /* Parent */ | |
| 357 | free(prompt); | |
| 363
by Teddy Hogeborn * plugin-runner.c: Minor stylistic changes. | 358 | prompt = NULL; | 
| 359 |   
 | |
| 360 | if(interrupted_by_signal){ | |
| 361 | goto failure; | |
| 362 | } | |
| 205
by Teddy Hogeborn * Makefile (PLUGINS, uninstall-client, | 363 |   
 | 
| 364 | /* Wait for command to complete */ | |
| 363
by Teddy Hogeborn * plugin-runner.c: Minor stylistic changes. | 365 | { | 
| 223
by Teddy Hogeborn * .bzrignore (plugins.d/askpass-fifo): Added. | 366 | int status; | 
| 363
by Teddy Hogeborn * plugin-runner.c: Minor stylistic changes. | 367 | do { | 
| 368 | ret = waitpid(splashy_command_pid, &status, 0); | |
| 369 | } while(ret == -1 and errno == EINTR | |
| 370 | and not interrupted_by_signal); | |
| 371 | if(interrupted_by_signal){ | |
| 372 | goto failure; | |
| 373 | } | |
| 223
by Teddy Hogeborn * .bzrignore (plugins.d/askpass-fifo): Added. | 374 | if(ret == -1){ | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 375 | error_plus(0, errno, "waitpid"); | 
| 223
by Teddy Hogeborn * .bzrignore (plugins.d/askpass-fifo): Added. | 376 | if(errno == ECHILD){ | 
| 377 | splashy_command_pid = 0; | |
| 378 | } | |
| 379 | } else { | |
| 380 | /* The child process has exited */ | |
| 381 | splashy_command_pid = 0; | |
| 363
by Teddy Hogeborn * plugin-runner.c: Minor stylistic changes. | 382 | if(WIFEXITED(status) and WEXITSTATUS(status) == 0){ | 
| 223
by Teddy Hogeborn * .bzrignore (plugins.d/askpass-fifo): Added. | 383 | return EXIT_SUCCESS; | 
| 384 | } | |
| 205
by Teddy Hogeborn * Makefile (PLUGINS, uninstall-client, | 385 | } | 
| 386 | } | |
| 363
by Teddy Hogeborn * plugin-runner.c: Minor stylistic changes. | 387 |   
 | 
| 388 | failure: | |
| 389 |   
 | |
| 390 | free(prompt); | |
| 391 |   
 | |
| 392 | if(proc_dir != NULL){ | |
| 393 | TEMP_FAILURE_RETRY(closedir(proc_dir)); | |
| 394 | } | |
| 395 |   
 | |
| 396 | if(splashy_command_pid != 0){ | |
| 397 | TEMP_FAILURE_RETRY(kill(splashy_command_pid, SIGTERM)); | |
| 223
by Teddy Hogeborn * .bzrignore (plugins.d/askpass-fifo): Added. | 398 |     
 | 
| 363
by Teddy Hogeborn * plugin-runner.c: Minor stylistic changes. | 399 | TEMP_FAILURE_RETRY(kill(splashy_pid, SIGTERM)); | 
| 400 | sleep(2); | |
| 401 | while(TEMP_FAILURE_RETRY(kill(splashy_pid, 0)) == 0){ | |
| 402 | TEMP_FAILURE_RETRY(kill(splashy_pid, SIGKILL)); | |
| 403 | sleep(1); | |
| 205
by Teddy Hogeborn * Makefile (PLUGINS, uninstall-client, | 404 | } | 
| 369
by Teddy Hogeborn * init.d-mandos (Required-Start, Required-Stop): Bug fix: Added | 405 | pid_t new_splashy_pid = (pid_t)TEMP_FAILURE_RETRY(fork()); | 
| 363
by Teddy Hogeborn * plugin-runner.c: Minor stylistic changes. | 406 | if(new_splashy_pid == 0){ | 
| 407 | /* Child; will become new splashy process */ | |
| 408 |       
 | |
| 409 | /* Make the effective user ID (root) the only user ID instead of | |
| 410 | 	 the real user ID (_mandos) */
 | |
| 411 | ret = setuid(geteuid()); | |
| 412 | if(ret == -1){ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 413 | error_plus(0, errno, "setuid"); | 
| 363
by Teddy Hogeborn * plugin-runner.c: Minor stylistic changes. | 414 | } | 
| 415 |       
 | |
| 416 | setsid(); | |
| 417 | ret = chdir("/"); | |
| 418 | if(ret == -1){ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 419 | error_plus(0, errno, "chdir"); | 
| 363
by Teddy Hogeborn * plugin-runner.c: Minor stylistic changes. | 420 | } | 
| 421 | /*       if(fork() != 0){ */
 | |
| 422 | /* 	_exit(EXIT_SUCCESS); */
 | |
| 423 | /*       } */
 | |
| 424 | ret = dup2(STDERR_FILENO, STDOUT_FILENO); /* replace stdout */ | |
| 425 | if(ret == -1){ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 426 | error_plus(0, errno, "dup2"); | 
| 389
by Teddy Hogeborn * plugins.d/splashy.c: Use exit codes from <sysexits.h>. | 427 | _exit(EX_OSERR); | 
| 363
by Teddy Hogeborn * plugin-runner.c: Minor stylistic changes. | 428 | } | 
| 389
by Teddy Hogeborn * plugins.d/splashy.c: Use exit codes from <sysexits.h>. | 429 |       
 | 
| 363
by Teddy Hogeborn * plugin-runner.c: Minor stylistic changes. | 430 | execl("/sbin/splashy", "/sbin/splashy", "boot", (char *)NULL); | 
| 389
by Teddy Hogeborn * plugins.d/splashy.c: Use exit codes from <sysexits.h>. | 431 | { | 
| 432 | int e = errno; | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 433 | error_plus(0, errno, "execl"); | 
| 389
by Teddy Hogeborn * plugins.d/splashy.c: Use exit codes from <sysexits.h>. | 434 | switch(e){ | 
| 435 | case EACCES: | |
| 436 | case ENOENT: | |
| 437 | case ENOEXEC: | |
| 438 | default: | |
| 439 | _exit(EX_UNAVAILABLE); | |
| 440 | case ENAMETOOLONG: | |
| 441 | case E2BIG: | |
| 442 | case ENOMEM: | |
| 443 | _exit(EX_OSERR); | |
| 444 | case ENOTDIR: | |
| 445 | case ELOOP: | |
| 446 | _exit(EX_OSFILE); | |
| 447 | } | |
| 448 | } | |
| 205
by Teddy Hogeborn * Makefile (PLUGINS, uninstall-client, | 449 | } | 
| 363
by Teddy Hogeborn * plugin-runner.c: Minor stylistic changes. | 450 | } | 
| 451 |   
 | |
| 452 | if(interrupted_by_signal){ | |
| 453 | struct sigaction signal_action; | |
| 454 | sigemptyset(&signal_action.sa_mask); | |
| 455 | signal_action.sa_handler = SIG_DFL; | |
| 369
by Teddy Hogeborn * init.d-mandos (Required-Start, Required-Stop): Bug fix: Added | 456 | ret = (int)TEMP_FAILURE_RETRY(sigaction(signal_received, | 
| 457 | &signal_action, NULL)); | |
| 363
by Teddy Hogeborn * plugin-runner.c: Minor stylistic changes. | 458 | if(ret == -1){ | 
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 459 | error_plus(0, errno, "sigaction"); | 
| 363
by Teddy Hogeborn * plugin-runner.c: Minor stylistic changes. | 460 | } | 
| 461 | do { | |
| 462 | ret = raise(signal_received); | |
| 463 | } while(ret != 0 and errno == EINTR); | |
| 464 | if(ret != 0){ | |
| 24.1.174
by Björn Påhlsson * Makefile (CFLAGS): Added "-lrt" to include real time library. | 465 | error_plus(0, errno, "raise"); | 
| 363
by Teddy Hogeborn * plugin-runner.c: Minor stylistic changes. | 466 | abort(); | 
| 467 | } | |
| 468 | TEMP_FAILURE_RETRY(pause()); | |
| 205
by Teddy Hogeborn * Makefile (PLUGINS, uninstall-client, | 469 | } | 
| 470 |   
 | |
| 389
by Teddy Hogeborn * plugins.d/splashy.c: Use exit codes from <sysexits.h>. | 471 | return exitstatus; | 
| 205
by Teddy Hogeborn * Makefile (PLUGINS, uninstall-client, | 472 | }
 |