Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 1 | From b7c6bfe2ec5ae426e586e1d6ecadb52a97128a3f Mon Sep 17 00:00:00 2001 |
Khem Raj | 1766350 | 2016-11-28 13:26:06 -0800 | [diff] [blame] | 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Wed, 9 Nov 2016 20:49:53 -0800 |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 4 | Subject: [PATCH 13/14] socket-util: don't fail if libc doesn't support IDN |
Khem Raj | 1766350 | 2016-11-28 13:26:06 -0800 | [diff] [blame] | 5 | |
| 6 | Upstream-Status: Pending |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 7 | |
| 8 | Signed-off-by: Emil Renner Berthing <systemd@esmil.dk> |
| 9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 10 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 11 | --- |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 12 | src/basic/socket-util.c | 9 +++++++++ |
| 13 | 1 file changed, 9 insertions(+) |
| 14 | |
| 15 | diff --git a/src/basic/socket-util.c b/src/basic/socket-util.c |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 16 | index 016e64aa0..d4658826e 100644 |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 17 | --- a/src/basic/socket-util.c |
| 18 | +++ b/src/basic/socket-util.c |
Khem Raj | 1766350 | 2016-11-28 13:26:06 -0800 | [diff] [blame] | 19 | @@ -47,6 +47,15 @@ |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 20 | #include "user-util.h" |
Khem Raj | 1766350 | 2016-11-28 13:26:06 -0800 | [diff] [blame] | 21 | #include "utf8.h" |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 22 | #include "util.h" |
| 23 | +/* Don't fail if the standard library |
| 24 | + * doesn't support IDN */ |
| 25 | +#ifndef NI_IDN |
| 26 | +#define NI_IDN 0 |
| 27 | +#endif |
| 28 | + |
| 29 | +#ifndef NI_IDN_USE_STD3_ASCII_RULES |
| 30 | +#define NI_IDN_USE_STD3_ASCII_RULES 0 |
| 31 | +#endif |
| 32 | |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 33 | #ifdef ENABLE_IDN |
| 34 | # define IDN_FLAGS (NI_IDN|NI_IDN_USE_STD3_ASCII_RULES) |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 35 | -- |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 36 | 2.13.2 |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 37 | |