summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--acconfig.h5
-rw-r--r--configure.ac6
-rw-r--r--session.c4
4 files changed, 15 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index a5a542b76..d2eb5ab42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
120020423 120020423
2 - (stevesk) [acconfig.h configure.ac session.c] LOGIN_NO_ENDOPT for HP-UX
2 - (stevesk) [acconfig.h] NEED_IN_SYSTM_H unused 3 - (stevesk) [acconfig.h] NEED_IN_SYSTM_H unused
3 - (markus) OpenBSD CVS Sync 4 - (markus) OpenBSD CVS Sync
4 - markus@cvs.openbsd.org 2002/04/23 12:58:26 5 - markus@cvs.openbsd.org 2002/04/23 12:58:26
@@ -493,4 +494,4 @@
493 - (stevesk) entropy.c: typo in debug message 494 - (stevesk) entropy.c: typo in debug message
494 - (djm) ssh-keygen -i needs seeded RNG; report from markus@ 495 - (djm) ssh-keygen -i needs seeded RNG; report from markus@
495 496
496$Id: ChangeLog,v 1.2080 2002/04/23 20:11:13 stevesk Exp $ 497$Id: ChangeLog,v 1.2081 2002/04/23 20:45:55 stevesk Exp $
diff --git a/acconfig.h b/acconfig.h
index 00acb0906..c110c5e48 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -1,4 +1,4 @@
1/* $Id: acconfig.h,v 1.133 2002/04/23 20:11:13 stevesk Exp $ */ 1/* $Id: acconfig.h,v 1.134 2002/04/23 20:45:56 stevesk Exp $ */
2 2
3#ifndef _CONFIG_H 3#ifndef _CONFIG_H
4#define _CONFIG_H 4#define _CONFIG_H
@@ -165,6 +165,9 @@
165/* Some versions of /bin/login need the TERM supplied on the commandline */ 165/* Some versions of /bin/login need the TERM supplied on the commandline */
166#undef LOGIN_NEEDS_TERM 166#undef LOGIN_NEEDS_TERM
167 167
168/* Define if your login program cannot handle end of options ("--") */
169#undef LOGIN_NO_ENDOPT
170
168/* Define if you want to specify the path to your lastlog file */ 171/* Define if you want to specify the path to your lastlog file */
169#undef CONF_LASTLOG_FILE 172#undef CONF_LASTLOG_FILE
170 173
diff --git a/configure.ac b/configure.ac
index 6bf5581f1..91a0a72f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.51 2002/04/23 13:22:25 djm Exp $ 1# $Id: configure.ac,v 1.52 2002/04/23 20:45:56 stevesk Exp $
2 2
3AC_INIT 3AC_INIT
4AC_CONFIG_SRCDIR([ssh.c]) 4AC_CONFIG_SRCDIR([ssh.c])
@@ -98,6 +98,8 @@ case "$host" in
98 CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1" 98 CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1"
99 IPADDR_IN_DISPLAY=yes 99 IPADDR_IN_DISPLAY=yes
100 AC_DEFINE(USE_PIPES) 100 AC_DEFINE(USE_PIPES)
101 AC_DEFINE(LOGIN_NO_ENDOPT)
102 AC_DEFINE(LOGIN_NEEDS_UTMPX)
101 AC_DEFINE(DISABLE_SHADOW) 103 AC_DEFINE(DISABLE_SHADOW)
102 AC_DEFINE(DISABLE_UTMP) 104 AC_DEFINE(DISABLE_UTMP)
103 AC_DEFINE(SPT_TYPE,SPT_PSTAT) 105 AC_DEFINE(SPT_TYPE,SPT_PSTAT)
@@ -108,6 +110,8 @@ case "$host" in
108 IPADDR_IN_DISPLAY=yes 110 IPADDR_IN_DISPLAY=yes
109 AC_DEFINE(PAM_SUN_CODEBASE) 111 AC_DEFINE(PAM_SUN_CODEBASE)
110 AC_DEFINE(USE_PIPES) 112 AC_DEFINE(USE_PIPES)
113 AC_DEFINE(LOGIN_NO_ENDOPT)
114 AC_DEFINE(LOGIN_NEEDS_UTMPX)
111 AC_DEFINE(DISABLE_SHADOW) 115 AC_DEFINE(DISABLE_SHADOW)
112 AC_DEFINE(DISABLE_UTMP) 116 AC_DEFINE(DISABLE_UTMP)
113 AC_DEFINE(SPT_TYPE,SPT_PSTAT) 117 AC_DEFINE(SPT_TYPE,SPT_PSTAT)
diff --git a/session.c b/session.c
index 6be7f9929..20e6a889f 100644
--- a/session.c
+++ b/session.c
@@ -1117,7 +1117,11 @@ launch_login(struct passwd *pw, const char *hostname)
1117#ifdef xxxLOGIN_NEEDS_TERM 1117#ifdef xxxLOGIN_NEEDS_TERM
1118 (s->term ? s->term : "unknown"), 1118 (s->term ? s->term : "unknown"),
1119#endif /* LOGIN_NEEDS_TERM */ 1119#endif /* LOGIN_NEEDS_TERM */
1120#ifdef LOGIN_NO_ENDOPT
1121 "-p", "-f", pw->pw_name, (char *)NULL);
1122#else
1120 "-p", "-f", "--", pw->pw_name, (char *)NULL); 1123 "-p", "-f", "--", pw->pw_name, (char *)NULL);
1124#endif
1121 1125
1122 /* Login couldn't be executed, die. */ 1126 /* Login couldn't be executed, die. */
1123 1127