-fixing installation scripts for suid binaries

2 files changed, 5 insertions, 12 deletions

diff --git a/src/nat/Makefile.am b/src/nat/Makefile.am
index e706a3a00..e4b36caa2 100644
--- a/src/nat/Makefile.am
+++ b/src/nat/Makefile.am
@@ -12,18 +12,12 @@ pkgcfgdir= $(pkgdatadir)/config.d/
 dist_pkgcfg_DATA = \
   nat.conf
 
-
-if ENABLE_TEST_RUN
- nattest = $(bindir)/gnunet-nat-server
-endif
-
-
 if LINUX
 NATBIN = gnunet-helper-nat-server gnunet-helper-nat-client
 NATSERVER = gnunet-helper-nat-server.c
 NATCLIENT = gnunet-helper-nat-client.c
 install-exec-hook:
-        $(top_srcdir)/src/nat/install-nat-helper.sh $(SUDO_BINARY) $(bindir) $(nattest) || true
+        $(top_srcdir)/src/nat/install-nat-helper.sh $(bindir) $(SUDO_BINARY) || true
 else
 install-exec-hook:
 endif
diff --git a/src/nat/install-nat-helper.sh b/src/nat/install-nat-helper.sh
index 158c9fb15..502aa71f1 100644
--- a/src/nat/install-nat-helper.sh
+++ b/src/nat/install-nat-helper.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
-# $1 - sudo binary
-# $2 - bindir
-# $3 - nattest
-$1 chown root:root $2/gnunet-helper-nat-server $2/gnunet-helper-nat-client $3 || true
-$1 chmod u+s $2/gnunet-helper-nat-server $2/gnunet-helper-nat-client $3 || true
+# $1 - bindir
+# $2 - sudo binary (optional)
+$2 chown root:root $1/gnunet-helper-nat-server $1/gnunet-helper-nat-client || true
+$2 chmod u+s $1/gnunet-helper-nat-server $1/gnunet-helper-nat-client || true