/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
1
/*  -*- coding: utf-8 -*- */
2
/*
237.2.24 by Teddy Hogeborn
* plugins.d/askpass-fifo.c: Fix name in header.
3
 * Mandos-client - get and decrypt data from a Mandos server
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
4
 *
5
 * This program is partly derived from an example program for an Avahi
6
 * service browser, downloaded from
7
 * <http://avahi.org/browser/examples/core-browse-services.c>.  This
8
 * includes the following functions: "resolve_callback",
9
 * "browse_callback", and parts of "main".
10
 * 
28 by Teddy Hogeborn
* server.conf: New file.
11
 * Everything else is
237.7.227 by Teddy Hogeborn
Update copyright year.
12
 * Copyright © 2008-2014 Teddy Hogeborn
13
 * Copyright © 2008-2014 Björn Påhlsson
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
14
 * 
15
 * This program is free software: you can redistribute it and/or
16
 * modify it under the terms of the GNU General Public License as
17
 * published by the Free Software Foundation, either version 3 of the
18
 * License, or (at your option) any later version.
19
 * 
20
 * This program is distributed in the hope that it will be useful, but
21
 * WITHOUT ANY WARRANTY; without even the implied warranty of
22
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
23
 * General Public License for more details.
24
 * 
25
 * You should have received a copy of the GNU General Public License
26
 * along with this program.  If not, see
27
 * <http://www.gnu.org/licenses/>.
28
 * 
237.11.2 by Teddy Hogeborn
Change "fukt.bsnet.se" to "recompile.se" throughout.
29
 * Contact the authors at <mandos@recompile.se>.
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
30
 */
31
28 by Teddy Hogeborn
* server.conf: New file.
32
/* Needed by GPGME, specifically gpgme_data_seek() */
237.2.80 by Teddy Hogeborn
Use "getconf" to get correct LFS compile and link flags.
33
#ifndef _LARGEFILE_SOURCE
13 by Björn Påhlsson
Added following support:
34
#define _LARGEFILE_SOURCE
237.7.239 by Teddy Hogeborn
Make mandos-client use scandirat() if it exists.
35
#endif	/* not _LARGEFILE_SOURCE */
237.2.80 by Teddy Hogeborn
Use "getconf" to get correct LFS compile and link flags.
36
#ifndef _FILE_OFFSET_BITS
13 by Björn Påhlsson
Added following support:
37
#define _FILE_OFFSET_BITS 64
237.7.239 by Teddy Hogeborn
Make mandos-client use scandirat() if it exists.
38
#endif	/* not _FILE_OFFSET_BITS */
13 by Björn Påhlsson
Added following support:
39
76 by Teddy Hogeborn
* plugins.d/password-request.c (init_gnutls_global): Renamed
40
#define _GNU_SOURCE		/* TEMP_FAILURE_RETRY(), asprintf() */
24.1.10 by Björn Påhlsson
merge commit
41
76 by Teddy Hogeborn
* plugins.d/password-request.c (init_gnutls_global): Renamed
42
#include <stdio.h>		/* fprintf(), stderr, fwrite(),
237.2.74 by Teddy Hogeborn
Overflows are not detected by sscanf(), so stop using it:
43
				   stdout, ferror(), remove() */
237.7.136 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Eliminate
44
#include <stdint.h> 		/* uint16_t, uint32_t, intptr_t */
24.1.26 by Björn Påhlsson
tally count of used symbols
45
#include <stddef.h>		/* NULL, size_t, ssize_t */
237.2.162 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
46
#include <stdlib.h> 		/* free(), EXIT_SUCCESS, srand(),
47
				   strtof(), abort() */
237.2.67 by Teddy Hogeborn
Four new interrelated features:
48
#include <stdbool.h>		/* bool, false, true */
24.1.29 by Björn Påhlsson
Added more header file comments
49
#include <string.h>		/* memset(), strcmp(), strlen(),
76 by Teddy Hogeborn
* plugins.d/password-request.c (init_gnutls_global): Renamed
50
				   strerror(), asprintf(), strcpy() */
237.2.67 by Teddy Hogeborn
Four new interrelated features:
51
#include <sys/ioctl.h>		/* ioctl */
24.1.26 by Björn Påhlsson
tally count of used symbols
52
#include <sys/types.h>		/* socket(), inet_pton(), sockaddr,
24.1.29 by Björn Påhlsson
Added more header file comments
53
				   sockaddr_in6, PF_INET6,
237.2.67 by Teddy Hogeborn
Four new interrelated features:
54
				   SOCK_STREAM, uid_t, gid_t, open(),
55
				   opendir(), DIR */
237.16.1 by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Add error message.
56
#include <sys/stat.h>		/* open(), S_ISREG */
24.1.26 by Björn Påhlsson
tally count of used symbols
57
#include <sys/socket.h>		/* socket(), struct sockaddr_in6,
237.7.215 by Teddy Hogeborn
Use getnameinfo() instead of inet_ntop() in mandos-client.
58
				   inet_pton(), connect(),
59
				   getnameinfo() */
24.1.81 by Björn Påhlsson
removed keyring pre-requirement for starting password-request.
60
#include <fcntl.h>		/* open() */
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
61
#include <dirent.h>		/* opendir(), struct dirent, readdir()
62
				 */
237.2.74 by Teddy Hogeborn
Overflows are not detected by sscanf(), so stop using it:
63
#include <inttypes.h>		/* PRIu16, PRIdMAX, intmax_t,
64
				   strtoimax() */
237.7.33 by Teddy Hogeborn
Merge from Björn.
65
#include <errno.h>		/* perror(), errno,
66
				   program_invocation_short_name */
24.1.163 by Björn Påhlsson
mandos-client: Added never ending loop for --connect
67
#include <time.h>		/* nanosleep(), time(), sleep() */
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
68
#include <net/if.h>		/* ioctl, ifreq, SIOCGIFFLAGS, IFF_UP,
24.1.26 by Björn Påhlsson
tally count of used symbols
69
				   SIOCSIFFLAGS, if_indextoname(),
70
				   if_nametoindex(), IF_NAMESIZE */
237.2.67 by Teddy Hogeborn
Four new interrelated features:
71
#include <netinet/in.h>		/* IN6_IS_ADDR_LINKLOCAL,
72
				   INET_ADDRSTRLEN, INET6_ADDRSTRLEN
73
				*/
24.1.29 by Björn Påhlsson
Added more header file comments
74
#include <unistd.h>		/* close(), SEEK_SET, off_t, write(),
237.2.128 by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Bug fix: Check result of setgid().
75
				   getuid(), getgid(), seteuid(),
237.16.15 by teddy at bsnet
* plugins.d/mandos-client.c (run_network_hooks): Do _exit() on failure
76
				   setgid(), pause(), _exit() */
237.7.215 by Teddy Hogeborn
Use getnameinfo() instead of inet_ntop() in mandos-client.
77
#include <arpa/inet.h>		/* inet_pton(), htons() */
237.2.67 by Teddy Hogeborn
Four new interrelated features:
78
#include <iso646.h>		/* not, or, and */
24.1.29 by Björn Påhlsson
Added more header file comments
79
#include <argp.h>		/* struct argp_option, error_t, struct
80
				   argp_state, struct argp,
81
				   argp_parse(), ARGP_KEY_ARG,
82
				   ARGP_KEY_END, ARGP_ERR_UNKNOWN */
237.2.70 by Teddy Hogeborn
Merge from Björn:
83
#include <signal.h>		/* sigemptyset(), sigaddset(),
237.2.117 by Teddy Hogeborn
* plugins.d/mandos-client.c (signal_received): New.
84
				   sigaction(), SIGTERM, sig_atomic_t,
85
				   raise() */
237.2.162 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
86
#include <sysexits.h>		/* EX_OSERR, EX_USAGE, EX_UNAVAILABLE,
87
				   EX_NOHOST, EX_IOERR, EX_PROTOCOL */
237.16.3 by teddy at bsnet
* plugins.d/mandos-client.c: Prefix all printouts with "Mandos plugin
88
#include <sys/wait.h>		/* waitpid(), WIFEXITED(),
89
				   WEXITSTATUS(), WTERMSIG() */
237.16.16 by teddy at bsnet
* network-hooks.d/bridge: Use "/usr/sbin/brctl" explicitly.
90
#include <grp.h>		/* setgroups() */
237.22.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
91
#include <argz.h>		/* argz_add_sep(), argz_next(),
92
				   argz_delete(), argz_append(),
93
				   argz_stringify(), argz_add(),
94
				   argz_count() */
237.7.215 by Teddy Hogeborn
Use getnameinfo() instead of inet_ntop() in mandos-client.
95
#include <netdb.h>		/* getnameinfo(), NI_NUMERICHOST,
96
				   EAI_SYSTEM, gai_strerror() */
237.2.70 by Teddy Hogeborn
Merge from Björn:
97
237.2.56 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
98
#ifdef __linux__
24.1.124 by Björn Påhlsson
Added lower kernel loglevel to reduce clutter on system console.
99
#include <sys/klog.h> 		/* klogctl() */
237.2.71 by Teddy Hogeborn
* plugin-runner.c: Comment change.
100
#endif	/* __linux__ */
24.1.26 by Björn Påhlsson
tally count of used symbols
101
102
/* Avahi */
24.1.29 by Björn Påhlsson
Added more header file comments
103
/* All Avahi types, constants and functions
104
 Avahi*, avahi_*,
105
 AVAHI_* */
106
#include <avahi-core/core.h>
24.1.26 by Björn Påhlsson
tally count of used symbols
107
#include <avahi-core/lookup.h>
24.1.29 by Björn Påhlsson
Added more header file comments
108
#include <avahi-core/log.h>
24.1.26 by Björn Påhlsson
tally count of used symbols
109
#include <avahi-common/simple-watch.h>
110
#include <avahi-common/malloc.h>
111
#include <avahi-common/error.h>
112
113
/* GnuTLS */
76 by Teddy Hogeborn
* plugins.d/password-request.c (init_gnutls_global): Renamed
114
#include <gnutls/gnutls.h>	/* All GnuTLS types, constants and
115
				   functions:
24.1.29 by Björn Påhlsson
Added more header file comments
116
				   gnutls_*
24.1.26 by Björn Påhlsson
tally count of used symbols
117
				   init_gnutls_session(),
24.1.29 by Björn Påhlsson
Added more header file comments
118
				   GNUTLS_* */
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
119
#include <gnutls/openpgp.h>
237.16.6 by teddy at bsnet
* plugins.d/mandos-client.c: Some white space fixes.
120
			 /* gnutls_certificate_set_openpgp_key_file(),
121
			    GNUTLS_OPENPGP_FMT_BASE64 */
24.1.26 by Björn Påhlsson
tally count of used symbols
122
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
123
/* GPGME */
76 by Teddy Hogeborn
* plugins.d/password-request.c (init_gnutls_global): Renamed
124
#include <gpgme.h> 		/* All GPGME types, constants and
125
				   functions:
24.1.29 by Björn Påhlsson
Added more header file comments
126
				   gpgme_*
24.1.26 by Björn Påhlsson
tally count of used symbols
127
				   GPGME_PROTOCOL_OpenPGP,
24.1.29 by Björn Påhlsson
Added more header file comments
128
				   GPG_ERR_NO_* */
13 by Björn Påhlsson
Added following support:
129
130
#define BUFFER_SIZE 256
37 by Teddy Hogeborn
Non-tested commit for merge purposes.
131
24.1.81 by Björn Påhlsson
removed keyring pre-requirement for starting password-request.
132
#define PATHDIR "/conf/conf.d/mandos"
133
#define SECKEY "seckey.txt"
168 by Teddy Hogeborn
* initramfs-tools-hook: Use long options where available. Use only
134
#define PUBKEY "pubkey.txt"
237.15.3 by Teddy Hogeborn
Intermediate commit - this does *not* work yet.
135
#define HOOKDIR "/lib/mandos/network-hooks.d"
24.1.81 by Björn Påhlsson
removed keyring pre-requirement for starting password-request.
136
15.1.2 by Björn Påhlsson
Added debug options from passprompt as --debug and --debug=passprompt
137
bool debug = false;
43 by Teddy Hogeborn
* plugins.d/mandosclient.c: Cosmetic changes.
138
static const char mandos_protocol_version[] = "1";
237.7.228 by Teddy Hogeborn
Minor changes to minimize diff from last release.
139
const char *argp_program_version = "mandos-client " VERSION;
140
const char *argp_program_bug_address = "<mandos@recompile.se>";
269.1.1 by teddy at bsnet
* plugins.d/mandos-client.c: An empty interface name now means to
141
static const char sys_class_net[] = "/sys/class/net";
142
char *connect_to = NULL;
237.16.4 by teddy at bsnet
* plugins.d/mandos-client.c (runnable_hook): Bug fix: stat using the
143
const char *hookdir = HOOKDIR;
237.7.239 by Teddy Hogeborn
Make mandos-client use scandirat() if it exists.
144
int hookdir_fd = -1;
237.22.1 by Teddy Hogeborn
* plugins.d/mandos-client.c: Refactoring.
145
uid_t uid = 65534;
146
gid_t gid = 65534;
24.1.10 by Björn Påhlsson
merge commit
147
237.7.33 by Teddy Hogeborn
Merge from Björn.
148
/* Doubly linked list that need to be circularly linked when used */
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
149
typedef struct server{
150
  const char *ip;
237.7.145 by Teddy Hogeborn
* plugins.d/mandos-client.c: Don't use assert(). Use in_port_t for
151
  in_port_t port;
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
152
  AvahiIfIndex if_index;
153
  int af;
154
  struct timespec last_seen;
155
  struct server *next;
156
  struct server *prev;
157
} server;
158
42 by Teddy Hogeborn
* plugins.d/mandosclient.c (start_mandos_communication): Change "to"
159
/* Used for passing in values through the Avahi callback functions */
13 by Björn Påhlsson
Added following support:
160
typedef struct {
24.1.9 by Björn Påhlsson
not working midwork...
161
  AvahiServer *server;
13 by Björn Påhlsson
Added following support:
162
  gnutls_certificate_credentials_t cred;
24.1.9 by Björn Påhlsson
not working midwork...
163
  unsigned int dh_bits;
24.1.13 by Björn Påhlsson
mandosclient
164
  gnutls_dh_params_t dh_params;
24.1.9 by Björn Påhlsson
not working midwork...
165
  const char *priority;
24.1.81 by Björn Påhlsson
removed keyring pre-requirement for starting password-request.
166
  gpgme_ctx_t ctx;
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
167
  server *current_server;
237.7.151 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): New "interfaces" and
168
  char *interfaces;
169
  size_t interfaces_size;
24.1.9 by Björn Påhlsson
not working midwork...
170
} mandos_context;
13 by Björn Påhlsson
Added following support:
171
237.7.149 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Removed "simple_poll"
172
/* global so signal handler can reach it*/
173
AvahiSimplePoll *simple_poll;
24.1.134 by Björn Påhlsson
plugin-runner: Added support for empty string arguments
174
237.2.134 by Teddy Hogeborn
* plugins.d/mandos-client.c (init_gnutls_session): Always fail and
175
sig_atomic_t quit_now = 0;
176
int signal_received = 0;
177
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
178
/* Function to use when printing errors */
179
void perror_plus(const char *print_text){
237.7.82 by teddy at bsnet
* plugin-runner.c (add_to_char_array): Added "nonnull" attribute.
180
  int e = errno;
237.7.33 by Teddy Hogeborn
Merge from Björn.
181
  fprintf(stderr, "Mandos plugin %s: ",
182
	  program_invocation_short_name);
237.7.82 by teddy at bsnet
* plugin-runner.c (add_to_char_array): Added "nonnull" attribute.
183
  errno = e;
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
184
  perror(print_text);
185
}
186
237.7.220 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
187
__attribute__((format (gnu_printf, 2, 3), nonnull))
237.15.4 by Björn Påhlsson
New convinence error printer: fprintf_plus
188
int fprintf_plus(FILE *stream, const char *format, ...){
189
  va_list ap;
190
  va_start (ap, format);
191
  
237.16.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
192
  TEMP_FAILURE_RETRY(fprintf(stream, "Mandos plugin %s: ",
193
			     program_invocation_short_name));
237.7.170 by Teddy Hogeborn
* debian/control (Build-Depends): Depend on debhelper 8.9.7 for using
194
  return (int)TEMP_FAILURE_RETRY(vfprintf(stream, format, ap));
237.15.4 by Björn Påhlsson
New convinence error printer: fprintf_plus
195
}
196
43 by Teddy Hogeborn
* plugins.d/mandosclient.c: Cosmetic changes.
197
/*
237.2.71 by Teddy Hogeborn
* plugin-runner.c: Comment change.
198
 * Make additional room in "buffer" for at least BUFFER_SIZE more
199
 * bytes. "buffer_capacity" is how much is currently allocated,
200
 * "buffer_length" is how much is already used.
43 by Teddy Hogeborn
* plugins.d/mandosclient.c: Cosmetic changes.
201
 */
237.7.220 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
202
__attribute__((nonnull, warn_unused_result))
24.1.132 by Björn Påhlsson
Fixed a bug in fallback handling
203
size_t incbuffer(char **buffer, size_t buffer_length,
237.16.6 by teddy at bsnet
* plugins.d/mandos-client.c: Some white space fixes.
204
		 size_t buffer_capacity){
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
205
  if(buffer_length + BUFFER_SIZE > buffer_capacity){
237.7.214 by Teddy Hogeborn
Bug fix: Free all memory and give better messages when memory is full.
206
    char *new_buf = realloc(*buffer, buffer_capacity + BUFFER_SIZE);
207
    if(new_buf == NULL){
208
      int old_errno = errno;
209
      free(*buffer);
210
      errno = old_errno;
211
      *buffer = NULL;
24.1.10 by Björn Påhlsson
merge commit
212
      return 0;
213
    }
237.7.214 by Teddy Hogeborn
Bug fix: Free all memory and give better messages when memory is full.
214
    *buffer = new_buf;
24.1.10 by Björn Påhlsson
merge commit
215
    buffer_capacity += BUFFER_SIZE;
216
  }
217
  return buffer_capacity;
218
}
219
237.7.39 by teddy at bsnet
* plugins.d/mandos-client.c (avahi_loop_with_timeout): Fix warning.
220
/* Add server to set of servers to retry periodically */
237.7.220 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
221
__attribute__((nonnull, warn_unused_result))
237.7.145 by Teddy Hogeborn
* plugins.d/mandos-client.c: Don't use assert(). Use in_port_t for
222
bool add_server(const char *ip, in_port_t port, AvahiIfIndex if_index,
237.7.150 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
223
		int af, server **current_server){
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
224
  int ret;
225
  server *new_server = malloc(sizeof(server));
226
  if(new_server == NULL){
227
    perror_plus("malloc");
237.11.27 by teddy at bsnet
* plugins.d/mandos-client.c (add_server): Return bool; all callers
228
    return false;
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
229
  }
230
  *new_server = (server){ .ip = strdup(ip),
237.16.6 by teddy at bsnet
* plugins.d/mandos-client.c: Some white space fixes.
231
			  .port = port,
232
			  .if_index = if_index,
233
			  .af = af };
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
234
  if(new_server->ip == NULL){
235
    perror_plus("strdup");
237.11.27 by teddy at bsnet
* plugins.d/mandos-client.c (add_server): Return bool; all callers
236
    return false;
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
237
  }
237.7.216 by Teddy Hogeborn
Do not add a new server to server list if clock_gettime() fails
238
  ret = clock_gettime(CLOCK_MONOTONIC, &(new_server->last_seen));
239
  if(ret == -1){
240
    perror_plus("clock_gettime");
241
    return false;
242
  }
237.7.39 by teddy at bsnet
* plugins.d/mandos-client.c (avahi_loop_with_timeout): Fix warning.
243
  /* Special case of first server */
237.7.150 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
244
  if(*current_server == NULL){
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
245
    new_server->next = new_server;
246
    new_server->prev = new_server;
237.7.150 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
247
    *current_server = new_server;
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
248
  } else {
237.7.220 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
249
    /* Place the new server last in the list */
237.7.150 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
250
    new_server->next = *current_server;
251
    new_server->prev = (*current_server)->prev;
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
252
    new_server->prev->next = new_server;
237.7.150 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
253
    (*current_server)->prev = new_server;
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
254
  }
237.11.27 by teddy at bsnet
* plugins.d/mandos-client.c (add_server): Return bool; all callers
255
  return true;
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
256
}
257
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
258
/* 
24.1.81 by Björn Påhlsson
removed keyring pre-requirement for starting password-request.
259
 * Initialize GPGME.
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
260
 */
