- (stevesk) [acconfig.h configure.ac session.c] LOGIN_NO_ENDOPT for HP-UX
diff --git a/ChangeLog b/ChangeLog
index a5a542b..d2eb5ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
20020423
+ - (stevesk) [acconfig.h configure.ac session.c] LOGIN_NO_ENDOPT for HP-UX
- (stevesk) [acconfig.h] NEED_IN_SYSTM_H unused
- (markus) OpenBSD CVS Sync
- markus@cvs.openbsd.org 2002/04/23 12:58:26
@@ -493,4 +494,4 @@
- (stevesk) entropy.c: typo in debug message
- (djm) ssh-keygen -i needs seeded RNG; report from markus@
-$Id: ChangeLog,v 1.2080 2002/04/23 20:11:13 stevesk Exp $
+$Id: ChangeLog,v 1.2081 2002/04/23 20:45:55 stevesk Exp $
diff --git a/acconfig.h b/acconfig.h
index 00acb09..c110c5e 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -1,4 +1,4 @@
-/* $Id: acconfig.h,v 1.133 2002/04/23 20:11:13 stevesk Exp $ */
+/* $Id: acconfig.h,v 1.134 2002/04/23 20:45:56 stevesk Exp $ */
#ifndef _CONFIG_H
#define _CONFIG_H
@@ -165,6 +165,9 @@
/* Some versions of /bin/login need the TERM supplied on the commandline */
#undef LOGIN_NEEDS_TERM
+/* Define if your login program cannot handle end of options ("--") */
+#undef LOGIN_NO_ENDOPT
+
/* Define if you want to specify the path to your lastlog file */
#undef CONF_LASTLOG_FILE
diff --git a/configure.ac b/configure.ac
index 6bf5581..91a0a72 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.51 2002/04/23 13:22:25 djm Exp $
+# $Id: configure.ac,v 1.52 2002/04/23 20:45:56 stevesk Exp $
AC_INIT
AC_CONFIG_SRCDIR([ssh.c])
@@ -98,6 +98,8 @@
CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1"
IPADDR_IN_DISPLAY=yes
AC_DEFINE(USE_PIPES)
+ AC_DEFINE(LOGIN_NO_ENDOPT)
+ AC_DEFINE(LOGIN_NEEDS_UTMPX)
AC_DEFINE(DISABLE_SHADOW)
AC_DEFINE(DISABLE_UTMP)
AC_DEFINE(SPT_TYPE,SPT_PSTAT)
@@ -108,6 +110,8 @@
IPADDR_IN_DISPLAY=yes
AC_DEFINE(PAM_SUN_CODEBASE)
AC_DEFINE(USE_PIPES)
+ AC_DEFINE(LOGIN_NO_ENDOPT)
+ AC_DEFINE(LOGIN_NEEDS_UTMPX)
AC_DEFINE(DISABLE_SHADOW)
AC_DEFINE(DISABLE_UTMP)
AC_DEFINE(SPT_TYPE,SPT_PSTAT)
diff --git a/session.c b/session.c
index 6be7f99..20e6a88 100644
--- a/session.c
+++ b/session.c
@@ -1117,7 +1117,11 @@
#ifdef xxxLOGIN_NEEDS_TERM
(s->term ? s->term : "unknown"),
#endif /* LOGIN_NEEDS_TERM */
+#ifdef LOGIN_NO_ENDOPT
+ "-p", "-f", pw->pw_name, (char *)NULL);
+#else
"-p", "-f", "--", pw->pw_name, (char *)NULL);
+#endif
/* Login couldn't be executed, die. */