summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2016-06-17 20:19:30 -0400
committerLuke Shumaker <lukeshu@sbcglobal.net>2016-06-17 20:19:30 -0400
commit6b3d4df8053a8dd6e53b5415c1793d553d35e883 (patch)
treea8e9d9736e3a8b7b7dd8b62f258faa677d7dba2a
parent902710f7956d29ae2c56d5851a4f4ecfb4de164d (diff)
mv bin/{,nshd-}setuid
-rw-r--r--.gitignore4
-rw-r--r--Makefile6
-rw-r--r--bin/.gitignore4
-rw-r--r--bin/nshd-setuid.c (renamed from bin/setuid.c)0
-rw-r--r--nshd.service.in2
5 files changed, 8 insertions, 8 deletions
diff --git a/.gitignore b/.gitignore
index a75421c..6069d5d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,4 @@
/LICENSE.*.txt
-/bin/common.rb
-/bin/nshd
-/bin/nshd-tester
-/bin/setuid
/nshd.service
/nshd.sysusers
diff --git a/Makefile b/Makefile
index 3a546fe..43af046 100644
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,7 @@ CGO_ENABLED = 1
at.subdirs += go/lukeshu.com/git/go/libnslcd.git/proto
-programs = setuid nshd-tester nshd common.rb
+programs = nshd nshd-setuid nshd-tester common.rb
scripts = $(filter-out %.c %.o $(programs) common.rb common.rb.in,$(notdir $(wildcard $(srcdir)/bin/*)))
std.gen_files += LICENSE.lgpl-2.1.txt LICENSE.gpl-2.txt LICENSE.apache-2.0.txt
@@ -72,14 +72,14 @@ $(outdir)/.gopath/bin/cmd-nshd: $(call golang.src,$(outdir)/.gopath) $(_gen) $(_
$(outdir)/%.o: $(srcdir)/%.c $(var)CC $(var)CPPFLAGS $(var)CFLAGS
$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $(filter-out $(var)%,$^)
-$(outdir)/bin/nshd-tester $(outdir)/bin/setuid: \
+$(outdir)/bin/nshd-tester $(outdir)/bin/nshd-setuid: \
$(outdir)/%: $(outdir)/%.o $(var)CC $(var)LDFLAGS
$(CC) $(LDFLAGS) -o $@ $(filter-out $(var)%,$^)
$(outdir)/%: $(srcdir)/%.in
< $< sed $(foreach v,$(patsubst $(var)%,%,$(filter $(var)%,$^)), -e 's|@$v@|$($v)|g' ) > $@
-$(outdir)/bin/setuid: -ldl
+$(outdir)/bin/nshd-setuid: -ldl
$(outdir)/nshd.service: $(var)user $(var)bindir
$(outdir)/nshd.sysusers: $(var)user
$(outdir)/bin/common.rb: $(var)conf_file
diff --git a/bin/.gitignore b/bin/.gitignore
new file mode 100644
index 0000000..b73f922
--- /dev/null
+++ b/bin/.gitignore
@@ -0,0 +1,4 @@
+/common.rb
+/nshd
+/nshd-setuid
+/nshd-tester
diff --git a/bin/setuid.c b/bin/nshd-setuid.c
index aa8847b..aa8847b 100644
--- a/bin/setuid.c
+++ b/bin/nshd-setuid.c
diff --git a/nshd.service.in b/nshd.service.in
index 80b83a9..b560ddc 100644
--- a/nshd.service.in
+++ b/nshd.service.in
@@ -8,5 +8,5 @@ Type=notify
# would deadlock as it tries to poll the nslcd socket to ask if it
# knows who the user is. It would time out after 1 minute, but that's
# still not good.
-ExecStart=@bindir@/setuid @user@ @bindir@/nshd
+ExecStart=@bindir@/nshd-setuid @user@ @bindir@/nshd
ExecReload=/bin/kill -HUP $MAINPID