summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--acconfig.h5
-rw-r--r--configure.ac14
-rw-r--r--ssh.h2
4 files changed, 20 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index a739f235a..82e06bec7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@
7 monitor_mm.c 7 monitor_mm.c
8 - (stevesk) remove configure support for poll.h; it was removed 8 - (stevesk) remove configure support for poll.h; it was removed
9 from sshd.c a long time ago. 9 from sshd.c a long time ago.
10 - (stevesk) --with-privsep-user; default sshd
10 11
1120020406 1220020406
12 - (djm) Typo in Suse SPEC file. Fix from Carsten Grohmann 13 - (djm) Typo in Suse SPEC file. Fix from Carsten Grohmann
@@ -8197,4 +8198,4 @@
8197 - Wrote replacements for strlcpy and mkdtemp 8198 - Wrote replacements for strlcpy and mkdtemp
8198 - Released 1.0pre1 8199 - Released 1.0pre1
8199 8200
8200$Id: ChangeLog,v 1.2037 2002/04/07 18:12:03 stevesk Exp $ 8201$Id: ChangeLog,v 1.2038 2002/04/07 19:22:55 stevesk Exp $
diff --git a/acconfig.h b/acconfig.h
index 7c5c1605d..a6bb1b795 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -1,4 +1,4 @@
1/* $Id: acconfig.h,v 1.128 2002/04/07 16:18:04 stevesk Exp $ */ 1/* $Id: acconfig.h,v 1.129 2002/04/07 19:22:54 stevesk Exp $ */
2 2
3#ifndef _CONFIG_H 3#ifndef _CONFIG_H
4#define _CONFIG_H 4#define _CONFIG_H
@@ -100,6 +100,9 @@
100/* Builtin PRNG command timeout */ 100/* Builtin PRNG command timeout */
101#undef ENTROPY_TIMEOUT_MSEC 101#undef ENTROPY_TIMEOUT_MSEC
102 102
103/* non-privileged user for privilege separation */
104#undef SSH_PRIVSEP_USER
105
103/* Define if you want to install preformatted manpages.*/ 106/* Define if you want to install preformatted manpages.*/
104#undef MANTYPE 107#undef MANTYPE
105 108
diff --git a/configure.ac b/configure.ac
index b3fa18674..10f238a25 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.38 2002/04/07 18:12:04 stevesk Exp $ 1# $Id: configure.ac,v 1.39 2002/04/07 19:22:54 stevesk Exp $
2 2
3AC_INIT 3AC_INIT
4AC_CONFIG_SRCDIR([ssh.c]) 4AC_CONFIG_SRCDIR([ssh.c])
@@ -993,9 +993,19 @@ AC_ARG_WITH(entropy-timeout,
993 fi 993 fi
994 ] 994 ]
995) 995)
996
997AC_DEFINE_UNQUOTED(ENTROPY_TIMEOUT_MSEC, $entropy_timeout) 996AC_DEFINE_UNQUOTED(ENTROPY_TIMEOUT_MSEC, $entropy_timeout)
998 997
998ssh_privsep_user=sshd
999AC_ARG_WITH(privsep-user,
1000 [ --with-privsep-user Specify non-privileged user for privilege separation],
1001 [
1002 if test -n "$withval"; then
1003 ssh_privsep_user=$withval
1004 fi
1005 ]
1006)
1007AC_DEFINE_UNQUOTED(SSH_PRIVSEP_USER, $ssh_privsep_user)
1008
999# We do this little dance with the search path to insure 1009# We do this little dance with the search path to insure
1000# that programs that we select for use by installed programs 1010# that programs that we select for use by installed programs
1001# (which may be run by the super-user) come from trusted 1011# (which may be run by the super-user) come from trusted
diff --git a/ssh.h b/ssh.h
index c5b500345..eefd57d5d 100644
--- a/ssh.h
+++ b/ssh.h
@@ -104,7 +104,9 @@
104 * sshd will change its pivileges to this user and its 104 * sshd will change its pivileges to this user and its
105 * primary group. 105 * primary group.
106 */ 106 */
107#ifndef SSH_PRIVSEP_USER
107#define SSH_PRIVSEP_USER "nobody" 108#define SSH_PRIVSEP_USER "nobody"
109#endif
108 110
109/* Minimum modulus size (n) for RSA keys. */ 111/* Minimum modulus size (n) for RSA keys. */
110#define SSH_RSA_MINIMUM_MODULUS_SIZE 768 112#define SSH_RSA_MINIMUM_MODULUS_SIZE 768