- (djm) Create privsep directory and warn if privsep user is missing

   during make install

diff --git a/ChangeLog b/ChangeLog
index 3703f49163dc47ced9d047e3db1887ffc6d13378..ac42ef59af5fba7783aa853474243718528e9529 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 20020625
  - (stevesk) [INSTALL acconfig.h configure.ac defines.h] remove --with-rsh
  - (stevesk) [README.privsep] minor updates
+ - (djm) Create privsep directory and warn if privsep user is missing 
+   during make install
 
 20020624
  - OpenBSD CVS Sync

diff --git a/Makefile.in b/Makefile.in
index fd4419da43d6551ecdc8b4c0fcf07f0ef469da7f..78143506c6a05d1486d93a0f11d047bd96d4f9bd 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -26,6 +26,7 @@ SFTP_SERVER=$(libexecdir)/sftp-server
 SSH_KEYSIGN=$(libexecdir)/ssh-keysign
 RAND_HELPER=$(libexecdir)/ssh-rand-helper
 PRIVSEP_PATH=@PRIVSEP_PATH@
+SSH_PRIVSEP_USER=@SSH_PRIVSEP_USER@
 
 PATHS= -DSSHDIR=\"$(sysconfdir)\" \
        -D_PATH_SSH_PROGRAM=\"$(SSH_PROGRAM)\" \
@@ -197,9 +198,13 @@ distprep: catman-do
        $(AUTORECONF)
        (cd scard && $(MAKE) -f Makefile.in distprep)
 
-install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files host-key
+install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files host-key check-user
 install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files
 
+check-user:
+       id $(SSH_PRIVSEP_USER) || \
+               echo "WARNING: Privilege separation user \"$(SSH_PRIVSEP_USER)\" does not exist"
+
 scard-install:
        (cd scard && $(MAKE) DESTDIR=$(DESTDIR) install)
 
@@ -212,6 +217,8 @@ install-files: scard-install
        $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)5
        $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)8
        $(srcdir)/mkinstalldirs $(DESTDIR)$(libexecdir)
+       $(srcdir)/mkinstalldirs $(DESTDIR)$(PRIVSEP_PATH)
+       chmod 0700 $(DESTDIR)$(PRIVSEP_PATH)
        $(INSTALL) -m 0755 -s ssh $(DESTDIR)$(bindir)/ssh
        $(INSTALL) -m 0755 -s scp $(DESTDIR)$(bindir)/scp
        $(INSTALL) -m 0755 -s ssh-add $(DESTDIR)$(bindir)/ssh-add

diff --git a/configure.ac b/configure.ac
index 8a533fb78157e6d621f1159569297d3fa3947609..d385c5a682a55b88c0eee31c5c040d8a9351dbcd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -906,16 +906,17 @@ AC_ARG_WITH(entropy-timeout,
 )
 AC_DEFINE_UNQUOTED(ENTROPY_TIMEOUT_MSEC, $entropy_timeout)
 
-ssh_privsep_user=sshd
+SSH_PRIVSEP_USER=sshd
 AC_ARG_WITH(privsep-user,
        [  --with-privsep-user=user Specify non-privileged user for privilege separation],
        [
                if test -n "$withval"; then
-                       ssh_privsep_user=$withval
+                       SSH_PRIVSEP_USER=$withval
                fi
        ]       
 )
-AC_DEFINE_UNQUOTED(SSH_PRIVSEP_USER, "$ssh_privsep_user")
+AC_DEFINE_UNQUOTED(SSH_PRIVSEP_USER, "$SSH_PRIVSEP_USER")
+AC_SUBST(SSH_PRIVSEP_USER)
 
 # We do this little dance with the search path to insure
 # that programs that we select for use by installed programs