/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

Hooks take new "modules" argument, and hook names can contain periods.

* debian/mandos-client.README.Debian: Adjust wording.
* debian/rules (binary-common): Exclude nework-hooks.d directory from
                                dh_fixperms.
* initramfs-tools-hook: Also create network hook directory.  Allow
                        periods in hook names.  Only run executable
                        files in hook directory.  Copy needed modules.
* network-hooks.d/bridge: Fix "/usr/bin/brctl" to "/usr/sbin/brctl".
                          Also take "modules" argument.
* plugins.d/mandos-client.xml (NETWORK HOOKS/REQUIREMENTS): Document
                                                            the
                                                            allowing
                                                            of periods
                                                            in hook
                                                            names.
  (NETWORK HOOKS/REQUIREMENTS/files): Adjust wording.
  (NETWORK HOOKS/REQUIREMENTS/modules): New.
  (NETWORK HOOKS/REQUIREMENTS/MANDOSNETHOOKDIR): Clarify.
  (NETWORK HOOKS/REQUIREMENTS/MODE): Add "modules".

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins.d/askpass-fifo.c
19
19
 * along with this program.  If not, see
20
20
 * <http://www.gnu.org/licenses/>.
21
21
 * 
22
 
 * Contact the authors at <mandos@fukt.bsnet.se>.
 
22
 * Contact the authors at <mandos@recompile.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(), vasprintf() */
 
35
#include <stdio.h>              /* fprintf(), vfprintf(),
 
36
                                   vasprintf() */
36
37
#include <stdlib.h>             /* EXIT_FAILURE, NULL, size_t, free(),
37
38
                                   realloc(), EXIT_SUCCESS */
38
39
#include <fcntl.h>              /* open(), O_RDONLY */
45
46
 
46
47
 
47
48
/* Function to use when printing errors */
48
 
void error_plus(int status, int errnum, const char *formatstring, ...){
 
49
void error_plus(int status, int errnum, const char *formatstring,
 
50
                ...){
49
51
  va_list ap;
50
52
  char *text;
51
53
  int ret;
53
55
  va_start(ap, formatstring);
54
56
  ret = vasprintf(&text, formatstring, ap);
55
57
  if (ret == -1){
56
 
    fprintf(stderr, "Mandos plugin %s: ", program_invocation_short_name);
 
58
    fprintf(stderr, "Mandos plugin %s: ",
 
59
            program_invocation_short_name);
57
60
    vfprintf(stderr, formatstring, ap);
58
61
    fprintf(stderr, ": ");
59
62
    fprintf(stderr, "%s\n", strerror(errnum));