Attachment 2237 Details for Bug 2086 – Tweak autoconf detection

[patch] Tweak autoconf detection

gecos.diff (text/plain), 3.21 KB, created by Damien Miller on 2013-04-05 10:59:10 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Damien Miller

Created: 2013-04-05 10:59:10 AEDT

Size: 3.21 KB

patch

obsolete

>Index: auth.c
>===================================================================
>RCS file: /var/cvs/openssh/auth.c,v
>retrieving revision 1.157
>diff -u -p -r1.157 auth.c
>--- auth.c	12 Mar 2013 00:31:05 -0000	1.157
>+++ auth.c	4 Apr 2013 23:58:07 -0000
>@@ -721,7 +721,9 @@ fakepw(void)
> 	fake.pw_name = "NOUSER";
> 	fake.pw_passwd =
> 	    "$2a$06$r3.juUaHZDlIbQaO2dS9FuYxL1W9M81R1Tc92PoSNmzvpEqLkLGrK";
>+#ifdef HAVE_PW_GECOS_IN_PASSWD
> 	fake.pw_gecos = "NOUSER";
>+#endif
> 	fake.pw_uid = privsep_pw == NULL ? (uid_t)-1 : privsep_pw->pw_uid;
> 	fake.pw_gid = privsep_pw == NULL ? (gid_t)-1 : privsep_pw->pw_gid;
> #ifdef HAVE_PW_CLASS_IN_PASSWD
>Index: configure.ac
>===================================================================
>RCS file: /var/cvs/openssh/configure.ac,v
>retrieving revision 1.519
>diff -u -p -r1.519 configure.ac
>--- configure.ac	22 Mar 2013 01:49:15 -0000	1.519
>+++ configure.ac	4 Apr 2013 23:58:07 -0000
>@@ -3302,6 +3302,13 @@ OSSH_CHECK_HEADER_FOR_FIELD([ut_time], [
> OSSH_CHECK_HEADER_FOR_FIELD([ut_tv], [utmpx.h], [HAVE_TV_IN_UTMPX])
> 
> AC_CHECK_MEMBERS([struct stat.st_blksize])
>+AC_CHECK_MEMBER([struct passwd.pw_gecos], [AC_DEFINE(
>+	[HAVE_PW_GECOS_IN_PASSWD], [1],
>+	[Define if struct passwd has a pw_gecos member])], [], [
>+#include <sys/types.h>
>+#include <pwd.h>
>+])
>+
> AC_CHECK_MEMBER([struct __res_state.retrans], [], [AC_DEFINE([__res_state], [state],
> 	[Define if we don't have struct __res_state in resolv.h])],
> [
>Index: misc.c
>===================================================================
>RCS file: /var/cvs/openssh/misc.c,v
>retrieving revision 1.111
>diff -u -p -r1.111 misc.c
>--- misc.c	22 Sep 2011 11:34:36 -0000	1.111
>+++ misc.c	4 Apr 2013 23:58:07 -0000
>@@ -206,7 +206,9 @@ pwcopy(struct passwd *pw)
> 
> 	copy->pw_name = xstrdup(pw->pw_name);
> 	copy->pw_passwd = xstrdup(pw->pw_passwd);
>+#ifdef HAVE_PW_GECOS_IN_PASSWD
> 	copy->pw_gecos = xstrdup(pw->pw_gecos);
>+#endif
> 	copy->pw_uid = pw->pw_uid;
> 	copy->pw_gid = pw->pw_gid;
> #ifdef HAVE_PW_EXPIRE_IN_PASSWD
>Index: monitor.c
>===================================================================
>RCS file: /var/cvs/openssh/monitor.c,v
>retrieving revision 1.155
>diff -u -p -r1.155 monitor.c
>--- monitor.c	11 Dec 2012 23:44:39 -0000	1.155
>+++ monitor.c	4 Apr 2013 23:58:07 -0000
>@@ -778,7 +778,9 @@ mm_answer_pwnamallow(int sock, Buffer *m
> 	buffer_put_string(m, pwent, sizeof(struct passwd));
> 	buffer_put_cstring(m, pwent->pw_name);
> 	buffer_put_cstring(m, "*");
>+#ifdef HAVE_PW_GECOS_IN_PASSWD
> 	buffer_put_cstring(m, pwent->pw_gecos);
>+#endif
> #ifdef HAVE_PW_CLASS_IN_PASSWD
> 	buffer_put_cstring(m, pwent->pw_class);
> #endif
>Index: monitor_wrap.c
>===================================================================
>RCS file: /var/cvs/openssh/monitor_wrap.c,v
>retrieving revision 1.91
>diff -u -p -r1.91 monitor_wrap.c
>--- monitor_wrap.c	9 Jan 2013 05:12:19 -0000	1.91
>+++ monitor_wrap.c	4 Apr 2013 23:58:07 -0000
>@@ -259,7 +259,9 @@ mm_getpwnamallow(const char *username)
> 		fatal("%s: struct passwd size mismatch", __func__);
> 	pw->pw_name = buffer_get_string(&m, NULL);
> 	pw->pw_passwd = buffer_get_string(&m, NULL);
>+#ifdef HAVE_PW_GECOS_IN_PASSWD
> 	pw->pw_gecos = buffer_get_string(&m, NULL);
>+#endif
> #ifdef HAVE_PW_CLASS_IN_PASSWD
> 	pw->pw_class = buffer_get_string(&m, NULL);
> #endif

Actions: View | Diff

Attachments on bug 2086: 2232 | 2237 | 2249 | 2251