summaryrefslogtreecommitdiff
path: root/src/nss-myhostname
diff options
context:
space:
mode:
authorDave Reisner <dreisner@archlinux.org>2013-04-19 16:31:25 -0400
committerDave Reisner <dreisner@archlinux.org>2013-04-19 16:31:52 -0400
commit1e335af70f29d1a1e9c132338aa35b8971934441 (patch)
tree535629fb824fec91e0a8a1815a86d17b6dd39e64 /src/nss-myhostname
parent7f6437976d31fa772ccef9abedd152d6f5372303 (diff)
nss-myhostname: ensure that glibc's assert is used
Diffstat (limited to 'src/nss-myhostname')
-rw-r--r--src/nss-myhostname/nss-myhostname.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/nss-myhostname/nss-myhostname.c b/src/nss-myhostname/nss-myhostname.c
index 16ccb3ee39..8699098b54 100644
--- a/src/nss-myhostname/nss-myhostname.c
+++ b/src/nss-myhostname/nss-myhostname.c
@@ -25,7 +25,6 @@
#include <netdb.h>
#include <errno.h>
#include <string.h>
-#include <assert.h>
#include <unistd.h>
#include <net/if.h>
#include <stdlib.h>
@@ -35,6 +34,11 @@
#include "macro.h"
#include "util.h"
+/* Ensure that glibc's assert is used. We cannot use assert from macro.h, as
+ * libnss_myhostname will be linked into arbitrary programs which will, in turn
+ * attempt to write to the journal via log_dispatch() */
+#include <assert.h>
+
/* We use 127.0.0.2 as IPv4 address. This has the advantage over
* 127.0.0.1 that it can be translated back to the local hostname. For
* IPv6 we use ::1 which unfortunately will not translate back to the