Skip to content

Commit

Permalink
Merge pull request #137 from mariux64/remove-setuid
Browse files Browse the repository at this point in the history
Remove setuid
  • Loading branch information
pmenzel committed Nov 17, 2020
2 parents 58e6ae1 + a067f67 commit 691bb17
Showing 3 changed files with 4 additions and 39 deletions.
10 changes: 4 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
@@ -64,12 +64,10 @@ INSTALL=install -v
INSTALL_PROGRAM = $(INSTALL)
INSTALL_DATA = $(INSTALL) -m 644

all: setuid/setuid
all:
@echo 'Nothing to be done. Ready for "make install"'

clean:
@rm setuid/setuid 2>/dev/null || true

install: all
install:
@prefix="$(prefix)" usr_prefix="$(usr_prefix)" usrlocal_prefix="$(usrlocal_prefix)" \
root_exec_prefix="$(root_exec_prefix)" root_bindir="$(root_bindir)" root_sbindir="$(root_sbindir)" \
usr_exec_prefix="$(usr_exec_prefix)" usr_bindir="$(usr_bindir)" usr_sbindir="$(usr_sbindir)" \
@@ -81,6 +79,6 @@ install: all
DESTDIR="$(DESTDIR)" \
./install.sh

.PHONY: all install clean
.PHONY: all install


1 change: 0 additions & 1 deletion install.sh
Original file line number Diff line number Diff line change
@@ -147,7 +147,6 @@ install_data blink/blinkd.service "$DESTDIR$systemdunitdi
install_data blink/51-blink.rules "$DESTDIR$udev_rulesdir/51-blink.rules"
install_data clusterd/clusterd.service "$DESTDIR$systemdunitdir/clusterd.service"
install_exec clusterd/clusterd "$DESTDIR$usr_sbindir/clusterd"
install_exec setuid/setuid "$DESTDIR$usr_sbindir/setuid"
install_exec uvpn/uvpn "$DESTDIR$usr_bindir/uvpn"
install_exec mxmount/mxmount "$DESTDIR$usr_bindir/mxmount"
install_data mxmount/mxmount.service "$DESTDIR$systemdunitdir/mxmount.service"
32 changes: 0 additions & 32 deletions setuid/setuid.c

This file was deleted.

0 comments on commit 691bb17

Please sign in to comment.