chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7f64379
)
nss-myhostname: ensure that glibc's assert is used
author
Dave Reisner
<dreisner@archlinux.org>
Fri, 19 Apr 2013 20:31:25 +0000
(16:31 -0400)
committer
Dave Reisner
<dreisner@archlinux.org>
Fri, 19 Apr 2013 20:31:52 +0000
(16:31 -0400)
src/nss-myhostname/nss-myhostname.c
patch
|
blob
|
history
diff --git
a/src/nss-myhostname/nss-myhostname.c
b/src/nss-myhostname/nss-myhostname.c
index 16ccb3ee39db42fe95c8da3609411bdb89c01d17..8699098b5478407c3a7d3a07d9773a413f5e6e58 100644
(file)
--- 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 <netdb.h>
#include <errno.h>
#include <string.h>
-#include <assert.h>
#include <unistd.h>
#include <net/if.h>
#include <stdlib.h>
#include <unistd.h>
#include <net/if.h>
#include <stdlib.h>
@@
-35,6
+34,11
@@
#include "macro.h"
#include "util.h"
#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
/* 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