/mandos/trunk

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

« back to all changes in this revision

Viewing changes to plugins.d/askpass-fifo.c

  • Committer: Teddy Hogeborn
  • Date: 2014-07-24 01:35:55 UTC
  • Revision ID: teddy@recompile.se-20140724013555-zrgds2ft5cmwhugb
Fix two mutually cancelling bugs.

* mandos (rfc3339_duration_to_delta): Set "token_duration" to be a
                                      token (and not a tuple) by
                                      removing the final comma.
                                      Construct the needed tuple later
                                      when initializing the
                                      "followers" variable.
* mandos-ctl (rfc3339_duration_to_delta): - '' -

Show diffs side-by-side

added added

removed removed

Lines of Context:
2
2
/*
3
3
 * Askpass-FIFO - Read a password from a FIFO and output it
4
4
 * 
5
 
 * Copyright © 2008-2011 Teddy Hogeborn
6
 
 * Copyright © 2008-2011 Björn Påhlsson
 
5
 * Copyright © 2008-2014 Teddy Hogeborn
 
6
 * Copyright © 2008-2014 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
46
46
 
47
47
 
48
48
/* Function to use when printing errors */
 
49
__attribute__((format (gnu_printf, 3, 4)))
49
50
void error_plus(int status, int errnum, const char *formatstring,
50
51
                ...){
51
52
  va_list ap;
54
55
  
55
56
  va_start(ap, formatstring);
56
57
  ret = vasprintf(&text, formatstring, ap);
57
 
  if (ret == -1){
 
58
  if(ret == -1){
58
59
    fprintf(stderr, "Mandos plugin %s: ",
59
60
            program_invocation_short_name);
60
61
    vfprintf(stderr, formatstring, ap);