bzr branch
http://bzr.recompile.se/loggerhead/mandos/trunk
| 356
by Teddy Hogeborn * plugin-runner.c (main): When a plugin is killed by a signal, show | 1 | /*  -*- coding: utf-8; mode: c; mode: orgtbl -*- */
 | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 2 | /*
 | 
| 261
by Teddy Hogeborn * plugins.d/askpass-fifo.c: Fix name in header. | 3 |  * Password-prompt - Read a password from the terminal and print 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
 | |
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 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
 | |
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 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/>.
 | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 22 |  * 
 | 
| 505.1.2
by Teddy Hogeborn Change "fukt.bsnet.se" to "recompile.se" throughout. | 23 |  * Contact the authors at <mandos@recompile.se>.
 | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 24 |  */
 | 
| 25 | ||
| 237.5.1
by Björn Påhlsson password-prompt: added conflic handling with plymouth daemon. | 26 | #define _GNU_SOURCE /* getline(), asprintf() */ | 
| 21
by Teddy Hogeborn * Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and | 27 | |
| 469.1.1
by teddy at bsnet * plugins.d/password-prompt.c: Some white space fixes. Break some | 28 | #include <termios.h> /* struct termios, tcsetattr(), | 
| 13
by Björn Påhlsson Added following support: | 29 | TCSAFLUSH, tcgetattr(), ECHO */ | 
| 30 | #include <unistd.h> /* struct termios, tcsetattr(), | |
| 31 | STDIN_FILENO, TCSAFLUSH, | |
| 237.5.1
by Björn Påhlsson password-prompt: added conflic handling with plymouth daemon. | 32 | tcgetattr(), ECHO, readlink() */ | 
| 13
by Björn Påhlsson Added following support: | 33 | #include <signal.h> /* sig_atomic_t, raise(), struct | 
| 34 | sigaction, sigemptyset(), | |
| 35 | sigaction(), sigaddset(), SIGINT, | |
| 356
by Teddy Hogeborn * plugin-runner.c (main): When a plugin is killed by a signal, show | 36 | SIGQUIT, SIGHUP, SIGTERM, | 
| 37 | raise() */ | |
| 24.1.26
by Björn Påhlsson tally count of used symbols | 38 | #include <stddef.h> /* NULL, size_t, ssize_t */ | 
| 237.5.2
by Björn Påhlsson fixed bug with conflict detection between plymouthd and password-prompt | 39 | #include <sys/types.h> /* ssize_t, struct dirent, pid_t, | 
| 40 | ssize_t, open() */ | |
| 15.1.3
by Björn Påhlsson Added getopt_long support for mandosclient and passprompt | 41 | #include <stdlib.h> /* EXIT_SUCCESS, EXIT_FAILURE, | 
| 237.5.1
by Björn Påhlsson password-prompt: added conflic handling with plymouth daemon. | 42 | getenv(), free() */ | 
| 43 | #include <dirent.h> /* scandir(), alphasort() */ | |
| 13
by Björn Påhlsson Added following support: | 44 | #include <stdio.h> /* fprintf(), stderr, getline(), | 
| 485
by Teddy Hogeborn Merge from Björn. | 45 | stdin, feof(), fputc(), vfprintf(), | 
| 46 | vasprintf() */ | |
| 391
by Teddy Hogeborn * plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do | 47 | #include <errno.h> /* errno, EBADF, ENOTTY, EINVAL, | 
| 48 | EFAULT, EFBIG, EIO, ENOSPC, EINTR | |
| 49 | */ | |
| 24.1.155
by Björn Påhlsson mandos server: Added debuglevel that adjust at what level information | 50 | #include <error.h> /* error() */ | 
| 13
by Björn Påhlsson Added following support: | 51 | #include <iso646.h> /* or, not */ | 
| 52 | #include <stdbool.h> /* bool, false, true */ | |
| 237.5.1
by Björn Påhlsson password-prompt: added conflic handling with plymouth daemon. | 53 | #include <inttypes.h> /* strtoumax() */ | 
| 469.1.1
by teddy at bsnet * plugins.d/password-prompt.c: Some white space fixes. Break some | 54 | #include <sys/stat.h> /* struct stat, lstat(), open() */ | 
| 485
by Teddy Hogeborn Merge from Björn. | 55 | #include <string.h> /* strlen, rindex, memcmp, strerror() | 
| 56 | */ | |
| 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(), error_t, | |
| 60 | ARGP_KEY_ARG, ARGP_KEY_END, | |
| 61 | ARGP_ERR_UNKNOWN */ | |
| 391
by Teddy Hogeborn * plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do | 62 | #include <sysexits.h> /* EX_SOFTWARE, EX_OSERR, | 
| 63 | EX_UNAVAILABLE, EX_IOERR, EX_OK */ | |
| 237.5.2
by Björn Påhlsson fixed bug with conflict detection between plymouthd and password-prompt | 64 | #include <fcntl.h> /* open() */ | 
| 24.1.173
by Björn Påhlsson prepended mandos plugin to error messages in each plugin. Added a better way in TODO. | 65 | #include <stdarg.h> /* va_list, va_start(), ... */ | 
| 13
by Björn Påhlsson Added following support: | 66 | |
| 294
by Teddy Hogeborn * plugins.d/password-prompt.c (quit_now): Changed type to "volatile | 67 | volatile sig_atomic_t quit_now = 0; | 
| 356
by Teddy Hogeborn * plugin-runner.c (main): When a plugin is killed by a signal, show | 68 | int signal_received; | 
| 15.1.2
by Björn Påhlsson Added debug options from passprompt as --debug and --debug=passprompt | 69 | bool debug = false; | 
| 217
by Teddy Hogeborn * .bzrignore: Added "man" directory (created by "make install-html"). | 70 | const char *argp_program_version = "password-prompt " VERSION; | 
| 505.1.2
by Teddy Hogeborn Change "fukt.bsnet.se" to "recompile.se" throughout. | 71 | const char *argp_program_bug_address = "<mandos@recompile.se>"; | 
| 13
by Björn Påhlsson Added following support: | 72 | |
| 469
by Teddy Hogeborn * plugins.d/password-prompt.c (conflict_detection): Check for both | 73 | /* Needed for conflict resolution */
 | 
