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/dns | |
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/dns')
-rw-r--r-- | src/dns/Makefile.am | 17 | ||||
-rwxr-xr-x | src/dns/install-dns-helper.sh | 12 |
2 files changed, 0 insertions, 29 deletions
diff --git a/src/dns/Makefile.am b/src/dns/Makefile.am index 1aea7f09a..d2598bd8a 100644 --- a/src/dns/Makefile.am +++ b/src/dns/Makefile.am | |||
@@ -14,25 +14,8 @@ plugindir = $(libdir)/gnunet | |||
14 | pkgcfg_DATA = \ | 14 | pkgcfg_DATA = \ |
15 | dns.conf | 15 | dns.conf |
16 | 16 | ||
17 | if HAVE_SUDO | ||
18 | SUDO_OR_DOAS_BINARY= $(SUDO_BINARY) | ||
19 | else | ||
20 | if HAVE_DOAS_BINARY | ||
21 | SUDO_OR_DOAS_BINARY= $(DOAS_BINARY) | ||
22 | endif | ||
23 | endif | ||
24 | |||
25 | if LINUX | 17 | if LINUX |
26 | HIJACKBIN = gnunet-helper-dns | 18 | HIJACKBIN = gnunet-helper-dns |
27 | install-exec-hook: | ||
28 | chown root $(DESTDIR)$(libexecdir)/gnunet-helper-dns | ||
29 | chgrp $(GNUNETDNS_GROUP) $(DESTDIR)$(libexecdir)/gnunet-helper-dns | ||
30 | chmod 4750 $(DESTDIR)$(libexecdir)/gnunet-helper-dns | ||
31 | chgrp $(GNUNETDNS_GROUP) $(DESTDIR)$(libexecdir)/gnunet-helper-dns | ||
32 | chown gnunet:$(GNUNETDNS_GROUP) $(DESTDIR)$(libexecdir)/gnunet-helper-dns | ||
33 | chmod 2750 $(DESTDIR)$(libexecdir)/gnunet-helper-dns | ||
34 | else | ||
35 | install-exec-hook: | ||
36 | endif | 19 | endif |
37 | 20 | ||
38 | lib_LTLIBRARIES = \ | 21 | lib_LTLIBRARIES = \ |
diff --git a/src/dns/install-dns-helper.sh b/src/dns/install-dns-helper.sh deleted file mode 100755 index 14d5caa70..000000000 --- a/src/dns/install-dns-helper.sh +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | # $1 - bindir | ||
3 | # $2 - gnunetdns group | ||
4 | # $3 - sudo binary (optional) | ||
5 | $3 chown root $1/gnunet-helper-dns | ||
6 | $3 chgrp $2 $1/gnunet-helper-dns | ||
7 | $3 chmod 4750 $1/gnunet-helper-dns | ||
8 | # In case user 'gnunet' does not exist, at least set the group | ||
9 | $3 chgrp $2 $1/gnunet-service-dns | ||
10 | # Usually we want both... | ||
11 | $3 chown gnunet:$2 $1/gnunet-service-dns | ||
12 | $3 chmod 2750 $1/gnunet-service-dns | ||