diff options
Diffstat (limited to 'src/gns')
-rw-r--r-- | src/gns/Makefile.am | 9 | ||||
-rw-r--r-- | src/gns/gnunet-gns-proxy-setup-ca.in | 20 | ||||
-rw-r--r-- | src/gns/gnunet-gns.c | 8 | ||||
-rwxr-xr-x | src/gns/test_gnunet_gns.sh.in | 6 |
4 files changed, 21 insertions, 22 deletions
diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am index 9f0e0bbb6..abd5d5b48 100644 --- a/src/gns/Makefile.am +++ b/src/gns/Makefile.am | |||
@@ -103,17 +103,12 @@ plugin_LTLIBRARIES = \ | |||
103 | bin_SCRIPTS = \ | 103 | bin_SCRIPTS = \ |
104 | gnunet-gns-proxy-setup-ca | 104 | gnunet-gns-proxy-setup-ca |
105 | 105 | ||
106 | # See: https://www.gnu.org/software/automake/manual/html_node/Scripts.html#Scripts | ||
107 | do_subst = $(SED) -e 's,[@]pkgdatadir[@],$(pkgdatadir),g' | ||
108 | |||
109 | gnunet-gns-proxy-setup-ca: gnunet-gns-proxy-setup-ca.in Makefile | 106 | gnunet-gns-proxy-setup-ca: gnunet-gns-proxy-setup-ca.in Makefile |
110 | $(do_subst) < $(srcdir)/gnunet-gns-proxy-setup-ca.in > gnunet-gns-proxy-setup-ca | 107 | $(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)" -v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/bin/dosubst.awk < $(srcdir)/gnunet-gns-proxy-setup-ca.in > gnunet-gns-proxy-setup-ca |
111 | @chmod +x gnunet-gns-proxy-setup-ca | 108 | @chmod +x gnunet-gns-proxy-setup-ca |
112 | 109 | ||
113 | do_subst_pkgdatadir = $(SED) -e 's,[@]pkgdatadir[@],$(pkgdatadir),g' | ||
114 | |||
115 | test_gnunet_gns.sh: test_gnunet_gns.sh.in Makefile | 110 | test_gnunet_gns.sh: test_gnunet_gns.sh.in Makefile |
116 | $(do_subst_pkgdatadir) < $(srcdir)/test_gnunet_gns.sh.in > test_gnunet_gns.sh | 111 | $(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)" -v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/bin/dosubst.awk < $(srcdir)/test_gnunet_gns.sh.in > test_gnunet_gns.sh |
117 | @chmod +x test_gnunet_gns.sh | 112 | @chmod +x test_gnunet_gns.sh |
118 | 113 | ||
119 | CLEANFILES = test_gnunet_gns.sh | 114 | CLEANFILES = test_gnunet_gns.sh |
diff --git a/src/gns/gnunet-gns-proxy-setup-ca.in b/src/gns/gnunet-gns-proxy-setup-ca.in index 7a79c7994..602aadb2a 100644 --- a/src/gns/gnunet-gns-proxy-setup-ca.in +++ b/src/gns/gnunet-gns-proxy-setup-ca.in | |||
@@ -48,30 +48,30 @@ | |||
48 | 48 | ||
49 | dir=$(dirname "$0") | 49 | dir=$(dirname "$0") |
50 | 50 | ||
51 | if test -e @pkgdatadir@/progname.sh | 51 | if test -e @PKGDATADIRECTORY@/progname.sh |
52 | then | 52 | then |
53 | . @pkgdatadir@/progname.sh | 53 | . @PKGDATADIRECTORY@/progname.sh |
54 | else | 54 | else |
55 | . $dir/../../contrib/build-common/sh/lib.sh/progname.sh | 55 | . $dir/../../contrib/build-common/sh/lib.sh/progname.sh |
56 | fi | 56 | fi |
57 | 57 | ||
58 | if test -e @pkgdatadir@/existence.sh | 58 | if test -e @PKGDATADIRECTORY@/existence.sh |
59 | then | 59 | then |
60 | . @pkgdatadir@/existence.sh | 60 | . @PKGDATADIRECTORY@/existence.sh |
61 | else | 61 | else |
62 | . $dir/../../contrib/build-common/sh/lib.sh/existence.sh | 62 | . $dir/../../contrib/build-common/sh/lib.sh/existence.sh |
63 | fi | 63 | fi |
64 | 64 | ||
65 | if test -e @pkgdatadir@/msg.sh | 65 | if test -e @PKGDATADIRECTORY@/msg.sh |
66 | then | 66 | then |
67 | . @pkgdatadir@/msg.sh | 67 | . @PKGDATADIRECTORY@/msg.sh |
68 | else | 68 | else |
69 | . $dir/../../contrib/build-common/sh/lib.sh/msg.sh | 69 | . $dir/../../contrib/build-common/sh/lib.sh/msg.sh |
70 | fi | 70 | fi |
71 | 71 | ||
72 | if test -e @pkgdatadir@/version_gnunet.sh | 72 | if test -e @PKGDATADIRECTORY@/version_gnunet.sh |
73 | then | 73 | then |
74 | . @pkgdatadir@/version_gnunet.sh | 74 | . @PKGDATADIRECTORY@/version_gnunet.sh |
75 | else | 75 | else |
76 | . $dir/../../contrib/build-common/sh/lib.sh/version_gnunet.sh | 76 | . $dir/../../contrib/build-common/sh/lib.sh/version_gnunet.sh |
77 | fi | 77 | fi |
@@ -143,8 +143,8 @@ generate_ca() | |||
143 | 143 | ||
144 | # ------------- openssl | 144 | # ------------- openssl |
145 | 145 | ||
146 | GNUTLS_CA_TEMPLATE=@pkgdatadir@/gnunet-gns-proxy-ca.template | 146 | GNUTLS_CA_TEMPLATE=@PKGDATADIRECTORY@/gnunet-gns-proxy-ca.template |
147 | OPENSSLCFG=@pkgdatadir@/openssl.cnf | 147 | OPENSSLCFG=@PKGDATADIRECTORY@/openssl.cnf |
148 | CERTTOOL="" | 148 | CERTTOOL="" |
149 | OPENSSL=0 | 149 | OPENSSL=0 |
150 | if test -x $(existence gnunet-certtool) | 150 | if test -x $(existence gnunet-certtool) |
diff --git a/src/gns/gnunet-gns.c b/src/gns/gnunet-gns.c index fe51013ed..600a9c9a5 100644 --- a/src/gns/gnunet-gns.c +++ b/src/gns/gnunet-gns.c | |||
@@ -229,7 +229,6 @@ run (void *cls, | |||
229 | (void) cls; | 229 | (void) cls; |
230 | (void) args; | 230 | (void) args; |
231 | (void) cfgfile; | 231 | (void) cfgfile; |
232 | Idna_rc rc; | ||
233 | 232 | ||
234 | cfg = c; | 233 | cfg = c; |
235 | to_task = NULL; | 234 | to_task = NULL; |
@@ -239,12 +238,15 @@ run (void *cls, | |||
239 | if (NULL != (colon = strchr (lookup_name, ':'))) | 238 | if (NULL != (colon = strchr (lookup_name, ':'))) |
240 | *colon = '\0'; | 239 | *colon = '\0'; |
241 | } | 240 | } |
241 | #ifdef LSD001 | ||
242 | Idna_rc rc; | ||
242 | /** | 243 | /** |
243 | * If DNS compatibility is requested, we first verify that the | 244 | * If DNS compatibility is requested, we first verify that the |
244 | * lookup_name is in a DNS format. If yes, we convert it to UTF-8. | 245 | * lookup_name is in a DNS format. If yes, we convert it to UTF-8. |
245 | */ | 246 | */ |
246 | if (GNUNET_YES == dns_compat) | 247 | if (GNUNET_YES == dns_compat) |
247 | { | 248 | { |
249 | #endif | ||
248 | if (GNUNET_OK != GNUNET_DNSPARSER_check_name (lookup_name)) | 250 | if (GNUNET_OK != GNUNET_DNSPARSER_check_name (lookup_name)) |
249 | { | 251 | { |
250 | fprintf (stderr, | 252 | fprintf (stderr, |
@@ -253,6 +255,7 @@ run (void *cls, | |||
253 | global_ret = 3; | 255 | global_ret = 3; |
254 | return; | 256 | return; |
255 | } | 257 | } |
258 | #ifdef LSD001 | ||
256 | if (IDNA_SUCCESS != | 259 | if (IDNA_SUCCESS != |
257 | (rc = idna_to_unicode_8z8z (lookup_name, &idna_name, | 260 | (rc = idna_to_unicode_8z8z (lookup_name, &idna_name, |
258 | IDNA_ALLOW_UNASSIGNED))) | 261 | IDNA_ALLOW_UNASSIGNED))) |
@@ -261,11 +264,12 @@ run (void *cls, | |||
261 | _ ("Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"), | 264 | _ ("Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"), |
262 | lookup_name, | 265 | lookup_name, |
263 | idna_strerror (rc)); | 266 | idna_strerror (rc)); |
264 | global_ret = 3; | 267 | global_ret = 4; |
265 | return; | 268 | return; |
266 | } | 269 | } |
267 | lookup_name = idna_name; | 270 | lookup_name = idna_name; |
268 | } | 271 | } |
272 | #endif | ||
269 | if (GNUNET_YES != | 273 | if (GNUNET_YES != |
270 | GNUNET_CLIENT_test (cfg, | 274 | GNUNET_CLIENT_test (cfg, |
271 | "arm")) | 275 | "arm")) |
diff --git a/src/gns/test_gnunet_gns.sh.in b/src/gns/test_gnunet_gns.sh.in index 66bed0516..8cdd062c7 100755 --- a/src/gns/test_gnunet_gns.sh.in +++ b/src/gns/test_gnunet_gns.sh.in | |||
@@ -8,9 +8,9 @@ | |||
8 | # but this works for now. | 8 | # but this works for now. |
9 | dir=$(dirname "$0") | 9 | dir=$(dirname "$0") |
10 | 10 | ||
11 | if test -e @pkgdatadir@/existence.sh | 11 | if test -e @PKGDATADIRECTORY@/existence.sh |
12 | then | 12 | then |
13 | . @pkgdatadir@/existence.sh | 13 | . @PKGDATADIRECTORY@/existence.sh |
14 | else | 14 | else |
15 | . $dir/../../contrib/build-common/sh/lib.sh/existence.sh | 15 | . $dir/../../contrib/build-common/sh/lib.sh/existence.sh |
16 | fi | 16 | fi |
@@ -22,7 +22,7 @@ fi | |||
22 | $LOCATION --version | 22 | $LOCATION --version |
23 | if test $? != 0 | 23 | if test $? != 0 |
24 | then | 24 | then |
25 | echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX" | 25 | echo "GNUnet command line tools cannot be found, check environmental variables PATH and GNUNET_PREFIX" |
26 | exit 77 | 26 | exit 77 |
27 | fi | 27 | fi |
28 | 28 | ||