| 74 | const char plymouth_name[] = "plymouthd"; | |
| 237.5.1
by Björn Påhlsson password-prompt: added conflic handling with plymouth daemon. | 75 | |
| 24.1.173
by Björn Påhlsson prepended mandos plugin to error messages in each plugin. Added a better way in TODO. | 76 | /* Function to use when printing errors */
 | 
| 533
by teddy at bsnet * plugins.d/splashy.c (error_plus): Check format string. | 77 | __attribute__((format (gnu_printf, 3, 4))) | 
| 485
by Teddy Hogeborn Merge from Björn. | 78 | void error_plus(int status, int errnum, const char *formatstring, | 
| 79 | ...){ | |
| 24.1.173
by Björn Påhlsson prepended mandos plugin to error messages in each plugin. Added a better way in TODO. | 80 | va_list ap; | 
| 81 | char *text; | |
| 82 | int ret; | |
| 83 |   
 | |
| 84 | va_start(ap, formatstring); | |
| 85 | ret = vasprintf(&text, formatstring, ap); | |
| 670
by Teddy Hogeborn White space fix: change "if (" to "if(" in C code. | 86 | if(ret == -1){ | 
| 485
by Teddy Hogeborn Merge from Björn. | 87 | fprintf(stderr, "Mandos plugin %s: ", | 
| 88 | program_invocation_short_name); | |
| 24.1.173
by Björn Påhlsson prepended mandos plugin to error messages in each plugin. Added a better way in TODO. | 89 | vfprintf(stderr, formatstring, ap); | 
| 534
by teddy at bsnet * plugin-runner.c (add_to_char_array): Added "nonnull" attribute. | 90 | fprintf(stderr, ": %s\n", strerror(errnum)); | 
| 24.1.173
by Björn Påhlsson prepended mandos plugin to error messages in each plugin. Added a better way in TODO. | 91 | error(status, errno, "vasprintf while printing error"); | 
| 92 | return; | |
| 93 | } | |
| 94 | fprintf(stderr, "Mandos plugin "); | |
| 95 | error(status, errnum, "%s", text); | |
| 96 | free(text); | |
| 97 | }
 | |
| 98 | ||
| 356
by Teddy Hogeborn * plugin-runner.c (main): When a plugin is killed by a signal, show | 99 | static void termination_handler(int signum){ | 
| 100 | if(quit_now){ | |
| 101 | return; | |
| 102 | } | |
| 294
by Teddy Hogeborn * plugins.d/password-prompt.c (quit_now): Changed type to "volatile | 103 | quit_now = 1; | 
| 356
by Teddy Hogeborn * plugin-runner.c (main): When a plugin is killed by a signal, show | 104 | signal_received = signum; | 
| 13
by Björn Påhlsson Added following support: | 105 | }
 | 
