ANNOUNCE: openssh-1.2.1pre18

[Damien Miller]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On Thu, 16 Dec 1999, Marc G. Fournier wrote:

> thats what I did to get around the problem, but still have the utmpx
> problem ;(

The attached patch makes utmpx support optional (disabled by default).
Does it help?

Note that the attached patch does not include the autoconf magic to
actually enable utmpx support.

Regards,
Damien 

- --
| "Bombay is 250ms from New York in the new world order" - Alan Cox
| Damien Miller - http://www.mindrot.org/
| Email: djm at mindrot.org (home) -or- djm at ibs.com.au (work)


-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.0 (GNU/Linux)
Comment: For info see http://www.gnupg.org

iD8DBQE4WaQcormJ9RG1dI8RAjnBAJ0WQTr1sZdzBNB8jVZ1vXJDYRaUgwCfZFdQ
CblBWPDYpOuV3GimPkgXK6c=
=nOO0
-----END PGP SIGNATURE-----
-------------- next part --------------
? openssh-keygen-progress.patch
Index: acconfig.h
===================================================================
RCS file: /var/cvs/openssh/acconfig.h,v
retrieving revision 1.24
diff -u -r1.24 acconfig.h
--- config.h.in	1999/12/15 05:33:33	1.24
+++ config.h.in 1999/12/17 02:44:22
@@ -91,7 +91,7 @@
 # include <utmp.h> /* For _PATH_XXX */
 #endif 
 
-#ifdef HAVE_UTMPX_H
+#if defined(HAVE_UTMPX_H) && defined(USE_UTMPX)
 # include <utmpx.h> /* For _PATH_XXX */
 #endif 
 
@@ -183,7 +183,7 @@
 #endif
 
 /* Use utmpx if supported */
-#ifdef HAVE_UTMPX_H
+#if defined(HAVE_UTMPX_H) && defined(USE_UTMPX)
 # define UTMP_STR utmpx
 #else 
 # ifdef HAVE_UTMP_H
@@ -192,7 +192,7 @@
 #endif
 
 #ifndef _PATH_UTMP
-# ifdef UTMPX_FILE
+# if defined(UTMPX_FILE) && defined(USE_UTMPX)
 #  define _PATH_UTMP UTMPX_FILE
 # else
 #  ifdef UTMP_FILE
@@ -204,7 +204,7 @@
 #endif
 
 #ifndef _PATH_WTMP
-# ifdef WTMPX_FILE
+# if defined(WTMPX_FILE) && defined(USE_UTMPX)
 #  define _PATH_WTMP WTMPX_FILE
 # else
 #  ifdef WTMP_FILE
Index: bsd-login.c
===================================================================
RCS file: /var/cvs/openssh/bsd-login.c,v
retrieving revision 1.6
diff -u -r1.6 bsd-login.c
--- bsd-login.c	1999/12/12 21:27:33	1.6
+++ bsd-login.c	1999/12/17 02:44:22
@@ -45,7 +45,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdlib.h>
-#ifdef HAVE_UTMPX_H
+#if defined(HAVE_UTMPX_H) && defined(USE_UTMPX)
 # include <utmpx.h>
 #endif
 #ifdef HAVE_UTMP_H
@@ -64,7 +64,7 @@
 
 #ifndef UT_LINESIZE
 # define UT_LINESIZE (sizeof(old_ut.ut_line))
-# ifdef HAVE_UTMPX_H
+# if defined(HAVE_UTMPX_H) && defined(USE_UTMPX)
 #  define UT_NAMESIZE (sizeof(old_ut.ut_user))
 # else
 #  define UT_NAMESIZE (sizeof(old_ut.ut_name))
@@ -72,7 +72,7 @@
 # ifdef HAVE_HOST_IN_UTMP
 #  define UT_HOSTSIZE (sizeof(old_ut.ut_host))
 # endif
-# ifdef HAVE_HOST_IN_UTMPX
+# if defined(HAVE_HOST_IN_UTMPX) && defined(USE_UTMPX)
 #  define UT_HOSTSIZE (sizeof(old_ut.ut_host))
 # endif
 #endif
Index: login.c
===================================================================
RCS file: /var/cvs/openssh/login.c,v
retrieving revision 1.6
diff -u -r1.6 login.c
--- login.c	1999/12/08 23:16:55	1.6
+++ login.c	1999/12/17 02:44:22
@@ -20,7 +20,7 @@
 #include "includes.h"
 RCSID("$Id: login.c,v 1.10 1999/11/24 19:53:47 markus Exp $");
 
-#ifdef HAVE_UTMPX_H
+#if defined(HAVE_UTMPX_H) && defined(USE_UTMPX)
 # include <utmpx.h>
 #endif
 #ifdef HAVE_UTMP_H
@@ -94,7 +94,7 @@
 	/* Construct an utmp/wtmp entry. */
 	memset(&u, 0, sizeof(u));
 	strncpy(u.ut_line, ttyname + 5, sizeof(u.ut_line));
-#ifdef HAVE_UTMPX_H
+#if defined(HAVE_UTMPX_H) && defined(USE_UTMPX)
 	u.ut_tv.tv_sec = time(NULL);
 	strncpy(u.ut_user, user, sizeof(u.ut_name));
 #else