r25554: Convert last instances of BOOL, True and False to the standard types.

[jelmer/samba4-debian.git] / source / ntvfs / ntvfs_base.c

diff --git a/source/ntvfs/ntvfs_base.c b/source/ntvfs/ntvfs_base.c
index 316a9e9c68bd38b87f17b8e758213b058d507ffe..20197a4ba9f612f319ce7623d598cb6b0cf961c9 100644 (file)
--- a/source/ntvfs/ntvfs_base.c
+++ b/source/ntvfs/ntvfs_base.c
@@ -7,7 +7,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -16,17 +16,17 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 /*
   this implements the core code for all NTVFS modules. Backends register themselves here.
 */
 
 #include "includes.h"
-#include "dlinklist.h"
+#include "lib/util/dlinklist.h"
 #include "build.h"
 #include "ntvfs/ntvfs.h"
+#include "param/param.h"
 
 /* the list of currently registered NTVFS backends, note that there
  * can be more than one backend with the same name, as long as they
@@ -113,7 +113,7 @@ _PUBLIC_ const struct ntvfs_critical_sizes *ntvfs_interface_version(void)
        return &critical_sizes;
 }
 
-_PUBLIC_ BOOL ntvfs_interface_differs(const struct ntvfs_critical_sizes *const iface)
+_PUBLIC_ bool ntvfs_interface_differs(const struct ntvfs_critical_sizes *const iface)
 {
        /* The comparison would be easier with memcmp, but compiler-interset
         * alignment padding is not guaranteed to be zeroed.
@@ -122,42 +122,41 @@ _PUBLIC_ BOOL ntvfs_interface_differs(const struct ntvfs_critical_sizes *const i
 #define FIELD_DIFFERS(field) (iface->field != critical_sizes.field)
 
        if (FIELD_DIFFERS(interface_version))
-               return True;
+               return true;
 
        if (FIELD_DIFFERS(sizeof_ntvfs_critical_sizes))
-               return True;
+               return true;
 
        if (FIELD_DIFFERS(sizeof_ntvfs_context))
-               return True;
+               return true;
 
        if (FIELD_DIFFERS(sizeof_ntvfs_module_context))
-               return True;
+               return true;
 
        if (FIELD_DIFFERS(sizeof_ntvfs_ops))
-               return True;
+               return true;
 
        if (FIELD_DIFFERS(sizeof_ntvfs_async_state))
-               return True;
+               return true;
 
        if (FIELD_DIFFERS(sizeof_ntvfs_request))
-               return True;
+               return true;
 
        /* Versions match. */
-       return False;
+       return false;
 
 #undef FIELD_DIFFERS
 }
 
-
 /*
   initialise a connection structure to point at a NTVFS backend
 */
-NTSTATUS ntvfs_init_connection(TALLOC_CTX *mem_ctx, int snum, enum ntvfs_type type,
+NTSTATUS ntvfs_init_connection(TALLOC_CTX *mem_ctx, struct share_config *scfg, enum ntvfs_type type,
                               enum protocol_types protocol,
                               struct event_context *ev, struct messaging_context *msg,
-                              uint32_t server_id, struct ntvfs_context **_ctx)
+                              struct server_id server_id, struct ntvfs_context **_ctx)
 {
-       const char **handlers = lp_ntvfs_handler(snum);
+       const char **handlers = share_string_list_option(mem_ctx, scfg, SHARE_NTVFS_HANDLER);
        int i;
        struct ntvfs_context *ctx;
 
@@ -169,7 +168,7 @@ NTSTATUS ntvfs_init_connection(TALLOC_CTX *mem_ctx, int snum, enum ntvfs_type ty
        NT_STATUS_HAVE_NO_MEMORY(ctx);
        ctx->protocol           = protocol;
        ctx->type               = type;
-       ctx->config.snum        = snum;
+       ctx->config             = talloc_steal(ctx, scfg);
        ctx->event_ctx          = ev;
        ctx->msg_ctx            = msg;
        ctx->server_id          = server_id;
@@ -201,7 +200,7 @@ NTSTATUS ntvfs_init_connection(TALLOC_CTX *mem_ctx, int snum, enum ntvfs_type ty
 NTSTATUS ntvfs_init(void)
 {
        init_module_fn static_init[] = STATIC_ntvfs_MODULES;
-       init_module_fn *shared_init = load_samba_modules(NULL, "ntvfs");
+       init_module_fn *shared_init = load_samba_modules(NULL, global_loadparm, "ntvfs");
 
        run_init_functions(static_init);
        run_init_functions(shared_init);