Attachment 746 Details for Bug 960 – Use {w,u}tmpx on NetBSD instead of login(3)

[patch] Use {w,u}tmpx on NetBSD instead of login(3)

openssh-wtmpx-ut_ss.patch (text/plain), 2.11 KB, created by Darren Tucker on 2004-12-04 16:53:01 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Darren Tucker

Created: 2004-12-04 16:53:01 AEDT

Size: 2.11 KB

patch

obsolete

>Index: acconfig.h
>===================================================================
>RCS file: /usr/local/src/security/openssh/cvs/openssh_cvs/acconfig.h,v
>retrieving revision 1.180
>diff -u -p -r1.180 acconfig.h
>--- acconfig.h	16 Aug 2004 13:12:06 -0000	1.180
>+++ acconfig.h	4 Dec 2004 04:44:22 -0000
>@@ -192,6 +192,7 @@
> #undef HAVE_EXIT_IN_UTMP
> #undef HAVE_TIME_IN_UTMP
> #undef HAVE_TIME_IN_UTMPX
>+#undef HAVE_SS_IN_UTMPX
> 
> /* Define if you don't want to use your system's login() call */
> #undef DISABLE_LOGIN
>Index: configure.ac
>===================================================================
>RCS file: /usr/local/src/security/openssh/cvs/openssh_cvs/configure.ac,v
>retrieving revision 1.233
>diff -u -p -r1.233 configure.ac
>--- configure.ac	7 Nov 2004 09:14:34 -0000	1.233
>+++ configure.ac	4 Dec 2004 05:45:05 -0000
>@@ -268,6 +268,11 @@ mips-sony-bsd|mips-sony-newsos4)
> 	SONY=1
> 	;;
> *-*-netbsd*)
>+	AC_DEFINE(DISABLE_LOGIN)
>+	AC_DEFINE_UNQUOTED(UTMPX_FILE, "/var/run/utmpx",
>+	    [Location of utmpx file])
>+	AC_DEFINE_UNQUOTED(WTMPX_FILE, "/var/log/wtmp",
>+	    [Location of wtmpx file])
> 	check_for_libcrypt_before=1
> 	if test "x$withval" != "xno" ; then	
> 		need_dash_r=1
>@@ -2002,6 +2007,7 @@ OSSH_CHECK_HEADER_FOR_FIELD(ut_exit, utm
> OSSH_CHECK_HEADER_FOR_FIELD(ut_time, utmp.h, HAVE_TIME_IN_UTMP)
> OSSH_CHECK_HEADER_FOR_FIELD(ut_time, utmpx.h, HAVE_TIME_IN_UTMPX)
> OSSH_CHECK_HEADER_FOR_FIELD(ut_tv, utmpx.h, HAVE_TV_IN_UTMPX)
>+OSSH_CHECK_HEADER_FOR_FIELD(ut_ss, utmpx.h, HAVE_SS_IN_UTMPX)
> 
> AC_CHECK_MEMBERS([struct stat.st_blksize])
> 
>Index: loginrec.c
>===================================================================
>RCS file: /usr/local/src/security/openssh/cvs/openssh_cvs/loginrec.c,v
>retrieving revision 1.62
>diff -u -p -r1.62 loginrec.c
>--- loginrec.c	12 Sep 2004 05:26:01 -0000	1.62
>+++ loginrec.c	4 Dec 2004 05:56:21 -0000
>@@ -744,6 +744,9 @@ construct_utmpx(struct logininfo *li, st
> 	/* ut_syslen is the length of the utx_host string */
> 	utx->ut_syslen = MIN(strlen(li->hostname), sizeof(utx->ut_host));
> # endif
>+# ifdef HAVE_SS_IN_UTMPX
>+	utx->ut_ss = li->hostaddr.sa_storage;
>+# endif
> }
> #endif /* USE_UTMPX || USE_WTMPX */
>

Flags:

djm: ok+

Actions: View | Diff

Attachments on bug 960: 746