/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/askpass-fifo.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/askpass-fifo.c
2
2
/*
3
3
 * Askpass-FIFO - Read a password from a FIFO and output it
4
4
 * 
5
 
 * Copyright © 2008-2014 Teddy Hogeborn
6
 
 * Copyright © 2008-2014 Björn Påhlsson
 
5
 * Copyright © 2008-2011 Teddy Hogeborn
 
6
 * Copyright © 2008-2011 Björn Påhlsson
7
7
 * 
8
8
 * This program is free software: you can redistribute it and/or
9
9
 * modify it under the terms of the GNU General Public License as
19
19
 * along with this program.  If not, see
20
20
 * <http://www.gnu.org/licenses/>.
21
21
 * 
22
 
 * Contact the authors at <mandos@recompile.se>.
 
22
 * Contact the authors at <mandos@fukt.bsnet.se>.
23
23
 */
24
24
 
25
25
#define _GNU_SOURCE             /* TEMP_FAILURE_RETRY() */
32
32
                                   ENFILE, ENOMEM, EBADF, EINVAL, EIO,
33
33
                                   EISDIR, EFBIG */
34
34
#include <error.h>              /* error() */
35
 
#include <stdio.h>              /* fprintf(), vfprintf(),
36
 
                                   vasprintf() */
 
35
#include <stdio.h>              /* fprintf(), vfprintf(), vasprintf() */
37
36
#include <stdlib.h>             /* EXIT_FAILURE, NULL, size_t, free(),
38
37
                                   realloc(), EXIT_SUCCESS */
39
38
#include <fcntl.h>              /* open(), O_RDONLY */
46
45
 
47
46
 
48
47
/* Function to use when printing errors */
49
 
__attribute__((format (gnu_printf, 3, 4)))
50
 
void error_plus(int status, int errnum, const char *formatstring,
51
 
                ...){
 
48
void error_plus(int status, int errnum, const char *formatstring, ...){
52
49
  va_list ap;
53
50
  char *text;
54
51
  int ret;
55
52
  
56
53
  va_start(ap, formatstring);
57
54
  ret = vasprintf(&text, formatstring, ap);
58
 
  if(ret == -1){
59
 
    fprintf(stderr, "Mandos plugin %s: ",
60
 
            program_invocation_short_name);
 
55
  if (ret == -1){
 
56
    fprintf(stderr, "Mandos plugin %s: ", program_invocation_short_name);
61
57
    vfprintf(stderr, formatstring, ap);
62
58
    fprintf(stderr, ": ");
63
59
    fprintf(stderr, "%s\n", strerror(errnum));