summaryrefslogtreecommitdiffstats
path: root/monitor_wrap.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2013-04-23 14:25:52 +1000
committerDamien Miller <djm@mindrot.org>2013-04-23 14:25:52 +1000
commit6332da2ae88db623d7da8070dd807efa26d9dfe8 (patch)
tree1d8fd6ce793ce93282d2ae80a6cee8324b283f31 /monitor_wrap.c
parentce1c9574fcfaf753a062276867335c1e237f725c (diff)
- (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@
Diffstat (limited to 'monitor_wrap.c')
-rw-r--r--monitor_wrap.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/monitor_wrap.c b/monitor_wrap.c
index ea654a73..3304f5bf 100644
--- a/monitor_wrap.c
+++ b/monitor_wrap.c
@@ -259,8 +259,10 @@ 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_STRUCT_PASSWD_PW_GECOS
pw->pw_gecos = buffer_get_string(&m, NULL);
-#ifdef HAVE_PW_CLASS_IN_PASSWD
+#endif
+#ifdef HAVE_STRUCT_PASSWD_PW_CLASS
pw->pw_class = buffer_get_string(&m, NULL);
#endif
pw->pw_dir = buffer_get_string(&m, NULL);