summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2003-09-15 05:30:52 +0000
committerTim Potter <tpot@samba.org>2003-09-15 05:30:52 +0000
commit5b5ed5a6dcc07b979f4386636a5430bfac39ad2a (patch)
treec97ba1db32acd2e35fc667205b60958c6209538e /source3
parent1d38ffec7a64d84bbfadd17d93a75cf2cd6451b5 (diff)
downloadsamba-5b5ed5a6dcc07b979f4386636a5430bfac39ad2a.tar.gz
samba-5b5ed5a6dcc07b979f4386636a5430bfac39ad2a.tar.bz2
samba-5b5ed5a6dcc07b979f4386636a5430bfac39ad2a.zip
Merge from Samba 3.0:
>remove getpwnam() calls from init_sam_from_xxx(). >This means that %u & %g will no longer expand, but %U >and %G still do. The payback is that winbindd local >accounts for users work with 'wbinfo -u' when winbind >is running on a PDC. (This used to be commit f047e24561688c697179b14549b1800e00b2a435)
Diffstat (limited to 'source3')
-rw-r--r--source3/passdb/passdb.c37
1 files changed, 8 insertions, 29 deletions
diff --git a/source3/passdb/passdb.c b/source3/passdb/passdb.c
index 76745be3f0..1dadee8a49 100644
--- a/source3/passdb/passdb.c
+++ b/source3/passdb/passdb.c
@@ -1311,9 +1311,6 @@ BOOL init_sam_from_buffer(SAM_ACCOUNT *sampass, uint8 *buf, uint32 buflen)
uint32 len = 0;
uint32 lm_pw_len, nt_pw_len, hourslen;
BOOL ret = True;
- uid_t uid = -1;
- gid_t gid = -1;
- struct passwd *pw = NULL;
if(sampass == NULL || buf == NULL) {
DEBUG(0, ("init_sam_from_buffer: NULL parameters found!\n"));
@@ -1369,55 +1366,37 @@ BOOL init_sam_from_buffer(SAM_ACCOUNT *sampass, uint8 *buf, uint32 buflen)
pdb_set_nt_username(sampass, nt_username, PDB_SET);
pdb_set_fullname(sampass, fullname, PDB_SET);
-
- if ( (pw=Get_Pwnam(username)) != NULL ) {
- uid = pw->pw_uid;
- gid = pw->pw_gid;
- }
-
if (homedir) {
pdb_set_homedir(sampass, homedir, PDB_SET);
}
else {
pdb_set_homedir(sampass,
- talloc_sub_specified(sampass->mem_ctx,
- lp_logon_home(),
- username, domain,
- uid, gid),
- PDB_DEFAULT);
+ talloc_sub_basic(sampass->mem_ctx, username, lp_logon_home()),
+ PDB_DEFAULT);
}
if (dir_drive)
pdb_set_dir_drive(sampass, dir_drive, PDB_SET);
else {
pdb_set_dir_drive(sampass,
- talloc_sub_specified(sampass->mem_ctx,
- lp_logon_drive(),
- username, domain,
- uid, gid),
- PDB_DEFAULT);
+ talloc_sub_basic(sampass->mem_ctx, username, lp_logon_drive()),
+ PDB_DEFAULT);
}
if (logon_script)
pdb_set_logon_script(sampass, logon_script, PDB_SET);
else {
pdb_set_logon_script(sampass,
- talloc_sub_specified(sampass->mem_ctx,
- lp_logon_script(),
- username, domain,
- uid, gid),
- PDB_DEFAULT);
+ talloc_sub_basic(sampass->mem_ctx, username, lp_logon_script()),
+ PDB_DEFAULT);
}
if (profile_path) {
pdb_set_profile_path(sampass, profile_path, PDB_SET);
} else {
pdb_set_profile_path(sampass,
- talloc_sub_specified(sampass->mem_ctx,
- lp_logon_path(),
- username, domain,
- uid, gid),
- PDB_DEFAULT);
+ talloc_sub_basic(sampass->mem_ctx, username, lp_logon_path()),
+ PDB_DEFAULT);
}
pdb_set_acct_desc(sampass, acct_desc, PDB_SET);