diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2017-06-15 17:44:59 +0200 |
|---|---|---|
| committer | Sven Eden <yamakuzure@gmx.net> | 2017-07-25 09:46:52 +0200 |
| commit | 1ea8dbd9cd30a46d8f410a7f651bd3e730d2378a (patch) | |
| tree | cf911388b34e2a03a723fd9d13b9498e8ab8595c | |
| parent | 94678e2009c5eb2fa259d4f74f7b055ddda38d9e (diff) | |
Make IDN support conditional
[zj: rename HAVE_IDN to ENABLE_IDN]
| -rw-r--r-- | src/basic/socket-util.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/basic/socket-util.c b/src/basic/socket-util.c index d392da2a4..23e960e02 100644 --- a/src/basic/socket-util.c +++ b/src/basic/socket-util.c @@ -44,9 +44,16 @@ #include "string-util.h" #include "strv.h" #include "user-util.h" +//#include "utf8.h" #include "util.h" #if 0 /// UNNEEDED by elogind +#ifdef ENABLE_IDN +# define IDN_FLAGS (NI_IDN|NI_IDN_USE_STD3_ASCII_RULES) +#else +# define IDN_FLAGS 0 +#endif + int socket_address_parse(SocketAddress *a, const char *s) { char *e, *n; unsigned u; @@ -722,8 +729,7 @@ int socknameinfo_pretty(union sockaddr_union *sa, socklen_t salen, char **_ret) assert(_ret); - r = getnameinfo(&sa->sa, salen, host, sizeof(host), NULL, 0, - NI_IDN|NI_IDN_USE_STD3_ASCII_RULES); + r = getnameinfo(&sa->sa, salen, host, sizeof(host), NULL, 0, IDN_FLAGS); if (r != 0) { int saved_errno = errno; |