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 24cffde6..632b41da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+20020714
+ - (tim) [Makefile.in] replace "id sshd" with "sshd -t"
+
20020712
- (tim) [Makefile.in] quiet down install-files: and check-user:
- (tim) [configure.ac] remove unused filepriv line
@@ -1349,4 +1352,4 @@
- (stevesk) entropy.c: typo in debug message
- (djm) ssh-keygen -i needs seeded RNG; report from markus@
-$Id: ChangeLog,v 1.2361 2002/07/13 01:11:24 tim Exp $
+$Id: ChangeLog,v 1.2362 2002/07/14 17:02:20 tim Exp $
diff --git a/Makefile.in b/Makefile.in
index 6e7cb187..89d02c95 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.221 2002/07/12 16:04:07 tim Exp $
+# $Id: Makefile.in,v 1.222 2002/07/14 17:02:21 tim Exp $
# uncomment if you run a non bourne compatable shell. Ie. csh
#SHELL = @SH@
@@ -198,12 +198,11 @@ distprep: catman-do
$(AUTORECONF)
(cd scard && $(MAKE) -f Makefile.in distprep)
-install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files host-key check-user
+install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files host-key check-config
install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files
-check-user:
- @id $(SSH_PRIVSEP_USER) || \
- echo "WARNING: Privilege separation user \"$(SSH_PRIVSEP_USER)\" does not exist"
+check-config:
+ -$(DESTDIR)$(sbindir)/sshd -t -f $(DESTDIR)$(sysconfdir)/sshd_config
scard-install:
(cd scard && $(MAKE) DESTDIR=$(DESTDIR) install)