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 | 73bac10cae03494bc046e1cd3b7cb9ce82121480 (patch) | |
| tree | 2649380fcf689c2f9e82ff8f11e4d23a2d5a9da4 | |
| parent | ad4048bb0a4dcf87c4e15f22539acebfc61b2e06 (diff) | |
| download | samba-73bac10cae03494bc046e1cd3b7cb9ce82121480.tar.gz samba-73bac10cae03494bc046e1cd3b7cb9ce82121480.tar.xz samba-73bac10cae03494bc046e1cd3b7cb9ce82121480.zip | |
param: rename lp function and variable from "rootdir" to "root_directory"
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 | 6 | ||||
| -rw-r--r-- | source3/smbd/process.c | 10 |
3 files changed, 9 insertions, 9 deletions
diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c index bc6746b25b3..e028b207382 100644 --- a/lib/param/param_functions.c +++ b/lib/param/param_functions.c @@ -402,7 +402,7 @@ 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(rename_user_script, rename_user_script) -FN_GLOBAL_STRING(rootdir, rootdir) +FN_GLOBAL_STRING(root_directory, root_directory) FN_GLOBAL_STRING(server_string, server_string) FN_GLOBAL_STRING(set_primary_group_script, set_primary_group_script) FN_GLOBAL_STRING(set_quota_command, set_quota_command) diff --git a/lib/param/param_table.c b/lib/param/param_table.c index 746d8e4ad8d..d5ef200e4cc 100644 --- a/lib/param/param_table.c +++ b/lib/param/param_table.c @@ -556,7 +556,7 @@ static struct parm_struct parm_table[] = { .label = "root directory", .type = P_STRING, .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(rootdir), + .offset = GLOBAL_VAR(root_directory), .special = NULL, .enum_list = NULL, .flags = FLAG_ADVANCED, @@ -565,7 +565,7 @@ static struct parm_struct parm_table[] = { .label = "root dir", .type = P_STRING, .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(rootdir), + .offset = GLOBAL_VAR(root_directory), .special = NULL, .enum_list = NULL, .flags = FLAG_HIDE, @@ -574,7 +574,7 @@ static struct parm_struct parm_table[] = { .label = "root", .type = P_STRING, .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(rootdir), + .offset = GLOBAL_VAR(root_directory), .special = NULL, .enum_list = NULL, .flags = FLAG_HIDE, diff --git a/source3/smbd/process.c b/source3/smbd/process.c index 1e1b8738b4f..f5ca2f95948 100644 --- a/source3/smbd/process.c +++ b/source3/smbd/process.c @@ -3513,17 +3513,17 @@ void smbd_process(struct tevent_context *ev_ctx, exit_server("Could not open account policy tdb.\n"); } - if (*lp_rootdir(talloc_tos())) { - if (chroot(lp_rootdir(talloc_tos())) != 0) { + if (*lp_root_directory(talloc_tos())) { + if (chroot(lp_root_directory(talloc_tos())) != 0) { DEBUG(0,("Failed to change root to %s\n", - lp_rootdir(talloc_tos()))); + lp_root_directory(talloc_tos()))); exit_server("Failed to chroot()"); } if (chdir("/") == -1) { - DEBUG(0,("Failed to chdir to / on chroot to %s\n", lp_rootdir(talloc_tos()))); + DEBUG(0,("Failed to chdir to / on chroot to %s\n", lp_root_directory(talloc_tos()))); exit_server("Failed to chroot()"); } - DEBUG(0,("Changed root to %s\n", lp_rootdir(talloc_tos()))); + DEBUG(0,("Changed root to %s\n", lp_root_directory(talloc_tos()))); } if (!srv_init_signing(sconn)) { |