[SCM] Samba Shared Repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
       via  1b470aaa67b s3:passdb: Consolidate error checking in fetch_ldap_pw()
       via  60ce54c36d7 s3:passdb: Remove upgrade support of samba-2.2 style ldap password
      from  fc45fcfde51 vfs_default: assert all passed in fsp's and names are non-stream type

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 1b470aaa67b0d5b2405621306c5b0d99d1fa0770
Author: Pavel Filipenský <pfilipensky at samba.org>
Date:   Fri Aug 5 21:43:25 2022 +0200

    s3:passdb: Consolidate error checking in fetch_ldap_pw()
    
    Signed-off-by: Pavel Filipenský <pfilipensky at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>
    
    Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date(master): Thu Aug 11 06:34:56 UTC 2022 on sn-devel-184

commit 60ce54c36d70c0ceddd5984343fb51462a6b1b76
Author: Pavel Filipenský <pfilipensky at samba.org>
Date:   Fri Aug 5 17:30:19 2022 +0200

    s3:passdb: Remove upgrade support of samba-2.2 style ldap password
    
    It was introduced in 2002. Probably we no longer need to support
    password upgrade from samba-2.2.
    
    Signed-off-by: Pavel Filipenský <pfilipensky at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 source3/passdb/secrets.c | 55 +++---------------------------------------------
 1 file changed, 3 insertions(+), 52 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/passdb/secrets.c b/source3/passdb/secrets.c
index fdacafa11c9..43a468ab068 100644
--- a/source3/passdb/secrets.c
+++ b/source3/passdb/secrets.c
@@ -379,63 +379,14 @@ bool fetch_ldap_pw(char **dn, char** pw)
 	*pw=(char *)secrets_fetch(key, &size);
 	SAFE_FREE(key);
 
-	if ((size != 0) && ((*pw)[size-1] != '\0')) {
-		DBG_ERR("Non 0-terminated password for dn %s\n", *dn);
+	if (*pw == NULL || size == 0 || (*pw)[size-1] != '\0') {
+		DBG_ERR("No valid password for %s\n", *dn);
 		SAFE_FREE(*pw);
 		SAFE_FREE(*dn);
 		return false;
 	}
 
-	if (!size) {
-		/* Upgrade 2.2 style entry */
-		char *p;
-	        char* old_style_key = SMB_STRDUP(*dn);
-		char *data;
-		fstring old_style_pw;
-
-		if (!old_style_key) {
-			DEBUG(0, ("fetch_ldap_pw: strdup failed!\n"));
-			SAFE_FREE(*pw);
-			SAFE_FREE(*dn);
-			return False;
-		}
-
-		for (p=old_style_key; *p; p++)
-			if (*p == ',') *p = '/';
-
-		data=(char *)secrets_fetch(old_style_key, &size);
-		if ((data == NULL) || (size < sizeof(old_style_pw))) {
-			DEBUG(0,("fetch_ldap_pw: neither ldap secret retrieved!\n"));
-			SAFE_FREE(old_style_key);
-			SAFE_FREE(*pw);
-			SAFE_FREE(*dn);
-			SAFE_FREE(data);
-			return False;
-		}
-
-		size = MIN(size, sizeof(fstring)-1);
-		strncpy(old_style_pw, data, size);
-		old_style_pw[size] = 0;
-
-		SAFE_FREE(data);
-
-		if (!secrets_store_ldap_pw(*dn, old_style_pw)) {
-			DEBUG(0,("fetch_ldap_pw: ldap secret could not be upgraded!\n"));
-			SAFE_FREE(old_style_key);
-			SAFE_FREE(*pw);
-			SAFE_FREE(*dn);
-			return False;
-		}
-		if (!secrets_delete_entry(old_style_key)) {
-			DEBUG(0,("fetch_ldap_pw: old ldap secret could not be deleted!\n"));
-		}
-
-		SAFE_FREE(old_style_key);
-
-		*pw = smb_xstrdup(old_style_pw);
-	}
-
-	return True;
+	return true;
 }
 
 /*******************************************************************************


-- 
Samba Shared Repository