/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to plugins.d/splashy.c

  • Committer: Björn Påhlsson
  • Date: 2011-06-23 22:27:15 UTC
  • mto: (237.7.33 trunk)
  • mto: This revision was merged to the branch mainline in revision 284.
  • Revision ID: belorn@fukt.bsnet.se-20110623222715-q5wro9ma9iyjl367
* Makefile (CFLAGS): Added "-lrt" to include real time library.
* plugins.d/mandos-client.c: use scandir(3) instead of readdir(3)
                             Prefix all debug output with "Mandos plugin " + program_invocation_short_name
                             Retry servers that failed to provide password.
                             New option --retry SECONDS that sets the interval between rechecking.
                             --retry also controls how often it retries a server when using --connect.
* plugins.d/splashy.c:  Prefix all debug output with "Mandos plugin " + program_invocation_short_name
* plugins.d/usplash.c: --||--
* plugins.d/askpass-fifo.c: --||--
* plugins.d/password-prompt.c: --||--
* plugins.d/plymouth.c: --||--
* mandos: Lower logger level from warning to info on failed client requests because client was disabled or unknown fingerprint.
* plugins.d/plymouth.c (get_pid): bug fix. Was not calling free on direntries. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins.d/splashy.c
2
2
/*
3
3
 * Splashy - Read a password from splashy and output it
4
4
 * 
5
 
 * Copyright © 2008-2018, 2021 Teddy Hogeborn
6
 
 * Copyright © 2008-2018, 2021 Björn Påhlsson
7
 
 * 
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
 
5
 * Copyright © 2008-2011 Teddy Hogeborn
 
6
 * Copyright © 2008-2011 Björn Påhlsson
 
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
16
14
 * WITHOUT ANY WARRANTY; without even the implied warranty of
17
15
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
18
16
 * General Public License for more details.
19
17
 * 
20
18
 * You should have received a copy of the GNU General Public License
21
 
 * along with Mandos.  If not, see <http://www.gnu.org/licenses/>.
 
19
 * along with this program.  If not, see
 
20
 * <http://www.gnu.org/licenses/>.
22
21
 * 
23
 
 * Contact the authors at <mandos@recompile.se>.
 
22
 * Contact the authors at <mandos@fukt.bsnet.se>.
24
23
 */
25
24
 
26
 
#define _GNU_SOURCE             /* vasprintf(),
27
 
                                   program_invocation_short_name,
28
 
                                   asprintf(), TEMP_FAILURE_RETRY() */
29
 
#include <sys/types.h>          /* sig_atomic_t, pid_t, setuid(),
30
 
                                   geteuid(), setsid() */
31
 
#include <stdarg.h>             /* va_list, va_start(), vfprintf() */
32
 
#include <stdio.h>              /* vasprintf(), fprintf(), stderr,
33
 
                                   vfprintf(), asprintf() */
34
 
#include <errno.h>              /* program_invocation_short_name,
35
 
                                   errno, EACCES, ENOTDIR, ELOOP,
 
25
#define _GNU_SOURCE             /* TEMP_FAILURE_RETRY(), asprintf() */
 
26
#include <signal.h>             /* sig_atomic_t, struct sigaction,
 
27
                                   sigemptyset(), sigaddset(), SIGINT,
 
28
                                   SIGHUP, SIGTERM, sigaction,
 
29
                                   SIG_IGN, kill(), SIGKILL */
 
30
#include <stddef.h>             /* NULL */
 
31
#include <stdlib.h>             /* getenv() */
 
32
#include <stdio.h>              /* asprintf(), vasprintf(), vprintf(), fprintf() */
 
33
#include <stdlib.h>             /* EXIT_FAILURE, free(),
 
34
                                   EXIT_SUCCESS */
 
35
#include <sys/types.h>          /* pid_t, DIR, struct dirent,
 
36
                                   ssize_t */
 
37
#include <dirent.h>             /* opendir(), readdir(), closedir() */
 
