- (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, 3 insertions, 1 deletions

diff --git a/monitor.c b/monitor.c
index 8006b833c..6560740b6 100644
--- a/monitor.c
+++ b/monitor.c
@@ -778,8 +778,10 @@ 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_STRUCT_PASSWD_PW_GECOS
         buffer_put_cstring(m, pwent->pw_gecos);
-#ifdef HAVE_PW_CLASS_IN_PASSWD
+#endif
+#ifdef HAVE_STRUCT_PASSWD_PW_CLASS
         buffer_put_cstring(m, pwent->pw_class);
 #endif
         buffer_put_cstring(m, pwent->pw_dir);