diff options
author | ng0 <ng0@n0.is> | 2019-10-23 21:51:46 +0000 |
---|---|---|
committer | ng0 <ng0@n0.is> | 2019-10-23 21:51:46 +0000 |
commit | 4993eac25ce2737fc45aec08f21226f523405804 (patch) | |
tree | a32a054c36102aa712a17b9b27be14b72fa8557b /src/nat | |
parent | 0c13e270c31ef2896d56eb3d53ac7a5714ea1e58 (diff) | |
download | gnunet-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.am | 18 | ||||
-rwxr-xr-x | src/nat/install-nat-helper.sh | 5 |
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/ | |||
8 | pkgcfg_DATA = \ | 8 | pkgcfg_DATA = \ |
9 | nat.conf | 9 | nat.conf |
10 | 10 | ||
11 | if HAVE_SUDO | ||
12 | SUDO_OR_DOAS_BINARY= $(SUDO_BINARY) | ||
13 | else | ||
14 | if HAVE_DOAS_BINARY | ||
15 | SUDO_OR_DOAS_BINARY= $(DOAS_BINARY) | ||
16 | endif | ||
17 | endif | ||
18 | |||
19 | if LINUX | 11 | if 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 |
23 | install-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 | ||
28 | else | 15 | else |
29 | if XFREEBSD | 16 | if 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 |
33 | install-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 | ||
38 | endif | 20 | endif |
39 | else | 21 | else |
40 | install-exec-hook: | 22 | install-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 | ||