View | Details | Raw Unified | Return to bug 105118
Collapse All | Expand All

(-) (-3 / +19 lines)
Lines 149-155 Link Here
149
#endif
149
#endif
150
150
151
static char rcsid[] __UNUSED__ =
151
static char rcsid[] __UNUSED__ =
152
  "$Id: pam_ldap.c,v 1.198 2005/07/17 11:11:35 lukeh Exp $";
152
  "$Id: pam_ldap.c,v 1.199 2005/08/11 03:16:02 lukeh Exp $";
153
#if LDAP_SET_REBIND_PROC_ARGS < 3
153
#if LDAP_SET_REBIND_PROC_ARGS < 3
154
static pam_ldap_session_t *global_session = 0;
154
static pam_ldap_session_t *global_session = 0;
155
#endif
155
#endif
Lines 2054-2061 Link Here
2054
           }
2054
           }
2055
         else if (!strcmp ((*ctlp)->ldctl_oid, LDAP_CONTROL_PASSWORDPOLICYRESPONSE))
2055
         else if (!strcmp ((*ctlp)->ldctl_oid, LDAP_CONTROL_PASSWORDPOLICYRESPONSE))
2056
           {
2056
           {
2057
             rc = _get_password_policy_response_value (&(*ctlp)->ldctl_value,
2057
             int rc2;
2058
                                                       session);
2058
2059
             rc2 = _get_password_policy_response_value (&(*ctlp)->ldctl_value,
2060
                                                        session);
2061
2062
             if (rc2 != LDAP_SUCCESS ||
2063
                 session->info->policy_error != POLICY_ERROR_SUCCESS)
2064
               {
2065
                 /*
2066
                  * If decoding policy control failed, return the error.
2067
                  *
2068
                  * If decoding policy control succeeded, and there is a
2069
                  * policy error, return LDAP_SUCCESS so that the error
2070
                  * will be handled in the account management step (see
2071
                  * above).
2072
                  */
2073
                 rc = rc2;
2074
               }
2059
           }
2075
           }
2060
       }
2076
       }
2061
      ldap_controls_free (controls);
2077
      ldap_controls_free (controls);

Return to bug 105118