r11947: Back out passdb:expand_explicit until we find consensus. I'll file this as a

bugzilla entry.

Volker

diff --git a/source/passdb/passdb.c b/source/passdb/passdb.c
index 7f9cc7df9f5f7666cf97e660bf59711cb697f002..c893ebcd4242161760f1a0b2bc8059c864f01deb 100644 (file)
--- a/source/passdb/passdb.c
+++ b/source/passdb/passdb.c
@@ -1751,8 +1751,6 @@ BOOL init_sam_from_buffer_v2(SAM_ACCOUNT *sampass, uint8 *buf, uint32 buflen)
        uint32 pwHistLen = 0;
        BOOL ret = True;
        fstring tmpstring;
-       BOOL expand_explicit = lp_parm_bool(-1, "passdb", "expand_explicit",
-                                           False);
        
        if(sampass == NULL || buf == NULL) {
                DEBUG(0, ("init_sam_from_buffer_v2: NULL parameters found!\n"));
@@ -1817,10 +1815,7 @@ BOOL init_sam_from_buffer_v2(SAM_ACCOUNT *sampass, uint8 *buf, uint32 buflen)
 
        if (homedir) {
                fstrcpy( tmpstring, homedir );
-               if (expand_explicit) {
-                       standard_sub_basic( username, tmpstring,
-                                           sizeof(tmpstring) );
-               }
+               standard_sub_basic( username, tmpstring, sizeof(tmpstring) );
                pdb_set_homedir(sampass, tmpstring, PDB_SET);
        }
        else {
@@ -1836,10 +1831,7 @@ BOOL init_sam_from_buffer_v2(SAM_ACCOUNT *sampass, uint8 *buf, uint32 buflen)
 
        if (logon_script) {
                fstrcpy( tmpstring, logon_script );
-               if (expand_explicit) {
-                       standard_sub_basic( username, tmpstring,
-                                           sizeof(tmpstring) );
-               }
+               standard_sub_basic( username, tmpstring, sizeof(tmpstring) );
                pdb_set_logon_script(sampass, tmpstring, PDB_SET);
        }
        else {
@@ -1850,10 +1842,7 @@ BOOL init_sam_from_buffer_v2(SAM_ACCOUNT *sampass, uint8 *buf, uint32 buflen)
        
        if (profile_path) {     
                fstrcpy( tmpstring, profile_path );
-               if (expand_explicit) {
-                       standard_sub_basic( username, tmpstring,
-                                           sizeof(tmpstring) );
-               }
+               standard_sub_basic( username, tmpstring, sizeof(tmpstring) );
                pdb_set_profile_path(sampass, tmpstring, PDB_SET);
        } 
        else {

diff --git a/source/passdb/pdb_ldap.c b/source/passdb/pdb_ldap.c
index 1254dba2b89eb966c2986f2bc47484c2ba057fc6..66efe5a8ae6fdc6581968eeb299c4c58e95010ff 100644 (file)
--- a/source/passdb/pdb_ldap.c
+++ b/source/passdb/pdb_ldap.c
@@ -604,8 +604,6 @@ static BOOL init_sam_from_ldap(struct ldapsam_privates *ldap_state,
        LOGIN_CACHE     *cache_entry = NULL;
        uint32          pwHistLen;
        pstring         tmpstring;
-       BOOL expand_explicit = lp_parm_bool(-1, "passdb", "expand_explicit",
-                                           False);
 
        /*
         * do a little initialization
@@ -778,10 +776,7 @@ static BOOL init_sam_from_ldap(struct ldapsam_privates *ldap_state,
                        PDB_DEFAULT );
        } else {
                pstrcpy( tmpstring, homedir );
-               if (expand_explicit) {
-                       standard_sub_basic( username, tmpstring,
-                                           sizeof(tmpstring) );
-               }
+               standard_sub_basic( username, tmpstring, sizeof(tmpstring) );
                pdb_set_homedir(sampass, tmpstring, PDB_SET);
        }
 
@@ -793,10 +788,7 @@ static BOOL init_sam_from_ldap(struct ldapsam_privates *ldap_state,
                        PDB_DEFAULT );
        } else {
                pstrcpy( tmpstring, logon_script );
-               if (expand_explicit) {
-                       standard_sub_basic( username, tmpstring,
-                                           sizeof(tmpstring) );
-               }
+               standard_sub_basic( username, tmpstring, sizeof(tmpstring) );
                pdb_set_logon_script(sampass, tmpstring, PDB_SET);
        }
 
@@ -808,10 +800,7 @@ static BOOL init_sam_from_ldap(struct ldapsam_privates *ldap_state,
                        PDB_DEFAULT );
        } else {
                pstrcpy( tmpstring, profile_path );
-               if (expand_explicit) {
-                       standard_sub_basic( username, tmpstring,
-                                           sizeof(tmpstring) );
-               }
+               standard_sub_basic( username, tmpstring, sizeof(tmpstring) );
                pdb_set_profile_path(sampass, tmpstring, PDB_SET);
        }