Changeset 124 for branches/samba-3.0/source/passdb/pdb_ldap.c

Timestamp:

Mar 12, 2008, 9:08:18 AM (17 years ago)

Author:

Paul Smedley

Message:

Update source to 3.0.28a

File:

• branches/samba-3.0/source/passdb/pdb_ldap.c (modified) (4 diffs)

branches/samba-3.0/source/passdb/pdb_ldap.c

@@ -1652 +1652 @@
                         SAFE_FREE(ld_error);
                         ber_bvfree(bv);
+#if defined(LDAP_CONSTRAINT_VIOLATION)
+                        if (rc == LDAP_CONSTRAINT_VIOLATION)
+                                return NT_STATUS_PASSWORD_RESTRICTION;
+#endif
                         return NT_STATUS_UNSUCCESSFUL;
                 } else {
@@ -2455 +2459 @@
                 }
 
-                rc = smbldap_search(conn, lp_ldap_user_suffix(),
+                rc = smbldap_search(conn, lp_ldap_suffix(),
                                     LDAP_SCOPE_SUBTREE, filter, sid_attrs, 0,
                                     &result);
@@ -2511 +2515 @@
                                  gidstr);
 
-        rc = smbldap_search(conn, lp_ldap_user_suffix(),
+        rc = smbldap_search(conn, lp_ldap_suffix(),
                             LDAP_SCOPE_SUBTREE, filter, sid_attrs, 0,
                             &result);
@@ -2595 +2599 @@
         }
 
-        rc = smbldap_search(conn, lp_ldap_user_suffix(),
+        rc = smbldap_search(conn, lp_ldap_suffix(),
                             LDAP_SCOPE_SUBTREE, filter, attrs, 0, &result);