summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Rice <tim@multitalents.net>2002-07-14 10:02:20 -0700
committerTim Rice <tim@multitalents.net>2002-07-14 10:02:20 -0700
commit952101952f204e5a85698a01469612d6518fc99a (patch)
tree8b0986a2bddd28e4e0fd3733c6b9f71d21f9dd38
parent4796a291f1d1ce781f6f840ff1fa7f28d19963b1 (diff)
[Makefile.in] replace "id sshd" with "sshd -t"
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.in9
2 files changed, 8 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 24cffde6b..632b41da0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
120020714
2 - (tim) [Makefile.in] replace "id sshd" with "sshd -t"
3
120020712 420020712
2 - (tim) [Makefile.in] quiet down install-files: and check-user: 5 - (tim) [Makefile.in] quiet down install-files: and check-user:
3 - (tim) [configure.ac] remove unused filepriv line 6 - (tim) [configure.ac] remove unused filepriv line
@@ -1349,4 +1352,4 @@
1349 - (stevesk) entropy.c: typo in debug message 1352 - (stevesk) entropy.c: typo in debug message
1350 - (djm) ssh-keygen -i needs seeded RNG; report from markus@ 1353 - (djm) ssh-keygen -i needs seeded RNG; report from markus@
1351 1354
1352$Id: ChangeLog,v 1.2361 2002/07/13 01:11:24 tim Exp $ 1355$Id: ChangeLog,v 1.2362 2002/07/14 17:02:20 tim Exp $
diff --git a/Makefile.in b/Makefile.in
index 6e7cb1876..89d02c959 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
1# $Id: Makefile.in,v 1.221 2002/07/12 16:04:07 tim Exp $ 1# $Id: Makefile.in,v 1.222 2002/07/14 17:02:21 tim Exp $
2 2
3# uncomment if you run a non bourne compatable shell. Ie. csh 3# uncomment if you run a non bourne compatable shell. Ie. csh
4#SHELL = @SH@ 4#SHELL = @SH@
@@ -198,12 +198,11 @@ distprep: catman-do
198 $(AUTORECONF) 198 $(AUTORECONF)
199 (cd scard && $(MAKE) -f Makefile.in distprep) 199 (cd scard && $(MAKE) -f Makefile.in distprep)
200 200
201install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files host-key check-user 201install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files host-key check-config
202install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files 202install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files
203 203
204check-user: 204check-config:
205 @id $(SSH_PRIVSEP_USER) || \ 205 -$(DESTDIR)$(sbindir)/sshd -t -f $(DESTDIR)$(sysconfdir)/sshd_config
206 echo "WARNING: Privilege separation user \"$(SSH_PRIVSEP_USER)\" does not exist"
207 206
208scard-install: 207scard-install:
209 (cd scard && $(MAKE) DESTDIR=$(DESTDIR) install) 208 (cd scard && $(MAKE) DESTDIR=$(DESTDIR) install)