Attachment 1034 Details for Bug 2453 – Patch: modifies pdb_nds.c - NDS specific.

[patch] Patch: modifies pdb_nds.c - NDS specific.

pdb_nds.c.diff (text/plain), 1.98 KB, created by Vince Brimhall on 2005-03-15 12:34:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vince Brimhall

Created: 2005-03-15 12:34:08 UTC

Size: 1.98 KB

patch

obsolete

>--- source/passdb/pdb_nds.c
>+++ source/passdb/pdb_nds.c	2005-03-14 14:35:02.507023272 -0700
>@@ -764,6 +764,7 @@
> 		char protocol[12];
> 		char ldap_server[256];
> 		const char *username = pdb_get_username(sam_acct);
>+		int got_clear_text_pw = 0;
> 
> 		DEBUG(5,("pdb_nds_update_login_attempts: %s login for %s\n",
> 				success ? "Successful" : "Failed", username));
>@@ -795,7 +796,8 @@
> 		pwd_len = sizeof(clear_text_pw);
> 		if (success == True) {
> 			if (pdb_nds_get_password(ldap_state->smbldap_state, dn, &pwd_len, clear_text_pw) == LDAP_SUCCESS) {
>-				/*  */
>+				/* Got clear text password. Use simple ldap bind */
>+				got_clear_text_pw = 1;
> 			}
> 		} else {
> 			generate_random_buffer(clear_text_pw, 24);
>@@ -849,22 +851,24 @@
> 			}
> 		}
> 
>-		/* Attempt simple bind with real or bogus password */
>-		rc = ldap_simple_bind_s(ld, dn, clear_text_pw);
>-		if (rc == LDAP_SUCCESS) {
>-			DEBUG(5,("pdb_nds_update_login_attempts: ldap_simple_bind_s Successful for %s\n", username));
>-			ldap_unbind_ext(ld, NULL, NULL);
>-		} else {
>-			NTSTATUS nt_status = NT_STATUS_ACCOUNT_RESTRICTION;
>-			DEBUG(5,("pdb_nds_update_login_attempts: ldap_simple_bind_s Failed for %s\n", username));
>-			switch(rc) {
>-				case LDAP_INVALID_CREDENTIALS:
>-					nt_status = NT_STATUS_WRONG_PASSWORD;
>-					break;
>-				default:
>-					break;
>+		if((success != True) || (got_clear_text_pw == 1)) {
>+			/* Attempt simple bind with real or bogus password */
>+			rc = ldap_simple_bind_s(ld, dn, clear_text_pw);
>+			if (rc == LDAP_SUCCESS) {
>+				DEBUG(5,("pdb_nds_update_login_attempts: ldap_simple_bind_s Successful for %s\n", username));
>+				ldap_unbind_ext(ld, NULL, NULL);
>+			} else {
>+				NTSTATUS nt_status = NT_STATUS_ACCOUNT_RESTRICTION;
>+				DEBUG(5,("pdb_nds_update_login_attempts: ldap_simple_bind_s Failed for %s\n", username));
>+				switch(rc) {
>+					case LDAP_INVALID_CREDENTIALS:
>+						nt_status = NT_STATUS_WRONG_PASSWORD;
>+						break;
>+					default:
>+						break;
>+				}
>+				return nt_status;
> 			}
>-			return nt_status;
> 		}
> 	}
>

Actions: View

Attachments on bug 2453: 1034