- (djm) [auth.c configure.ac misc.c monitor.c monitor_wrap.c] Support

   platforms, such as Android, that lack struct passwd.pw_gecos. Report
   and initial patch from Nathan Osman bz#2086; feedback tim@ ok dtucker@

1 files changed, 5 insertions, 3 deletions

diff --git a/misc.c b/misc.c
index a7a23dcc6..9e287433a 100644
--- a/misc.c
+++ b/misc.c
@@ -206,16 +206,18 @@ pwcopy(struct passwd *pw)
 
         copy->pw_name = xstrdup(pw->pw_name);
         copy->pw_passwd = xstrdup(pw->pw_passwd);
+#ifdef HAVE_STRUCT_PASSWD_PW_GECOS
         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
+#ifdef HAVE_STRUCT_PASSWD_PW_EXPIRE
         copy->pw_expire = pw->pw_expire;
 #endif
-#ifdef HAVE_PW_CHANGE_IN_PASSWD
+#ifdef HAVE_STRUCT_PASSWD_PW_CHANGE
         copy->pw_change = pw->pw_change;
 #endif
-#ifdef HAVE_PW_CLASS_IN_PASSWD
+#ifdef HAVE_STRUCT_PASSWD_PW_CLASS
         copy->pw_class = xstrdup(pw->pw_class);
 #endif
         copy->pw_dir = xstrdup(pw->pw_dir);