param: rename lp function and variable from 'dontdescend' to 'dont_descend'
authorGarming Sam <garming@catalyst.net.nz>
Mon, 3 Feb 2014 01:56:12 +0000 (14:56 +1300)
committerJeremy Allison <jra@samba.org>
Sat, 8 Feb 2014 00:19:09 +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/param/loadparm.c
source3/smbd/reply.c
source3/smbd/smb2_find.c
source3/smbd/trans2.c

index f1eb1156f59a0cd2bbee2effed053df2da2f81ae..81601c63bf8d20705f5d390f0e5c28efa8c9ddec 100644 (file)
@@ -51,7 +51,7 @@ FN_LOCAL_STRING(preexec, preexec)
 FN_LOCAL_STRING(postexec, postexec)
 FN_LOCAL_STRING(rootpreexec, rootpreexec)
 FN_LOCAL_STRING(rootpostexec, rootpostexec)
-FN_LOCAL_STRING(dontdescend, dontdescend)
+FN_LOCAL_STRING(dont_descend, dont_descend)
 FN_LOCAL_STRING(username, username)
 FN_LOCAL_LIST(invalid_users, invalid_users)
 FN_LOCAL_LIST(valid_users, valid_users)
index 0724fb8c003df340061fa26d5c8368cf2a414c1f..cdb6eccca497f1d062628e5a80cf500753400539 100644 (file)
@@ -3751,7 +3751,7 @@ static struct parm_struct parm_table[] = {
                .label          = "dont descend",
                .type           = P_STRING,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(dontdescend),
+               .offset         = LOCAL_VAR(dont_descend),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE,
index 28fbf4077a702063399c32d1b9aaedb00f198a0d..224aedec79c27b84045ed8083eb855fde835ed59 100644 (file)
@@ -167,7 +167,7 @@ static struct loadparm_service sDefault =
        .queueresumecommand = NULL,
        ._printername = NULL,
        .printjob_username = NULL,
-       .dontdescend = NULL,
+       .dont_descend = NULL,
        .hosts_allow = NULL,
        .hosts_deny = NULL,
        .magicscript = NULL,
index 72dadf6dbbf4bf729249f53ab2c83218da265706..3d2750161fe8a4fa881ba82298c4441a25983351 100644 (file)
@@ -1705,8 +1705,8 @@ void reply_search(struct smb_request *req)
                         /DIR_STRUCT_SIZE));
 
                DEBUG(8,("dirpath=<%s> dontdescend=<%s>\n",
-                        directory,lp_dontdescend(ctx, SNUM(conn))));
-               if (in_list(directory, lp_dontdescend(ctx, SNUM(conn)),True)) {
+                        directory,lp_dont_descend(ctx, SNUM(conn))));
+               if (in_list(directory, lp_dont_descend(ctx, SNUM(conn)),True)) {
                        check_descend = True;
                }
 
index c39a35d526cd1aaf1929733bde9628a0087d10db..46d0aa49ae56d3be5b4f7d78f4b17c78a865ad5a 100644 (file)
@@ -381,9 +381,9 @@ static struct tevent_req *smbd_smb2_find_send(TALLOC_CTX *mem_ctx,
 
        DEBUG(8,("smbd_smb2_find_send: dirpath=<%s> dontdescend=<%s>, "
                "in_output_buffer_length = %u\n",
-               fsp->fsp_name->base_name, lp_dontdescend(talloc_tos(), SNUM(conn)),
+               fsp->fsp_name->base_name, lp_dont_descend(talloc_tos(), SNUM(conn)),
                (unsigned int)in_output_buffer_length ));
-       if (in_list(fsp->fsp_name->base_name,lp_dontdescend(talloc_tos(), SNUM(conn)),
+       if (in_list(fsp->fsp_name->base_name,lp_dont_descend(talloc_tos(), SNUM(conn)),
                        conn->case_sensitive)) {
                dont_descend = true;
        }
index 2d9aefafa4522ab82d74cda16cc9d3b6f506f41c..bd5ab1fb0baf92a07825573a464a9b9fefdebd35 100644 (file)
@@ -2571,8 +2571,8 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
                a different TRANS2 call. */
 
        DEBUG(8,("dirpath=<%s> dontdescend=<%s>\n",
-                directory,lp_dontdescend(ctx, SNUM(conn))));
-       if (in_list(directory,lp_dontdescend(ctx, SNUM(conn)),conn->case_sensitive))
+                directory,lp_dont_descend(ctx, SNUM(conn))));
+       if (in_list(directory,lp_dont_descend(ctx, SNUM(conn)),conn->case_sensitive))
                dont_descend = True;
 
        p = pdata;
@@ -2905,8 +2905,8 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
                a different TRANS2 call. */
 
        DEBUG(8,("dirpath=<%s> dontdescend=<%s>\n",
-                directory,lp_dontdescend(ctx, SNUM(conn))));
-       if (in_list(directory,lp_dontdescend(ctx, SNUM(conn)),conn->case_sensitive))
+                directory,lp_dont_descend(ctx, SNUM(conn))));
+       if (in_list(directory,lp_dont_descend(ctx, SNUM(conn)),conn->case_sensitive))
                dont_descend = True;
 
        p = pdata;