| 106 | ||
| 237.5.1
by Björn Påhlsson password-prompt: added conflic handling with plymouth daemon. | 107 | bool conflict_detection(void){ | 
| 108 | ||
| 237.5.2
by Björn Påhlsson fixed bug with conflict detection between plymouthd and password-prompt | 109 | /* plymouth conflicts with password-prompt since both want to read | 
| 110 |      from the terminal.  Password-prompt will exit if it detects
 | |
| 111 |      plymouth since plymouth performs the same functionality.
 | |
| 237.5.1
by Björn Påhlsson password-prompt: added conflic handling with plymouth daemon. | 112 |    */
 | 
| 534
by teddy at bsnet * plugin-runner.c (add_to_char_array): Added "nonnull" attribute. | 113 | __attribute__((nonnull)) | 
| 237.5.1
by Björn Påhlsson password-prompt: added conflic handling with plymouth daemon. | 114 | int is_plymouth(const struct dirent *proc_entry){ | 
| 115 | int ret; | |
| 237.5.2
by Björn Påhlsson fixed bug with conflict detection between plymouthd and password-prompt | 116 | int cl_fd; | 
| 237.5.1
by Björn Påhlsson password-prompt: added conflic handling with plymouth daemon. | 117 | { | 
| 536
by Björn Påhlsson renamed some foomax values to what they actually represent | 118 | uintmax_t proc_id; | 
| 237.5.1
by Björn Påhlsson password-prompt: added conflic handling with plymouth daemon. | 119 | char *tmp; | 
| 120 | errno = 0; | |
| 536
by Björn Påhlsson renamed some foomax values to what they actually represent | 121 | proc_id = strtoumax(proc_entry->d_name, &tmp, 10); | 
| 237.5.1
by Björn Påhlsson password-prompt: added conflic handling with plymouth daemon. | 122 |       
 | 
| 123 | if(errno != 0 or *tmp != '\0' | |
| 536
by Björn Påhlsson renamed some foomax values to what they actually represent | 124 | or proc_id != (uintmax_t)((pid_t)proc_id)){ | 
| 237.5.1
by Björn Påhlsson password-prompt: added conflic handling with plymouth daemon. | 125 | return 0; | 
| 126 | } | |
| 127 | } | |
| 237.5.2
by Björn Påhlsson fixed bug with conflict detection between plymouthd and password-prompt | 128 |     
 | 
| 129 | char *cmdline_filename; | |
| 469.1.1
by teddy at bsnet * plugins.d/password-prompt.c: Some white space fixes. Break some | 130 | ret = asprintf(&cmdline_filename, "/proc/%s/cmdline", | 
| 131 | proc_entry->d_name); | |
| 237.5.1
by Björn Påhlsson password-prompt: added conflic handling with plymouth daemon. | 132 | if(ret == -1){ | 
| 534
by teddy at bsnet * plugin-runner.c (add_to_char_array): Added "nonnull" attribute. | 133 | error_plus(0, errno, "asprintf"); | 
| 237.5.1
by Björn Påhlsson password-prompt: added conflic handling with plymouth daemon. | 134 | return 0; | 
| 135 | } | |
| 237.5.2
by Björn Påhlsson fixed bug with conflict detection between plymouthd and password-prompt | 136 |     
 | 
| 469.1.1
by teddy at bsnet * plugins.d/password-prompt.c: Some white space fixes. Break some | 137 | /* Open /proc/<pid>/cmdline */ | 
| 237.5.2
by Björn Påhlsson fixed bug with conflict detection between plymouthd and password-prompt | 138 | cl_fd = open(cmdline_filename, O_RDONLY); | 
| 139 | free(cmdline_filename); | |
| 140 | if(cl_fd == -1){ | |
| 478
by Teddy Hogeborn * plugins.d/password-prompt.c (conflict_detection): Don't print error | 141 | if(errno != ENOENT){ | 
| 534
by teddy at bsnet * plugin-runner.c (add_to_char_array): Added "nonnull" attribute. | 142 | error_plus(0, errno, "open"); | 
| 478
by Teddy Hogeborn * plugins.d/password-prompt.c (conflict_detection): Don't print error | 143 | } | 
| 237.5.2
by Björn Påhlsson fixed bug with conflict detection between plymouthd and password-prompt | 144 | return 0; | 
| 145 | } | |
| 146 |     
 | |
| 147 | char *cmdline = NULL; | |
| 148 | { | |
| 149 | size_t cmdline_len = 0; | |
| 150 | size_t cmdline_allocated = 0; | |
| 151 | char *tmp; | |
| 152 | const size_t blocksize = 1024; | |
| 153 | ssize_t sret; | |
| 154 | do { | |
| 155 | /* Allocate more space? */ | |
| 156 | if(cmdline_len + blocksize + 1 > cmdline_allocated){ | |
| 157 | tmp = realloc(cmdline, cmdline_allocated + blocksize + 1); | |
| 158 | if(tmp == NULL){ | |
| 534
by teddy at bsnet * plugin-runner.c (add_to_char_array): Added "nonnull" attribute. | 159 | error_plus(0, errno, "realloc"); | 
| 237.5.2
by Björn Påhlsson fixed bug with conflict detection between plymouthd and password-prompt | 160 | free(cmdline); | 
| 161 | close(cl_fd); | |
| 162 | return 0; | |
| 163 | } | |
| 164 | cmdline = tmp; | |
| 165 | cmdline_allocated += blocksize; | |
| 166 | } | |
| 167 | 	
 | |
| 168 | /* Read data */ | |
| 169 | sret = read(cl_fd, cmdline + cmdline_len, | |
| 170 | cmdline_allocated - cmdline_len); | |
| 171 | if(sret == -1){ | |
| 534
by teddy at bsnet * plugin-runner.c (add_to_char_array): Added "nonnull" attribute. | 172 | error_plus(0, errno, "read"); | 
| 237.5.2
by Björn Påhlsson fixed bug with conflict detection between plymouthd and password-prompt | 173 | free(cmdline); | 
| 174 | close(cl_fd); | |
| 175 | return 0; | |
| 176 | } | |
| 177 | cmdline_len += (size_t)sret; | |
| 178 | } while(sret != 0); | |
| 179 | ret = close(cl_fd); | |
| 180 | if(ret == -1){ | |
| 534
by teddy at bsnet * plugin-runner.c (add_to_char_array): Added "nonnull" attribute. | 181 | error_plus(0, errno, "close"); | 
| 237.5.2
by Björn Påhlsson fixed bug with conflict detection between plymouthd and password-prompt | 182 | free(cmdline); | 
| 183 | return 0; | |
| 237.5.1
by Björn Påhlsson password-prompt: added conflic handling with plymouth daemon. | 184 | } | 
| 237.5.2
by Björn Påhlsson fixed bug with conflict detection between plymouthd and password-prompt | 185 | cmdline[cmdline_len] = '\0'; /* Make sure it is terminated */ | 
| 186 | } | |
| 187 | /* we now have cmdline */ | |
| 188 |     
 | |
| 189 | /* get basename */ | |
| 190 | char *cmdline_base = strrchr(cmdline, '/'); | |
| 191 | if(cmdline_base != NULL){ | |
| 192 | cmdline_base += 1; /* skip the slash */ | |
| 193 | } else { | |
| 194 | cmdline_base = cmdline; | |
| 195 | } | |
| 196 |     
 | |
| 471
by Teddy Hogeborn * plugins.d/password-prompt.c (conflict_detection): Check for both | 197 | if(strcmp(cmdline_base, plymouth_name) != 0){ | 
| 469.1.1
by teddy at bsnet * plugins.d/password-prompt.c: Some white space fixes. Break some | 198 | if(debug){ | 
| 471
by Teddy Hogeborn * plugins.d/password-prompt.c (conflict_detection): Check for both | 199 | fprintf(stderr, "\"%s\" is not \"%s\"\n", cmdline_base, | 
| 200 | plymouth_name); | |
| 469.1.1
by teddy at bsnet * plugins.d/password-prompt.c: Some white space fixes. Break some | 201 | } | 
| 237.5.2
by Björn Påhlsson fixed bug with conflict detection between plymouthd and password-prompt | 202 | free(cmdline); | 
| 203 | return 0; | |
| 204 | } | |
| 471
by Teddy Hogeborn * plugins.d/password-prompt.c (conflict_detection): Check for both | 205 | if(debug){ | 
| 206 | fprintf(stderr, "\"%s\" equals \"%s\"\n", cmdline_base, | |
| 207 | plymouth_name); | |
| 208 | } | |
| 237.5.2
by Björn Påhlsson fixed bug with conflict detection between plymouthd and password-prompt | 209 | free(cmdline); | 
| 237.5.1
by Björn Påhlsson password-prompt: added conflic handling with plymouth daemon. | 210 | return 1; | 
| 211 | } | |
| 469.1.1
by teddy at bsnet * plugins.d/password-prompt.c: Some white space fixes. Break some | 212 |   
 | 
| 24.1.176
by Björn Påhlsson free dirents in password-prompt | 213 | struct dirent **direntries = NULL; | 
| 237.5.1
by Björn Påhlsson password-prompt: added conflic handling with plymouth daemon. | 214 | int ret; | 
| 215 | ret = scandir("/proc", &direntries, is_plymouth, alphasort); | |
| 670
by Teddy Hogeborn White space fix: change "if (" to "if(" in C code. | 216 | if(ret == -1){ | 
| 534
by teddy at bsnet * plugin-runner.c (add_to_char_array): Added "nonnull" attribute. | 217 | error_plus(1, errno, "scandir"); | 
| 237.5.1
by Björn Påhlsson password-prompt: added conflic handling with plymouth daemon. | 218 | } | 
| 901
by Teddy Hogeborn Fix memory leak in password-prompt | 219 | { | 
| 220 | int i = ret; | |
| 221 | while(i--){ | |
| 222 | free(direntries[i]); | |
| 223 | } | |
| 224 | } | |
| 237.4.16
by Teddy Hogeborn * Makefile (version): Changed to "1.3.1". | 225 | free(direntries); | 
| 467
by Teddy Hogeborn Merge fix for password-prompt/plymouth conflict from Björn. | 226 | return ret > 0; | 
| 237.5.1
by Björn Påhlsson password-prompt: added conflic handling with plymouth daemon. | 227 | }
 | 
