Attachment 5277 Details for Bug 7101 – Update ldap password first

[patch] Update ldap password first

password_sync.patch (text/plain), 2.17 KB, created by Andy Hanton on 2010-02-04 19:38:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andy Hanton

Created: 2010-02-04 19:38:15 UTC

Size: 2.17 KB

patch

obsolete

>--- source3/passdb/pdb_ldap.c.orig	2010-02-05 01:11:28.000000000 +0000
>+++ source3/passdb/pdb_ldap.c	2010-02-05 01:10:32.000000000 +0000
>@@ -1657,40 +1657,7 @@
> 	if (!newpwd || !dn) {
> 		return NT_STATUS_INVALID_PARAMETER;
> 	}
>-	
>-	if (!mods) {
>-		DEBUG(5,("ldapsam_modify_entry: mods is empty: nothing to modify\n"));
>-		/* may be password change below however */
>-	} else {
>-		switch(ldap_op) {
>-			case LDAP_MOD_ADD:
>-				if (ldap_state->is_nds_ldap) {
>-					smbldap_set_mod(&mods, LDAP_MOD_ADD, 
>-							"objectclass", 
>-							"inetOrgPerson");
>-				} else {
>-					smbldap_set_mod(&mods, LDAP_MOD_ADD, 
>-							"objectclass", 
>-							LDAP_OBJ_ACCOUNT);
>-				}
>-				rc = smbldap_add(ldap_state->smbldap_state, 
>-						 dn, mods);
>-				break;
>-			case LDAP_MOD_REPLACE: 
>-				rc = smbldap_modify(ldap_state->smbldap_state, 
>-						    dn ,mods);
>-				break;
>-			default: 	
>-				DEBUG(0,("ldapsam_modify_entry: Wrong LDAP operation type: %d!\n", 
>-					 ldap_op));
>-				return NT_STATUS_INVALID_PARAMETER;
>-		}
>-		
>-		if (rc!=LDAP_SUCCESS) {
>-			return NT_STATUS_UNSUCCESSFUL;
>-		}  
>-	}
>-	
>+
> 	if (!(pdb_get_acct_ctrl(newpwd)&(ACB_WSTRUST|ACB_SVRTRUST|ACB_DOMTRUST)) &&
> 			(lp_ldap_passwd_sync() != LDAP_PASSWD_SYNC_OFF) &&
> 			need_update(newpwd, PDB_PLAINTEXT_PW) &&
>@@ -1816,6 +1783,40 @@
> 		}
> 		ber_bvfree(bv);
> 	}
>+	
>+	if (!mods) {
>+		DEBUG(5,("ldapsam_modify_entry: mods is empty: nothing to modify\n"));
>+		/* may be password change below however */
>+	} else {
>+		switch(ldap_op) {
>+			case LDAP_MOD_ADD:
>+				if (ldap_state->is_nds_ldap) {
>+					smbldap_set_mod(&mods, LDAP_MOD_ADD, 
>+							"objectclass", 
>+							"inetOrgPerson");
>+				} else {
>+					smbldap_set_mod(&mods, LDAP_MOD_ADD, 
>+							"objectclass", 
>+							LDAP_OBJ_ACCOUNT);
>+				}
>+				rc = smbldap_add(ldap_state->smbldap_state, 
>+						 dn, mods);
>+				break;
>+			case LDAP_MOD_REPLACE: 
>+				rc = smbldap_modify(ldap_state->smbldap_state, 
>+						    dn ,mods);
>+				break;
>+			default: 	
>+				DEBUG(0,("ldapsam_modify_entry: Wrong LDAP operation type: %d!\n", 
>+					 ldap_op));
>+				return NT_STATUS_INVALID_PARAMETER;
>+		}
>+		
>+		if (rc!=LDAP_SUCCESS) {
>+			return NT_STATUS_UNSUCCESSFUL;
>+		}  
>+	}
>+	
> 	return NT_STATUS_OK;
> }
>

Actions: View

Attachments on bug 7101: 5277