diff options
Diffstat (limited to 'source4/ntvfs/ntvfs_base.c')
| -rw-r--r-- | source4/ntvfs/ntvfs_base.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/source4/ntvfs/ntvfs_base.c b/source4/ntvfs/ntvfs_base.c index 03c5aff01c..20197a4ba9 100644 --- a/source4/ntvfs/ntvfs_base.c +++ b/source4/ntvfs/ntvfs_base.c @@ -26,6 +26,7 @@ #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 @@ -112,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. @@ -121,28 +122,28 @@ _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 } @@ -199,7 +200,7 @@ NTSTATUS ntvfs_init_connection(TALLOC_CTX *mem_ctx, struct share_config *scfg, e 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); |