diff options
author | Andreas Schneider <asn@samba.org> | 2013-11-18 14:58:04 +0100 |
---|---|---|
committer | Jeremy Allison <jra@samba.org> | 2013-11-21 15:00:44 -0800 |
commit | 6366ebb79bb72d9dcb12f8fe8d6e35611fcff150 (patch) | |
tree | ad74b0c98947a3b233d12e7612d22d0673df231a /source3/passdb | |
parent | 4ea92841b72a7b701a7c0fadf63430a7d0a3fac8 (diff) | |
download | samba-6366ebb79bb72d9dcb12f8fe8d6e35611fcff150.tar.gz samba-6366ebb79bb72d9dcb12f8fe8d6e35611fcff150.tar.xz samba-6366ebb79bb72d9dcb12f8fe8d6e35611fcff150.zip |
s3-lib: Add grpname to talloc_sub_specified().
BUG: https://bugzilla.samba.org/show_bug.cgi?id=2191
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source3/passdb')
-rw-r--r-- | source3/passdb/passdb.c | 8 | ||||
-rw-r--r-- | source3/passdb/pdb_ldap.c | 24 |
2 files changed, 25 insertions, 7 deletions
diff --git a/source3/passdb/passdb.c b/source3/passdb/passdb.c index 379d85803f1..5a4620f6cb3 100644 --- a/source3/passdb/passdb.c +++ b/source3/passdb/passdb.c @@ -228,16 +228,16 @@ static NTSTATUS samu_set_unix_internal(struct pdb_methods *methods, /* set some basic attributes */ pdb_set_profile_path(user, talloc_sub_specified(user, - lp_logon_path(), pwd->pw_name, domain, pwd->pw_uid, pwd->pw_gid), + lp_logon_path(), pwd->pw_name, NULL, domain, pwd->pw_uid, pwd->pw_gid), PDB_DEFAULT); pdb_set_homedir(user, talloc_sub_specified(user, - lp_logon_home(), pwd->pw_name, domain, pwd->pw_uid, pwd->pw_gid), + lp_logon_home(), pwd->pw_name, NULL, domain, pwd->pw_uid, pwd->pw_gid), PDB_DEFAULT); pdb_set_dir_drive(user, talloc_sub_specified(user, - lp_logon_drive(), pwd->pw_name, domain, pwd->pw_uid, pwd->pw_gid), + lp_logon_drive(), pwd->pw_name, NULL, domain, pwd->pw_uid, pwd->pw_gid), PDB_DEFAULT); pdb_set_logon_script(user, talloc_sub_specified(user, - lp_logon_script(), pwd->pw_name, domain, pwd->pw_uid, pwd->pw_gid), + lp_logon_script(), pwd->pw_name, NULL, domain, pwd->pw_uid, pwd->pw_gid), PDB_DEFAULT); } diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c index d7db4d80514..bb0d3b3de90 100644 --- a/source3/passdb/pdb_ldap.c +++ b/source3/passdb/pdb_ldap.c @@ -5316,11 +5316,29 @@ static NTSTATUS ldapsam_create_user(struct pdb_methods *my_methods, if (is_machine) { /* TODO: choose a more appropriate default for machines */ - homedir = talloc_sub_specified(tmp_ctx, lp_template_homedir(), "SMB_workstations_home", ldap_state->domain_name, uid, gid); + homedir = talloc_sub_specified(tmp_ctx, + lp_template_homedir(), + "SMB_workstations_home", + NULL, + ldap_state->domain_name, + uid, + gid); shell = talloc_strdup(tmp_ctx, "/bin/false"); } else { - homedir = talloc_sub_specified(tmp_ctx, lp_template_homedir(), name, ldap_state->domain_name, uid, gid); - shell = talloc_sub_specified(tmp_ctx, lp_template_shell(), name, ldap_state->domain_name, uid, gid); + homedir = talloc_sub_specified(tmp_ctx, + lp_template_homedir(), + name, + NULL, + ldap_state->domain_name, + uid, + gid); + shell = talloc_sub_specified(tmp_ctx, + lp_template_shell(), + name, + NULL, + ldap_state->domain_name, + uid, + gid); } uidstr = talloc_asprintf(tmp_ctx, "%u", (unsigned int)uid); gidstr = talloc_asprintf(tmp_ctx, "%u", (unsigned int)gid); |