summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2005-11-28 20:42:18 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:05:38 -0500
commit6f04dc477e273f782454c798f26f2d24c2a83574 (patch)
tree2e4c93fc7c4a26393988a72d92046fe32d57ff08
parentdefe1f3aa8ada898b158836993d8dc98c7cc3b76 (diff)
downloadsamba-6f04dc477e273f782454c798f26f2d24c2a83574.tar.gz
samba-6f04dc477e273f782454c798f26f2d24c2a83574.tar.bz2
samba-6f04dc477e273f782454c798f26f2d24c2a83574.zip
r11947: Back out passdb:expand_explicit until we find consensus. I'll file this as a
bugzilla entry. Volker (This used to be commit d228cb62a7be6ae128d3418aeb0ea466c7329802)
-rw-r--r--source3/passdb/passdb.c17
-rw-r--r--source3/passdb/pdb_ldap.c17
2 files changed, 6 insertions, 28 deletions
diff --git a/source3/passdb/passdb.c b/source3/passdb/passdb.c
index 7f9cc7df9f..c893ebcd42 100644
--- a/source3/passdb/passdb.c
+++ b/source3/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/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
index 1254dba2b8..66efe5a8ae 100644
--- a/source3/passdb/pdb_ldap.c
+++ b/source3/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);
}