summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Steves <stevesk@pobox.com>2002-03-22 18:07:17 +0000
committerKevin Steves <stevesk@pobox.com>2002-03-22 18:07:17 +0000
commit7e147607f56648e19a856fd1a1f905635e1f359e (patch)
tree276380223bacaaf31d574230a013b9a28b4db0c1
parent939c9db9b1e71fed79edc6d77a2d89ca991f4b2e (diff)
- (stevesk) [monitor.c monitor_wrap.c] #ifdef HAVE_PW_CLASS_IN_PASSWD
-rw-r--r--ChangeLog3
-rw-r--r--monitor.c2
-rw-r--r--monitor_wrap.c2
3 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e3f3fcaf2..04d101ba3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
120020322 120020322
2 - (stevesk) HAVE_ACCRIGHTS_IN_MSGHDR configure support 2 - (stevesk) HAVE_ACCRIGHTS_IN_MSGHDR configure support
3 - (stevesk) [monitor.c monitor_wrap.c] #ifdef HAVE_PW_CLASS_IN_PASSWD
3 4
420020321 520020321
5 - (bal) OpenBSD CVS Sync 6 - (bal) OpenBSD CVS Sync
@@ -7994,4 +7995,4 @@
7994 - Wrote replacements for strlcpy and mkdtemp 7995 - Wrote replacements for strlcpy and mkdtemp
7995 - Released 1.0pre1 7996 - Released 1.0pre1
7996 7997
7997$Id: ChangeLog,v 1.1967 2002/03/22 17:23:25 stevesk Exp $ 7998$Id: ChangeLog,v 1.1968 2002/03/22 18:07:17 stevesk Exp $
diff --git a/monitor.c b/monitor.c
index 921ad985a..6136c109e 100644
--- a/monitor.c
+++ b/monitor.c
@@ -494,7 +494,9 @@ mm_answer_pwnamallow(int socket, Buffer *m)
494 buffer_put_cstring(m, pwent->pw_name); 494 buffer_put_cstring(m, pwent->pw_name);
495 buffer_put_cstring(m, "*"); 495 buffer_put_cstring(m, "*");
496 buffer_put_cstring(m, pwent->pw_gecos); 496 buffer_put_cstring(m, pwent->pw_gecos);
497#ifdef HAVE_PW_CLASS_IN_PASSWD
497 buffer_put_cstring(m, pwent->pw_class); 498 buffer_put_cstring(m, pwent->pw_class);
499#endif
498 buffer_put_cstring(m, pwent->pw_dir); 500 buffer_put_cstring(m, pwent->pw_dir);
499 buffer_put_cstring(m, pwent->pw_shell); 501 buffer_put_cstring(m, pwent->pw_shell);
500 502
diff --git a/monitor_wrap.c b/monitor_wrap.c
index e477cff25..8b0ded190 100644
--- a/monitor_wrap.c
+++ b/monitor_wrap.c
@@ -197,7 +197,9 @@ mm_getpwnamallow(const char *login)
197 pw->pw_name = buffer_get_string(&m, NULL); 197 pw->pw_name = buffer_get_string(&m, NULL);
198 pw->pw_passwd = buffer_get_string(&m, NULL); 198 pw->pw_passwd = buffer_get_string(&m, NULL);
199 pw->pw_gecos = buffer_get_string(&m, NULL); 199 pw->pw_gecos = buffer_get_string(&m, NULL);
200#ifdef HAVE_PW_CLASS_IN_PASSWD
200 pw->pw_class = buffer_get_string(&m, NULL); 201 pw->pw_class = buffer_get_string(&m, NULL);
202#endif
201 pw->pw_dir = buffer_get_string(&m, NULL); 203 pw->pw_dir = buffer_get_string(&m, NULL);
202 pw->pw_shell = buffer_get_string(&m, NULL); 204 pw->pw_shell = buffer_get_string(&m, NULL);
203 buffer_free(&m); 205 buffer_free(&m);