diff options
| author | Ralph Boehme <slow@samba.org> | 2019-11-05 11:49:28 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2019-11-27 10:25:36 +0000 |
| commit | 1439c19ceef3682782a7c337302ef9b7310687ef (patch) | |
| tree | 65a166f28f594e0ed924ab3722105c2748c55bae /source3/passdb | |
| parent | 6d0db70ef7379ab722daed78ff5a877b48efd083 (diff) | |
| download | samba-1439c19ceef3682782a7c337302ef9b7310687ef.tar.gz | |
smbdotconf: mark "rename user script" with substitution="1"
Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source3/passdb')
| -rw-r--r-- | source3/passdb/pdb_ldap.c | 4 | ||||
| -rw-r--r-- | source3/passdb/pdb_smbpasswd.c | 6 | ||||
| -rw-r--r-- | source3/passdb/pdb_tdb.c | 4 |
3 files changed, 10 insertions, 4 deletions
diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c index 22050fa828c..2aeb62af3c0 100644 --- a/source3/passdb/pdb_ldap.c +++ b/source3/passdb/pdb_ldap.c @@ -2040,6 +2040,8 @@ static NTSTATUS ldapsam_rename_sam_account(struct pdb_methods *my_methods, struct samu *old_acct, const char *newname) { + const struct loadparm_substitution *lp_sub = + loadparm_s3_global_substitution(); const char *oldname; int rc; char *rename_script = NULL; @@ -2057,7 +2059,7 @@ static NTSTATUS ldapsam_rename_sam_account(struct pdb_methods *my_methods, oldname = pdb_get_username(old_acct); /* rename the posix user */ - rename_script = lp_rename_user_script(talloc_tos()); + rename_script = lp_rename_user_script(talloc_tos(), lp_sub); if (rename_script == NULL) { return NT_STATUS_NO_MEMORY; } diff --git a/source3/passdb/pdb_smbpasswd.c b/source3/passdb/pdb_smbpasswd.c index bed3cea744c..76cfddfb195 100644 --- a/source3/passdb/pdb_smbpasswd.c +++ b/source3/passdb/pdb_smbpasswd.c @@ -1444,13 +1444,15 @@ static NTSTATUS smbpasswd_rename_sam_account (struct pdb_methods *my_methods, struct samu *old_acct, const char *newname) { + const struct loadparm_substitution *lp_sub = + loadparm_s3_global_substitution(); char *rename_script = NULL; struct samu *new_acct = NULL; bool interim_account = False; TALLOC_CTX *ctx = talloc_tos(); NTSTATUS ret = NT_STATUS_UNSUCCESSFUL; - if (!*(lp_rename_user_script(talloc_tos()))) + if (!*(lp_rename_user_script(talloc_tos(), lp_sub))) goto done; if ( !(new_acct = samu_new( NULL )) ) { @@ -1470,7 +1472,7 @@ static NTSTATUS smbpasswd_rename_sam_account (struct pdb_methods *my_methods, interim_account = True; /* rename the posix user */ - rename_script = lp_rename_user_script(ctx); + rename_script = lp_rename_user_script(ctx, lp_sub); if (!rename_script) { ret = NT_STATUS_NO_MEMORY; goto done; diff --git a/source3/passdb/pdb_tdb.c b/source3/passdb/pdb_tdb.c index 7488d99a94e..8b4d84b3704 100644 --- a/source3/passdb/pdb_tdb.c +++ b/source3/passdb/pdb_tdb.c @@ -1001,6 +1001,8 @@ static NTSTATUS tdbsam_rename_sam_account(struct pdb_methods *my_methods, struct samu *old_acct, const char *newname) { + const struct loadparm_substitution *lp_sub = + loadparm_s3_global_substitution(); struct samu *new_acct = NULL; char *rename_script = NULL; int rename_ret; @@ -1013,7 +1015,7 @@ static NTSTATUS tdbsam_rename_sam_account(struct pdb_methods *my_methods, return NT_STATUS_NO_MEMORY; } - rename_script = lp_rename_user_script(new_acct); + rename_script = lp_rename_user_script(new_acct, lp_sub); if (!rename_script) { TALLOC_FREE(new_acct); return NT_STATUS_NO_MEMORY; |