summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--Makefile.in11
-rw-r--r--configure.ac9
3 files changed, 17 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 4efc11acd..6d1bb96b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
120020625 120020625
2 - (stevesk) [INSTALL acconfig.h configure.ac defines.h] remove --with-rsh 2 - (stevesk) [INSTALL acconfig.h configure.ac defines.h] remove --with-rsh
3 - (stevesk) [README.privsep] minor updates 3 - (stevesk) [README.privsep] minor updates
4 - (djm) Create privsep directory and warn if privsep user is missing
5 during make install
4 6
520020624 720020624
6 - OpenBSD CVS Sync 8 - OpenBSD CVS Sync
@@ -1086,4 +1088,4 @@
1086 - (stevesk) entropy.c: typo in debug message 1088 - (stevesk) entropy.c: typo in debug message
1087 - (djm) ssh-keygen -i needs seeded RNG; report from markus@ 1089 - (djm) ssh-keygen -i needs seeded RNG; report from markus@
1088 1090
1089$Id: ChangeLog,v 1.2266 2002/06/24 16:49:22 stevesk Exp $ 1091$Id: ChangeLog,v 1.2267 2002/06/25 00:24:47 djm Exp $
diff --git a/Makefile.in b/Makefile.in
index 4b3e27865..7eb8ec268 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
1# $Id: Makefile.in,v 1.215 2002/06/21 01:38:53 mouring Exp $ 1# $Id: Makefile.in,v 1.216 2002/06/25 00:24:47 djm 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@
@@ -26,6 +26,7 @@ SFTP_SERVER=$(libexecdir)/sftp-server
26SSH_KEYSIGN=$(libexecdir)/ssh-keysign 26SSH_KEYSIGN=$(libexecdir)/ssh-keysign
27RAND_HELPER=$(libexecdir)/ssh-rand-helper 27RAND_HELPER=$(libexecdir)/ssh-rand-helper
28PRIVSEP_PATH=@PRIVSEP_PATH@ 28PRIVSEP_PATH=@PRIVSEP_PATH@
29SSH_PRIVSEP_USER=@SSH_PRIVSEP_USER@
29 30
30PATHS= -DSSHDIR=\"$(sysconfdir)\" \ 31PATHS= -DSSHDIR=\"$(sysconfdir)\" \
31 -D_PATH_SSH_PROGRAM=\"$(SSH_PROGRAM)\" \ 32 -D_PATH_SSH_PROGRAM=\"$(SSH_PROGRAM)\" \
@@ -197,9 +198,13 @@ distprep: catman-do
197 $(AUTORECONF) 198 $(AUTORECONF)
198 (cd scard && $(MAKE) -f Makefile.in distprep) 199 (cd scard && $(MAKE) -f Makefile.in distprep)
199 200
200install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files host-key 201install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files host-key check-user
201install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files 202install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files
202 203
204check-user:
205 id $(SSH_PRIVSEP_USER) || \
206 echo "WARNING: Privilege separation user \"$(SSH_PRIVSEP_USER)\" does not exist"
207
203scard-install: 208scard-install:
204 (cd scard && $(MAKE) DESTDIR=$(DESTDIR) install) 209 (cd scard && $(MAKE) DESTDIR=$(DESTDIR) install)
205 210
@@ -212,6 +217,8 @@ install-files: scard-install
212 $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)5 217 $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)5
213 $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)8 218 $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)8
214 $(srcdir)/mkinstalldirs $(DESTDIR)$(libexecdir) 219 $(srcdir)/mkinstalldirs $(DESTDIR)$(libexecdir)
220 $(srcdir)/mkinstalldirs $(DESTDIR)$(PRIVSEP_PATH)
221 chmod 0700 $(DESTDIR)$(PRIVSEP_PATH)
215 $(INSTALL) -m 0755 -s ssh $(DESTDIR)$(bindir)/ssh 222 $(INSTALL) -m 0755 -s ssh $(DESTDIR)$(bindir)/ssh
216 $(INSTALL) -m 0755 -s scp $(DESTDIR)$(bindir)/scp 223 $(INSTALL) -m 0755 -s scp $(DESTDIR)$(bindir)/scp
217 $(INSTALL) -m 0755 -s ssh-add $(DESTDIR)$(bindir)/ssh-add 224 $(INSTALL) -m 0755 -s ssh-add $(DESTDIR)$(bindir)/ssh-add
diff --git a/configure.ac b/configure.ac
index 44ff46ab1..d29091e9e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.69 2002/06/24 16:26:49 stevesk Exp $ 1# $Id: configure.ac,v 1.70 2002/06/25 00:24:48 djm Exp $
2 2
3AC_INIT 3AC_INIT
4AC_CONFIG_SRCDIR([ssh.c]) 4AC_CONFIG_SRCDIR([ssh.c])
@@ -906,16 +906,17 @@ AC_ARG_WITH(entropy-timeout,
906) 906)
907AC_DEFINE_UNQUOTED(ENTROPY_TIMEOUT_MSEC, $entropy_timeout) 907AC_DEFINE_UNQUOTED(ENTROPY_TIMEOUT_MSEC, $entropy_timeout)
908 908
909ssh_privsep_user=sshd 909SSH_PRIVSEP_USER=sshd
910AC_ARG_WITH(privsep-user, 910AC_ARG_WITH(privsep-user,
911 [ --with-privsep-user=user Specify non-privileged user for privilege separation], 911 [ --with-privsep-user=user Specify non-privileged user for privilege separation],
912 [ 912 [
913 if test -n "$withval"; then 913 if test -n "$withval"; then
914 ssh_privsep_user=$withval 914 SSH_PRIVSEP_USER=$withval
915 fi 915 fi
916 ] 916 ]
917) 917)
918AC_DEFINE_UNQUOTED(SSH_PRIVSEP_USER, "$ssh_privsep_user") 918AC_DEFINE_UNQUOTED(SSH_PRIVSEP_USER, "$SSH_PRIVSEP_USER")
919AC_SUBST(SSH_PRIVSEP_USER)
919 920
920# We do this little dance with the search path to insure 921# We do this little dance with the search path to insure
921# that programs that we select for use by installed programs 922# that programs that we select for use by installed programs