summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGarming Sam <garming@catalyst.net.nz>2014-02-04 15:09:00 +1300
committerJeremy Allison <jra@samba.org>2014-02-07 16:19:12 -0800
commit216d9691803ce58da97458466fd0d2f964c26b83 (patch)
treeb8168a3199d26b1c339e1b8d60c7de057f7e37e5
parent8feac8039535dc9b68cd04fcf5a30f9a8e2ba7a6 (diff)
downloadsamba-216d9691803ce58da97458466fd0d2f964c26b83.tar.gz
param: rename lp function and variable from "adduser_script" to "add_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.c2
-rw-r--r--lib/param/param_table.c2
-rw-r--r--source3/auth/auth_util.c2
-rw-r--r--source3/libnet/libnet_dssync_passdb.c2
-rw-r--r--source3/libnet/libnet_samsync_passdb.c2
-rw-r--r--source3/passdb/pdb_interface.c2
6 files changed, 6 insertions, 6 deletions
diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c
index 250053c6d5f..686484e0192 100644
--- a/lib/param/param_functions.c
+++ b/lib/param/param_functions.c
@@ -372,7 +372,7 @@ FN_GLOBAL_STRING(add_machine_script, add_machine_script)
FN_GLOBAL_STRING(addport_cmd, addport_cmd)
FN_GLOBAL_STRING(addprinter_cmd, addprinter_cmd)
FN_GLOBAL_STRING(add_share_cmd, add_share_cmd)
-FN_GLOBAL_STRING(adduser_script, adduser_script)
+FN_GLOBAL_STRING(add_user_script, add_user_script)
FN_GLOBAL_STRING(addusertogroup_script, addusertogroup_script)
FN_GLOBAL_STRING(auto_services, auto_services)
FN_GLOBAL_STRING(change_share_cmd, change_share_cmd)
diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index 5f7e06e2430..85ef490e4ef 100644
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -2593,7 +2593,7 @@ static struct parm_struct parm_table[] = {
.label = "add user script",
.type = P_STRING,
.p_class = P_GLOBAL,
- .offset = GLOBAL_VAR(adduser_script),
+ .offset = GLOBAL_VAR(add_user_script),
.special = NULL,
.enum_list = NULL,
.flags = FLAG_ADVANCED,
diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c
index 5ac9ebde4b3..2b6b13f5c47 100644
--- a/source3/auth/auth_util.c
+++ b/source3/auth/auth_util.c
@@ -48,7 +48,7 @@ static int _smb_create_user(const char *domain, const char *unix_username, const
char *add_script;
int ret;
- add_script = lp_adduser_script(ctx);
+ add_script = lp_add_user_script(ctx);
if (!add_script || !*add_script) {
return -1;
}
diff --git a/source3/libnet/libnet_dssync_passdb.c b/source3/libnet/libnet_dssync_passdb.c
index 6fadcef8a80..22eff90f9fa 100644
--- a/source3/libnet/libnet_dssync_passdb.c
+++ b/source3/libnet/libnet_dssync_passdb.c
@@ -670,7 +670,7 @@ static NTSTATUS smb_create_user(TALLOC_CTX *mem_ctx,
/* Create appropriate user */
if (acct_flags & ACB_NORMAL) {
- add_script = lp_adduser_script(mem_ctx);
+ add_script = lp_add_user_script(mem_ctx);
} else if ( (acct_flags & ACB_WSTRUST) ||
(acct_flags & ACB_SVRTRUST) ||
(acct_flags & ACB_DOMTRUST) ) {
diff --git a/source3/libnet/libnet_samsync_passdb.c b/source3/libnet/libnet_samsync_passdb.c
index fd5388a2ccf..53e9a3230e2 100644
--- a/source3/libnet/libnet_samsync_passdb.c
+++ b/source3/libnet/libnet_samsync_passdb.c
@@ -250,7 +250,7 @@ static NTSTATUS smb_create_user(TALLOC_CTX *mem_ctx,
/* Create appropriate user */
if (acct_flags & ACB_NORMAL) {
- add_script = lp_adduser_script(mem_ctx);
+ add_script = lp_add_user_script(mem_ctx);
} else if ( (acct_flags & ACB_WSTRUST) ||
(acct_flags & ACB_SVRTRUST) ||
(acct_flags & ACB_DOMTRUST) ) {
diff --git a/source3/passdb/pdb_interface.c b/source3/passdb/pdb_interface.c
index 12b2f6e16de..e48e6d40da3 100644
--- a/source3/passdb/pdb_interface.c
+++ b/source3/passdb/pdb_interface.c
@@ -459,7 +459,7 @@ static NTSTATUS pdb_default_create_user(struct pdb_methods *methods,
fstring name2;
if ((acb_info & ACB_NORMAL) && name[strlen(name)-1] != '$') {
- add_script = lp_adduser_script(tmp_ctx);
+ add_script = lp_add_user_script(tmp_ctx);
} else {
add_script = lp_add_machine_script(tmp_ctx);
}