param: rename lp function and variable from "rootdir" to "root_directory"
authorGarming Sam <garming@catalyst.net.nz>
Tue, 4 Feb 2014 02:09:11 +0000 (15:09 +1300)
committerJeremy Allison <jra@samba.org>
Sat, 8 Feb 2014 00:19:16 +0000 (16:19 -0800)
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
lib/param/param_functions.c
lib/param/param_table.c
source3/smbd/process.c

index bc6746b25b3104b5e33c0310ed0672c69d72e280..e028b207382cee3ae533c9264b42b85872d213c2 100644 (file)
@@ -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)
index 746d8e4ad8de2c160c31767871f76f2b8cf29e08..d5ef200e4cc51aa81b737a2453692d0832e73b3a 100644 (file)
@@ -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,
index 1e1b8738b4ffe6be0f0b444d271e1ef0319f3d22..f5ca2f95948e077e8cd22bdaf1c159580a782fa5 100644 (file)
@@ -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)) {