38
#include <inttypes.h>           /* intmax_t, strtoimax() */
 
39
#include <sys/stat.h>           /* struct stat, lstat(), S_ISLNK */
 
40
#include <iso646.h>             /* not, or, and */
 
41
#include <unistd.h>             /* readlink(), fork(), execl(),
 
42
                                   sleep(), dup2() STDERR_FILENO,
 
43
                                   STDOUT_FILENO, _exit(),
 
44
                                   pause() */
 
45
#include <string.h>             /* memcmp(), strerror() */
 
46
#include <errno.h>              /* errno, EACCES, ENOTDIR, ELOOP,
36
47
                                   ENOENT, ENAMETOOLONG, EMFILE,
37
48
                                   ENFILE, ENOMEM, ENOEXEC, EINVAL,
38
49
                                   E2BIG, EFAULT, EIO, ETXTBSY,
39
50
                                   EISDIR, ELIBBAD, EPERM, EINTR,
40
51
                                   ECHILD */
41
 
#include <string.h>             /* strerror(), memcmp() */
42
52
#include <error.h>              /* error() */
43
 
#include <stdlib.h>             /* free(), EXIT_FAILURE, getenv(),
44
 
                                   EXIT_SUCCESS, abort() */
45
 
#include <stddef.h>             /* NULL */
46
 
#include <dirent.h>             /* DIR, opendir(), struct dirent,
47
 
                                   readdir(), closedir() */
 
53
#include <sys/wait.h>           /* waitpid(), WIFEXITED(),
 
54
                                   WEXITSTATUS() */
48
55
#include <sysexits.h>           /* EX_OSERR, EX_OSFILE,
49
56
                                   EX_UNAVAILABLE */
50
 
#include <inttypes.h>           /* intmax_t, strtoimax() */
51
 
#include <iso646.h>             /* or, not, and */
52
 
#include <unistd.h>             /* ssize_t, readlink(), fork(),
53
 
                                   execl(), _exit(),
54
 
                                   TEMP_FAILURE_RETRY(), sleep(),
55
 
                                   setuid(), geteuid(), setsid(),
56
 
                                   chdir(), dup2(), STDERR_FILENO,
57
 
                                   STDOUT_FILENO, pause() */
58
 
#include <sys/stat.h>           /* struct stat, lstat(), S_ISLNK() */
59
 
#include <signal.h>             /* struct sigaction, sigemptyset(),
60
 
                                   sigaddset(), SIGINT, SIGHUP,
61
 
                                   SIGTERM, SIG_IGN, kill(), SIGKILL,
62
 
                                   SIG_DFL, raise() */
63
 
#include <sys/wait.h>           /* waitpid(), WIFEXITED(),
64
 
                                   WEXITSTATUS() */
 
57
#include <stdarg.h>             /* va_list, va_start(), ... */
65
58
 
66
59
sig_atomic_t interrupted_by_signal = 0;
67
60
int signal_received;
68
61
 
69
62
/* Function to use when printing errors */
70
 
__attribute__((format (gnu_printf, 3, 4)))
71
 
void error_plus(int status, int errnum, const char *formatstring,
72
 
                ...){
 
63
void error_plus(int status, int errnum, const char *formatstring, ...){
73
64
  va_list ap;
74
65
  char *text;
75
66
  int ret;
76
67
  
77
68
  va_start(ap, formatstring);
78
69
  ret = vasprintf(&text, formatstring, ap);
79
 
  if(ret == -1){
80
 
    fprintf(stderr, "Mandos plugin %s: ",
81
 
            program_invocation_short_name);
 
70
  if (ret == -1){
 
71
    fprintf(stderr, "Mandos plugin %s: ", program_invocation_short_name);
82
72
    vfprintf(stderr, formatstring, ap);
83
73
    fprintf(stderr, ": ");
84
74
    fprintf(stderr, "%s\n", strerror(errnum));