237.7.220 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
261
__attribute__((nonnull, warn_unused_result))
237.7.221 by Teddy Hogeborn
Make mandos-client prefer /run/tmp over /tmp.
262
static bool init_gpgme(const char * const seckey,
263
		       const char * const pubkey,
264
		       const char * const tempdir,
265
		       mandos_context *mc){
13 by Björn Påhlsson
Added following support:
266
  gpgme_error_t rc;
267
  gpgme_engine_info_t engine_info;
168 by Teddy Hogeborn
* initramfs-tools-hook: Use long options where available. Use only
268
  
24.1.81 by Björn Påhlsson
removed keyring pre-requirement for starting password-request.
269
  /*
237.2.51 by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Use separate bool variable instead
270
   * Helper function to insert pub and seckey to the engine keyring.
24.1.81 by Björn Påhlsson
removed keyring pre-requirement for starting password-request.
271
   */
237.7.221 by Teddy Hogeborn
Make mandos-client prefer /run/tmp over /tmp.
272
  bool import_key(const char * const filename){
237.2.124 by Teddy Hogeborn
* plugins.d/mandos-client.c (init_gpgme): Move variable "ret" into the
273
    int ret;
24.1.81 by Björn Påhlsson
removed keyring pre-requirement for starting password-request.
274
    int fd;
275
    gpgme_data_t pgp_data;
276
    
237.3.2 by Mooie
Fixed warnings in the 64 bit build. Added explicit cast to int for
277
    fd = (int)TEMP_FAILURE_RETRY(open(filename, O_RDONLY));
24.1.81 by Björn Påhlsson
removed keyring pre-requirement for starting password-request.
278
    if(fd == -1){
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
279
      perror_plus("open");
24.1.81 by Björn Påhlsson
removed keyring pre-requirement for starting password-request.
280
      return false;
281
    }
282
    
283
    rc = gpgme_data_new_from_fd(&pgp_data, fd);
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
284
    if(rc != GPG_ERR_NO_ERROR){
237.15.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
285
      fprintf_plus(stderr, "bad gpgme_data_new_from_fd: %s: %s\n",
237.16.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
286
		   gpgme_strsource(rc), gpgme_strerror(rc));
24.1.81 by Björn Påhlsson
removed keyring pre-requirement for starting password-request.
287
      return false;
288
    }
168 by Teddy Hogeborn
* initramfs-tools-hook: Use long options where available. Use only
289
    
237.7.150 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
290
    rc = gpgme_op_import(mc->ctx, pgp_data);
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
291
    if(rc != GPG_ERR_NO_ERROR){
237.15.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
292
      fprintf_plus(stderr, "bad gpgme_op_import: %s: %s\n",
237.16.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
293
		   gpgme_strsource(rc), gpgme_strerror(rc));
24.1.81 by Björn Påhlsson
removed keyring pre-requirement for starting password-request.
294
      return false;
295
    }
168 by Teddy Hogeborn
* initramfs-tools-hook: Use long options where available. Use only
296
    
237.3.2 by Mooie
Fixed warnings in the 64 bit build. Added explicit cast to int for
297
    ret = (int)TEMP_FAILURE_RETRY(close(fd));
24.1.81 by Björn Påhlsson
removed keyring pre-requirement for starting password-request.
298
    if(ret == -1){
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
299
      perror_plus("close");
24.1.81 by Björn Påhlsson
removed keyring pre-requirement for starting password-request.
300
    }
301
    gpgme_data_release(pgp_data);
302
    return true;
303
  }
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
304
  
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
305
  if(debug){
237.15.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
306
    fprintf_plus(stderr, "Initializing GPGME\n");
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
307
  }
168 by Teddy Hogeborn
* initramfs-tools-hook: Use long options where available. Use only
308
  
13 by Björn Påhlsson
Added following support:
309
  /* Init GPGME */
310
  gpgme_check_version(NULL);
24.1.4 by Björn Påhlsson
Added optional parameters certdir, certkey and certfile that can be iven at start in the command line.
311
  rc = gpgme_engine_check_version(GPGME_PROTOCOL_OpenPGP);
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
312
  if(rc != GPG_ERR_NO_ERROR){
237.15.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
313
    fprintf_plus(stderr, "bad gpgme_engine_check_version: %s: %s\n",
237.16.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
314
		 gpgme_strsource(rc), gpgme_strerror(rc));
24.1.81 by Björn Påhlsson
removed keyring pre-requirement for starting password-request.
315
    return false;
24.1.4 by Björn Påhlsson
Added optional parameters certdir, certkey and certfile that can be iven at start in the command line.
316
  }
168 by Teddy Hogeborn
* initramfs-tools-hook: Use long options where available. Use only
317
  
237.7.40 by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Do not even try to work around
318
  /* Set GPGME home directory for the OpenPGP engine only */
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
319
  rc = gpgme_get_engine_info(&engine_info);
320
  if(rc != GPG_ERR_NO_ERROR){
237.15.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
321
    fprintf_plus(stderr, "bad gpgme_get_engine_info: %s: %s\n",
237.16.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
322
		 gpgme_strsource(rc), gpgme_strerror(rc));
24.1.81 by Björn Påhlsson
removed keyring pre-requirement for starting password-request.
323
    return false;
13 by Björn Påhlsson
Added following support:
324
  }
325
  while(engine_info != NULL){
326
    if(engine_info->protocol == GPGME_PROTOCOL_OpenPGP){
327
      gpgme_set_engine_info(GPGME_PROTOCOL_OpenPGP,
24.1.81 by Björn Påhlsson
removed keyring pre-requirement for starting password-request.
328
			    engine_info->file_name, tempdir);
13 by Björn Påhlsson
Added following support:
329
      break;
330
    }
331
    engine_info = engine_info->next;
332
  }
333
  if(engine_info == NULL){
237.16.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
334
    fprintf_plus(stderr, "Could not set GPGME home dir to %s\n",
335
		 tempdir);
24.1.81 by Björn Påhlsson
removed keyring pre-requirement for starting password-request.
336
    return false;
337
  }
168 by Teddy Hogeborn
* initramfs-tools-hook: Use long options where available. Use only
338
  
24.1.81 by Björn Påhlsson
removed keyring pre-requirement for starting password-request.
339
  /* Create new GPGME "context" */
237.7.150 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
340
  rc = gpgme_new(&(mc->ctx));
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
341
  if(rc != GPG_ERR_NO_ERROR){
237.15.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
342
    fprintf_plus(stderr, "Mandos plugin mandos-client: "
237.16.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
343
		 "bad gpgme_new: %s: %s\n", gpgme_strsource(rc),
344
		 gpgme_strerror(rc));
24.1.81 by Björn Påhlsson
removed keyring pre-requirement for starting password-request.
345
    return false;
346
  }
347
  
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
348
  if(not import_key(pubkey) or not import_key(seckey)){
24.1.81 by Björn Påhlsson
removed keyring pre-requirement for starting password-request.
349
    return false;
350
  }
351
  
237.2.118 by Teddy Hogeborn
* mandos: White-space fixes only.
352
  return true;
24.1.81 by Björn Påhlsson
removed keyring pre-requirement for starting password-request.
353
}
354
355
/* 
356
 * Decrypt OpenPGP data.
357
 * Returns -1 on error
358
 */
237.7.220 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
359
__attribute__((nonnull, warn_unused_result))
24.1.134 by Björn Påhlsson
plugin-runner: Added support for empty string arguments
360
static ssize_t pgp_packet_decrypt(const char *cryptotext,
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
361
				  size_t crypto_size,
237.7.150 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
362
				  char **plaintext,
363
				  mandos_context *mc){
24.1.81 by Björn Påhlsson
removed keyring pre-requirement for starting password-request.
364
  gpgme_data_t dh_crypto, dh_plain;
365
  gpgme_error_t rc;
366
  ssize_t ret;
367
  size_t plaintext_capacity = 0;
368
  ssize_t plaintext_length = 0;
369
  
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
370
  if(debug){
237.15.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
371
    fprintf_plus(stderr, "Trying to decrypt OpenPGP data\n");
13 by Björn Påhlsson
Added following support:
372
  }
373
  
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
374
  /* Create new GPGME data buffer from memory cryptotext */
375
  rc = gpgme_data_new_from_mem(&dh_crypto, cryptotext, crypto_size,
376
			       0);
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
377
  if(rc != GPG_ERR_NO_ERROR){
237.15.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
378
    fprintf_plus(stderr, "bad gpgme_data_new_from_mem: %s: %s\n",
237.16.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
379
		 gpgme_strsource(rc), gpgme_strerror(rc));
13 by Björn Påhlsson
Added following support:
380
    return -1;
381
  }
382
  
383
  /* Create new empty GPGME data buffer for the plaintext */
384
  rc = gpgme_data_new(&dh_plain);
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
385
  if(rc != GPG_ERR_NO_ERROR){
237.15.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
386
    fprintf_plus(stderr, "Mandos plugin mandos-client: "
237.16.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
387
		 "bad gpgme_data_new: %s: %s\n",
388
		 gpgme_strsource(rc), gpgme_strerror(rc));
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
389
    gpgme_data_release(dh_crypto);
13 by Björn Påhlsson
Added following support:
390
    return -1;
391
  }
392
  
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
393
  /* Decrypt data from the cryptotext data buffer to the plaintext
394
     data buffer */
237.7.150 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
395
  rc = gpgme_op_decrypt(mc->ctx, dh_crypto, dh_plain);
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
396
  if(rc != GPG_ERR_NO_ERROR){
237.15.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
397
    fprintf_plus(stderr, "bad gpgme_op_decrypt: %s: %s\n",
237.16.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
398
		 gpgme_strsource(rc), gpgme_strerror(rc));
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
399
    plaintext_length = -1;
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
400
    if(debug){
99 by Teddy Hogeborn
* mandos (fingerprint): Bug fix: Check crtverify.value, not crtverify.
401
      gpgme_decrypt_result_t result;
237.7.150 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
402
      result = gpgme_op_decrypt_result(mc->ctx);
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
403
      if(result == NULL){
237.15.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
404
	fprintf_plus(stderr, "gpgme_op_decrypt_result failed\n");
99 by Teddy Hogeborn
* mandos (fingerprint): Bug fix: Check crtverify.value, not crtverify.
405
      } else {
237.15.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
406
	fprintf_plus(stderr, "Unsupported algorithm: %s\n",
237.16.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
407
		     result->unsupported_algorithm);
237.15.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
408
	fprintf_plus(stderr, "Wrong key usage: %u\n",
237.16.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
409
		     result->wrong_key_usage);
99 by Teddy Hogeborn
* mandos (fingerprint): Bug fix: Check crtverify.value, not crtverify.
410
	if(result->file_name != NULL){
237.15.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
411
	  fprintf_plus(stderr, "File name: %s\n", result->file_name);
99 by Teddy Hogeborn
* mandos (fingerprint): Bug fix: Check crtverify.value, not crtverify.
412
	}
413
	gpgme_recipient_t recipient;
414
	recipient = result->recipients;
237.2.112 by Teddy Hogeborn
* plugins.d/mandos-client.c (pgp_packet_decrypt): Remove redundant
415
	while(recipient != NULL){
237.15.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
416
	  fprintf_plus(stderr, "Public key algorithm: %s\n",
237.16.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
417
		       gpgme_pubkey_algo_name
418
		       (recipient->pubkey_algo));
237.15.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
419
	  fprintf_plus(stderr, "Key ID: %s\n", recipient->keyid);
420
	  fprintf_plus(stderr, "Secret key available: %s\n",
237.16.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
421
		       recipient->status == GPG_ERR_NO_SECKEY
422
		       ? "No" : "Yes");
237.2.112 by Teddy Hogeborn
* plugins.d/mandos-client.c (pgp_packet_decrypt): Remove redundant
423
	  recipient = recipient->next;
99 by Teddy Hogeborn
* mandos (fingerprint): Bug fix: Check crtverify.value, not crtverify.
424
	}
425
      }
426
    }
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
427
    goto decrypt_end;
13 by Björn Påhlsson
Added following support:
428
  }
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
429
  
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
430
  if(debug){
237.15.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
431
    fprintf_plus(stderr, "Decryption of OpenPGP data succeeded\n");
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
432
  }
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
433
  
13 by Björn Påhlsson
Added following support:
434
  /* Seek back to the beginning of the GPGME plaintext data buffer */
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
435
  if(gpgme_data_seek(dh_plain, (off_t)0, SEEK_SET) == -1){
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
436
    perror_plus("gpgme_data_seek");
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
437
    plaintext_length = -1;
438
    goto decrypt_end;
24.1.5 by Björn Påhlsson
plugbasedclient:
439
  }
440
  
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
441
  *plaintext = NULL;
13 by Björn Påhlsson
Added following support:
442
  while(true){
24.1.132 by Björn Påhlsson
Fixed a bug in fallback handling
443
    plaintext_capacity = incbuffer(plaintext,
237.16.6 by teddy at bsnet
* plugins.d/mandos-client.c: Some white space fixes.
444
				   (size_t)plaintext_length,
445
				   plaintext_capacity);
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
446
    if(plaintext_capacity == 0){
237.16.6 by teddy at bsnet
* plugins.d/mandos-client.c: Some white space fixes.
447
      perror_plus("incbuffer");
448
      plaintext_length = -1;
449
      goto decrypt_end;
13 by Björn Påhlsson
Added following support:
450
    }
451
    
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
452
    ret = gpgme_data_read(dh_plain, *plaintext + plaintext_length,
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
453
			  BUFFER_SIZE);
13 by Björn Påhlsson
Added following support:
454
    /* Print the data, if any */
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
455
    if(ret == 0){
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
456
      /* EOF */
13 by Björn Påhlsson
Added following support:
457
      break;
458
    }
459
    if(ret < 0){
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
460
      perror_plus("gpgme_data_read");
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
461
      plaintext_length = -1;
462
      goto decrypt_end;
13 by Björn Påhlsson
Added following support:
463
    }
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
464
    plaintext_length += ret;
13 by Björn Påhlsson
Added following support:
465
  }
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
466
  
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
467
  if(debug){
237.15.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
468
    fprintf_plus(stderr, "Decrypted password is: ");
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
469
    for(ssize_t i = 0; i < plaintext_length; i++){
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
470
      fprintf(stderr, "%02hhX ", (*plaintext)[i]);
471
    }
472
    fprintf(stderr, "\n");
473
  }
474
  
475
 decrypt_end:
476
  
477
  /* Delete the GPGME cryptotext data buffer */
478
  gpgme_data_release(dh_crypto);
15.1.3 by Björn Påhlsson
Added getopt_long support for mandosclient and passprompt
479
  
480
  /* Delete the GPGME plaintext data buffer */
13 by Björn Påhlsson
Added following support:
481
  gpgme_data_release(dh_plain);
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
482
  return plaintext_length;
13 by Björn Påhlsson
Added following support:
483
}
484
237.7.220 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
485
__attribute__((warn_unused_result))
486
static const char *safer_gnutls_strerror(int value){
237.7.145 by Teddy Hogeborn
* plugins.d/mandos-client.c: Don't use assert(). Use in_port_t for
487
  const char *ret = gnutls_strerror(value);
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
488
  if(ret == NULL)
13 by Björn Påhlsson
Added following support:
489
    ret = "(unknown)";
490
  return ret;
491
}
492
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
493
/* GnuTLS log function callback */
237.7.220 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
494
__attribute__((nonnull))
36 by Teddy Hogeborn
* TODO: Converted to org-mode style
495
static void debuggnutls(__attribute__((unused)) int level,
496
			const char* string){
237.15.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
497
  fprintf_plus(stderr, "GnuTLS: %s", string);
13 by Björn Påhlsson
Added following support:
498
}
499
237.7.220 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
500
__attribute__((nonnull, warn_unused_result))
24.1.134 by Björn Påhlsson
plugin-runner: Added support for empty string arguments
501
static int init_gnutls_global(const char *pubkeyfilename,
237.7.150 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
502
			      const char *seckeyfilename,
503
			      mandos_context *mc){
13 by Björn Påhlsson
Added following support:
504
  int ret;
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
505
  
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
506
  if(debug){
237.15.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
507
    fprintf_plus(stderr, "Initializing GnuTLS\n");
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
508
  }
24.1.29 by Björn Påhlsson
Added more header file comments
509
  
510
  ret = gnutls_global_init();
237.2.56 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
511
  if(ret != GNUTLS_E_SUCCESS){
237.16.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
512
    fprintf_plus(stderr, "GnuTLS global_init: %s\n",
513
		 safer_gnutls_strerror(ret));
13 by Björn Påhlsson
Added following support:
514
    return -1;
515
  }
38 by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options.
516
  
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
517
  if(debug){
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
518
    /* "Use a log level over 10 to enable all debugging options."
519
     * - GnuTLS manual
520
     */
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
521
    gnutls_global_set_log_level(11);
522
    gnutls_global_set_log_function(debuggnutls);
523
  }
524
  
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
525
  /* OpenPGP credentials */
237.7.150 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
526
  ret = gnutls_certificate_allocate_credentials(&mc->cred);
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
527
  if(ret != GNUTLS_E_SUCCESS){
237.16.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
528
    fprintf_plus(stderr, "GnuTLS memory error: %s\n",
529
		 safer_gnutls_strerror(ret));
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
530
    gnutls_global_deinit();
13 by Björn Påhlsson
Added following support:
531
    return -1;
532
  }
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
533
  
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
534
  if(debug){
237.15.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
535
    fprintf_plus(stderr, "Attempting to use OpenPGP public key %s and"
237.16.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
536
		 " secret key %s as GnuTLS credentials\n",
537
		 pubkeyfilename,
538
		 seckeyfilename);
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
539
  }
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
540
  
13 by Björn Påhlsson
Added following support:
541
  ret = gnutls_certificate_set_openpgp_key_file
237.7.150 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
542
    (mc->cred, pubkeyfilename, seckeyfilename,
76 by Teddy Hogeborn
* plugins.d/password-request.c (init_gnutls_global): Renamed
543
     GNUTLS_OPENPGP_FMT_BASE64);
237.2.56 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
544
  if(ret != GNUTLS_E_SUCCESS){
237.15.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
545
    fprintf_plus(stderr,
546
		 "Error[%d] while reading the OpenPGP key pair ('%s',"
547
		 " '%s')\n", ret, pubkeyfilename, seckeyfilename);
237.16.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
548
    fprintf_plus(stderr, "The GnuTLS error is: %s\n",
549
		 safer_gnutls_strerror(ret));
24.1.20 by Björn Påhlsson
mandosclient
550
    goto globalfail;
13 by Björn Påhlsson
Added following support:
551
  }
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
552
  
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
553
  /* GnuTLS server initialization */
237.7.150 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
554
  ret = gnutls_dh_params_init(&mc->dh_params);
237.2.56 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
555
  if(ret != GNUTLS_E_SUCCESS){
237.16.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
556
    fprintf_plus(stderr, "Error in GnuTLS DH parameter"
557
		 " initialization: %s\n",
558
		 safer_gnutls_strerror(ret));
24.1.20 by Björn Påhlsson
mandosclient
559
    goto globalfail;
13 by Björn Påhlsson
Added following support:
560
  }
237.7.150 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
561
  ret = gnutls_dh_params_generate2(mc->dh_params, mc->dh_bits);
237.2.56 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
562
  if(ret != GNUTLS_E_SUCCESS){
237.15.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
563
    fprintf_plus(stderr, "Error in GnuTLS prime generation: %s\n",
237.16.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
564
		 safer_gnutls_strerror(ret));
24.1.20 by Björn Påhlsson
mandosclient
565
    goto globalfail;
13 by Björn Påhlsson
Added following support:
566
  }
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
567
  
237.7.150 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
568
  gnutls_certificate_set_dh_params(mc->cred, mc->dh_params);
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
569
  
24.1.13 by Björn Påhlsson
mandosclient
570
  return 0;
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
571
  
24.1.20 by Björn Påhlsson
mandosclient
572
 globalfail:
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
573
  
237.7.150 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
574
  gnutls_certificate_free_credentials(mc->cred);
24.1.26 by Björn Påhlsson
tally count of used symbols
575
  gnutls_global_deinit();
237.7.150 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
576
  gnutls_dh_params_deinit(mc->dh_params);
24.1.20 by Björn Påhlsson
mandosclient
577
  return -1;
24.1.13 by Björn Påhlsson
mandosclient
578
}
579
237.7.220 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
580
__attribute__((nonnull, warn_unused_result))
237.7.150 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
581
static int init_gnutls_session(gnutls_session_t *session,
582
			       mandos_context *mc){
24.1.13 by Björn Påhlsson
mandosclient
583
  int ret;
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
584
  /* GnuTLS session creation */
237.2.131 by Teddy Hogeborn
* plugins.d/mandos-client.c (init_gnutls_session): Retry interrupted
585
  do {
586
    ret = gnutls_init(session, GNUTLS_SERVER);
237.2.134 by Teddy Hogeborn
* plugins.d/mandos-client.c (init_gnutls_session): Always fail and
587
    if(quit_now){
588
      return -1;
589
    }
237.2.131 by Teddy Hogeborn
* plugins.d/mandos-client.c (init_gnutls_session): Retry interrupted
590
  } while(ret == GNUTLS_E_INTERRUPTED or ret == GNUTLS_E_AGAIN);
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
591
  if(ret != GNUTLS_E_SUCCESS){
237.16.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
592
    fprintf_plus(stderr,
593
		 "Error in GnuTLS session initialization: %s\n",
594
		 safer_gnutls_strerror(ret));
13 by Björn Påhlsson
Added following support:
595
  }
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
596
  
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
597
  {
598
    const char *err;
237.2.131 by Teddy Hogeborn
* plugins.d/mandos-client.c (init_gnutls_session): Retry interrupted
599
    do {
237.7.150 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
600
      ret = gnutls_priority_set_direct(*session, mc->priority, &err);
237.2.134 by Teddy Hogeborn
* plugins.d/mandos-client.c (init_gnutls_session): Always fail and
601
      if(quit_now){
602
	gnutls_deinit(*session);
603
	return -1;
604
      }
237.2.131 by Teddy Hogeborn
* plugins.d/mandos-client.c (init_gnutls_session): Retry interrupted
605
    } while(ret == GNUTLS_E_INTERRUPTED or ret == GNUTLS_E_AGAIN);
237.2.56 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
606
    if(ret != GNUTLS_E_SUCCESS){
237.15.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
607
      fprintf_plus(stderr, "Syntax error at: %s\n", err);
237.16.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
608
      fprintf_plus(stderr, "GnuTLS error: %s\n",
609
		   safer_gnutls_strerror(ret));
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
610
      gnutls_deinit(*session);
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
611
      return -1;
612
    }
13 by Björn Påhlsson
Added following support:
613
  }
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
614
  
237.2.131 by Teddy Hogeborn
* plugins.d/mandos-client.c (init_gnutls_session): Retry interrupted
615
  do {
616
    ret = gnutls_credentials_set(*session, GNUTLS_CRD_CERTIFICATE,
237.7.150 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
617
				 mc->cred);
237.2.134 by Teddy Hogeborn
* plugins.d/mandos-client.c (init_gnutls_session): Always fail and
618
    if(quit_now){
619
      gnutls_deinit(*session);
620
      return -1;
621
    }
237.2.131 by Teddy Hogeborn
* plugins.d/mandos-client.c (init_gnutls_session): Retry interrupted
622
  } while(ret == GNUTLS_E_INTERRUPTED or ret == GNUTLS_E_AGAIN);
237.2.56 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
623
  if(ret != GNUTLS_E_SUCCESS){
237.15.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
624
    fprintf_plus(stderr, "Error setting GnuTLS credentials: %s\n",
237.16.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
625
		 safer_gnutls_strerror(ret));
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
626
    gnutls_deinit(*session);
13 by Björn Påhlsson
Added following support:
627
    return -1;
628
  }
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
629
  
13 by Björn Påhlsson
Added following support:
630
  /* ignore client certificate if any. */
237.2.131 by Teddy Hogeborn
* plugins.d/mandos-client.c (init_gnutls_session): Retry interrupted
631
  gnutls_certificate_server_set_request(*session, GNUTLS_CERT_IGNORE);
13 by Björn Påhlsson
Added following support:
632
  
237.7.150 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
633
  gnutls_dh_set_prime_bits(*session, mc->dh_bits);
13 by Björn Påhlsson
Added following support:
634
  
635
  return 0;
636
}
637
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
638
/* Avahi log function callback */
36 by Teddy Hogeborn
* TODO: Converted to org-mode style
639
static void empty_log(__attribute__((unused)) AvahiLogLevel level,
640
		      __attribute__((unused)) const char *txt){}
