sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-09 08:58:35 +03:00
Code

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

Browse Source 
bugzilla entry.

Volker
(This used to be commit d228cb62a7be6ae128d3418aeb0ea466c7329802)
This commit is contained in:
Volker Lendecke 2005-11-28 20:42:18 +00:00 committed by Gerald (Jerry) Carter
parent defe1f3aa8
commit 6f04dc477e
2 changed files with 6 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
source3/passdb/passdb.c
View File

@ -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 {

17
source3/passdb/pdb_ldap.c
View File

@ -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);
}