diff options
| author | Garming Sam <garming@catalyst.net.nz> | 2014-02-04 15:09:11 +1300 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2014-02-07 16:19:16 -0800 |
| commit | ad4048bb0a4dcf87c4e15f22539acebfc61b2e06 (patch) | |
| tree | 0dff9581428f498ed1abf6eead32de523a02eb34 | |
| parent | 8256cb5a37f15ce22dcfee19806a3323a4b9c34c (diff) | |
| download | samba-ad4048bb0a4dcf87c4e15f22539acebfc61b2e06.tar.gz samba-ad4048bb0a4dcf87c4e15f22539acebfc61b2e06.tar.xz samba-ad4048bb0a4dcf87c4e15f22539acebfc61b2e06.zip | |
param: rename lp function and variable from "renameuser_script" to "rename_user_script"
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
| -rw-r--r-- | lib/param/param_functions.c | 2 | ||||
| -rw-r--r-- | lib/param/param_table.c | 2 | ||||
| -rw-r--r-- | source3/passdb/pdb_ldap.c | 2 | ||||
| -rw-r--r-- | source3/passdb/pdb_smbpasswd.c | 4 | ||||
| -rw-r--r-- | source3/passdb/pdb_tdb.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c index 0483c1461d..bc6746b25b 100644 --- a/lib/param/param_functions.c +++ b/lib/param/param_functions.c @@ -401,7 +401,7 @@ FN_GLOBAL_STRING(passwd_program, passwd_program) FN_GLOBAL_STRING(perfcount_module, perfcount_module) FN_GLOBAL_STRING(remote_announce, remote_announce) FN_GLOBAL_STRING(remote_browse_sync, remote_browse_sync) -FN_GLOBAL_STRING(renameuser_script, renameuser_script) +FN_GLOBAL_STRING(rename_user_script, rename_user_script) FN_GLOBAL_STRING(rootdir, rootdir) FN_GLOBAL_STRING(server_string, server_string) FN_GLOBAL_STRING(set_primary_group_script, set_primary_group_script) diff --git a/lib/param/param_table.c b/lib/param/param_table.c index 7616bbefb4..746d8e4ad8 100644 --- a/lib/param/param_table.c +++ b/lib/param/param_table.c @@ -2602,7 +2602,7 @@ static struct parm_struct parm_table[] = { .label = "rename user script", .type = P_STRING, .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(renameuser_script), + .offset = GLOBAL_VAR(rename_user_script), .special = NULL, .enum_list = NULL, .flags = FLAG_ADVANCED, diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c index bb0d3b3de9..6be5fb62f5 100644 --- a/source3/passdb/pdb_ldap.c +++ b/source3/passdb/pdb_ldap.c @@ -1975,7 +1975,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_renameuser_script(talloc_tos()); + rename_script = lp_rename_user_script(talloc_tos()); if (rename_script == NULL) { return NT_STATUS_NO_MEMORY; } diff --git a/source3/passdb/pdb_smbpasswd.c b/source3/passdb/pdb_smbpasswd.c index 8b0cd7aa36..6e6fb5687e 100644 --- a/source3/passdb/pdb_smbpasswd.c +++ b/source3/passdb/pdb_smbpasswd.c @@ -1449,7 +1449,7 @@ static NTSTATUS smbpasswd_rename_sam_account (struct pdb_methods *my_methods, TALLOC_CTX *ctx = talloc_tos(); NTSTATUS ret = NT_STATUS_UNSUCCESSFUL; - if (!*(lp_renameuser_script(talloc_tos()))) + if (!*(lp_rename_user_script(talloc_tos()))) goto done; if ( !(new_acct = samu_new( NULL )) ) { @@ -1469,7 +1469,7 @@ static NTSTATUS smbpasswd_rename_sam_account (struct pdb_methods *my_methods, interim_account = True; /* rename the posix user */ - rename_script = lp_renameuser_script(ctx); + rename_script = lp_rename_user_script(ctx); 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 162083f9c7..9dd445103d 100644 --- a/source3/passdb/pdb_tdb.c +++ b/source3/passdb/pdb_tdb.c @@ -1002,7 +1002,7 @@ static NTSTATUS tdbsam_rename_sam_account(struct pdb_methods *my_methods, return NT_STATUS_NO_MEMORY; } - rename_script = lp_renameuser_script(new_acct); + rename_script = lp_rename_user_script(new_acct); if (!rename_script) { TALLOC_FREE(new_acct); return NT_STATUS_NO_MEMORY; |