13 by Björn Påhlsson
Added following support:
641
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
642
/* Called when a Mandos server is found */
237.7.220 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
643
__attribute__((nonnull, warn_unused_result))
237.7.145 by Teddy Hogeborn
* plugins.d/mandos-client.c: Don't use assert(). Use in_port_t for
644
static int start_mandos_communication(const char *ip, in_port_t port,
24.1.9 by Björn Påhlsson
not working midwork...
645
				      AvahiIfIndex if_index,
237.7.150 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
646
				      int af, mandos_context *mc){
237.2.121 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check
647
  int ret, tcp_sd = -1;
237.3.2 by Mooie
Fixed warnings in the 64 bit build. Added explicit cast to int for
648
  ssize_t sret;
237.7.217 by Teddy Hogeborn
Use "struct sockaddr_storage" instead of a union in mandos-client.
649
  struct sockaddr_storage to;
13 by Björn Påhlsson
Added following support:
650
  char *buffer = NULL;
237.2.135 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Bug fix:
651
  char *decrypted_buffer = NULL;
13 by Björn Påhlsson
Added following support:
652
  size_t buffer_length = 0;
653
  size_t buffer_capacity = 0;
24.1.10 by Björn Påhlsson
merge commit
654
  size_t written;
237.2.135 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Bug fix:
655
  int retval = -1;
38 by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options.
656
  gnutls_session_t session;
237.2.67 by Teddy Hogeborn
Four new interrelated features:
657
  int pf;			/* Protocol family */
658
  
237.2.162 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
659
  errno = 0;
660
  
237.2.121 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check
661
  if(quit_now){
237.2.162 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
662
    errno = EINTR;
237.2.121 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check
663
    return -1;
664
  }
665
  
237.2.67 by Teddy Hogeborn
Four new interrelated features:
666
  switch(af){
667
  case AF_INET6:
668
    pf = PF_INET6;
669
    break;
670
  case AF_INET:
671
    pf = PF_INET;
672
    break;
673
  default:
237.15.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
674
    fprintf_plus(stderr, "Bad address family: %d\n", af);
237.2.162 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
675
    errno = EINVAL;
237.2.67 by Teddy Hogeborn
Four new interrelated features:
676
    return -1;
677
  }
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
678
  
237.7.153 by Teddy Hogeborn
* plugins.d/mandos-client.c: Comment changes
679
  /* If the interface is specified and we have a list of interfaces */
237.7.152 by Teddy Hogeborn
* plugins.d/mandos-client (start_mandos_communication): Bug fix; skip
680
  if(if_index != AVAHI_IF_UNSPEC and mc->interfaces != NULL){
681
    /* Check if the interface is one of the interfaces we are using */
682
    bool match = false;
683
    {
684
      char *interface = NULL;
685
      while((interface=argz_next(mc->interfaces, mc->interfaces_size,
686
				 interface))){
687
	if(if_nametoindex(interface) == (unsigned int)if_index){
688
	  match = true;
689
	  break;
690
	}
691
      }
692
    }
693
    if(not match){
237.7.153 by Teddy Hogeborn
* plugins.d/mandos-client.c: Comment changes
694
      /* This interface does not match any in the list, so we don't
695
	 connect to the server */
237.7.152 by Teddy Hogeborn
* plugins.d/mandos-client (start_mandos_communication): Bug fix; skip
696
      if(debug){
697
	char interface[IF_NAMESIZE];
698
	if(if_indextoname((unsigned int)if_index, interface) == NULL){
699
	  perror_plus("if_indextoname");
700
	} else {
701
	  fprintf_plus(stderr, "Skipping server on non-used interface"
702
		       " \"%s\"\n",
703
		       if_indextoname((unsigned int)if_index,
704
				      interface));
705
	}
706
      }
707
      return -1;
708
    }
709
  }
710
  
237.7.150 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
711
  ret = init_gnutls_session(&session, mc);
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
712
  if(ret != 0){
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
713
    return -1;
714
  }
715
  
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
716
  if(debug){
237.16.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
717
    fprintf_plus(stderr, "Setting up a TCP connection to %s, port %"
237.7.145 by Teddy Hogeborn
* plugins.d/mandos-client.c: Don't use assert(). Use in_port_t for
718
		 PRIuMAX "\n", ip, (uintmax_t)port);
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
719
  }
13 by Björn Påhlsson
Added following support:
720
  
237.2.67 by Teddy Hogeborn
Four new interrelated features:
721
  tcp_sd = socket(pf, SOCK_STREAM, 0);
237.2.56 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
722
  if(tcp_sd < 0){
237.2.162 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
723
    int e = errno;
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
724
    perror_plus("socket");
237.2.162 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
725
    errno = e;
237.2.121 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check
726
    goto mandos_end;
727
  }
728
  
729
  if(quit_now){
237.2.162 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
730
    errno = EINTR;
237.2.121 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check
731
    goto mandos_end;
13 by Björn Påhlsson
Added following support:
732
  }
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
733
  
84 by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN): Use the local manpages/docbook.xsl file, do
734
  memset(&to, 0, sizeof(to));
237.2.67 by Teddy Hogeborn
Four new interrelated features:
735
  if(af == AF_INET6){
237.7.217 by Teddy Hogeborn
Use "struct sockaddr_storage" instead of a union in mandos-client.
736
    ((struct sockaddr_in6 *)&to)->sin6_family = (sa_family_t)af;
737
    ret = inet_pton(af, ip, &((struct sockaddr_in6 *)&to)->sin6_addr);
237.2.67 by Teddy Hogeborn
Four new interrelated features:
738
  } else {			/* IPv4 */
237.7.217 by Teddy Hogeborn
Use "struct sockaddr_storage" instead of a union in mandos-client.
739
    ((struct sockaddr_in *)&to)->sin_family = (sa_family_t)af;
740
    ret = inet_pton(af, ip, &((struct sockaddr_in *)&to)->sin_addr);
237.2.67 by Teddy Hogeborn
Four new interrelated features:
741
  }
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
742
  if(ret < 0 ){
237.2.162 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
743
    int e = errno;
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
744
    perror_plus("inet_pton");
237.2.162 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
745
    errno = e;
237.2.121 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check
746
    goto mandos_end;
38 by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options.
747
  }
13 by Björn Påhlsson
Added following support:
748
  if(ret == 0){
237.2.162 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
749
    int e = errno;
237.15.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
750
    fprintf_plus(stderr, "Bad address: %s\n", ip);
237.2.162 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
751
    errno = e;
237.2.121 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check
752
    goto mandos_end;
13 by Björn Påhlsson
Added following support:
753
  }
237.2.67 by Teddy Hogeborn
Four new interrelated features:
754
  if(af == AF_INET6){
237.7.220 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
755
    ((struct sockaddr_in6 *)&to)->sin6_port = htons(port);
237.7.217 by Teddy Hogeborn
Use "struct sockaddr_storage" instead of a union in mandos-client.
756
    if(IN6_IS_ADDR_LINKLOCAL
757
       (&((struct sockaddr_in6 *)&to)->sin6_addr)){
237.2.67 by Teddy Hogeborn
Four new interrelated features:
758
      if(if_index == AVAHI_IF_UNSPEC){
237.16.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
759
	fprintf_plus(stderr, "An IPv6 link-local address is"
760
		     " incomplete without a network interface\n");
237.2.162 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
761
	errno = EINVAL;
237.2.121 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check
762
	goto mandos_end;
237.2.67 by Teddy Hogeborn
Four new interrelated features:
763
      }
764
      /* Set the network interface number as scope */
237.7.217 by Teddy Hogeborn
Use "struct sockaddr_storage" instead of a union in mandos-client.
765
      ((struct sockaddr_in6 *)&to)->sin6_scope_id = (uint32_t)if_index;
237.2.67 by Teddy Hogeborn
Four new interrelated features:
766
    }
767
  } else {
237.7.217 by Teddy Hogeborn
Use "struct sockaddr_storage" instead of a union in mandos-client.
768
    ((struct sockaddr_in *)&to)->sin_port = htons(port);
237.2.67 by Teddy Hogeborn
Four new interrelated features:
769
  }
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
770
  
237.2.121 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check
771
  if(quit_now){
237.2.162 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
772
    errno = EINTR;
237.2.121 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check
773
    goto mandos_end;
774
  }
775
  
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
776
  if(debug){
237.2.67 by Teddy Hogeborn
Four new interrelated features:
777
    if(af == AF_INET6 and if_index != AVAHI_IF_UNSPEC){
778
      char interface[IF_NAMESIZE];
779
      if(if_indextoname((unsigned int)if_index, interface) == NULL){
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
780
	perror_plus("if_indextoname");
237.2.67 by Teddy Hogeborn
Four new interrelated features:
781
      } else {
237.7.145 by Teddy Hogeborn
* plugins.d/mandos-client.c: Don't use assert(). Use in_port_t for
782
	fprintf_plus(stderr, "Connection to: %s%%%s, port %" PRIuMAX
783
		     "\n", ip, interface, (uintmax_t)port);
237.2.67 by Teddy Hogeborn
Four new interrelated features:
784
      }
785
    } else {
237.7.145 by Teddy Hogeborn
* plugins.d/mandos-client.c: Don't use assert(). Use in_port_t for
786
      fprintf_plus(stderr, "Connection to: %s, port %" PRIuMAX "\n",
787
		   ip, (uintmax_t)port);
237.2.67 by Teddy Hogeborn
Four new interrelated features:
788
    }
789
    char addrstr[(INET_ADDRSTRLEN > INET6_ADDRSTRLEN) ?
790
		 INET_ADDRSTRLEN : INET6_ADDRSTRLEN] = "";
791
    if(af == AF_INET6){
237.7.217 by Teddy Hogeborn
Use "struct sockaddr_storage" instead of a union in mandos-client.
792
      ret = getnameinfo((struct sockaddr *)&to,
793
			sizeof(struct sockaddr_in6),
237.7.215 by Teddy Hogeborn
Use getnameinfo() instead of inet_ntop() in mandos-client.
794
			addrstr, sizeof(addrstr), NULL, 0,
795
			NI_NUMERICHOST);
237.2.67 by Teddy Hogeborn
Four new interrelated features:
796
    } else {
237.7.217 by Teddy Hogeborn
Use "struct sockaddr_storage" instead of a union in mandos-client.
797
      ret = getnameinfo((struct sockaddr *)&to,
798
			sizeof(struct sockaddr_in),
237.7.215 by Teddy Hogeborn
Use getnameinfo() instead of inet_ntop() in mandos-client.
799
			addrstr, sizeof(addrstr), NULL, 0,
800
			NI_NUMERICHOST);
237.2.67 by Teddy Hogeborn
Four new interrelated features:
801
    }
237.7.215 by Teddy Hogeborn
Use getnameinfo() instead of inet_ntop() in mandos-client.
802
    if(ret == EAI_SYSTEM){
803
      perror_plus("getnameinfo");
804
    } else if(ret != 0) {
805
      fprintf_plus(stderr, "getnameinfo: %s", gai_strerror(ret));
806
    } else if(strcmp(addrstr, ip) != 0){
807
      fprintf_plus(stderr, "Canonical address form: %s\n", addrstr);
37 by Teddy Hogeborn
Non-tested commit for merge purposes.
808
    }
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
809
  }
13 by Björn Påhlsson
Added following support:
810
  
237.2.121 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check
811
  if(quit_now){
237.2.162 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
812
    errno = EINTR;
237.2.121 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check
813
    goto mandos_end;
814
  }
815
  
237.2.67 by Teddy Hogeborn
Four new interrelated features:
816
  if(af == AF_INET6){
237.7.217 by Teddy Hogeborn
Use "struct sockaddr_storage" instead of a union in mandos-client.
817
    ret = connect(tcp_sd, (struct sockaddr *)&to,
818
		  sizeof(struct sockaddr_in6));
237.2.67 by Teddy Hogeborn
Four new interrelated features:
819
  } else {
237.7.217 by Teddy Hogeborn
Use "struct sockaddr_storage" instead of a union in mandos-client.
820
    ret = connect(tcp_sd, (struct sockaddr *)&to, /* IPv4 */
821
		  sizeof(struct sockaddr_in));
237.2.67 by Teddy Hogeborn
Four new interrelated features:
822
  }
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
823
  if(ret < 0){
237.7.219 by Teddy Hogeborn
White space fix: change "if (" to "if(" in C code.
824
    if((errno != ECONNREFUSED and errno != ENETUNREACH) or debug){
24.1.163 by Björn Påhlsson
mandos-client: Added never ending loop for --connect
825
      int e = errno;
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
826
      perror_plus("connect");
24.1.163 by Björn Påhlsson
mandos-client: Added never ending loop for --connect
827
      errno = e;
828
    }
237.2.121 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check
829
    goto mandos_end;
830
  }
831
  
832
  if(quit_now){
237.2.162 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
833
    errno = EINTR;
237.2.121 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check
834
    goto mandos_end;
13 by Björn Påhlsson
Added following support:
835
  }
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
836
  
24.1.12 by Björn Påhlsson
merge +
837
  const char *out = mandos_protocol_version;
24.1.10 by Björn Påhlsson
merge commit
838
  written = 0;
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
839
  while(true){
24.1.10 by Björn Påhlsson
merge commit
840
    size_t out_size = strlen(out);
237.3.2 by Mooie
Fixed warnings in the 64 bit build. Added explicit cast to int for
841
    ret = (int)TEMP_FAILURE_RETRY(write(tcp_sd, out + written,
237.16.6 by teddy at bsnet
* plugins.d/mandos-client.c: Some white space fixes.
842
					out_size - written));
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
843
    if(ret == -1){
237.2.162 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
844
      int e = errno;
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
845
      perror_plus("write");
237.2.162 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
846
      errno = e;
24.1.12 by Björn Påhlsson
merge +
847
      goto mandos_end;
24.1.10 by Björn Påhlsson
merge commit
848
    }
24.1.12 by Björn Påhlsson
merge +
849
    written += (size_t)ret;
24.1.10 by Björn Påhlsson
merge commit
850
    if(written < out_size){
851
      continue;
852
    } else {
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
853
      if(out == mandos_protocol_version){
24.1.10 by Björn Påhlsson
merge commit
854
	written = 0;
855
	out = "\r\n";
856
      } else {
857
	break;
858
      }
859
    }
237.2.121 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check
860
  
861
    if(quit_now){
237.2.162 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
862
      errno = EINTR;
237.2.121 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check
863
      goto mandos_end;
864
    }
24.1.10 by Björn Påhlsson
merge commit
865
  }
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
866
  
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
867
  if(debug){
237.15.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
868
    fprintf_plus(stderr, "Establishing TLS session with %s\n", ip);
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
869
  }
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
870
  
237.2.121 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check
871
  if(quit_now){
237.2.162 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
872
    errno = EINTR;
237.2.121 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check
873
    goto mandos_end;
874
  }
875
  
237.7.136 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Eliminate
876
  /* This casting via intptr_t is to eliminate warning about casting
877
     an int to a pointer type.  This is exactly how the GnuTLS Guile
878
     function "set-session-transport-fd!" does it. */
