Attachment 46248 Details for Bug 105118

[patch] Proposed fix

pam_ldap-ppolicy.dif (text/plain), 1.62 KB, created by Ralf Haferkamp on 2005-08-17 09:07:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralf Haferkamp

Created: 2005-08-17 09:07:20 UTC

Size: 1.62 KB

patch

obsolete

>===================================================================
>RCS file: /home/project/cvs/pam_ldap/pam_ldap.c,v
>retrieving revision 1.198
>retrieving revision 1.199
>diff -u -r1.198 -r1.199
>--- pam_ldap.c  17 Jul 2005 11:11:35 -0000      1.198
>+++ pam_ldap.c  11 Aug 2005 03:16:02 -0000      1.199
>@@ -149,7 +149,7 @@
> #endif
> 
> static char rcsid[] __UNUSED__ =
>-  "$Id: pam_ldap.c,v 1.198 2005/07/17 11:11:35 lukeh Exp $";
>+  "$Id: pam_ldap.c,v 1.199 2005/08/11 03:16:02 lukeh Exp $";
> #if LDAP_SET_REBIND_PROC_ARGS < 3
> static pam_ldap_session_t *global_session = 0;
> #endif
>@@ -2054,8 +2054,24 @@
>            }
>          else if (!strcmp ((*ctlp)->ldctl_oid, LDAP_CONTROL_PASSWORDPOLICYRESPONSE))
>            {
>-             rc = _get_password_policy_response_value (&(*ctlp)->ldctl_value,
>-                                                       session);
>+             int rc2;
>+
>+             rc2 = _get_password_policy_response_value (&(*ctlp)->ldctl_value,
>+                                                        session);
>+
>+             if (rc2 != LDAP_SUCCESS ||
>+                 session->info->policy_error != POLICY_ERROR_SUCCESS)
>+               {
>+                 /*
>+                  * If decoding policy control failed, return the error.
>+                  *
>+                  * If decoding policy control succeeded, and there is a
>+                  * policy error, return LDAP_SUCCESS so that the error
>+                  * will be handled in the account management step (see
>+                  * above).
>+                  */
>+                 rc = rc2;
>+               }
>            }
>        }
>       ldap_controls_free (controls);

Actions: View | Diff

Attachments on bug 105118: 46248