diff options
author | Sergey Poznyakoff <gray@gnu.org> | 2017-08-15 08:13:40 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org> | 2017-08-15 08:13:40 +0300 |
commit | 03a9d11a59cec2047ec1282e0dfa76ef1f248a18 (patch) | |
tree | e1bb32b95c9edb5a2cbceb46b27ffd5d1227ac91 | |
parent | 5d9f2f079856185cf6530e1807f2dfe26bd05996 (diff) | |
download | nssync-03a9d11a59cec2047ec1282e0dfa76ef1f248a18.tar.gz nssync-03a9d11a59cec2047ec1282e0dfa76ef1f248a18.tar.bz2 |
Fix build without libmicrohttpd
-rw-r--r-- | src/Makefile.am | 2 | ||||
-rw-r--r-- | src/noserver.c | 8 | ||||
-rw-r--r-- | src/nssync.c | 1 | ||||
-rw-r--r-- | src/server.c | 2 |
4 files changed, 11 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 8aa4e09..e2e3783 100644 --- a/src/Makefile.am +++ b/src/Makefile.am | |||
@@ -26,6 +26,8 @@ nssync_SOURCES = \ | |||
26 | 26 | ||
27 | if COND_MICROHTTPD | 27 | if COND_MICROHTTPD |
28 | nssync_SOURCES += server.c | 28 | nssync_SOURCES += server.c |
29 | else | ||
30 | nssync_SOURCES += noserver.c | ||
29 | endif | 31 | endif |
30 | 32 | ||
31 | LDADD=@GRECS_LDADD@ ../runcap/libruncap.a | 33 | LDADD=@GRECS_LDADD@ ../runcap/libruncap.a |
diff --git a/src/noserver.c b/src/noserver.c new file mode 100644 index 0000000..5b43508 --- /dev/null +++ b/src/noserver.c | |||
@@ -0,0 +1,8 @@ | |||
1 | #include "nssync.h" | ||
2 | |||
3 | void | ||
4 | nssync_server(void) | ||
5 | { | ||
6 | error("compiled without HTTPD support"); | ||
7 | exit(EX_UNAVAILABLE); | ||
8 | } | ||
diff --git a/src/nssync.c b/src/nssync.c index 8cd9939..e18100c 100644 --- a/src/nssync.c +++ b/src/nssync.c | |||
@@ -33,6 +33,7 @@ struct json_value *error_list; | |||
33 | struct json_value *changed_zones; | 33 | struct json_value *changed_zones; |
34 | int check_ns; | 34 | int check_ns; |
35 | int server_mode; | 35 | int server_mode; |
36 | struct grecs_sockaddr *server_addr; | ||
36 | 37 | ||
37 | #include "cmdline.h" | 38 | #include "cmdline.h" |
38 | 39 | ||
diff --git a/src/server.c b/src/server.c index 6db8da6..ae0d755 100644 --- a/src/server.c +++ b/src/server.c | |||
@@ -7,8 +7,6 @@ | |||
7 | #define MHD_PLATFORM_H | 7 | #define MHD_PLATFORM_H |
8 | #include <microhttpd.h> | 8 | #include <microhttpd.h> |
9 | 9 | ||
10 | struct grecs_sockaddr *server_addr; | ||
11 | |||
12 | static int | 10 | static int |
13 | setup_listen_socket(struct grecs_sockaddr *sa, int fd) | 11 | setup_listen_socket(struct grecs_sockaddr *sa, int fd) |
14 | { | 12 | { |