From: Tim Rice <tim@multitalents.net>
Date: Sun, 14 Jul 2002 17:02:20 +0000 (-0700)
Subject: [Makefile.in] replace "id sshd" with "sshd -t"
X-Git-Tag: V_3_5_P1~135
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=952101952f204e5a85698a01469612d6518fc99a;p=thirdparty%2Fopenssh-portable.git

[Makefile.in] replace "id sshd" with "sshd -t"
---

diff --git a/ChangeLog b/ChangeLog
index 24cffde6b..632b41da0 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 6e7cb1876..89d02c959 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)