| 228 | ||
| 229 | ||
| 13
by Björn Påhlsson Added following support: | 230 | int main(int argc, char **argv){ | 
| 24.1.155
by Björn Påhlsson mandos server: Added debuglevel that adjust at what level information | 231 | ssize_t sret; | 
| 232 | int ret; | |
| 13
by Björn Påhlsson Added following support: | 233 | size_t n; | 
| 234 | struct termios t_new, t_old; | |
| 235 | char *buffer = NULL; | |
| 15.1.3
by Björn Påhlsson Added getopt_long support for mandosclient and passprompt | 236 | char *prefix = NULL; | 
| 13
by Björn Påhlsson Added following support: | 237 | int status = EXIT_SUCCESS; | 
| 238 | struct sigaction old_action, | |
| 239 | new_action = { .sa_handler = termination_handler, | |
| 240 | .sa_flags = 0 }; | |
| 24.1.17
by Björn Påhlsson passprompt | 241 | { | 
| 242 | struct argp_option options[] = { | |
| 243 | { .name = "prefix", .key = 'p', | |
| 244 | .arg = "PREFIX", .flags = 0, | |
| 110
by Teddy Hogeborn * mandos.xml (EXAMPLE): Replaced all occurences of command name with | 245 | .doc = "Prefix shown before the prompt", .group = 2 }, | 
| 24.1.17
by Björn Påhlsson passprompt | 246 | { .name = "debug", .key = 128, | 
| 247 | .doc = "Debug mode", .group = 3 }, | |
| 394
by Teddy Hogeborn Convert some programs to use the exit codes from <sysexits.h>. Change | 248 | /* | 
| 249 |        * These reproduce what we would get without ARGP_NO_HELP
 | |
| 250 |        */
 | |
| 251 | { .name = "help", .key = '?', | |
| 252 | .doc = "Give this help list", .group = -1 }, | |
| 253 | { .name = "usage", .key = -3, | |
| 254 | .doc = "Give a short usage message", .group = -1 }, | |
| 255 | { .name = "version", .key = 'V', | |
| 256 | .doc = "Print program version", .group = -1 }, | |
| 24.1.17
by Björn Påhlsson passprompt | 257 | { .name = NULL } | 
| 258 | }; | |
| 257
by Teddy Hogeborn Change the default value of the "checker" option command to make the | 259 |     
 | 
| 534
by teddy at bsnet * plugin-runner.c (add_to_char_array): Added "nonnull" attribute. | 260 | __attribute__((nonnull(3))) | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 261 | error_t parse_opt (int key, char *arg, struct argp_state *state){ | 
| 394
by Teddy Hogeborn Convert some programs to use the exit codes from <sysexits.h>. Change | 262 | errno = 0; | 
| 293
by Teddy Hogeborn * plugin-runner.c: Whitespace changes only. | 263 | switch (key){ | 
| 24.1.17
by Björn Påhlsson passprompt | 264 | case 'p': | 
| 265 | prefix = arg; | |
| 266 | break; | |
| 267 | case 128: | |
| 268 | debug = true; | |
| 269 | break; | |
| 394
by Teddy Hogeborn Convert some programs to use the exit codes from <sysexits.h>. Change | 270 | /* | 
| 271 | 	 * These reproduce what we would get without ARGP_NO_HELP
 | |
| 272 | 	 */
 | |
| 273 | case '?': /* --help */ | |
| 274 | argp_state_help(state, state->out_stream, | |
| 275 | (ARGP_HELP_STD_HELP | ARGP_HELP_EXIT_ERR) | |
| 276 | & ~(unsigned int)ARGP_HELP_EXIT_OK); | |
| 277 | case -3: /* --usage */ | |
| 278 | argp_state_help(state, state->out_stream, | |
| 279 | ARGP_HELP_USAGE | ARGP_HELP_EXIT_ERR); | |
| 280 | case 'V': /* --version */ | |
| 281 | fprintf(state->out_stream, "%s\n", argp_program_version); | |
| 282 | exit(argp_err_exit_status); | |
| 24.1.17
by Björn Påhlsson passprompt | 283 | break; | 
| 284 | default: | |
| 285 | return ARGP_ERR_UNKNOWN; | |
| 286 | } | |
| 394
by Teddy Hogeborn Convert some programs to use the exit codes from <sysexits.h>. Change | 287 | return errno; | 
| 24.1.17
by Björn Påhlsson passprompt | 288 | } | 
| 257
by Teddy Hogeborn Change the default value of the "checker" option command to make the | 289 |     
 | 
| 24.1.17
by Björn Påhlsson passprompt | 290 | struct argp argp = { .options = options, .parser = parse_opt, | 
| 291 | .args_doc = "", | |
| 110
by Teddy Hogeborn * mandos.xml (EXAMPLE): Replaced all occurences of command name with | 292 | .doc = "Mandos password-prompt -- Read and" | 
| 293 | " output a password" }; | |
| 394
by Teddy Hogeborn Convert some programs to use the exit codes from <sysexits.h>. Change | 294 | ret = argp_parse(&argp, argc, argv, | 
| 295 | ARGP_IN_ORDER | ARGP_NO_HELP, NULL, NULL); | |
| 296 | switch(ret){ | |
| 297 | case 0: | |
| 298 | break; | |
| 299 | case ENOMEM: | |
| 300 | default: | |
| 301 | errno = ret; | |
| 534
by teddy at bsnet * plugin-runner.c (add_to_char_array): Added "nonnull" attribute. | 302 | error_plus(0, errno, "argp_parse"); | 
| 394
by Teddy Hogeborn Convert some programs to use the exit codes from <sysexits.h>. Change | 303 | return EX_OSERR; | 
| 304 | case EINVAL: | |
| 305 | return EX_USAGE; | |
| 24.1.26
by Björn Påhlsson tally count of used symbols | 306 | } | 
| 15.1.3
by Björn Påhlsson Added getopt_long support for mandosclient and passprompt | 307 | } | 
| 257
by Teddy Hogeborn Change the default value of the "checker" option command to make the | 308 |   
 | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 309 | if(debug){ | 
| 15.1.2
by Björn Påhlsson Added debug options from passprompt as --debug and --debug=passprompt | 310 | fprintf(stderr, "Starting %s\n", argv[0]); | 
| 311 | } | |
| 237.5.1
by Björn Påhlsson password-prompt: added conflic handling with plymouth daemon. | 312 | |
| 670
by Teddy Hogeborn White space fix: change "if (" to "if(" in C code. | 313 | if(conflict_detection()){ | 
| 237.5.1
by Björn Påhlsson password-prompt: added conflic handling with plymouth daemon. | 314 | if(debug){ | 
| 469.1.1
by teddy at bsnet * plugins.d/password-prompt.c: Some white space fixes. Break some | 315 | fprintf(stderr, "Stopping %s because of conflict\n", argv[0]); | 
| 237.5.1
by Björn Påhlsson password-prompt: added conflic handling with plymouth daemon. | 316 | } | 
| 317 | return EXIT_FAILURE; | |
| 318 | } | |
| 319 |   
 | |
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 320 | if(debug){ | 
| 15.1.2
by Björn Påhlsson Added debug options from passprompt as --debug and --debug=passprompt | 321 | fprintf(stderr, "Storing current terminal attributes\n"); | 
| 322 | } | |
| 13
by Björn Påhlsson Added following support: | 323 |   
 | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 324 | if(tcgetattr(STDIN_FILENO, &t_old) != 0){ | 
| 391
by Teddy Hogeborn * plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do | 325 | int e = errno; | 
| 534
by teddy at bsnet * plugin-runner.c (add_to_char_array): Added "nonnull" attribute. | 326 | error_plus(0, errno, "tcgetattr"); | 
| 391
by Teddy Hogeborn * plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do | 327 | switch(e){ | 
| 328 | case EBADF: | |
| 329 | case ENOTTY: | |
| 330 | return EX_UNAVAILABLE; | |
| 331 | default: | |
| 332 | return EX_OSERR; | |
| 333 | } | |
| 13
by Björn Påhlsson Added following support: | 334 | } | 
| 335 |   
 | |
| 336 | sigemptyset(&new_action.sa_mask); | |
| 357
by Teddy Hogeborn * plugins.d/mandos-client.c (main): Do not handle ignored signals. | 337 | ret = sigaddset(&new_action.sa_mask, SIGINT); | 
| 338 | if(ret == -1){ | |
| 534
by teddy at bsnet * plugin-runner.c (add_to_char_array): Added "nonnull" attribute. | 339 | error_plus(0, errno, "sigaddset"); | 
| 391
by Teddy Hogeborn * plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do | 340 | return EX_OSERR; | 
| 357
by Teddy Hogeborn * plugins.d/mandos-client.c (main): Do not handle ignored signals. | 341 | } | 
| 342 | ret = sigaddset(&new_action.sa_mask, SIGHUP); | |
| 343 | if(ret == -1){ | |
| 534
by teddy at bsnet * plugin-runner.c (add_to_char_array): Added "nonnull" attribute. | 344 | error_plus(0, errno, "sigaddset"); | 
| 391
by Teddy Hogeborn * plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do | 345 | return EX_OSERR; | 
| 357
by Teddy Hogeborn * plugins.d/mandos-client.c (main): Do not handle ignored signals. | 346 | } | 
| 347 | ret = sigaddset(&new_action.sa_mask, SIGTERM); | |
| 348 | if(ret == -1){ | |
| 534
by teddy at bsnet * plugin-runner.c (add_to_char_array): Added "nonnull" attribute. | 349 | error_plus(0, errno, "sigaddset"); | 
| 391
by Teddy Hogeborn * plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do | 350 | return EX_OSERR; | 
| 24.1.26
by Björn Påhlsson tally count of used symbols | 351 | } | 
| 356
by Teddy Hogeborn * plugin-runner.c (main): When a plugin is killed by a signal, show | 352 | /* Need to check if the handler is SIG_IGN before handling: | 
| 353 |      | [[info:libc:Initial Signal Actions]] |
 | |
| 354 |      | [[info:libc:Basic Signal Handling]]  |
 | |
| 355 |   */
 | |
| 357
by Teddy Hogeborn * plugins.d/mandos-client.c (main): Do not handle ignored signals. | 356 | ret = sigaction(SIGINT, NULL, &old_action); | 
| 357 | if(ret == -1){ | |
| 534
by teddy at bsnet * plugin-runner.c (add_to_char_array): Added "nonnull" attribute. | 358 | error_plus(0, errno, "sigaction"); | 
| 391
by Teddy Hogeborn * plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do | 359 | return EX_OSERR; | 
| 357
by Teddy Hogeborn * plugins.d/mandos-client.c (main): Do not handle ignored signals. | 360 | } | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 361 | if(old_action.sa_handler != SIG_IGN){ | 
| 24.1.26
by Björn Påhlsson tally count of used symbols | 362 | ret = sigaction(SIGINT, &new_action, NULL); | 
| 363 | if(ret == -1){ | |
| 534
by teddy at bsnet * plugin-runner.c (add_to_char_array): Added "nonnull" attribute. | 364 | error_plus(0, errno, "sigaction"); | 
| 391
by Teddy Hogeborn * plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do | 365 | return EX_OSERR; | 
| 24.1.26
by Björn Påhlsson tally count of used symbols | 366 | } | 
| 367 | } | |
| 368 | ret = sigaction(SIGHUP, NULL, &old_action); | |
| 369 | if(ret == -1){ | |
| 534
by teddy at bsnet * plugin-runner.c (add_to_char_array): Added "nonnull" attribute. | 370 | error_plus(0, errno, "sigaction"); | 
| 391
by Teddy Hogeborn * plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do | 371 | return EX_OSERR; | 
| 24.1.26
by Björn Påhlsson tally count of used symbols | 372 | } | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 373 | if(old_action.sa_handler != SIG_IGN){ | 
| 24.1.26
by Björn Påhlsson tally count of used symbols | 374 | ret = sigaction(SIGHUP, &new_action, NULL); | 
| 375 | if(ret == -1){ | |
| 534
by teddy at bsnet * plugin-runner.c (add_to_char_array): Added "nonnull" attribute. | 376 | error_plus(0, errno, "sigaction"); | 
| 391
by Teddy Hogeborn * plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do | 377 | return EX_OSERR; | 
| 24.1.26
by Björn Påhlsson tally count of used symbols | 378 | } | 
| 379 | } | |
| 380 | ret = sigaction(SIGTERM, NULL, &old_action); | |
| 381 | if(ret == -1){ | |
| 534
by teddy at bsnet * plugin-runner.c (add_to_char_array): Added "nonnull" attribute. | 382 | error_plus(0, errno, "sigaction"); | 
| 391
by Teddy Hogeborn * plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do | 383 | return EX_OSERR; | 
| 24.1.26
by Björn Påhlsson tally count of used symbols | 384 | } | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 385 | if(old_action.sa_handler != SIG_IGN){ | 
| 24.1.26
by Björn Påhlsson tally count of used symbols | 386 | ret = sigaction(SIGTERM, &new_action, NULL); | 
| 387 | if(ret == -1){ | |
| 534
by teddy at bsnet * plugin-runner.c (add_to_char_array): Added "nonnull" attribute. | 388 | error_plus(0, errno, "sigaction"); | 
| 391
by Teddy Hogeborn * plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do | 389 | return EX_OSERR; | 
| 24.1.26
by Björn Påhlsson tally count of used symbols | 390 | } | 
| 391 | } | |
| 392 |   
 | |
| 15.1.2
by Björn Påhlsson Added debug options from passprompt as --debug and --debug=passprompt | 393 |   
 | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 394 | if(debug){ | 
| 15.1.2
by Björn Påhlsson Added debug options from passprompt as --debug and --debug=passprompt | 395 | fprintf(stderr, "Removing echo flag from terminal attributes\n"); | 
| 396 | } | |
| 13
by Björn Påhlsson Added following support: | 397 |   
 | 
| 398 | t_new = t_old; | |
| 377
by Teddy Hogeborn * plugins.d/password-prompt.c (main): Fix "-Wconversion" warning. | 399 | t_new.c_lflag &= ~(tcflag_t)ECHO; | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 400 | if(tcsetattr(STDIN_FILENO, TCSAFLUSH, &t_new) != 0){ | 
| 391
by Teddy Hogeborn * plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do | 401 | int e = errno; | 
| 534
by teddy at bsnet * plugin-runner.c (add_to_char_array): Added "nonnull" attribute. | 402 | error_plus(0, errno, "tcsetattr-echo"); | 
| 391
by Teddy Hogeborn * plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do | 403 | switch(e){ | 
| 404 | case EBADF: | |
| 405 | case ENOTTY: | |
| 406 | return EX_UNAVAILABLE; | |
| 407 | case EINVAL: | |
| 408 | default: | |
| 409 | return EX_OSERR; | |
| 410 | } | |
| 13
by Björn Påhlsson Added following support: | 411 | } | 
| 391
by Teddy Hogeborn * plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do | 412 |   
 | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 413 | if(debug){ | 
| 15.1.2
by Björn Påhlsson Added debug options from passprompt as --debug and --debug=passprompt | 414 | fprintf(stderr, "Waiting for input from stdin \n"); | 
| 415 | } | |
| 13
by Björn Påhlsson Added following support: | 416 | while(true){ | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 417 | if(quit_now){ | 
| 110
by Teddy Hogeborn * mandos.xml (EXAMPLE): Replaced all occurences of command name with | 418 | if(debug){ | 
| 419 | fprintf(stderr, "Interrupted by signal, exiting.\n"); | |
| 420 | } | |
| 13
by Björn Påhlsson Added following support: | 421 | status = EXIT_FAILURE; | 
| 422 | break; | |
| 423 | } | |
| 15.1.3
by Björn Påhlsson Added getopt_long support for mandosclient and passprompt | 424 | |
| 425 | if(prefix){ | |
| 79
by Teddy Hogeborn * plugins.d/password-request.c (main): Include environment variables | 426 | fprintf(stderr, "%s ", prefix); | 
| 427 | } | |
| 428 | { | |
| 397
by Teddy Hogeborn * plugins.d/password-prompt.c: Use environment variables and prompt | 429 | const char *cryptsource = getenv("CRYPTTAB_SOURCE"); | 
| 430 | const char *crypttarget = getenv("CRYPTTAB_NAME"); | |
| 431 | /* Before cryptsetup 1.1.0~rc2 */ | |
| 432 | if(cryptsource == NULL){ | |
| 433 | cryptsource = getenv("cryptsource"); | |
| 434 | } | |
| 435 | if(crypttarget == NULL){ | |
| 436 | crypttarget = getenv("crypttarget"); | |
| 437 | } | |
| 438 | const char *const prompt1 = "Unlocking the disk"; | |
| 439 | const char *const prompt2 = "Enter passphrase"; | |
| 79
by Teddy Hogeborn * plugins.d/password-request.c (main): Include environment variables | 440 | if(cryptsource == NULL){ | 
| 441 | if(crypttarget == NULL){ | |
| 397
by Teddy Hogeborn * plugins.d/password-prompt.c: Use environment variables and prompt | 442 | fprintf(stderr, "%s to unlock the disk: ", prompt2); | 
| 79
by Teddy Hogeborn * plugins.d/password-request.c (main): Include environment variables | 443 | } else { | 
| 397
by Teddy Hogeborn * plugins.d/password-prompt.c: Use environment variables and prompt | 444 | fprintf(stderr, "%s (%s)\n%s: ", prompt1, crypttarget, | 
| 445 | prompt2); | |
| 79
by Teddy Hogeborn * plugins.d/password-request.c (main): Include environment variables | 446 | } | 
| 447 | } else { | |
| 448 | if(crypttarget == NULL){ | |
| 397
by Teddy Hogeborn * plugins.d/password-prompt.c: Use environment variables and prompt | 449 | fprintf(stderr, "%s %s\n%s: ", prompt1, cryptsource, | 
| 450 | prompt2); | |
| 79
by Teddy Hogeborn * plugins.d/password-request.c (main): Include environment variables | 451 | } else { | 
| 397
by Teddy Hogeborn * plugins.d/password-prompt.c: Use environment variables and prompt | 452 | fprintf(stderr, "%s %s (%s)\n%s: ", prompt1, cryptsource, | 
| 453 | crypttarget, prompt2); | |
| 79
by Teddy Hogeborn * plugins.d/password-request.c (main): Include environment variables | 454 | } | 
| 455 | } | |
| 456 | } | |
| 24.1.155
by Björn Påhlsson mandos server: Added debuglevel that adjust at what level information | 457 | sret = getline(&buffer, &n, stdin); | 
| 458 | if(sret > 0){ | |
| 13
by Björn Påhlsson Added following support: | 459 | status = EXIT_SUCCESS; | 
| 110
by Teddy Hogeborn * mandos.xml (EXAMPLE): Replaced all occurences of command name with | 460 | /* Make n = data size instead of allocated buffer size */ | 
| 24.1.155
by Björn Påhlsson mandos server: Added debuglevel that adjust at what level information | 461 | n = (size_t)sret; | 
| 168
by Teddy Hogeborn * initramfs-tools-hook: Use long options where available. Use only | 462 | /* Strip final newline */ | 
| 391
by Teddy Hogeborn * plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do | 463 | if(n > 0 and buffer[n-1] == '\n'){ | 
| 168
by Teddy Hogeborn * initramfs-tools-hook: Use long options where available. Use only | 464 | buffer[n-1] = '\0'; /* not strictly necessary */ | 
| 465 | n--; | |
| 466 | } | |
| 110
by Teddy Hogeborn * mandos.xml (EXAMPLE): Replaced all occurences of command name with | 467 | size_t written = 0; | 
| 468 | while(written < n){ | |
| 24.1.155
by Björn Påhlsson mandos server: Added debuglevel that adjust at what level information | 469 | sret = write(STDOUT_FILENO, buffer + written, n - written); | 
| 470 | if(sret < 0){ | |
| 391
by Teddy Hogeborn * plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do | 471 | int e = errno; | 
| 534
by teddy at bsnet * plugin-runner.c (add_to_char_array): Added "nonnull" attribute. | 472 | error_plus(0, errno, "write"); | 
| 391
by Teddy Hogeborn * plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do | 473 | switch(e){ | 
| 474 | case EBADF: | |
| 475 | case EFAULT: | |
| 476 | case EINVAL: | |
| 477 | case EFBIG: | |
| 478 | case EIO: | |
| 479 | case ENOSPC: | |
| 480 | default: | |
| 481 | status = EX_IOERR; | |
| 482 | break; | |
| 483 | case EINTR: | |
| 484 | status = EXIT_FAILURE; | |
| 485 | break; | |
| 486 | } | |
| 110
by Teddy Hogeborn * mandos.xml (EXAMPLE): Replaced all occurences of command name with | 487 | break; | 
| 488 | } | |
| 24.1.155
by Björn Påhlsson mandos server: Added debuglevel that adjust at what level information | 489 | written += (size_t)sret; | 
| 110
by Teddy Hogeborn * mandos.xml (EXAMPLE): Replaced all occurences of command name with | 490 | } | 
| 24.1.155
by Björn Påhlsson mandos server: Added debuglevel that adjust at what level information | 491 | sret = close(STDOUT_FILENO); | 
| 492 | if(sret == -1){ | |
| 391
by Teddy Hogeborn * plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do | 493 | int e = errno; | 
| 534
by teddy at bsnet * plugin-runner.c (add_to_char_array): Added "nonnull" attribute. | 494 | error_plus(0, errno, "close"); | 
| 391
by Teddy Hogeborn * plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do | 495 | switch(e){ | 
| 496 | case EBADF: | |
| 497 | status = EX_OSFILE; | |
| 498 | break; | |
| 499 | case EIO: | |
| 500 | default: | |
| 501 | status = EX_IOERR; | |
| 502 | break; | |
| 503 | } | |
| 504 | } | |
| 13
by Björn Påhlsson Added following support: | 505 | break; | 
| 506 | } | |
| 24.1.155
by Björn Påhlsson mandos server: Added debuglevel that adjust at what level information | 507 | if(sret < 0){ | 
| 391
by Teddy Hogeborn * plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do | 508 | int e = errno; | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 509 | if(errno != EINTR and not feof(stdin)){ | 
| 534
by teddy at bsnet * plugin-runner.c (add_to_char_array): Added "nonnull" attribute. | 510 | error_plus(0, errno, "getline"); | 
| 391
by Teddy Hogeborn * plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do | 511 | switch(e){ | 
| 512 | case EBADF: | |
| 513 | status = EX_UNAVAILABLE; | |
| 536
by Björn Påhlsson renamed some foomax values to what they actually represent | 514 | break; | 
| 391
by Teddy Hogeborn * plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do | 515 | case EIO: | 
| 516 | case EINVAL: | |
| 517 | default: | |
| 518 | status = EX_IOERR; | |
| 519 | break; | |
| 520 | } | |
| 13
by Björn Påhlsson Added following support: | 521 | break; | 
| 522 | } | |
| 523 | } | |
| 469.1.1
by teddy at bsnet * plugins.d/password-prompt.c: Some white space fixes. Break some | 524 | /* if(sret == 0), then the only sensible thing to do is to retry | 
| 525 |        to read from stdin */
 | |
| 13
by Björn Påhlsson Added following support: | 526 | fputc('\n', stderr); | 
| 356
by Teddy Hogeborn * plugin-runner.c (main): When a plugin is killed by a signal, show | 527 | if(debug and not quit_now){ | 
| 294
by Teddy Hogeborn * plugins.d/password-prompt.c (quit_now): Changed type to "volatile | 528 | /* If quit_now is nonzero, we were interrupted by a signal, and | 
| 110
by Teddy Hogeborn * mandos.xml (EXAMPLE): Replaced all occurences of command name with | 529 | 	 will print that later, so no need to show this too. */
 | 
| 530 | fprintf(stderr, "getline() returned 0, retrying.\n"); | |
| 531 | } | |
| 13
by Björn Påhlsson Added following support: | 532 | } | 
| 257
by Teddy Hogeborn Change the default value of the "checker" option command to make the | 533 |   
 | 
| 24.1.92
by Björn Påhlsson Several memory leaks detected by valgrind fixed | 534 | free(buffer); | 
| 41
by Teddy Hogeborn Merge. | 535 |   
 | 
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 536 | if(debug){ | 
| 15.1.2
by Björn Påhlsson Added debug options from passprompt as --debug and --debug=passprompt | 537 | fprintf(stderr, "Restoring terminal attributes\n"); | 
| 538 | } | |
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 539 | if(tcsetattr(STDIN_FILENO, TCSAFLUSH, &t_old) != 0){ | 
| 534
by teddy at bsnet * plugin-runner.c (add_to_char_array): Added "nonnull" attribute. | 540 | error_plus(0, errno, "tcsetattr+echo"); | 
| 13
by Björn Påhlsson Added following support: | 541 | } | 
| 41
by Teddy Hogeborn Merge. | 542 |   
 | 
| 356
by Teddy Hogeborn * plugin-runner.c (main): When a plugin is killed by a signal, show | 543 | if(quit_now){ | 
| 544 | sigemptyset(&old_action.sa_mask); | |
| 545 | old_action.sa_handler = SIG_DFL; | |
| 546 | ret = sigaction(signal_received, &old_action, NULL); | |
| 547 | if(ret == -1){ | |
| 534
by teddy at bsnet * plugin-runner.c (add_to_char_array): Added "nonnull" attribute. | 548 | error_plus(0, errno, "sigaction"); | 
| 356
by Teddy Hogeborn * plugin-runner.c (main): When a plugin is killed by a signal, show | 549 | } | 
| 550 | raise(signal_received); | |
| 551 | } | |
| 552 |   
 | |
| 266
by Teddy Hogeborn * plugin-runner.c: Only space changes. | 553 | if(debug){ | 
| 110
by Teddy Hogeborn * mandos.xml (EXAMPLE): Replaced all occurences of command name with | 554 | fprintf(stderr, "%s is exiting with status %d\n", argv[0], | 
| 555 | status); | |
| 15.1.2
by Björn Påhlsson Added debug options from passprompt as --debug and --debug=passprompt | 556 | } | 
| 391
by Teddy Hogeborn * plugins.d/password-prompt.c: Use exit codes from <sysexits.h>. Do | 557 | if(status == EXIT_SUCCESS or status == EX_OK){ | 
| 167
by Teddy Hogeborn * plugins.d/password-prompt.c (main): If successful, output an extra | 558 | fputc('\n', stderr); | 
| 559 | } | |
| 13
by Björn Påhlsson Added following support: | 560 |   
 | 
| 561 | return status; | |
| 562 | }
 |