879
  gnutls_transport_set_ptr(session,
880
			   (gnutls_transport_ptr_t)(intptr_t)tcp_sd);
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
881
  
237.2.121 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check
882
  if(quit_now){
237.2.162 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
883
    errno = EINTR;
237.2.121 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check
884
    goto mandos_end;
885
  }
886
  
237.2.126 by Teddy Hogeborn
* plugin-runner.c: Minor stylistic changes.
887
  do {
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
888
    ret = gnutls_handshake(session);
237.2.121 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check
889
    if(quit_now){
237.2.162 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
890
      errno = EINTR;
237.2.121 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check
891
      goto mandos_end;
892
    }
24.1.29 by Björn Påhlsson
Added more header file comments
893
  } while(ret == GNUTLS_E_AGAIN or ret == GNUTLS_E_INTERRUPTED);
13 by Björn Påhlsson
Added following support:
894
  
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
895
  if(ret != GNUTLS_E_SUCCESS){
25 by Teddy Hogeborn
* mandos-clients.conf ([DEFAULT]): New section.
896
    if(debug){
237.15.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
897
      fprintf_plus(stderr, "*** GnuTLS Handshake failed ***\n");
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
898
      gnutls_perror(ret);
25 by Teddy Hogeborn
* mandos-clients.conf ([DEFAULT]): New section.
899
    }
237.2.162 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
900
    errno = EPROTO;
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
901
    goto mandos_end;
13 by Björn Påhlsson
Added following support:
902
  }
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
903
  
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
904
  /* Read OpenPGP packet that contains the wanted password */
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
905
  
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
906
  if(debug){
237.16.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
907
    fprintf_plus(stderr, "Retrieving OpenPGP encrypted password from"
908
		 " %s\n", ip);
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
909
  }
143 by Teddy Hogeborn
* Makefile (mandos.8): Add dependency on "overview.xml" and
910
  
13 by Björn Påhlsson
Added following support:
911
  while(true){
237.2.121 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check
912
    
913
    if(quit_now){
237.2.162 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
914
      errno = EINTR;
237.2.121 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check
915
      goto mandos_end;
916
    }
917
    
24.1.132 by Björn Påhlsson
Fixed a bug in fallback handling
918
    buffer_capacity = incbuffer(&buffer, buffer_length,
237.16.6 by teddy at bsnet
* plugins.d/mandos-client.c: Some white space fixes.
919
				buffer_capacity);
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
920
    if(buffer_capacity == 0){
237.2.162 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
921
      int e = errno;
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
922
      perror_plus("incbuffer");
237.2.162 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
923
      errno = e;
24.1.12 by Björn Påhlsson
merge +
924
      goto mandos_end;
13 by Björn Påhlsson
Added following support:
925
    }
926
    
237.2.121 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check
927
    if(quit_now){
237.2.162 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
928
      errno = EINTR;
237.2.121 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check
929
      goto mandos_end;
930
    }
931
    
237.3.2 by Mooie
Fixed warnings in the 64 bit build. Added explicit cast to int for
932
    sret = gnutls_record_recv(session, buffer+buffer_length,
933
			      BUFFER_SIZE);
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
934
    if(sret == 0){
13 by Björn Påhlsson
Added following support:
935
      break;
936
    }
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
937
    if(sret < 0){
237.3.2 by Mooie
Fixed warnings in the 64 bit build. Added explicit cast to int for
938
      switch(sret){
13 by Björn Påhlsson
Added following support:
939
      case GNUTLS_E_INTERRUPTED:
940
      case GNUTLS_E_AGAIN:
941
	break;
942
      case GNUTLS_E_REHANDSHAKE:
237.2.126 by Teddy Hogeborn
* plugin-runner.c: Minor stylistic changes.
943
	do {
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
944
	  ret = gnutls_handshake(session);
237.2.121 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check
945
	  
946
	  if(quit_now){
237.2.162 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
947
	    errno = EINTR;
237.2.121 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check
948
	    goto mandos_end;
949
	  }
24.1.29 by Björn Påhlsson
Added more header file comments
950
	} while(ret == GNUTLS_E_AGAIN or ret == GNUTLS_E_INTERRUPTED);
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
951
	if(ret < 0){
237.16.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
952
	  fprintf_plus(stderr, "*** GnuTLS Re-handshake failed "
953
		       "***\n");
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
954
	  gnutls_perror(ret);
237.2.162 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
955
	  errno = EPROTO;
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
956
	  goto mandos_end;
13 by Björn Påhlsson
Added following support:
957
	}
958
	break;
959
      default:
237.15.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
960
	fprintf_plus(stderr, "Unknown error while reading data from"
237.16.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
961
		     " encrypted session with Mandos server\n");
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
962
	gnutls_bye(session, GNUTLS_SHUT_RDWR);
237.2.162 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
963
	errno = EIO;
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
964
	goto mandos_end;
13 by Björn Påhlsson
Added following support:
965
      }
966
    } else {
237.3.2 by Mooie
Fixed warnings in the 64 bit build. Added explicit cast to int for
967
      buffer_length += (size_t) sret;
13 by Björn Påhlsson
Added following support:
968
    }
969
  }
15.1.1 by Björn Påhlsson
Added debugg support in form off --debug and --debug=mandosclient
970
  
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
971
  if(debug){
237.15.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
972
    fprintf_plus(stderr, "Closing TLS session\n");
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
973
  }
974
  
237.2.121 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check
975
  if(quit_now){
237.2.162 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
976
    errno = EINTR;
237.2.134 by Teddy Hogeborn
* plugins.d/mandos-client.c (init_gnutls_session): Always fail and
977
    goto mandos_end;
978
  }
979
  
980
  do {
981
    ret = gnutls_bye(session, GNUTLS_SHUT_RDWR);
982
    if(quit_now){
237.2.162 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
983
      errno = EINTR;
237.2.134 by Teddy Hogeborn
* plugins.d/mandos-client.c (init_gnutls_session): Always fail and
984
      goto mandos_end;
985
    }
986
  } while(ret == GNUTLS_E_AGAIN or ret == GNUTLS_E_INTERRUPTED);
237.2.121 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check
987
  
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
988
  if(buffer_length > 0){
237.2.125 by Teddy Hogeborn
* plugin-runner.c (getplugin, add_environment, main): Handle EINTR
989
    ssize_t decrypted_buffer_size;
237.16.6 by teddy at bsnet
* plugins.d/mandos-client.c: Some white space fixes.
990
    decrypted_buffer_size = pgp_packet_decrypt(buffer, buffer_length,
237.7.150 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
991
					       &decrypted_buffer, mc);
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
992
    if(decrypted_buffer_size >= 0){
237.2.124 by Teddy Hogeborn
* plugins.d/mandos-client.c (init_gpgme): Move variable "ret" into the
993
      
24.1.10 by Björn Påhlsson
merge commit
994
      written = 0;
28 by Teddy Hogeborn
* server.conf: New file.
995
      while(written < (size_t) decrypted_buffer_size){
237.2.121 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check
996
	if(quit_now){
237.2.162 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
997
	  errno = EINTR;
237.2.121 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check
998
	  goto mandos_end;
999
	}
1000
	
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
1001
	ret = (int)fwrite(decrypted_buffer + written, 1,
1002
			  (size_t)decrypted_buffer_size - written,
1003
			  stdout);
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
1004
	if(ret == 0 and ferror(stdout)){
237.2.162 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
1005
	  int e = errno;
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
1006
	  if(debug){
237.15.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
1007
	    fprintf_plus(stderr, "Error writing encrypted data: %s\n",
237.16.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
1008
			 strerror(errno));
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
1009
	  }
237.2.162 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
1010
	  errno = e;
237.2.135 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Bug fix:
1011
	  goto mandos_end;
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
1012
	}
22 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Cast "0" argument to
1013
	written += (size_t)ret;
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
1014
      }
237.2.135 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Bug fix:
1015
      retval = 0;
13 by Björn Påhlsson
Added following support:
1016
    }
1017
  }
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
1018
  
1019
  /* Shutdown procedure */
1020
  
1021
 mandos_end:
237.2.162 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
1022
  {
1023
    int e = errno;
1024
    free(decrypted_buffer);
1025
    free(buffer);
1026
    if(tcp_sd >= 0){
1027
      ret = (int)TEMP_FAILURE_RETRY(close(tcp_sd));
1028
    }
1029
    if(ret == -1){
1030
      if(e == 0){
1031
	e = errno;
1032
      }
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
1033
      perror_plus("close");
237.2.162 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
1034
    }
1035
    gnutls_deinit(session);
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
1036
    errno = e;
237.2.162 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
1037
    if(quit_now){
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
1038
      errno = EINTR;
237.2.162 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
1039
      retval = -1;
1040
    }
237.2.121 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check
1041
  }
13 by Björn Påhlsson
Added following support:
1042
  return retval;
1043
}
1044
237.7.220 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1045
__attribute__((nonnull))
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
1046
static void resolve_callback(AvahiSServiceResolver *r,
1047
			     AvahiIfIndex interface,
237.2.67 by Teddy Hogeborn
Four new interrelated features:
1048
			     AvahiProtocol proto,
39 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Renamed variables.
1049
			     AvahiResolverEvent event,
1050
			     const char *name,
1051
			     const char *type,
1052
			     const char *domain,
1053
			     const char *host_name,
1054
			     const AvahiAddress *address,
1055
			     uint16_t port,
1056
			     AVAHI_GCC_UNUSED AvahiStringList *txt,
1057
			     AVAHI_GCC_UNUSED AvahiLookupResultFlags
1058
			     flags,
237.7.220 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1059
			     void *mc){
237.7.145 by Teddy Hogeborn
* plugins.d/mandos-client.c: Don't use assert(). Use in_port_t for
1060
  if(r == NULL){
1061
    return;
1062
  }
22 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Cast "0" argument to
1063
  
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
1064
  /* Called whenever a service has been resolved successfully or
1065
     timed out */
22 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Cast "0" argument to
1066
  
237.2.116 by Teddy Hogeborn
* plugins.d/mandos-client.c (quit_now): Move up declaration before
1067
  if(quit_now){
1068
    return;
1069
  }
1070
  
237.2.56 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
1071
  switch(event){
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
1072
  default:
1073
  case AVAHI_RESOLVER_FAILURE:
237.16.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
1074
    fprintf_plus(stderr, "(Avahi Resolver) Failed to resolve service "
1075
		 "'%s' of type '%s' in domain '%s': %s\n", name, type,
1076
		 domain,
237.7.150 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
1077
		 avahi_strerror(avahi_server_errno
1078
				(((mandos_context*)mc)->server)));
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
1079
    break;
22 by Teddy Hogeborn
* plugins.d/mandosclient.c (pgp_packet_decrypt): Cast "0" argument to
1080
    
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
1081
  case AVAHI_RESOLVER_FOUND:
1082
    {
1083
      char ip[AVAHI_ADDRESS_STR_MAX];
1084
      avahi_address_snprint(ip, sizeof(ip), address);
1085
      if(debug){
237.15.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
1086
	fprintf_plus(stderr, "Mandos server \"%s\" found on %s (%s, %"
237.16.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
1087
		     PRIdMAX ") on port %" PRIu16 "\n", name,
1088
		     host_name, ip, (intmax_t)interface, port);
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
1089
      }
237.7.145 by Teddy Hogeborn
* plugins.d/mandos-client.c: Don't use assert(). Use in_port_t for
1090
      int ret = start_mandos_communication(ip, (in_port_t)port,
1091
					   interface,
237.7.150 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
1092
					   avahi_proto_to_af(proto),
1093
					   mc);
237.2.29 by Teddy Hogeborn
* plugin-runner.c: Only space changes.
1094
      if(ret == 0){
237.7.149 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Removed "simple_poll"
1095
	avahi_simple_poll_quit(simple_poll);
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
1096
      } else {
237.7.145 by Teddy Hogeborn
* plugins.d/mandos-client.c: Don't use assert(). Use in_port_t for
1097
	if(not add_server(ip, (in_port_t)port, interface,
237.7.150 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
1098
			  avahi_proto_to_af(proto),
1099
			  &((mandos_context*)mc)->current_server)){
237.11.27 by teddy at bsnet
* plugins.d/mandos-client.c (add_server): Return bool; all callers
1100
	  fprintf_plus(stderr, "Failed to add server \"%s\" to server"
1101
		       " list\n", name);
1102
	}
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
1103
      }
13 by Björn Påhlsson
Added following support:
1104
    }
21 by Teddy Hogeborn
* Makefile (CFLAGS): Changed to use $(WARN), $(DEBUG), $(COVERAGE) and
1105
  }
1106
  avahi_s_service_resolver_free(r);
13 by Björn Påhlsson
Added following support:
1107
}
1108
237.2.56 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
1109
static void browse_callback(AvahiSServiceBrowser *b,
1110
			    AvahiIfIndex interface,
1111
			    AvahiProtocol protocol,
1112
			    AvahiBrowserEvent event,
1113
			    const char *name,
1114
			    const char *type,
1115
			    const char *domain,
1116
			    AVAHI_GCC_UNUSED AvahiLookupResultFlags
1117
			    flags,
237.7.220 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1118
			    void *mc){
237.7.145 by Teddy Hogeborn
* plugins.d/mandos-client.c: Don't use assert(). Use in_port_t for
1119
  if(b == NULL){
1120
    return;
1121
  }
24.1.9 by Björn Påhlsson
not working midwork...
1122
  
1123
  /* Called whenever a new services becomes available on the LAN or
1124
     is removed from the LAN */
1125
  
237.2.121 by Teddy Hogeborn
* plugins.d/mandos-client.c (start_mandos_communication): Check
1126
  if(quit_now){
1127
    return;
1128
  }
1129
  
237.2.56 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
1130
  switch(event){
24.1.9 by Björn Påhlsson
not working midwork...
1131
  default:
1132
  case AVAHI_BROWSER_FAILURE:
38 by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options.
1133
    
237.15.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
1134
    fprintf_plus(stderr, "(Avahi browser) %s\n",
237.7.150 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
1135
		 avahi_strerror(avahi_server_errno
1136
				(((mandos_context*)mc)->server)));
237.7.149 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Removed "simple_poll"
1137
    avahi_simple_poll_quit(simple_poll);
24.1.9 by Björn Påhlsson
not working midwork...
1138
    return;
38 by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options.
1139
    
24.1.9 by Björn Påhlsson
not working midwork...
1140
  case AVAHI_BROWSER_NEW:
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
1141
    /* We ignore the returned Avahi resolver object. In the callback
1142
       function we free it. If the Avahi server is terminated before
1143
       the callback function is called the Avahi server will free the
1144
       resolver for us. */
38 by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options.
1145
    
237.7.150 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
1146
    if(avahi_s_service_resolver_new(((mandos_context*)mc)->server,
1147
				    interface, protocol, name, type,
1148
				    domain, protocol, 0,
1149
				    resolve_callback, mc) == NULL)
237.16.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
1150
      fprintf_plus(stderr, "Avahi: Failed to resolve service '%s':"
1151
		   " %s\n", name,
237.7.150 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
1152
		   avahi_strerror(avahi_server_errno
1153
				  (((mandos_context*)mc)->server)));
24.1.9 by Björn Påhlsson
not working midwork...
1154
    break;
38 by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options.
1155
    
24.1.9 by Björn Påhlsson
not working midwork...
1156
  case AVAHI_BROWSER_REMOVE:
1157
    break;
38 by Teddy Hogeborn
* plugbasedclient.c (main): New "--userid" and "--groupid" options.
1158
    
24.1.9 by Björn Påhlsson
not working midwork...
1159
  case AVAHI_BROWSER_ALL_FOR_NOW:
1160
  case AVAHI_BROWSER_CACHE_EXHAUSTED:
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
1161
    if(debug){
237.16.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
1162
      fprintf_plus(stderr, "No Mandos server found, still"
1163
		   " searching...\n");
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
1164
    }
24.1.9 by Björn Påhlsson
not working midwork...
1165
    break;
1166
  }
13 by Björn Påhlsson
Added following support:
1167
}
1168
237.7.33 by Teddy Hogeborn
Merge from Björn.
1169
/* Signal handler that stops main loop after SIGTERM */
237.2.117 by Teddy Hogeborn
* plugins.d/mandos-client.c (signal_received): New.
1170
static void handle_sigterm(int sig){
237.2.71 by Teddy Hogeborn
* plugin-runner.c: Comment change.
1171
  if(quit_now){
1172
    return;
1173
  }
1174
  quit_now = 1;
237.2.117 by Teddy Hogeborn
* plugins.d/mandos-client.c (signal_received): New.
1175
  signal_received = sig;
24.1.134 by Björn Påhlsson
plugin-runner: Added support for empty string arguments
1176
  int old_errno = errno;
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
1177
  /* set main loop to exit */
237.7.149 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Removed "simple_poll"
1178
  if(simple_poll != NULL){
1179
    avahi_simple_poll_quit(simple_poll);
237.2.71 by Teddy Hogeborn
* plugin-runner.c: Comment change.
1180
  }
24.1.134 by Björn Påhlsson
plugin-runner: Added support for empty string arguments
1181
  errno = old_errno;
1182
}
1183
237.7.220 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1184
__attribute__((nonnull, warn_unused_result))
237.15.2 by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead
1185
bool get_flags(const char *ifname, struct ifreq *ifr){
237.15.1 by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead
1186
  int ret;
237.22.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1187
  error_t ret_errno;
237.15.2 by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead
1188
  
237.15.1 by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead
1189
  int s = socket(PF_INET6, SOCK_DGRAM, IPPROTO_IP);
1190
  if(s < 0){
237.22.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1191
    ret_errno = errno;
237.15.1 by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead
1192
    perror_plus("socket");
237.22.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1193
    errno = ret_errno;
237.15.2 by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead
1194
    return false;
237.15.1 by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead
1195
  }
237.15.2 by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead
1196
  strcpy(ifr->ifr_name, ifname);
1197
  ret = ioctl(s, SIOCGIFFLAGS, ifr);
237.15.1 by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead
1198
  if(ret == -1){
269.1.2 by teddy at bsnet
* plugins.d/mandos-client.c: Added debug output.
1199
    if(debug){
237.22.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1200
      ret_errno = errno;
237.15.1 by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead
1201
      perror_plus("ioctl SIOCGIFFLAGS");
237.22.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1202
      errno = ret_errno;
269.1.2 by teddy at bsnet
* plugins.d/mandos-client.c: Added debug output.
1203
    }
237.15.2 by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead
1204
    return false;
269.1.1 by teddy at bsnet
* plugins.d/mandos-client.c: An empty interface name now means to
1205
  }
237.15.2 by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead
1206
  return true;
1207
}
1208
237.7.220 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1209
__attribute__((nonnull, warn_unused_result))
237.15.2 by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead
1210
bool good_flags(const char *ifname, const struct ifreq *ifr){
1211
  
269.1.1 by teddy at bsnet
* plugins.d/mandos-client.c: An empty interface name now means to
1212
  /* Reject the loopback device */
237.15.2 by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead
1213
  if(ifr->ifr_flags & IFF_LOOPBACK){
269.1.2 by teddy at bsnet
* plugins.d/mandos-client.c: Added debug output.
1214
    if(debug){
237.16.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
1215
      fprintf_plus(stderr, "Rejecting loopback interface \"%s\"\n",
1216
		   ifname);
269.1.2 by teddy at bsnet
* plugins.d/mandos-client.c: Added debug output.
1217
    }
237.15.2 by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead
1218
    return false;
269.1.1 by teddy at bsnet
* plugins.d/mandos-client.c: An empty interface name now means to
1219
  }
1220
  /* Accept point-to-point devices only if connect_to is specified */
237.15.2 by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead
1221
  if(connect_to != NULL and (ifr->ifr_flags & IFF_POINTOPOINT)){
269.1.2 by teddy at bsnet
* plugins.d/mandos-client.c: Added debug output.
1222
    if(debug){
237.16.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
1223
      fprintf_plus(stderr, "Accepting point-to-point interface"
1224
		   " \"%s\"\n", ifname);
269.1.2 by teddy at bsnet
* plugins.d/mandos-client.c: Added debug output.
1225
    }
237.15.2 by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead
1226
    return true;
269.1.1 by teddy at bsnet
* plugins.d/mandos-client.c: An empty interface name now means to
1227
  }
1228
  /* Otherwise, reject non-broadcast-capable devices */
237.15.2 by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead
1229
  if(not (ifr->ifr_flags & IFF_BROADCAST)){
269.1.2 by teddy at bsnet
* plugins.d/mandos-client.c: Added debug output.
1230
    if(debug){
237.16.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
1231
      fprintf_plus(stderr, "Rejecting non-broadcast interface"
1232
		   " \"%s\"\n", ifname);
269.1.2 by teddy at bsnet
* plugins.d/mandos-client.c: Added debug output.
1233
    }
237.15.2 by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead
1234
    return false;
269.1.1 by teddy at bsnet
* plugins.d/mandos-client.c: An empty interface name now means to
1235
  }
237.7.29 by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Reject non-ARP
1236
  /* Reject non-ARP interfaces (including dummy interfaces) */
237.15.2 by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead
1237
  if(ifr->ifr_flags & IFF_NOARP){
237.7.29 by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Reject non-ARP
1238
    if(debug){
237.16.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
1239
      fprintf_plus(stderr, "Rejecting non-ARP interface \"%s\"\n",
1240
		   ifname);
237.7.29 by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Reject non-ARP
1241
    }
237.15.2 by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead
1242
    return false;
237.7.29 by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Reject non-ARP
1243
  }
237.15.2 by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead
1244
  
269.1.1 by teddy at bsnet
* plugins.d/mandos-client.c: An empty interface name now means to
1245
  /* Accept this device */
269.1.2 by teddy at bsnet
* plugins.d/mandos-client.c: Added debug output.
1246
  if(debug){
237.15.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
1247
    fprintf_plus(stderr, "Interface \"%s\" is good\n", ifname);
237.15.2 by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead
1248
  }
1249
  return true;
1250
}
1251
1252
/* 
1253
 * This function determines if a directory entry in /sys/class/net
1254
 * corresponds to an acceptable network device.
1255
 * (This function is passed to scandir(3) as a filter function.)
1256
 */
