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