r25446: Merge some changes I made on the way home from SFO:

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

diff --git a/source/ntvfs/ntvfs_base.c b/source/ntvfs/ntvfs_base.c
index 7e794b582facaf44386ebc5ab87e94f75e8bb324..c837e5898b73f432d2acb6033619894f75376e27 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,8 +16,7 @@
    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.
@@ -27,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
@@ -154,7 +154,7 @@ _PUBLIC_ BOOL ntvfs_interface_differs(const struct ntvfs_critical_sizes *const i
 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 = share_string_list_option(mem_ctx, scfg, SHARE_NTVFS_HANDLER);
        int i;
@@ -200,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);