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@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>

diff --git a/source3/passdb/secrets.c b/source3/passdb/secrets.c
index fdacafa11c97798062fe464f31015ef38a32e210..7537ecb82a1558711d42d413ed7c77464e9b8be5 100644 (file)
--- a/source3/passdb/secrets.c
+++ b/source3/passdb/secrets.c
@@ -387,55 +387,13 @@ bool fetch_ldap_pw(char **dn, char** pw)
        }
 
        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);
+               DBG_ERR("No password for %s\n", *dn);
+               SAFE_FREE(*pw);
+               SAFE_FREE(*dn);
+               return false;
        }
 
-       return True;
+       return true;
 }
 
 /*******************************************************************************