aboutsummaryrefslogtreecommitdiff
path: root/src/nat
diff options
context:
space:
mode:
authorng0 <ng0@n0.is>2019-10-23 21:51:46 +0000
committerng0 <ng0@n0.is>2019-10-23 21:51:46 +0000
commit4993eac25ce2737fc45aec08f21226f523405804 (patch)
treea32a054c36102aa712a17b9b27be14b72fa8557b /src/nat
parent0c13e270c31ef2896d56eb3d53ac7a5714ea1e58 (diff)
downloadgnunet-4993eac25ce2737fc45aec08f21226f523405804.tar.gz
gnunet-4993eac25ce2737fc45aec08f21226f523405804.zip
remove never working setuid helper code from the build-system.
refer to the Changelog for a longer reason. In conclusion, this is what people expect, this is what Package Managers patch away for portability, and we can't use install(1) for this because it's not a portable tool.
Diffstat (limited to 'src/nat')
-rw-r--r--src/nat/Makefile.am18
-rwxr-xr-xsrc/nat/install-nat-helper.sh5
2 files changed, 0 insertions, 23 deletions
diff --git a/src/nat/Makefile.am b/src/nat/Makefile.am
index 2c04741da..67f5e4dbc 100644
--- a/src/nat/Makefile.am
+++ b/src/nat/Makefile.am
@@ -8,33 +8,15 @@ pkgcfgdir= $(pkgdatadir)/config.d/
8pkgcfg_DATA = \ 8pkgcfg_DATA = \
9 nat.conf 9 nat.conf
10 10
11if HAVE_SUDO
12SUDO_OR_DOAS_BINARY= $(SUDO_BINARY)
13else
14if HAVE_DOAS_BINARY
15SUDO_OR_DOAS_BINARY= $(DOAS_BINARY)
16endif
17endif
18
19if LINUX 11if LINUX
20 NATBIN = gnunet-helper-nat-server gnunet-helper-nat-client 12 NATBIN = gnunet-helper-nat-server gnunet-helper-nat-client
21 NATSERVER = gnunet-helper-nat-server.c 13 NATSERVER = gnunet-helper-nat-server.c
22 NATCLIENT = gnunet-helper-nat-client.c 14 NATCLIENT = gnunet-helper-nat-client.c
23install-exec-hook:
24 chown root:root $(DESTDIR)$(libexecdir)/gnunet-helper-nat-server
25 chown root:root $(DESTDIR)$(libexecdir)/gnunet-helper-nat-client
26 chmod u+s $(DESTDIR)$(libexecdir)/gnunet-helper-nat-server
27 chmod u+s $(DESTDIR)$(libexecdir)/gnunet-helper-nat-client
28else 15else
29if XFREEBSD 16if XFREEBSD
30 NATBIN = gnunet-helper-nat-server gnunet-helper-nat-client 17 NATBIN = gnunet-helper-nat-server gnunet-helper-nat-client
31 NATSERVER = gnunet-helper-nat-server.c 18 NATSERVER = gnunet-helper-nat-server.c
32 NATCLIENT = gnunet-helper-nat-client.c 19 NATCLIENT = gnunet-helper-nat-client.c
33install-exec-hook:
34 chown root:root $(DESTDIR)$(libexecdir)/gnunet-helper-nat-server
35 chown root:root $(DESTDIR)$(libexecdir)/gnunet-helper-nat-client
36 chmod u+s $(DESTDIR)$(libexecdir)/gnunet-helper-nat-server
37 chmod u+s $(DESTDIR)$(libexecdir)/gnunet-helper-nat-client
38endif 20endif
39else 21else
40install-exec-hook: 22install-exec-hook:
diff --git a/src/nat/install-nat-helper.sh b/src/nat/install-nat-helper.sh
deleted file mode 100755
index d5ee91fa3..000000000
--- a/src/nat/install-nat-helper.sh
+++ /dev/null
@@ -1,5 +0,0 @@
1#!/bin/sh
2# $1 - bindir
3# $2 - sudo binary (optional)
4$2 chown root:root $1/gnunet-helper-nat-server $1/gnunet-helper-nat-client || true
5$2 chmod u+s $1/gnunet-helper-nat-server $1/gnunet-helper-nat-client || true