237.7.220 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1257
__attribute__((nonnull, warn_unused_result))
237.15.2 by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead
1258
int good_interface(const struct dirent *if_entry){
1259
  if(if_entry->d_name[0] == '.'){
1260
    return 0;
1261
  }
237.16.1 by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Add error message.
1262
  
237.15.2 by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead
1263
  struct ifreq ifr;
1264
  if(not get_flags(if_entry->d_name, &ifr)){
237.16.1 by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Add error message.
1265
    if(debug){
237.16.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
1266
      fprintf_plus(stderr, "Failed to get flags for interface "
1267
		   "\"%s\"\n", if_entry->d_name);
237.16.1 by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Add error message.
1268
    }
237.15.2 by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Use SIOCGIFFLAGS instead
1269
    return 0;
1270
  }
1271
  
1272
  if(not good_flags(if_entry->d_name, &ifr)){
1273
    return 0;
269.1.2 by teddy at bsnet
* plugins.d/mandos-client.c: Added debug output.
1274
  }
269.1.1 by teddy at bsnet
* plugins.d/mandos-client.c: An empty interface name now means to
1275
  return 1;
1276
}
1277
237.15.3 by Teddy Hogeborn
Intermediate commit - this does *not* work yet.
1278
/* 
237.22.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1279
 * This function determines if a network interface is up.
1280
 */
237.7.220 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1281
__attribute__((nonnull, warn_unused_result))
237.22.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1282
bool interface_is_up(const char *interface){
1283
  struct ifreq ifr;
1284
  if(not get_flags(interface, &ifr)){
1285
    if(debug){
1286
      fprintf_plus(stderr, "Failed to get flags for interface "
1287
		   "\"%s\"\n", interface);
1288
    }
1289
    return false;
1290
  }
1291
  
1292
  return (bool)(ifr.ifr_flags & IFF_UP);
1293
}
1294
1295
/* 
1296
 * This function determines if a network interface is running
1297
 */
237.7.220 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1298
__attribute__((nonnull, warn_unused_result))
237.22.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1299
bool interface_is_running(const char *interface){
1300
  struct ifreq ifr;
1301
  if(not get_flags(interface, &ifr)){
1302
    if(debug){
1303
      fprintf_plus(stderr, "Failed to get flags for interface "
1304
		   "\"%s\"\n", interface);
1305
    }
1306
    return false;
1307
  }
1308
  
1309
  return (bool)(ifr.ifr_flags & IFF_RUNNING);
237.15.3 by Teddy Hogeborn
Intermediate commit - this does *not* work yet.
1310
}
1311
237.7.220 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1312
__attribute__((nonnull, pure, warn_unused_result))
24.1.172 by Björn Påhlsson
using scandir instead of readdir
1313
int notdotentries(const struct dirent *direntry){
1314
  /* Skip "." and ".." */
1315
  if(direntry->d_name[0] == '.'
1316
     and (direntry->d_name[1] == '\0'
1317
	  or (direntry->d_name[1] == '.'
1318
	      and direntry->d_name[2] == '\0'))){
1319
    return 0;
1320
  }
1321
  return 1;
1322
}
1323
237.15.3 by Teddy Hogeborn
Intermediate commit - this does *not* work yet.
1324
/* Is this directory entry a runnable program? */
237.7.220 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1325
__attribute__((nonnull, warn_unused_result))
237.15.3 by Teddy Hogeborn
Intermediate commit - this does *not* work yet.
1326
int runnable_hook(const struct dirent *direntry){
1327
  int ret;
237.16.6 by teddy at bsnet
* plugins.d/mandos-client.c: Some white space fixes.
1328
  size_t sret;
237.15.3 by Teddy Hogeborn
Intermediate commit - this does *not* work yet.
1329
  struct stat st;
1330
  
1331
  if((direntry->d_name)[0] == '\0'){
1332
    /* Empty name? */
1333
    return 0;
1334
  }
1335
  
237.16.6 by teddy at bsnet
* plugins.d/mandos-client.c: Some white space fixes.
1336
  sret = strspn(direntry->d_name, "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
1337
		"abcdefghijklmnopqrstuvwxyz"
1338
		"0123456789"
237.7.236 by Teddy Hogeborn
Minor bug fix in mandos-client: Allow periods in network hook names.
1339
		"_.-");
237.16.6 by teddy at bsnet
* plugins.d/mandos-client.c: Some white space fixes.
1340
  if((direntry->d_name)[sret] != '\0'){
1341
    /* Contains non-allowed characters */
1342
    if(debug){
237.15.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
1343
      fprintf_plus(stderr, "Ignoring hook \"%s\" with bad name\n",
237.16.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
1344
		   direntry->d_name);
237.16.6 by teddy at bsnet
* plugins.d/mandos-client.c: Some white space fixes.
1345
    }
1346
    return 0;
1347
  }
237.15.3 by Teddy Hogeborn
Intermediate commit - this does *not* work yet.
1348
  
237.16.4 by teddy at bsnet
* plugins.d/mandos-client.c (runnable_hook): Bug fix: stat using the
1349
  char *fullname = NULL;
237.16.6 by teddy at bsnet
* plugins.d/mandos-client.c: Some white space fixes.
1350
  ret = asprintf(&fullname, "%s/%s", hookdir, direntry->d_name);
237.16.4 by teddy at bsnet
* plugins.d/mandos-client.c (runnable_hook): Bug fix: stat using the
1351
  if(ret < 0){
1352
    perror_plus("asprintf");
1353
    return 0;
1354
  }
1355
  
1356
  ret = stat(fullname, &st);
237.15.3 by Teddy Hogeborn
Intermediate commit - this does *not* work yet.
1357
  if(ret == -1){
1358
    if(debug){
237.16.6 by teddy at bsnet
* plugins.d/mandos-client.c: Some white space fixes.
1359
      perror_plus("Could not stat hook");
237.15.3 by Teddy Hogeborn
Intermediate commit - this does *not* work yet.
1360
    }
1361
    return 0;
1362
  }
237.7.237 by Teddy Hogeborn
Minor bug fix in mandos-client: Remove memory leak for network hooks.
1363
  free(fullname);
237.16.1 by teddy at bsnet
* plugins.d/mandos-client.c (good_interface): Add error message.
1364
  if(not (S_ISREG(st.st_mode))){
237.15.3 by Teddy Hogeborn
Intermediate commit - this does *not* work yet.
1365
    /* Not a regular file */
237.16.6 by teddy at bsnet
* plugins.d/mandos-client.c: Some white space fixes.
1366
    if(debug){
237.15.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
1367
      fprintf_plus(stderr, "Ignoring hook \"%s\" - not a file\n",
237.16.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
1368
		   direntry->d_name);
237.16.6 by teddy at bsnet
* plugins.d/mandos-client.c: Some white space fixes.
1369
    }
237.15.3 by Teddy Hogeborn
Intermediate commit - this does *not* work yet.
1370
    return 0;
1371
  }
1372
  if(not (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH))){
1373
    /* Not executable */
237.16.6 by teddy at bsnet
* plugins.d/mandos-client.c: Some white space fixes.
1374
    if(debug){
237.15.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
1375
      fprintf_plus(stderr, "Ignoring hook \"%s\" - not executable\n",
237.16.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
1376
		   direntry->d_name);
237.16.6 by teddy at bsnet
* plugins.d/mandos-client.c: Some white space fixes.
1377
    }
237.15.3 by Teddy Hogeborn
Intermediate commit - this does *not* work yet.
1378
    return 0;
1379
  }
237.16.12 by Teddy Hogeborn
* plugins.d/mandos-client.c (runnable_hook): Add debug output.
1380
  if(debug){
1381
    fprintf_plus(stderr, "Hook \"%s\" is acceptable\n",
1382
		 direntry->d_name);
1383
  }
237.15.3 by Teddy Hogeborn
Intermediate commit - this does *not* work yet.
1384
  return 1;
