OBS User unknown 2008-11-03 13:16:59 +00:00 committed by Git OBS Bridge
parent 0baf56c7da
commit a06ca1d4e8
3 changed files with 40 additions and 11 deletions

View File

@ -1,15 +1,35 @@
Index: pam_krb5-2.3.1-1/src/password.c diff --git a/src/password.c b/src/password.c
=================================================================== index 85ab240..5ed4cf1 100644
--- pam_krb5-2.3.1-1.orig/src/password.c --- a/src/password.c
+++ pam_krb5-2.3.1-1/src/password.c +++ b/src/password.c
@@ -465,6 +465,10 @@ pam_sm_chauthtok(pam_handle_t *pamh, int @@ -442,16 +442,22 @@ pam_sm_chauthtok(pam_handle_t *pamh, int flags,
_pam_krb5_always_fail_prompter,
&stash->v5result);
stash->v5attempted = 1;
- if ((i == PAM_SUCCESS) &&
- ((options->v4 == 1) || (options->v4_for_afs == 1))) {
- v4_get_creds(ctx, pamh, stash, userinfo,
- options, password, &i);
- if (i != 0) {
- if (options->debug) {
- debug("error obtaining initial credentials using newly-set password: %d (%s)",
- i, v5_error_message(i));
+ if (i == PAM_SUCCESS) {
+ if ((options->v4 == 1) || (options->v4_for_afs == 1)) {
+ v4_get_creds(ctx, pamh, stash, userinfo,
+ options, password, &i);
+ if (i != 0) {
+ if (options->debug) {
+ debug("error obtaining initial credentials using newly-set password: %d (%s)",
+ i, v5_error_message(i));
+ }
} }
} }
+ if (options->use_shmem) {
+ _pam_krb5_stash_shm_write(pamh, stash,
+ options,
+ userinfo);
+ }
} }
+ if ((i == PAM_SUCCESS) && options->use_shmem)
+ {
+ _pam_krb5_stash_shm_write(pamh, stash, options, userinfo);
+ }
} }
/* Free the new password. */

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Oct 29 11:35:39 CET 2008 - mc@suse.de
- use the upstream fix for
pam_krb5-2.3.1-fix-pwchange-with-use_shmem.dif
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Oct 28 15:09:24 CET 2008 - mc@suse.de Tue Oct 28 15:09:24 CET 2008 - mc@suse.de

View File

@ -26,7 +26,7 @@ Group: Productivity/Networking/Security
Provides: pam_krb Provides: pam_krb
AutoReqProv: on AutoReqProv: on
Version: 2.3.1 Version: 2.3.1
Release: 39 Release: 40
Summary: PAM Module for Kerberos Authentication Summary: PAM Module for Kerberos Authentication
Url: http://sourceforge.net/projects/pam-krb5/ Url: http://sourceforge.net/projects/pam-krb5/
Source: pam_krb5-%{version}-%{PAM_RELEASE}.tar.bz2 Source: pam_krb5-%{version}-%{PAM_RELEASE}.tar.bz2
@ -97,6 +97,9 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) /usr/bin/afs5log %attr(755,root,root) /usr/bin/afs5log
%changelog %changelog
* Wed Oct 29 2008 mc@suse.de
- use the upstream fix for
pam_krb5-2.3.1-fix-pwchange-with-use_shmem.dif
* Tue Oct 28 2008 mc@suse.de * Tue Oct 28 2008 mc@suse.de
- simplify switch permissions of refresh credentials - simplify switch permissions of refresh credentials
(remove pam_krb5-2.2.11-1-refresh-drop-restore-priv.dif (remove pam_krb5-2.2.11-1-refresh-drop-restore-priv.dif