summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Steves <stevesk@pobox.com>2000-10-07 13:24:00 +0000
committerKevin Steves <stevesk@pobox.com>2000-10-07 13:24:00 +0000
commit48b7cc0dd7d166ea0ea76c6c2a1da26923e7ac32 (patch)
tree9ceb7ce8ff168aabad12860f0f3e73152c501e66
parentcccca2789073abe1aa781978d25d1d2e7736aad4 (diff)
- (stevesk) Fix detection of pw_class struct member in configure;
patch from KAMAHARA Junzo <kamahara@cc.kshosen.ac.jp>
-rw-r--r--CREDITS1
-rw-r--r--ChangeLog4
-rw-r--r--configure.in3
-rw-r--r--session.c4
4 files changed, 7 insertions, 5 deletions
diff --git a/CREDITS b/CREDITS
index 1e317f6ca..90aa89dc1 100644
--- a/CREDITS
+++ b/CREDITS
@@ -44,6 +44,7 @@ Jarno Huuskonen <jhuuskon@hytti.uku.fi> - Bugfixes
44Jim Knoble <jmknoble@pobox.com> - Many patches 44Jim Knoble <jmknoble@pobox.com> - Many patches
45Jonchen (email unknown) - the original author of PAM support of SSH 45Jonchen (email unknown) - the original author of PAM support of SSH
46Juergen Keil <jk@tools.de> - scp bugfixing 46Juergen Keil <jk@tools.de> - scp bugfixing
47KAMAHARA Junzo <kamahara@cc.kshosen.ac.jp> - Configure fixes
47Kees Cook <cook@cpoint.net> - scp fixes 48Kees Cook <cook@cpoint.net> - scp fixes
48Kenji Miyake <kenji@miyake.org> - Configure fixes 49Kenji Miyake <kenji@miyake.org> - Configure fixes
49Kevin O'Connor <kevin_oconnor@standardandpoors.com> - RSAless operation 50Kevin O'Connor <kevin_oconnor@standardandpoors.com> - RSAless operation
diff --git a/ChangeLog b/ChangeLog
index a58d4a6b4..61993bb00 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,9 @@
120001007 120001007
2 - (stevesk) Print PAM return value in PAM log messages to aid 2 - (stevesk) Print PAM return value in PAM log messages to aid
3 with debugging. 3 with debugging.
4 4 - (stevesk) Fix detection of pw_class struct member in configure;
5 patch from KAMAHARA Junzo <kamahara@cc.kshosen.ac.jp>
6
520001002 720001002
6 - (djm) Fix USER_PATH, report from Kevin Steves <stevesk@sweden.hp.com> 8 - (djm) Fix USER_PATH, report from Kevin Steves <stevesk@sweden.hp.com>
7 - (djm) Add host system and CC to end-of-configure report. Suggested by 9 - (djm) Add host system and CC to end-of-configure report. Suggested by
diff --git a/configure.in b/configure.in
index 38afa3b4d..c342d14fa 100644
--- a/configure.in
+++ b/configure.in
@@ -829,10 +829,9 @@ AC_CACHE_CHECK([for pw_class field in struct passwd],
829 ac_cv_have_pw_class_in_struct_passwd, [ 829 ac_cv_have_pw_class_in_struct_passwd, [
830 AC_TRY_COMPILE( 830 AC_TRY_COMPILE(
831 [ 831 [
832#include <sys/types.h>
833#include <pwd.h> 832#include <pwd.h>
834 ], 833 ],
835 [ struct passwd p s; p.pw_class = NULL; ], 834 [ struct passwd p; p.pw_class = 0; ],
836 [ ac_cv_have_pw_class_in_struct_passwd="yes" ], 835 [ ac_cv_have_pw_class_in_struct_passwd="yes" ],
837 [ ac_cv_have_pw_class_in_struct_passwd="no" ] 836 [ ac_cv_have_pw_class_in_struct_passwd="no" ]
838 ) 837 )
diff --git a/session.c b/session.c
index 446385892..0aa5138c6 100644
--- a/session.c
+++ b/session.c
@@ -244,7 +244,7 @@ do_authenticated(struct passwd * pw)
244 s = session_new(); 244 s = session_new();
245 s->pw = pw; 245 s->pw = pw;
246 246
247#ifdef HAVE_LOGIN_CAP 247#if defined(HAVE_LOGIN_CAP) && defined(HAVE_PW_CLASS_IN_PASSWD)
248 if ((lc = login_getclass(pw->pw_class)) == NULL) { 248 if ((lc = login_getclass(pw->pw_class)) == NULL) {
249 error("unable to get login class"); 249 error("unable to get login class");
250 return; 250 return;
@@ -1966,7 +1966,7 @@ do_authenticated2(void)
1966 close(startup_pipe); 1966 close(startup_pipe);
1967 startup_pipe = -1; 1967 startup_pipe = -1;
1968 } 1968 }
1969#ifdef HAVE_LOGIN_CAP 1969#if defined(HAVE_LOGIN_CAP) && defined(HAVE_PW_CLASS_IN_PASSWD)
1970 pw = auth_get_user(); 1970 pw = auth_get_user();
1971 if ((lc = login_getclass(pw->pw_class)) == NULL) { 1971 if ((lc = login_getclass(pw->pw_class)) == NULL) {
1972 error("unable to get login class"); 1972 error("unable to get login class");