1385
}
1386
237.7.220 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1387
__attribute__((nonnull, warn_unused_result))
237.7.150 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
1388
int avahi_loop_with_timeout(AvahiSimplePoll *s, int retry_interval,
1389
			    mandos_context *mc){
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
1390
  int ret;
1391
  struct timespec now;
1392
  struct timespec waited_time;
1393
  intmax_t block_time;
237.7.39 by teddy at bsnet
* plugins.d/mandos-client.c (avahi_loop_with_timeout): Fix warning.
1394
  
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
1395
  while(true){
237.7.150 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
1396
    if(mc->current_server == NULL){
237.7.219 by Teddy Hogeborn
White space fix: change "if (" to "if(" in C code.
1397
      if(debug){
237.16.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
1398
	fprintf_plus(stderr, "Wait until first server is found."
1399
		     " No timeout!\n");
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
1400
      }
1401
      ret = avahi_simple_poll_iterate(s, -1);
1402
    } else {
237.7.219 by Teddy Hogeborn
White space fix: change "if (" to "if(" in C code.
1403
      if(debug){
237.16.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
1404
	fprintf_plus(stderr, "Check current_server if we should run"
1405
		     " it, or wait\n");
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
1406
      }
1407
      /* the current time */
1408
      ret = clock_gettime(CLOCK_MONOTONIC, &now);
1409
      if(ret == -1){
1410
	perror_plus("clock_gettime");
1411
	return -1;
1412
      }
1413
      /* Calculating in ms how long time between now and server
1414
	 who we visted longest time ago. Now - last seen.  */
237.7.33 by Teddy Hogeborn
Merge from Björn.
1415
      waited_time.tv_sec = (now.tv_sec
237.7.150 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
1416
			    - mc->current_server->last_seen.tv_sec);
237.7.33 by Teddy Hogeborn
Merge from Björn.
1417
      waited_time.tv_nsec = (now.tv_nsec
237.7.150 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
1418
			     - mc->current_server->last_seen.tv_nsec);
237.7.33 by Teddy Hogeborn
Merge from Björn.
1419
      /* total time is 10s/10,000ms.
1420
	 Converting to s from ms by dividing by 1,000,
1421
	 and ns to ms by dividing by 1,000,000. */
1422
      block_time = ((retry_interval
1423
		     - ((intmax_t)waited_time.tv_sec * 1000))
1424
		    - ((intmax_t)waited_time.tv_nsec / 1000000));
237.7.39 by teddy at bsnet
* plugins.d/mandos-client.c (avahi_loop_with_timeout): Fix warning.
1425
      
237.7.219 by Teddy Hogeborn
White space fix: change "if (" to "if(" in C code.
1426
      if(debug){
237.16.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
1427
	fprintf_plus(stderr, "Blocking for %" PRIdMAX " ms\n",
1428
		     block_time);
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
1429
      }
237.7.39 by teddy at bsnet
* plugins.d/mandos-client.c (avahi_loop_with_timeout): Fix warning.
1430
      
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
1431
      if(block_time <= 0){
237.7.150 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
1432
	ret = start_mandos_communication(mc->current_server->ip,
1433
					 mc->current_server->port,
1434
					 mc->current_server->if_index,
1435
					 mc->current_server->af, mc);
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
1436
	if(ret == 0){
237.7.150 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
1437
	  avahi_simple_poll_quit(s);
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
1438
	  return 0;
1439
	}
237.7.33 by Teddy Hogeborn
Merge from Björn.
1440
	ret = clock_gettime(CLOCK_MONOTONIC,
237.7.150 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
1441
			    &mc->current_server->last_seen);
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
1442
	if(ret == -1){
1443
	  perror_plus("clock_gettime");
1444
	  return -1;
1445
	}
237.7.150 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
1446
	mc->current_server = mc->current_server->next;
237.7.33 by Teddy Hogeborn
Merge from Björn.
1447
	block_time = 0; 	/* Call avahi to find new Mandos
1448
				   servers, but don't block */
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
1449
      }
1450
      
1451
      ret = avahi_simple_poll_iterate(s, (int)block_time);
1452
    }
1453
    if(ret != 0){
237.7.219 by Teddy Hogeborn
White space fix: change "if (" to "if(" in C code.
1454
      if(ret > 0 or errno != EINTR){
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
1455
	return (ret != 1) ? ret : 0;
1456
      }
1457
    }
1458
  }
1459
}
1460
237.22.1 by Teddy Hogeborn
* plugins.d/mandos-client.c: Refactoring.
1461
/* Set effective uid to 0, return errno */
237.7.220 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1462
__attribute__((warn_unused_result))
237.22.3 by Teddy Hogeborn
* plugins.d/mandos-client.c (raise_privileges,
1463
error_t raise_privileges(void){
1464
  error_t old_errno = errno;
1465
  error_t ret_errno = 0;
237.22.1 by Teddy Hogeborn
* plugins.d/mandos-client.c: Refactoring.
1466
  if(seteuid(0) == -1){
237.22.3 by Teddy Hogeborn
* plugins.d/mandos-client.c (raise_privileges,
1467
    ret_errno = errno;
237.22.1 by Teddy Hogeborn
* plugins.d/mandos-client.c: Refactoring.
1468
    perror_plus("seteuid");
1469
  }
1470
  errno = old_errno;
1471
  return ret_errno;
1472
}
1473
1474
/* Set effective and real user ID to 0.  Return errno. */
237.7.220 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1475
__attribute__((warn_unused_result))
237.22.3 by Teddy Hogeborn
* plugins.d/mandos-client.c (raise_privileges,
1476
error_t raise_privileges_permanently(void){
1477
  error_t old_errno = errno;
1478
  error_t ret_errno = raise_privileges();
237.22.1 by Teddy Hogeborn
* plugins.d/mandos-client.c: Refactoring.
1479
  if(ret_errno != 0){
1480
    errno = old_errno;
1481
    return ret_errno;
1482
  }
1483
  if(setuid(0) == -1){
237.22.3 by Teddy Hogeborn
* plugins.d/mandos-client.c (raise_privileges,
1484
    ret_errno = errno;
237.22.1 by Teddy Hogeborn
* plugins.d/mandos-client.c: Refactoring.
1485
    perror_plus("seteuid");
1486
  }
1487
  errno = old_errno;
1488
  return ret_errno;
1489
}
1490
1491
/* Set effective user ID to unprivileged saved user ID */
237.7.220 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1492
__attribute__((warn_unused_result))
237.22.3 by Teddy Hogeborn
* plugins.d/mandos-client.c (raise_privileges,
1493
error_t lower_privileges(void){
1494
  error_t old_errno = errno;
1495
  error_t ret_errno = 0;
237.22.1 by Teddy Hogeborn
* plugins.d/mandos-client.c: Refactoring.
1496
  if(seteuid(uid) == -1){
237.22.3 by Teddy Hogeborn
* plugins.d/mandos-client.c (raise_privileges,
1497
    ret_errno = errno;
237.22.1 by Teddy Hogeborn
* plugins.d/mandos-client.c: Refactoring.
1498
    perror_plus("seteuid");
1499
  }
1500
  errno = old_errno;
1501
  return ret_errno;
1502
}
1503
237.22.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1504
/* Lower privileges permanently */
237.7.220 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1505
__attribute__((warn_unused_result))
237.22.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1506
error_t lower_privileges_permanently(void){
1507
  error_t old_errno = errno;
1508
  error_t ret_errno = 0;
1509
  if(setuid(uid) == -1){
1510
    ret_errno = errno;
1511
    perror_plus("setuid");
1512
  }
1513
  errno = old_errno;
1514
  return ret_errno;
1515
}
1516
237.7.239 by Teddy Hogeborn
Make mandos-client use scandirat() if it exists.
1517
#ifndef O_CLOEXEC
1518
/*
1519
 * Based on the example in the GNU LibC manual chapter 13.13 "File
1520
 * Descriptor Flags".
1521
 | [[info:libc:Descriptor%20Flags][File Descriptor Flags]] |
1522
 */
1523
__attribute__((warn_unused_result))
1524
static int set_cloexec_flag(int fd){
1525
  int ret = (int)TEMP_FAILURE_RETRY(fcntl(fd, F_GETFD, 0));
1526
  /* If reading the flags failed, return error indication now. */
1527
  if(ret < 0){
1528
    return ret;
1529
  }
1530
  /* Store modified flag word in the descriptor. */
1531
  return (int)TEMP_FAILURE_RETRY(fcntl(fd, F_SETFD,
1532
				       ret | FD_CLOEXEC));
1533
}
1534
#endif	/* not O_CLOEXEC */
1535
237.7.220 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1536
__attribute__((nonnull))
1537
void run_network_hooks(const char *mode, const char *interface,
237.16.8 by Teddy Hogeborn
* plugins.d/mandos-client.c (run_network_hooks): New.
1538
		       const float delay){
1539
  struct dirent **direntries;
237.7.239 by Teddy Hogeborn
Make mandos-client use scandirat() if it exists.
1540
  if(hookdir_fd == -1){
1541
    hookdir_fd = open(hookdir, O_RDONLY |
1542
#ifdef O_CLOEXEC
1543
		      O_CLOEXEC
1544
#else  /* not O_CLOEXEC */
1545
		      0
1546
#endif	/* not O_CLOEXEC */
1547
		      );
1548
    if(hookdir_fd == -1){
1549
      if(errno == ENOENT){
1550
	if(debug){
1551
	  fprintf_plus(stderr, "Network hook directory \"%s\" not"
1552
		       " found\n", hookdir);
1553
	}
1554
      } else {
1555
	perror_plus("open");
1556
      }
1557
      return;
1558
    }
1559
#ifndef O_CLOEXEC
1560
    if(set_cloexec_flag(hookdir_fd) < 0){
1561
      perror_plus("set_cloexec_flag");
1562
      if((int)TEMP_FAILURE_RETRY(close(hookdir_fd)) == -1){
1563
	perror_plus("close");
1564
      } else {
1565
	hookdir_fd = -1;
1566
      }
1567
      return;
1568
    }
1569
#endif	/* not O_CLOEXEC */
1570
  }
1571
#ifdef __GLIBC__
1572
#if __GLIBC_PREREQ(2, 15)
1573
  int numhooks = scandirat(hookdir_fd, ".", &direntries,
1574
			   runnable_hook, alphasort);
1575
#else  /* not __GLIBC_PREREQ(2, 15) */
1576
  int numhooks = scandir(hookdir, &direntries, runnable_hook,
1577
			 alphasort);
1578
#endif	/* not __GLIBC_PREREQ(2, 15) */
1579
#else	/* not __GLIBC__ */
1580
  int numhooks = scandir(hookdir, &direntries, runnable_hook,
1581
			 alphasort);
1582
#endif	/* not __GLIBC__ */
237.16.8 by Teddy Hogeborn
* plugins.d/mandos-client.c (run_network_hooks): New.
1583
  if(numhooks == -1){
237.7.239 by Teddy Hogeborn
Make mandos-client use scandirat() if it exists.
1584
    perror_plus("scandir");
1585
    return;
1586
  }
1587
  struct dirent *direntry;
1588
  int ret;
1589
  int devnull = open("/dev/null", O_RDONLY);
1590
  for(int i = 0; i < numhooks; i++){
1591
    direntry = direntries[i];
1592
    char *fullname = NULL;
1593
    ret = asprintf(&fullname, "%s/%s", hookdir, direntry->d_name);
1594
    if(ret < 0){
1595
      perror_plus("asprintf");
1596
      continue;
1597
    }
1598
    if(debug){
1599
      fprintf_plus(stderr, "Running network hook \"%s\"\n",
1600
		   direntry->d_name);
1601
    }
1602
    pid_t hook_pid = fork();
1603
    if(hook_pid == 0){
1604
      /* Child */
1605
      /* Raise privileges */
1606
      if(raise_privileges_permanently() != 0){
1607
	perror_plus("Failed to raise privileges");
1608
	_exit(EX_NOPERM);
1609
      }
1610
      /* Set group */
1611
      errno = 0;
1612
      ret = setgid(0);
1613
      if(ret == -1){
1614
	perror_plus("setgid");
1615
	_exit(EX_NOPERM);
1616
      }
1617
      /* Reset supplementary groups */
1618
      errno = 0;
1619
      ret = setgroups(0, NULL);
1620
      if(ret == -1){
1621
	perror_plus("setgroups");
1622
	_exit(EX_NOPERM);
1623
      }
1624
      ret = dup2(devnull, STDIN_FILENO);
1625
      if(ret == -1){
1626
	perror_plus("dup2(devnull, STDIN_FILENO)");
1627
	_exit(EX_OSERR);
1628
      }
1629
      ret = close(devnull);
1630
      if(ret == -1){
1631
	perror_plus("close");
1632
	_exit(EX_OSERR);
1633
      }
1634
      ret = dup2(STDERR_FILENO, STDOUT_FILENO);
1635
      if(ret == -1){
1636
	perror_plus("dup2(STDERR_FILENO, STDOUT_FILENO)");
1637
	_exit(EX_OSERR);
1638
      }
1639
      ret = setenv("MANDOSNETHOOKDIR", hookdir, 1);
1640
      if(ret == -1){
1641
	perror_plus("setenv");
1642
	_exit(EX_OSERR);
1643
      }
1644
      ret = setenv("DEVICE", interface, 1);
1645
      if(ret == -1){
1646
	perror_plus("setenv");
1647
	_exit(EX_OSERR);
1648
      }
1649
      ret = setenv("VERBOSITY", debug ? "1" : "0", 1);
1650
      if(ret == -1){
1651
	perror_plus("setenv");
1652
	_exit(EX_OSERR);
1653
      }
1654
      ret = setenv("MODE", mode, 1);
1655
      if(ret == -1){
1656
	perror_plus("setenv");
1657
	_exit(EX_OSERR);
1658
      }
1659
      char *delaystring;
1660
      ret = asprintf(&delaystring, "%f", (double)delay);
1661
      if(ret == -1){
237.16.8 by Teddy Hogeborn
* plugins.d/mandos-client.c (run_network_hooks): New.
1662
	perror_plus("asprintf");
237.7.239 by Teddy Hogeborn
Make mandos-client use scandirat() if it exists.
1663
	_exit(EX_OSERR);
1664
      }
1665
      ret = setenv("DELAY", delaystring, 1);
1666
      if(ret == -1){
237.16.8 by Teddy Hogeborn
* plugins.d/mandos-client.c (run_network_hooks): New.
1667
	free(delaystring);
237.7.239 by Teddy Hogeborn
Make mandos-client use scandirat() if it exists.
1668
	perror_plus("setenv");
1669
	_exit(EX_OSERR);
1670
      }
1671
      free(delaystring);
1672
      if(connect_to != NULL){
1673
	ret = setenv("CONNECT", connect_to, 1);
1674
	if(ret == -1){
1675
	  perror_plus("setenv");
1676
	  _exit(EX_OSERR);
1677
	}
1678
      }
1679
      if(execl(fullname, direntry->d_name, mode, NULL) == -1){
1680
	perror_plus("execl");
1681
	_exit(EXIT_FAILURE);
1682
      }
1683
    } else {
1684
      int status;
1685
      if(TEMP_FAILURE_RETRY(waitpid(hook_pid, &status, 0)) == -1){
1686
	perror_plus("waitpid");
1687
	free(fullname);
1688
	continue;
1689
      }
1690
      if(WIFEXITED(status)){
1691
	if(WEXITSTATUS(status) != 0){
1692
	  fprintf_plus(stderr, "Warning: network hook \"%s\" exited"
1693
		       " with status %d\n", direntry->d_name,
1694
		       WEXITSTATUS(status));
1695
	  free(fullname);
1696
	  continue;
1697
	}
1698
      } else if(WIFSIGNALED(status)){
1699
	fprintf_plus(stderr, "Warning: network hook \"%s\" died by"
1700
		     " signal %d\n", direntry->d_name,
1701
		     WTERMSIG(status));
1702
	free(fullname);
1703
	continue;
237.16.8 by Teddy Hogeborn
* plugins.d/mandos-client.c (run_network_hooks): New.
1704
      } else {
237.7.239 by Teddy Hogeborn
Make mandos-client use scandirat() if it exists.
1705
	fprintf_plus(stderr, "Warning: network hook \"%s\""
1706
		     " crashed\n", direntry->d_name);
1707
	free(fullname);
1708
	continue;
1709
      }
1710
    }
1711
    free(fullname);
1712
    if(debug){
1713
      fprintf_plus(stderr, "Network hook \"%s\" ran successfully\n",
1714
		   direntry->d_name);
1715
    }
1716
  }
1717
  if((int)TEMP_FAILURE_RETRY(close(hookdir_fd)) == -1){
1718
    perror_plus("close");
1719
  } else {
1720
    hookdir_fd = -1;
1721
  }
1722
  close(devnull);
237.16.8 by Teddy Hogeborn
* plugins.d/mandos-client.c (run_network_hooks): New.
1723
}
1724
237.7.220 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1725
__attribute__((nonnull, warn_unused_result))
237.22.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1726
error_t bring_up_interface(const char *const interface,
1727
			   const float delay){
1728
  error_t old_errno = errno;
237.7.220 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1729
  int ret;
237.22.1 by Teddy Hogeborn
* plugins.d/mandos-client.c: Refactoring.
1730
  struct ifreq network;
237.22.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1731
  unsigned int if_index = if_nametoindex(interface);
237.22.1 by Teddy Hogeborn
* plugins.d/mandos-client.c: Refactoring.
1732
  if(if_index == 0){
1733
    fprintf_plus(stderr, "No such interface: \"%s\"\n", interface);
237.22.2 by Teddy Hogeborn
* plugins.d/mandos-client.c (bring_up_interface): Bug fix: Return
1734
    errno = old_errno;
1735
    return ENXIO;
237.22.1 by Teddy Hogeborn
* plugins.d/mandos-client.c: Refactoring.
1736
  }
1737
  
1738
  if(quit_now){
237.22.2 by Teddy Hogeborn
* plugins.d/mandos-client.c (bring_up_interface): Bug fix: Return
1739
    errno = old_errno;
237.22.1 by Teddy Hogeborn
* plugins.d/mandos-client.c: Refactoring.
1740
    return EINTR;
1741
  }
1742
  
237.22.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1743
  if(not interface_is_up(interface)){
237.7.220 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1744
    error_t ret_errno = 0, ioctl_errno = 0;
1745
    if(not get_flags(interface, &network)){
237.22.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1746
      ret_errno = errno;
1747
      fprintf_plus(stderr, "Failed to get flags for interface "
1748
		   "\"%s\"\n", interface);
237.7.220 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1749
      errno = old_errno;
237.22.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1750
      return ret_errno;
1751
    }
237.7.220 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1752
    network.ifr_flags |= IFF_UP; /* set flag */
237.22.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1753
    
237.7.220 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1754
    int sd = socket(PF_INET6, SOCK_DGRAM, IPPROTO_IP);
1755
    if(sd == -1){
237.22.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1756
      ret_errno = errno;
1757
      perror_plus("socket");
1758
      errno = old_errno;
1759
      return ret_errno;
1760
    }
237.7.220 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1761
    
237.22.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1762
    if(quit_now){
237.7.220 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1763
      ret = (int)TEMP_FAILURE_RETRY(close(sd));
1764
      if(ret == -1){
1765
	perror_plus("close");
1766
      }
237.22.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1767
      errno = old_errno;
1768
      return EINTR;
1769
    }
1770
    
1771
    if(debug){
1772
      fprintf_plus(stderr, "Bringing up interface \"%s\"\n",
1773
		   interface);
1774
    }
1775
    
237.7.220 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1776
    /* Raise privileges */
1777
    ret_errno = raise_privileges();
237.7.228 by Teddy Hogeborn
Minor changes to minimize diff from last release.
1778
    if(ret_errno != 0){
1779
      perror_plus("Failed to raise privileges");
1780
    }
1781
    
1782
#ifdef __linux__
1783
    int ret_linux;
237.7.220 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1784
    bool restore_loglevel = false;
1785
    if(ret_errno == 0){
1786
      /* Lower kernel loglevel to KERN_NOTICE to avoid KERN_INFO
1787
	 messages about the network interface to mess up the prompt */
1788
      ret_linux = klogctl(8, NULL, 5);
1789
      if(ret_linux == -1){
1790
	perror_plus("klogctl");
1791
      } else {
1792
	restore_loglevel = true;
1793
      }
237.22.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1794
    }
1795
#endif	/* __linux__ */
237.7.220 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1796
    int ret_setflags = ioctl(sd, SIOCSIFFLAGS, &network);
1797
    ioctl_errno = errno;
237.22.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1798
#ifdef __linux__
1799
    if(restore_loglevel){
1800
      ret_linux = klogctl(7, NULL, 0);
1801
      if(ret_linux == -1){
1802
	perror_plus("klogctl");
1803
      }
1804
    }
1805
#endif	/* __linux__ */
1806
    
237.7.220 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1807
    /* If raise_privileges() succeeded above */
1808
    if(ret_errno == 0){
1809
      /* Lower privileges */
1810
      ret_errno = lower_privileges();
1811
      if(ret_errno != 0){
1812
	errno = ret_errno;
1813
	perror_plus("Failed to lower privileges");
1814
      }
1815
    }
237.22.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1816
    
1817
    /* Close the socket */
1818
    ret = (int)TEMP_FAILURE_RETRY(close(sd));
237.22.1 by Teddy Hogeborn
* plugins.d/mandos-client.c: Refactoring.
1819
    if(ret == -1){
237.22.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1820
      perror_plus("close");
1821
    }
1822
    
1823
    if(ret_setflags == -1){
237.7.220 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1824
      errno = ioctl_errno;
237.22.1 by Teddy Hogeborn
* plugins.d/mandos-client.c: Refactoring.
1825
      perror_plus("ioctl SIOCSIFFLAGS +IFF_UP");
237.22.2 by Teddy Hogeborn
* plugins.d/mandos-client.c (bring_up_interface): Bug fix: Return
1826
      errno = old_errno;
237.7.220 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1827
      return ioctl_errno;
237.22.1 by Teddy Hogeborn
* plugins.d/mandos-client.c: Refactoring.
1828
    }
237.22.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1829
  } else if(debug){
1830
    fprintf_plus(stderr, "Interface \"%s\" is already up; good\n",
1831
		 interface);
237.22.1 by Teddy Hogeborn
* plugins.d/mandos-client.c: Refactoring.
1832
  }
237.22.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1833
  
237.22.1 by Teddy Hogeborn
* plugins.d/mandos-client.c: Refactoring.
1834
  /* Sleep checking until interface is running.
1835
     Check every 0.25s, up to total time of delay */
1836
  for(int i=0; i < delay * 4; i++){
237.22.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1837
    if(interface_is_running(interface)){
237.22.1 by Teddy Hogeborn
* plugins.d/mandos-client.c: Refactoring.
1838
      break;
1839
    }
1840
    struct timespec sleeptime = { .tv_nsec = 250000000 };
1841
    ret = nanosleep(&sleeptime, NULL);
1842
    if(ret == -1 and errno != EINTR){
1843
      perror_plus("nanosleep");
1844
    }
1845
  }
237.22.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1846
  
1847
  errno = old_errno;
1848
  return 0;
1849
}
1850
237.7.220 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1851
__attribute__((nonnull, warn_unused_result))
237.22.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1852
error_t take_down_interface(const char *const interface){
1853
  error_t old_errno = errno;
1854
  struct ifreq network;
1855
  unsigned int if_index = if_nametoindex(interface);
1856
  if(if_index == 0){
1857
    fprintf_plus(stderr, "No such interface: \"%s\"\n", interface);
1858
    errno = old_errno;
1859
    return ENXIO;
237.22.1 by Teddy Hogeborn
* plugins.d/mandos-client.c: Refactoring.
1860
  }
237.22.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1861
  if(interface_is_up(interface)){
237.7.220 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1862
    error_t ret_errno = 0, ioctl_errno = 0;
237.22.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1863
    if(not get_flags(interface, &network) and debug){
1864
      ret_errno = errno;
1865
      fprintf_plus(stderr, "Failed to get flags for interface "
1866
		   "\"%s\"\n", interface);
237.7.220 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1867
      errno = old_errno;
237.22.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1868
      return ret_errno;
1869
    }
1870
    network.ifr_flags &= ~(short)IFF_UP; /* clear flag */
1871
    
237.7.214 by Teddy Hogeborn
Bug fix: Free all memory and give better messages when memory is full.
1872
    int sd = socket(PF_INET6, SOCK_DGRAM, IPPROTO_IP);
237.7.220 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1873
    if(sd == -1){
237.22.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1874
      ret_errno = errno;
1875
      perror_plus("socket");
1876
      errno = old_errno;
1877
      return ret_errno;
1878
    }
1879
    
1880
    if(debug){
1881
      fprintf_plus(stderr, "Taking down interface \"%s\"\n",
1882
		   interface);
1883
    }
1884
    
237.7.220 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1885
    /* Raise privileges */
1886
    ret_errno = raise_privileges();
1887
    if(ret_errno != 0){
1888
      perror_plus("Failed to raise privileges");
1889
    }
237.7.228 by Teddy Hogeborn
Minor changes to minimize diff from last release.
1890
    
237.7.214 by Teddy Hogeborn
Bug fix: Free all memory and give better messages when memory is full.
1891
    int ret_setflags = ioctl(sd, SIOCSIFFLAGS, &network);
237.7.220 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1892
    ioctl_errno = errno;
237.22.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1893
    
237.7.220 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1894
    /* If raise_privileges() succeeded above */
1895
    if(ret_errno == 0){
1896
      /* Lower privileges */
1897
      ret_errno = lower_privileges();
1898
      if(ret_errno != 0){
1899
	errno = ret_errno;
1900
	perror_plus("Failed to lower privileges");
1901
      }
1902
    }
237.22.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1903
    
1904
    /* Close the socket */
237.7.214 by Teddy Hogeborn
Bug fix: Free all memory and give better messages when memory is full.
1905
    int ret = (int)TEMP_FAILURE_RETRY(close(sd));
237.22.1 by Teddy Hogeborn
* plugins.d/mandos-client.c: Refactoring.
1906
    if(ret == -1){
237.22.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1907
      perror_plus("close");
1908
    }
1909
    
1910
    if(ret_setflags == -1){
237.7.220 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1911
      errno = ioctl_errno;
237.22.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1912
      perror_plus("ioctl SIOCSIFFLAGS -IFF_UP");
1913
      errno = old_errno;
237.7.220 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1914
      return ioctl_errno;
237.22.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1915
    }
1916
  } else if(debug){
1917
    fprintf_plus(stderr, "Interface \"%s\" is already down; odd\n",
1918
		 interface);
237.22.1 by Teddy Hogeborn
* plugins.d/mandos-client.c: Refactoring.
1919
  }
237.22.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1920
  
237.22.2 by Teddy Hogeborn
* plugins.d/mandos-client.c (bring_up_interface): Bug fix: Return
1921
  errno = old_errno;
1922
  return 0;
237.22.1 by Teddy Hogeborn
* plugins.d/mandos-client.c: Refactoring.
1923
}
1924
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
1925
int main(int argc, char *argv[]){
237.7.150 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
1926
  mandos_context mc = { .server = NULL, .dh_bits = 1024,
1927
			.priority = "SECURE256:!CTYPE-X.509:"
237.7.220 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
1928
			"+CTYPE-OPENPGP", .current_server = NULL,
237.7.151 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): New "interfaces" and
1929
			.interfaces = NULL, .interfaces_size = 0 };
237.2.56 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
1930
  AvahiSServiceBrowser *sb = NULL;
237.22.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1931
  error_t ret_errno;
237.2.56 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
1932
  int ret;
1933
  intmax_t tmpmax;
237.2.74 by Teddy Hogeborn
Overflows are not detected by sscanf(), so stop using it:
1934
  char *tmp;
237.2.56 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
1935
  int exitcode = EXIT_SUCCESS;
237.22.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1936
  char *interfaces_to_take_down = NULL;
1937
  size_t interfaces_to_take_down_size = 0;
237.7.221 by Teddy Hogeborn
Make mandos-client prefer /run/tmp over /tmp.
1938
  char run_tempdir[] = "/run/tmp/mandosXXXXXX";
1939
  char old_tempdir[] = "/tmp/mandosXXXXXX";
1940
  char *tempdir = NULL;
237.2.56 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
1941
  AvahiIfIndex if_index = AVAHI_IF_UNSPEC;
1942
  const char *seckey = PATHDIR "/" SECKEY;
1943
  const char *pubkey = PATHDIR "/" PUBKEY;
237.22.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
1944
  char *interfaces_hooks = NULL;
237.2.56 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
1945
  
1946
  bool gnutls_initialized = false;
1947
  bool gpgme_initialized = false;
237.2.74 by Teddy Hogeborn
Overflows are not detected by sscanf(), so stop using it:
1948
  float delay = 2.5f;
237.7.33 by Teddy Hogeborn
Merge from Björn.
1949
  double retry_interval = 10; /* 10s between trying a server and
1950
				 retrying the same server again */
237.2.74 by Teddy Hogeborn
Overflows are not detected by sscanf(), so stop using it:
1951
  
237.2.132 by Teddy Hogeborn
* init.d-mandos (Required-Start, Required-Stop): Bug fix: Added
1952
  struct sigaction old_sigterm_action = { .sa_handler = SIG_DFL };
24.1.134 by Björn Påhlsson
plugin-runner: Added support for empty string arguments
1953
  struct sigaction sigterm_action = { .sa_handler = handle_sigterm };
237.2.56 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
1954
  
237.2.131 by Teddy Hogeborn
* plugins.d/mandos-client.c (init_gnutls_session): Retry interrupted
1955
  uid = getuid();
1956
  gid = getgid();
1957
  
1958
  /* Lower any group privileges we might have, just to be safe */
1959
  errno = 0;
1960
  ret = setgid(gid);
1961
  if(ret == -1){
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
1962
    perror_plus("setgid");
237.2.131 by Teddy Hogeborn
* plugins.d/mandos-client.c (init_gnutls_session): Retry interrupted
1963
  }
1964
  
1965
  /* Lower user privileges (temporarily) */
1966
  errno = 0;
1967
  ret = seteuid(uid);
1968
  if(ret == -1){
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
1969
    perror_plus("seteuid");
237.2.131 by Teddy Hogeborn
* plugins.d/mandos-client.c (init_gnutls_session): Retry interrupted
1970
  }
1971
  
1972
  if(quit_now){
1973
    goto end;
1974
  }
1975
  
237.2.56 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
1976
  {
1977
    struct argp_option options[] = {
1978
      { .name = "debug", .key = 128,
1979
	.doc = "Debug mode", .group = 3 },
1980
      { .name = "connect", .key = 'c',
1981
	.arg = "ADDRESS:PORT",
1982
	.doc = "Connect directly to a specific Mandos server",
1983
	.group = 1 },
1984
      { .name = "interface", .key = 'i',
1985
	.arg = "NAME",
237.2.67 by Teddy Hogeborn
Four new interrelated features:
1986
	.doc = "Network interface that will be used to search for"
1987
	" Mandos servers",
237.2.56 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
1988
	.group = 1 },
1989
      { .name = "seckey", .key = 's',
1990
	.arg = "FILE",
1991
	.doc = "OpenPGP secret key file base name",
1992
	.group = 1 },
1993
      { .name = "pubkey", .key = 'p',
1994
	.arg = "FILE",
1995
	.doc = "OpenPGP public key file base name",
1996
	.group = 2 },
1997
      { .name = "dh-bits", .key = 129,
1998
	.arg = "BITS",
1999
	.doc = "Bit length of the prime number used in the"
2000
	" Diffie-Hellman key exchange",
2001
	.group = 2 },
2002
      { .name = "priority", .key = 130,
2003
	.arg = "STRING",
2004
	.doc = "GnuTLS priority string for the TLS handshake",
2005
	.group = 1 },
2006
      { .name = "delay", .key = 131,
2007
	.arg = "SECONDS",
2008
	.doc = "Maximum delay to wait for interface startup",
2009
	.group = 2 },
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
2010
      { .name = "retry", .key = 132,
2011
	.arg = "SECONDS",
237.17.1 by teddy at recompile
Add wireless network hook
2012
	.doc = "Retry interval used when denied by the Mandos server",
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
2013
	.group = 2 },
237.16.4 by teddy at bsnet
* plugins.d/mandos-client.c (runnable_hook): Bug fix: stat using the
2014
      { .name = "network-hook-dir", .key = 133,
2015
	.arg = "DIR",
2016
	.doc = "Directory where network hooks are located",
2017
	.group = 2 },
237.2.157 by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change
2018
      /*
2019
       * These reproduce what we would get without ARGP_NO_HELP
2020
       */
2021
      { .name = "help", .key = '?',
2022
	.doc = "Give this help list", .group = -1 },
2023
      { .name = "usage", .key = -3,
2024
	.doc = "Give a short usage message", .group = -1 },
2025
      { .name = "version", .key = 'V',
2026
	.doc = "Print program version", .group = -1 },
237.2.56 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2027
      { .name = NULL }
2028
    };
2029
    
2030
    error_t parse_opt(int key, char *arg,
2031
		      struct argp_state *state){
237.2.157 by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change
2032
      errno = 0;
237.2.56 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2033
      switch(key){
2034
      case 128:			/* --debug */
2035
	debug = true;
2036
	break;
2037
      case 'c':			/* --connect */
2038
	connect_to = arg;
2039
	break;
2040
      case 'i':			/* --interface */
237.7.151 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): New "interfaces" and
2041
	ret_errno = argz_add_sep(&mc.interfaces, &mc.interfaces_size,
2042
				 arg, (int)',');
237.22.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
2043
	if(ret_errno != 0){
2044
	  argp_error(state, "%s", strerror(ret_errno));
2045
	}
237.2.56 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2046
	break;
2047
      case 's':			/* --seckey */
2048
	seckey = arg;
2049
	break;
2050
      case 'p':			/* --pubkey */
2051
	pubkey = arg;
2052
	break;
2053
      case 129:			/* --dh-bits */
237.2.74 by Teddy Hogeborn
Overflows are not detected by sscanf(), so stop using it:
2054
	errno = 0;
2055
	tmpmax = strtoimax(arg, &tmp, 10);
2056
	if(errno != 0 or tmp == arg or *tmp != '\0'
2057
	   or tmpmax != (typeof(mc.dh_bits))tmpmax){
237.2.157 by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change
2058
	  argp_error(state, "Bad number of DH bits");
237.2.56 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2059
	}
2060
	mc.dh_bits = (typeof(mc.dh_bits))tmpmax;
2061
	break;
2062
      case 130:			/* --priority */
2063
	mc.priority = arg;
2064
	break;
2065
      case 131:			/* --delay */
237.2.74 by Teddy Hogeborn
Overflows are not detected by sscanf(), so stop using it:
2066
	errno = 0;
2067
	delay = strtof(arg, &tmp);
2068
	if(errno != 0 or tmp == arg or *tmp != '\0'){
237.2.157 by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change
2069
	  argp_error(state, "Bad delay");
237.2.56 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2070
	}
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
2071
      case 132:			/* --retry */
2072
	errno = 0;
2073
	retry_interval = strtod(arg, &tmp);
2074
	if(errno != 0 or tmp == arg or *tmp != '\0'
237.7.39 by teddy at bsnet
* plugins.d/mandos-client.c (avahi_loop_with_timeout): Fix warning.
2075
	   or (retry_interval * 1000) > INT_MAX
2076
	   or retry_interval < 0){
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
2077
	  argp_error(state, "Bad retry interval");
2078
	}
237.2.56 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2079
	break;
237.16.4 by teddy at bsnet
* plugins.d/mandos-client.c (runnable_hook): Bug fix: stat using the
2080
      case 133:			/* --network-hook-dir */
2081
	hookdir = arg;
2082
	break;
237.2.157 by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change
2083
	/*
2084
	 * These reproduce what we would get without ARGP_NO_HELP
2085
	 */
2086
      case '?':			/* --help */
2087
	argp_state_help(state, state->out_stream,
2088
			(ARGP_HELP_STD_HELP | ARGP_HELP_EXIT_ERR)
2089
			& ~(unsigned int)ARGP_HELP_EXIT_OK);
2090
      case -3:			/* --usage */
2091
	argp_state_help(state, state->out_stream,
2092
			ARGP_HELP_USAGE | ARGP_HELP_EXIT_ERR);
2093
      case 'V':			/* --version */
237.15.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
2094
	fprintf_plus(state->out_stream, "%s\n", argp_program_version);
237.2.157 by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change
2095
	exit(argp_err_exit_status);
237.2.56 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2096
	break;
2097
      default:
2098
	return ARGP_ERR_UNKNOWN;
2099
      }
237.2.157 by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change
2100
      return errno;
237.2.56 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2101
    }
2102
    
2103
    struct argp argp = { .options = options, .parser = parse_opt,
2104
			 .args_doc = "",
2105
			 .doc = "Mandos client -- Get and decrypt"
2106
			 " passwords from a Mandos server" };
237.2.157 by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change
2107
    ret = argp_parse(&argp, argc, argv,
2108
		     ARGP_IN_ORDER | ARGP_NO_HELP, 0, NULL);
2109
    switch(ret){
2110
    case 0:
2111
      break;
2112
    case ENOMEM:
2113
    default:
2114
      errno = ret;
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
2115
      perror_plus("argp_parse");
237.2.157 by Teddy Hogeborn
Convert some programs to use the exit codes from <sysexits.h>. Change
2116
      exitcode = EX_OSERR;
2117
      goto end;
2118
    case EINVAL:
2119
      exitcode = EX_USAGE;
237.2.56 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2120
      goto end;
2121
    }
2122
  }
237.7.35 by Teddy Hogeborn
* initramfs-tools-script: Abort if plugin-runner is missing. Removed
2123
    
237.16.16 by teddy at bsnet
* network-hooks.d/bridge: Use "/usr/sbin/brctl" explicitly.
2124
  {
237.7.35 by Teddy Hogeborn
* initramfs-tools-script: Abort if plugin-runner is missing. Removed
2125
    /* Work around Debian bug #633582:
2126
       <http://bugs.debian.org/633582> */
2127
    
237.7.220 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
2128
    /* Re-raise privileges */
2129
    ret_errno = raise_privileges();
2130
    if(ret_errno != 0){
2131
      errno = ret_errno;
2132
      perror_plus("Failed to raise privileges");
2133
    } else {
237.16.16 by teddy at bsnet
* network-hooks.d/bridge: Use "/usr/sbin/brctl" explicitly.
2134
      struct stat st;
2135
      
2136
      if(strcmp(seckey, PATHDIR "/" SECKEY) == 0){
2137
	int seckey_fd = open(seckey, O_RDONLY);
2138
	if(seckey_fd == -1){
2139
	  perror_plus("open");
2140
	} else {
2141
	  ret = (int)TEMP_FAILURE_RETRY(fstat(seckey_fd, &st));
2142
	  if(ret == -1){
2143
	    perror_plus("fstat");
2144
	  } else {
2145
	    if(S_ISREG(st.st_mode)
2146
	       and st.st_uid == 0 and st.st_gid == 0){
2147
	      ret = fchown(seckey_fd, uid, gid);
2148
	      if(ret == -1){
2149
		perror_plus("fchown");
2150
	      }
2151
	    }
2152
	  }
2153
	  TEMP_FAILURE_RETRY(close(seckey_fd));
2154
	}
2155
      }
2156
    
2157
      if(strcmp(pubkey, PATHDIR "/" PUBKEY) == 0){
2158
	int pubkey_fd = open(pubkey, O_RDONLY);
2159
	if(pubkey_fd == -1){
2160
	  perror_plus("open");
2161
	} else {
2162
	  ret = (int)TEMP_FAILURE_RETRY(fstat(pubkey_fd, &st));
2163
	  if(ret == -1){
2164
	    perror_plus("fstat");
2165
	  } else {
2166
	    if(S_ISREG(st.st_mode)
2167
	       and st.st_uid == 0 and st.st_gid == 0){
2168
	      ret = fchown(pubkey_fd, uid, gid);
2169
	      if(ret == -1){
2170
		perror_plus("fchown");
2171
	      }
2172
	    }
2173
	  }
2174
	  TEMP_FAILURE_RETRY(close(pubkey_fd));
2175
	}
2176
      }
2177
    
237.16.11 by Teddy Hogeborn
* Makefile (run-client): Add "--network-hook-dir" option.
2178
      /* Lower privileges */
237.7.220 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
2179
      ret_errno = lower_privileges();
2180
      if(ret_errno != 0){
2181
	errno = ret_errno;
2182
	perror_plus("Failed to lower privileges");
2183
      }
237.15.3 by Teddy Hogeborn
Intermediate commit - this does *not* work yet.
2184
    }
2185
  }
2186
  
237.7.152 by Teddy Hogeborn
* plugins.d/mandos-client (start_mandos_communication): Bug fix; skip
2187
  /* Remove invalid interface names (except "none") */
237.22.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
2188
  {
2189
    char *interface = NULL;
237.7.151 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): New "interfaces" and
2190
    while((interface = argz_next(mc.interfaces, mc.interfaces_size,
237.22.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
2191
				 interface))){
237.7.152 by Teddy Hogeborn
* plugins.d/mandos-client (start_mandos_communication): Bug fix; skip
2192
      if(strcmp(interface, "none") != 0
2193
	 and if_nametoindex(interface) == 0){
2194
	if(interface[0] != '\0'){
237.22.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
2195
	  fprintf_plus(stderr, "Not using nonexisting interface"
2196
		       " \"%s\"\n", interface);
2197
	}
237.7.151 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): New "interfaces" and
2198
	argz_delete(&mc.interfaces, &mc.interfaces_size, interface);
237.22.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
2199
	interface = NULL;
2200
      }
2201
    }
2202
  }
2203
  
237.16.16 by teddy at bsnet
* network-hooks.d/bridge: Use "/usr/sbin/brctl" explicitly.
2204
  /* Run network hooks */
237.22.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
2205
  {
237.7.151 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): New "interfaces" and
2206
    if(mc.interfaces != NULL){
2207
      interfaces_hooks = malloc(mc.interfaces_size);
237.7.147 by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Bug fix: Set DEVICE environment
2208
      if(interfaces_hooks == NULL){
2209
	perror_plus("malloc");
2210
	goto end;
2211
      }
237.7.151 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): New "interfaces" and
2212
      memcpy(interfaces_hooks, mc.interfaces, mc.interfaces_size);
237.7.214 by Teddy Hogeborn
Bug fix: Free all memory and give better messages when memory is full.
2213
      argz_stringify(interfaces_hooks, mc.interfaces_size, (int)',');
237.22.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
2214
    }
237.7.220 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
2215
    run_network_hooks("start", interfaces_hooks != NULL ?
2216
		      interfaces_hooks : "", delay);
237.16.16 by teddy at bsnet
* network-hooks.d/bridge: Use "/usr/sbin/brctl" explicitly.
2217
  }
2218
  
24.1.135 by Björn Påhlsson
Earlier signal handling
2219
  if(not debug){
2220
    avahi_set_log_function(empty_log);
2221
  }
237.15.3 by Teddy Hogeborn
Intermediate commit - this does *not* work yet.
2222
  
24.1.135 by Björn Påhlsson
Earlier signal handling
2223
  /* Initialize Avahi early so avahi_simple_poll_quit() can be called
2224
     from the signal handler */
2225
  /* Initialize the pseudo-RNG for Avahi */
2226
  srand((unsigned int) time(NULL));
237.7.149 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Removed "simple_poll"
2227
  simple_poll = avahi_simple_poll_new();
2228
  if(simple_poll == NULL){
237.16.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
2229
    fprintf_plus(stderr,
2230
		 "Avahi: Failed to create simple poll object.\n");
237.2.162 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
2231
    exitcode = EX_UNAVAILABLE;
24.1.135 by Björn Påhlsson
Earlier signal handling
2232
    goto end;
2233
  }
237.2.72 by Teddy Hogeborn
Merge from Björn:
2234
  
24.1.135 by Björn Påhlsson
Earlier signal handling
2235
  sigemptyset(&sigterm_action.sa_mask);
237.2.72 by Teddy Hogeborn
Merge from Björn:
2236
  ret = sigaddset(&sigterm_action.sa_mask, SIGINT);
2237
  if(ret == -1){
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
2238
    perror_plus("sigaddset");
237.2.162 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
2239
    exitcode = EX_OSERR;
237.2.72 by Teddy Hogeborn
Merge from Björn:
2240
    goto end;
2241
  }
2242
  ret = sigaddset(&sigterm_action.sa_mask, SIGHUP);
2243
  if(ret == -1){
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
2244
    perror_plus("sigaddset");
237.2.162 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
2245
    exitcode = EX_OSERR;
237.2.72 by Teddy Hogeborn
Merge from Björn:
2246
    goto end;
2247
  }
24.1.135 by Björn Påhlsson
Earlier signal handling
2248
  ret = sigaddset(&sigterm_action.sa_mask, SIGTERM);
2249
  if(ret == -1){
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
2250
    perror_plus("sigaddset");
237.2.162 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
2251
    exitcode = EX_OSERR;
24.1.135 by Björn Påhlsson
Earlier signal handling
2252
    goto end;
2253
  }
237.2.120 by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Do not handle ignored signals.
2254
  /* Need to check if the handler is SIG_IGN before handling:
2255
     | [[info:libc:Initial Signal Actions]] |
2256
     | [[info:libc:Basic Signal Handling]]  |
2257
  */
2258
  ret = sigaction(SIGINT, NULL, &old_sigterm_action);
2259
  if(ret == -1){
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
2260
    perror_plus("sigaction");
237.2.162 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
2261
    return EX_OSERR;
237.2.120 by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Do not handle ignored signals.
2262
  }
2263
  if(old_sigterm_action.sa_handler != SIG_IGN){
2264
    ret = sigaction(SIGINT, &sigterm_action, NULL);
2265
    if(ret == -1){
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
2266
      perror_plus("sigaction");
237.2.162 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
2267
      exitcode = EX_OSERR;
237.2.120 by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Do not handle ignored signals.
2268
      goto end;
2269
    }
2270
  }
2271
  ret = sigaction(SIGHUP, NULL, &old_sigterm_action);
2272
  if(ret == -1){
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
2273
    perror_plus("sigaction");
237.2.162 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
2274
    return EX_OSERR;
237.2.120 by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Do not handle ignored signals.
2275
  }
2276
  if(old_sigterm_action.sa_handler != SIG_IGN){
2277
    ret = sigaction(SIGHUP, &sigterm_action, NULL);
2278
    if(ret == -1){
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
2279
      perror_plus("sigaction");
237.2.162 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
2280
      exitcode = EX_OSERR;
237.2.120 by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Do not handle ignored signals.
2281
      goto end;
2282
    }
2283
  }
2284
  ret = sigaction(SIGTERM, NULL, &old_sigterm_action);
2285
  if(ret == -1){
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
2286
    perror_plus("sigaction");
237.2.162 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
2287
    return EX_OSERR;
237.2.120 by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Do not handle ignored signals.
2288
  }
2289
  if(old_sigterm_action.sa_handler != SIG_IGN){
2290
    ret = sigaction(SIGTERM, &sigterm_action, NULL);
2291
    if(ret == -1){
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
2292
      perror_plus("sigaction");
237.2.162 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
2293
      exitcode = EX_OSERR;
237.2.120 by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Do not handle ignored signals.
2294
      goto end;
2295
    }
237.2.117 by Teddy Hogeborn
* plugins.d/mandos-client.c (signal_received): New.
2296
  }
237.2.56 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2297
  
237.22.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
2298
  /* If no interfaces were specified, make a list */
237.7.151 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): New "interfaces" and
2299
  if(mc.interfaces == NULL){
237.22.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
2300
    struct dirent **direntries;
2301
    /* Look for any good interfaces */
2302
    ret = scandir(sys_class_net, &direntries, good_interface,
2303
		  alphasort);
2304
    if(ret >= 1){
2305
      /* Add all found interfaces to interfaces list */
2306
      for(int i = 0; i < ret; ++i){
237.7.151 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): New "interfaces" and
2307
	ret_errno = argz_add(&mc.interfaces, &mc.interfaces_size,
237.22.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
2308
			     direntries[i]->d_name);
2309
	if(ret_errno != 0){
237.7.214 by Teddy Hogeborn
Bug fix: Free all memory and give better messages when memory is full.
2310
	  errno = ret_errno;
237.22.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
2311
	  perror_plus("argz_add");
2312
	  continue;
2313
	}
2314
	if(debug){
2315
	  fprintf_plus(stderr, "Will use interface \"%s\"\n",
2316
		       direntries[i]->d_name);
2317
	}
2318
      }
2319
      free(direntries);
2320
    } else {
2321
      free(direntries);
2322
      fprintf_plus(stderr, "Could not find a network interface\n");
2323
      exitcode = EXIT_FAILURE;
2324
      goto end;
2325
    }
