=== modified file 'Makefile' --- Makefile 2008-08-12 06:46:11 +0000 +++ Makefile 2008-08-12 16:47:22 +0000 @@ -10,7 +10,7 @@ # For info about _FORTIFY_SOURCE, see # FORTIFY=-D_FORTIFY_SOURCE=2 # -fstack-protector-all -#COVERAGE=--coverage +#COVERAGE=-fprofile-arcs -ftest-coverage OPTIMIZE=-Os LANGUAGE=-std=gnu99 @@ -113,8 +113,6 @@ /usr/share/initramfs-tools/hooks/mandos install initramfs-tools-hook-conf \ /usr/share/initramfs-tools/conf-hooks.d/mandos - install initramfs-tools-hook-conf \ - /usr/share/initramfs-tools/conf-hooks.d/mandos gzip --best --to-stdout mandos-keygen.8 \ > /usr/share/man/man8/mandos-keygen.8.gz gzip --best --to-stdout mandos-client.8mandos \ === modified file 'TODO' --- TODO 2008-08-12 06:46:11 +0000 +++ TODO 2008-08-12 16:47:22 +0000 @@ -32,6 +32,8 @@ * Password-request ** [#A] Man page: man8/password-request.8mandos +** [#B] Temporarily lower kernel log level + for less printouts during sucessfull boot. *** DESCRIPTION Move options to new OPTIONS section. State that this command is not meant to be invoked directly, but === modified file 'mandos-client.c' --- mandos-client.c 2008-08-11 20:16:35 +0000 +++ mandos-client.c 2008-08-12 16:47:22 +0000 @@ -455,8 +455,7 @@ char *filename = malloc(d_name_len + strlen(plugindir) + 2); if (filename == NULL){ perror("malloc"); - exitstatus = EXIT_FAILURE; - goto end; + continue; } strcpy(filename, plugindir); /* Spurious warning */ strcat(filename, "/"); /* Spurious warning */ @@ -465,8 +464,8 @@ ret = stat(filename, &st); if (ret == -1){ perror("stat"); - exitstatus = EXIT_FAILURE; - goto end; + free(filename); + continue; } if (not S_ISREG(st.st_mode) or (access(filename, X_OK) != 0)){ @@ -521,6 +520,11 @@ } // Starting a new process to be watched pid_t pid = fork(); + if(pid == -1){ + perror("fork"); + exitstatus = EXIT_FAILURE; + goto end; + } if(pid == 0){ /* this is the child process */ ret = sigaction(SIGCHLD, &old_sigchld_action, NULL); @@ -713,7 +717,7 @@ end: if(process_list == NULL or exitstatus != EXIT_SUCCESS){ - /* Fallback if all plugins failed or an error occured */ + /* Fallback if all plugins failed, none are found or an error occured */ bool bret; fprintf(stderr, "Going to fallback mode using getpass(3)\n"); char *passwordbuffer = getpass("Password: "); === modified file 'plugins.d/password-request.c' --- plugins.d/password-request.c 2008-08-11 16:35:32 +0000 +++ plugins.d/password-request.c 2008-08-12 16:29:05 +0000 @@ -682,7 +682,7 @@ } int ret = start_mandos_communication(ip, port, interface, mc); if (ret == 0){ - exit(EXIT_SUCCESS); + avahi_simple_poll_quit(mc->simple_poll); } } } @@ -850,9 +850,8 @@ break; case ARGP_KEY_ARG: argp_usage (state); + case ARGP_KEY_END: break; - case ARGP_KEY_END: - break; default: return ARGP_ERR_UNKNOWN; }