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

[jelmer/samba4-debian.git] / source / smbd / process_model.c

diff --git a/source/smbd/process_model.c b/source/smbd/process_model.c
index f98468265714f7258d704fc59f3e1f69c7a2dffc..bb4d3a53bbfc1fb635ed7982bef75582e99d8c9e 100644 (file)
--- a/source/smbd/process_model.c
+++ b/source/smbd/process_model.c
@@ -6,7 +6,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,
@@ -15,19 +15,18 @@
    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/>.
 */
 
 #include "includes.h"
-#include "lib/events/events.h"
-#include "smb_server/smb_server.h"
-#include "smb_build.h"
+#include "smbd/process_model.h"
+#include "build.h"
+#include "param/param.h"
 
 /*
   setup the events for the chosen process model
 */
-const struct model_ops *process_model_startup(struct event_context *ev, const char *model)
+_PUBLIC_ const struct model_ops *process_model_startup(struct event_context *ev, const char *model)
 {
        const struct model_ops *ops;
 
@@ -54,7 +53,7 @@ static int num_models;
   The 'name' can be later used by other backends to find the operations
   structure for this backend.  
 */
-NTSTATUS register_process_model(const void *_ops)
+_PUBLIC_ NTSTATUS register_process_model(const void *_ops)
 {
        const struct model_ops *ops = _ops;
 
@@ -83,8 +82,8 @@ NTSTATUS register_process_model(const void *_ops)
 
 NTSTATUS process_model_init(void)
 {
-       init_module_fn static_init[] = STATIC_PROCESS_MODEL_MODULES;
-       init_module_fn *shared_init = load_samba_modules(NULL, "process_model");
+       init_module_fn static_init[] = STATIC_process_model_MODULES;
+       init_module_fn *shared_init = load_samba_modules(NULL, global_loadparm, "process_model");
 
        run_init_functions(static_init);
        run_init_functions(shared_init);