2326
  }
2327
  
237.7.153 by Teddy Hogeborn
* plugins.d/mandos-client.c: Comment changes
2328
  /* Bring up interfaces which are down, and remove any "none"s */
237.7.152 by Teddy Hogeborn
* plugins.d/mandos-client (start_mandos_communication): Bug fix; skip
2329
  {
237.22.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
2330
    char *interface = NULL;
237.7.151 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): New "interfaces" and
2331
    while((interface = argz_next(mc.interfaces, mc.interfaces_size,
237.22.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
2332
				 interface))){
237.7.152 by Teddy Hogeborn
* plugins.d/mandos-client (start_mandos_communication): Bug fix; skip
2333
      /* If interface name is "none", stop bringing up interfaces.
2334
	 Also remove all instances of "none" from the list */
2335
      if(strcmp(interface, "none") == 0){
2336
	argz_delete(&mc.interfaces, &mc.interfaces_size,
2337
		    interface);
2338
	interface = NULL;
2339
	while((interface = argz_next(mc.interfaces,
2340
				     mc.interfaces_size, interface))){
2341
	  if(strcmp(interface, "none") == 0){
2342
	    argz_delete(&mc.interfaces, &mc.interfaces_size,
2343
			interface);
2344
	    interface = NULL;
2345
	  }
2346
	}
2347
	break;
2348
      }
237.22.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
2349
      bool interface_was_up = interface_is_up(interface);
237.7.220 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
2350
      errno = bring_up_interface(interface, delay);
237.22.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
2351
      if(not interface_was_up){
237.7.220 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
2352
	if(errno != 0){
237.22.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
2353
	  perror_plus("Failed to bring up interface");
2354
	} else {
237.7.220 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
2355
	  errno = argz_add(&interfaces_to_take_down,
2356
			   &interfaces_to_take_down_size,
2357
			   interface);
2358
	  if(errno != 0){
237.7.214 by Teddy Hogeborn
Bug fix: Free all memory and give better messages when memory is full.
2359
	    perror_plus("argz_add");
2360
	  }
237.22.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
2361
	}
2362
      }
2363
    }
2364
    if(debug and (interfaces_to_take_down == NULL)){
2365
      fprintf_plus(stderr, "No interfaces were brought up\n");
237.2.128 by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Bug fix: Check result of setgid().
2366
    }
237.2.56 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2367
  }
2368
  
237.7.152 by Teddy Hogeborn
* plugins.d/mandos-client (start_mandos_communication): Bug fix; skip
2369
  /* If we only got one interface, explicitly use only that one */
2370
  if(argz_count(mc.interfaces, mc.interfaces_size) == 1){
2371
    if(debug){
2372
      fprintf_plus(stderr, "Using only interface \"%s\"\n",
2373
		   mc.interfaces);
2374
    }
2375
    if_index = (AvahiIfIndex)if_nametoindex(mc.interfaces);
2376
  }
2377
  
237.2.116 by Teddy Hogeborn
* plugins.d/mandos-client.c (quit_now): Move up declaration before
2378
  if(quit_now){
2379
    goto end;
2380
  }
2381
  
237.7.150 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
2382
  ret = init_gnutls_global(pubkey, seckey, &mc);
237.2.56 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2383
  if(ret == -1){
237.15.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
2384
    fprintf_plus(stderr, "init_gnutls_global failed\n");
237.2.162 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
2385
    exitcode = EX_UNAVAILABLE;
237.2.56 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2386
    goto end;
2387
  } else {
2388
    gnutls_initialized = true;
2389
  }
2390
  
237.2.116 by Teddy Hogeborn
* plugins.d/mandos-client.c (quit_now): Move up declaration before
2391
  if(quit_now){
2392
    goto end;
2393
  }
2394
  
237.7.221 by Teddy Hogeborn
Make mandos-client prefer /run/tmp over /tmp.
2395
  /* Try /run/tmp before /tmp */
2396
  tempdir = mkdtemp(run_tempdir);
2397
  if(tempdir == NULL and errno == ENOENT){
2398
      if(debug){
2399
	fprintf_plus(stderr, "Tempdir %s did not work, trying %s\n",
2400
		     run_tempdir, old_tempdir);
2401
      }
2402
      tempdir = mkdtemp(old_tempdir);
2403
  }
2404
  if(tempdir == NULL){
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
2405
    perror_plus("mkdtemp");
237.2.56 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2406
    goto end;
2407
  }
237.2.116 by Teddy Hogeborn
* plugins.d/mandos-client.c (quit_now): Move up declaration before
2408
  
2409
  if(quit_now){
2410
    goto end;
2411
  }
237.2.56 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2412
  
237.7.150 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
2413
  if(not init_gpgme(pubkey, seckey, tempdir, &mc)){
237.15.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
2414
    fprintf_plus(stderr, "init_gpgme failed\n");
237.2.162 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
2415
    exitcode = EX_UNAVAILABLE;
237.2.56 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2416
    goto end;
2417
  } else {
2418
    gpgme_initialized = true;
2419
  }
2420
  
237.2.116 by Teddy Hogeborn
* plugins.d/mandos-client.c (quit_now): Move up declaration before
2421
  if(quit_now){
2422
    goto end;
237.2.56 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2423
  }
2424
  
2425
  if(connect_to != NULL){
2426
    /* Connect directly, do not use Zeroconf */
2427
    /* (Mainly meant for debugging) */
2428
    char *address = strrchr(connect_to, ':');
237.22.1 by Teddy Hogeborn
* plugins.d/mandos-client.c: Refactoring.
2429
    
237.2.56 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2430
    if(address == NULL){
237.15.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
2431
      fprintf_plus(stderr, "No colon in address\n");
237.2.162 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
2432
      exitcode = EX_USAGE;
237.2.56 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2433
      goto end;
2434
    }
237.2.116 by Teddy Hogeborn
* plugins.d/mandos-client.c (quit_now): Move up declaration before
2435
    
2436
    if(quit_now){
2437
      goto end;
2438
    }
2439
    
237.7.145 by Teddy Hogeborn
* plugins.d/mandos-client.c: Don't use assert(). Use in_port_t for
2440
    in_port_t port;
237.2.74 by Teddy Hogeborn
Overflows are not detected by sscanf(), so stop using it:
2441
    errno = 0;
2442
    tmpmax = strtoimax(address+1, &tmp, 10);
2443
    if(errno != 0 or tmp == address+1 or *tmp != '\0'
237.7.145 by Teddy Hogeborn
* plugins.d/mandos-client.c: Don't use assert(). Use in_port_t for
2444
       or tmpmax != (in_port_t)tmpmax){
237.15.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
2445
      fprintf_plus(stderr, "Bad port number\n");
237.2.162 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
2446
      exitcode = EX_USAGE;
237.2.56 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2447
      goto end;
2448
    }
237.7.152 by Teddy Hogeborn
* plugins.d/mandos-client (start_mandos_communication): Bug fix; skip
2449
    
237.2.116 by Teddy Hogeborn
* plugins.d/mandos-client.c (quit_now): Move up declaration before
2450
    if(quit_now){
2451
      goto end;
2452
    }
2453
    
237.7.145 by Teddy Hogeborn
* plugins.d/mandos-client.c: Don't use assert(). Use in_port_t for
2454
    port = (in_port_t)tmpmax;
237.2.56 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2455
    *address = '\0';
237.2.67 by Teddy Hogeborn
Four new interrelated features:
2456
    /* Colon in address indicates IPv6 */
2457
    int af;
237.7.39 by teddy at bsnet
* plugins.d/mandos-client.c (avahi_loop_with_timeout): Fix warning.
2458
    if(strchr(connect_to, ':') != NULL){
237.2.67 by Teddy Hogeborn
Four new interrelated features:
2459
      af = AF_INET6;
237.7.39 by teddy at bsnet
* plugins.d/mandos-client.c (avahi_loop_with_timeout): Fix warning.
2460
      /* Accept [] around IPv6 address - see RFC 5952 */
2461
      if(connect_to[0] == '[' and address[-1] == ']')
2462
	{
2463
	  connect_to++;
2464
	  address[-1] = '\0';
2465
	}
237.2.67 by Teddy Hogeborn
Four new interrelated features:
2466
    } else {
2467
      af = AF_INET;
2468
    }
237.7.39 by teddy at bsnet
* plugins.d/mandos-client.c (avahi_loop_with_timeout): Fix warning.
2469
    address = connect_to;
237.2.116 by Teddy Hogeborn
* plugins.d/mandos-client.c (quit_now): Move up declaration before
2470
    
2471
    if(quit_now){
2472
      goto end;
2473
    }
237.7.39 by teddy at bsnet
* plugins.d/mandos-client.c (avahi_loop_with_timeout): Fix warning.
2474
    
24.1.163 by Björn Påhlsson
mandos-client: Added never ending loop for --connect
2475
    while(not quit_now){
237.7.150 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
2476
      ret = start_mandos_communication(address, port, if_index, af,
2477
				       &mc);
24.1.163 by Björn Påhlsson
mandos-client: Added never ending loop for --connect
2478
      if(quit_now or ret == 0){
237.2.162 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
2479
	break;
2480
      }
237.7.39 by teddy at bsnet
* plugins.d/mandos-client.c (avahi_loop_with_timeout): Fix warning.
2481
      if(debug){
237.16.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
2482
	fprintf_plus(stderr, "Retrying in %d seconds\n",
2483
		     (int)retry_interval);
237.7.39 by teddy at bsnet
* plugins.d/mandos-client.c (avahi_loop_with_timeout): Fix warning.
2484
      }
237.7.168 by Teddy Hogeborn
* plugin-runner.c (main): Bug fix; do not ignore return value of
2485
      sleep((unsigned int)retry_interval);
237.7.40 by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Do not even try to work around
2486
    }
2487
    
237.7.219 by Teddy Hogeborn
White space fix: change "if (" to "if(" in C code.
2488
    if(not quit_now){
237.2.56 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2489
      exitcode = EXIT_SUCCESS;
2490
    }
237.15.3 by Teddy Hogeborn
Intermediate commit - this does *not* work yet.
2491
    
237.2.56 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2492
    goto end;
2493
  }
237.2.116 by Teddy Hogeborn
* plugins.d/mandos-client.c (quit_now): Move up declaration before
2494
  
2495
  if(quit_now){
2496
    goto end;
2497
  }
2498
  
237.2.56 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2499
  {
2500
    AvahiServerConfig config;
2501
    /* Do not publish any local Zeroconf records */
2502
    avahi_server_config_init(&config);
2503
    config.publish_hinfo = 0;
2504
    config.publish_addresses = 0;
2505
    config.publish_workstation = 0;
2506
    config.publish_domain = 0;
2507
    
2508
    /* Allocate a new server */
237.7.149 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Removed "simple_poll"
2509
    mc.server = avahi_server_new(avahi_simple_poll_get(simple_poll),
2510
				 &config, NULL, NULL, &ret_errno);
237.2.56 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2511
    
2512
    /* Free the Avahi configuration data */
2513
    avahi_server_config_free(&config);
2514
  }
2515
  
2516
  /* Check if creating the Avahi server object succeeded */
2517
  if(mc.server == NULL){
237.15.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
2518
    fprintf_plus(stderr, "Failed to create Avahi server: %s\n",
237.22.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
2519
		 avahi_strerror(ret_errno));
237.2.162 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
2520
    exitcode = EX_UNAVAILABLE;
237.2.56 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2521
    goto end;
2522
  }
2523
  
237.2.116 by Teddy Hogeborn
* plugins.d/mandos-client.c (quit_now): Move up declaration before
2524
  if(quit_now){
2525
    goto end;
2526
  }
2527
  
237.2.56 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2528
  /* Create the Avahi service browser */
2529
  sb = avahi_s_service_browser_new(mc.server, if_index,
237.2.76 by Teddy Hogeborn
* plugins.d/mandos-client.c (browse_callback, main): Do not require
2530
				   AVAHI_PROTO_UNSPEC, "_mandos._tcp",
237.7.150 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
2531
				   NULL, 0, browse_callback,
2532
				   (void *)&mc);
237.2.56 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2533
  if(sb == NULL){
237.15.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
2534
    fprintf_plus(stderr, "Failed to create service browser: %s\n",
237.16.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
2535
		 avahi_strerror(avahi_server_errno(mc.server)));
237.2.162 by Teddy Hogeborn
* Makefile (BROKEN_PIE): Add comment.
2536
    exitcode = EX_UNAVAILABLE;
237.2.56 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2537
    goto end;
2538
  }
237.2.70 by Teddy Hogeborn
Merge from Björn:
2539
  
237.2.116 by Teddy Hogeborn
* plugins.d/mandos-client.c (quit_now): Move up declaration before
2540
  if(quit_now){
2541
    goto end;
2542
  }
2543
  
237.2.56 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2544
  /* Run the main loop */
2545
  
2546
  if(debug){
237.15.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
2547
    fprintf_plus(stderr, "Starting Avahi loop search\n");
237.2.56 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2548
  }
237.7.235 by Teddy Hogeborn
White space fix only.
2549
  
237.7.149 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Removed "simple_poll"
2550
  ret = avahi_loop_with_timeout(simple_poll,
237.7.150 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Moved to inside "main()".
2551
				(int)(retry_interval * 1000), &mc);
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
2552
  if(debug){
237.15.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
2553
    fprintf_plus(stderr, "avahi_loop_with_timeout exited %s\n",
237.16.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
2554
		 (ret == 0) ? "successfully" : "with error");
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
2555
  }
237.2.56 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2556
  
40 by Teddy Hogeborn
* plugins.d/mandosclient.c (initgnutls): Moved "err" variable into its
2557
 end:
237.2.56 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2558
  
2559
  if(debug){
237.15.6 by Björn Påhlsson
replace calls to fprintf with fprintf_plus.
2560
    fprintf_plus(stderr, "%s exiting\n", argv[0]);
237.2.56 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2561
  }
2562
  
2563
  /* Cleanup things */
237.7.152 by Teddy Hogeborn
* plugins.d/mandos-client (start_mandos_communication): Bug fix; skip
2564
  free(mc.interfaces);
2565
  
237.2.56 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2566
  if(sb != NULL)
2567
    avahi_s_service_browser_free(sb);
2568
  
2569
  if(mc.server != NULL)
2570
    avahi_server_free(mc.server);
2571
  
237.7.149 by Teddy Hogeborn
* plugins.d/mandos-client (mandos_context): Removed "simple_poll"
2572
  if(simple_poll != NULL)
2573
    avahi_simple_poll_free(simple_poll);
237.2.56 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2574
  
2575
  if(gnutls_initialized){
2576
    gnutls_certificate_free_credentials(mc.cred);
2577
    gnutls_global_deinit();
2578
    gnutls_dh_params_deinit(mc.dh_params);
2579
  }
2580
  
2581
  if(gpgme_initialized){
2582
    gpgme_release(mc.ctx);
2583
  }
237.16.12 by Teddy Hogeborn
* plugins.d/mandos-client.c (runnable_hook): Add debug output.
2584
  
237.7.33 by Teddy Hogeborn
Merge from Björn.
2585
  /* Cleans up the circular linked list of Mandos servers the client
2586
     has seen */
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
2587
  if(mc.current_server != NULL){
2588
    mc.current_server->prev->next = NULL;
2589
    while(mc.current_server != NULL){
2590
      server *next = mc.current_server->next;
2591
      free(mc.current_server);
2592
      mc.current_server = next;
2593
    }
2594
  }
237.2.56 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2595
  
237.7.220 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
2596
  /* Re-raise privileges */
237.16.8 by Teddy Hogeborn
* plugins.d/mandos-client.c (run_network_hooks): New.
2597
  {
237.7.220 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
2598
    ret_errno = raise_privileges();
2599
    if(ret_errno != 0){
2600
      perror_plus("Failed to raise privileges");
2601
    } else {
2602
      
2603
      /* Run network hooks */
2604
      run_network_hooks("stop", interfaces_hooks != NULL ?
2605
			interfaces_hooks : "", delay);
2606
      
2607
      /* Take down the network interfaces which were brought up */
2608
      {
2609
	char *interface = NULL;
2610
	while((interface=argz_next(interfaces_to_take_down,
2611
				   interfaces_to_take_down_size,
2612
				   interface))){
2613
	  ret_errno = take_down_interface(interface);
2614
	  if(ret_errno != 0){
2615
	    errno = ret_errno;
2616
	    perror_plus("Failed to take down interface");
2617
	  }
2618
	}
2619
	if(debug and (interfaces_to_take_down == NULL)){
2620
	  fprintf_plus(stderr, "No interfaces needed to be taken"
2621
		       " down\n");
2622
	}
2623
      }
2624
    }
237.7.228 by Teddy Hogeborn
Minor changes to minimize diff from last release.
2625
    
237.7.220 by Teddy Hogeborn
Update GCC warning flags and function attributes to GCC 4.7.
2626
    ret_errno = lower_privileges_permanently();
2627
    if(ret_errno != 0){
2628
      perror_plus("Failed to lower privileges permanently");
2629
    }
237.22.4 by Teddy Hogeborn
* plugins.d/mandos-client.c (get_flags): Don't clobber errno.
2630
  }
2631
  
2632
  free(interfaces_to_take_down);
2633
  free(interfaces_hooks);
237.2.113 by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Take down network interface on
2634
  
24.1.172 by Björn Påhlsson
using scandir instead of readdir
2635
  /* Removes the GPGME temp directory and all files inside */
237.7.221 by Teddy Hogeborn
Make mandos-client prefer /run/tmp over /tmp.
2636
  if(tempdir != NULL){
24.1.172 by Björn Påhlsson
using scandir instead of readdir
2637
    struct dirent **direntries = NULL;
2638
    struct dirent *direntry = NULL;
237.7.40 by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Do not even try to work around
2639
    int numentries = scandir(tempdir, &direntries, notdotentries,
2640
			     alphasort);
237.7.219 by Teddy Hogeborn
White space fix: change "if (" to "if(" in C code.
2641
    if(numentries > 0){
237.7.40 by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Do not even try to work around
2642
      for(int i = 0; i < numentries; i++){
24.1.172 by Björn Påhlsson
using scandir instead of readdir
2643
	direntry = direntries[i];
237.2.56 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2644
	char *fullname = NULL;
2645
	ret = asprintf(&fullname, "%s/%s", tempdir,
2646
		       direntry->d_name);
2647
	if(ret < 0){
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
2648
	  perror_plus("asprintf");
237.2.56 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2649
	  continue;
2650
	}
2651
	ret = remove(fullname);
2652
	if(ret == -1){
237.16.9 by Teddy Hogeborn
* plugins.d/mandos-client.c: Merge unified printing system.
2653
	  fprintf_plus(stderr, "remove(\"%s\"): %s\n", fullname,
2654
		       strerror(errno));
237.2.56 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2655
	}
2656
	free(fullname);
2657
      }
24.1.172 by Björn Påhlsson
using scandir instead of readdir
2658
    }
237.7.235 by Teddy Hogeborn
White space fix only.
2659
    
237.7.40 by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Do not even try to work around
2660
    /* need to clean even if 0 because man page doesn't specify */
24.1.172 by Björn Påhlsson
using scandir instead of readdir
2661
    free(direntries);
237.7.219 by Teddy Hogeborn
White space fix: change "if (" to "if(" in C code.
2662
    if(numentries == -1){
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
2663
      perror_plus("scandir");
237.2.56 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2664
    }
2665
    ret = rmdir(tempdir);
2666
    if(ret == -1 and errno != ENOENT){
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
2667
      perror_plus("rmdir");
237.2.56 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2668
    }
2669
  }
2670
  
237.2.117 by Teddy Hogeborn
* plugins.d/mandos-client.c (signal_received): New.
2671
  if(quit_now){
237.2.120 by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Do not handle ignored signals.
2672
    sigemptyset(&old_sigterm_action.sa_mask);
2673
    old_sigterm_action.sa_handler = SIG_DFL;
237.2.137 by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Try harder to raise signal on
2674
    ret = (int)TEMP_FAILURE_RETRY(sigaction(signal_received,
2675
					    &old_sigterm_action,
2676
					    NULL));
237.2.117 by Teddy Hogeborn
* plugins.d/mandos-client.c (signal_received): New.
2677
    if(ret == -1){
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
2678
      perror_plus("sigaction");
237.2.117 by Teddy Hogeborn
* plugins.d/mandos-client.c (signal_received): New.
2679
    }
237.2.137 by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Try harder to raise signal on
2680
    do {
2681
      ret = raise(signal_received);
2682
    } while(ret != 0 and errno == EINTR);
2683
    if(ret != 0){
24.1.174 by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library.
2684
      perror_plus("raise");
237.2.137 by Teddy Hogeborn
* plugins.d/mandos-client.c (main): Try harder to raise signal on
2685
      abort();
2686
    }
2687
    TEMP_FAILURE_RETRY(pause());
237.2.117 by Teddy Hogeborn
* plugins.d/mandos-client.c (signal_received): New.
2688
  }
2689
  
237.2.56 by Teddy Hogeborn
* plugin-runner.c: Whitespace changes only.
2690
  return exitcode;
13 by Björn Påhlsson
Added following support:
2691
}