Fix includes.

[kai/samba.git] / source4 / param / generic.c

diff --git a/source4/param/generic.c b/source4/param/generic.c
index 2327000fc917d1fdb8d4bffd2556e753db294a6d..ba5464a0f0aabf8166887073e17366630ec64126 100644 (file)
--- a/source4/param/generic.c
+++ b/source4/param/generic.c
@@ -17,8 +17,9 @@
  */
 
 #include "includes.h"
-#include "lib/util/dlinklist.h"
+#include "../lib/util/dlinklist.h"
 #include "param/param.h"
+#include "param/loadparm.h"
 #include "system/filesys.h"
 
 struct param_section *param_get_section(struct param_context *ctx, const char *name)
@@ -127,10 +128,7 @@ const char **param_get_string_list(struct param_context *ctx, const char *param,
        if (p == NULL)
                return NULL;
 
-       if (separator == NULL)
-               separator = LIST_SEP;
-       
-       return str_list_make(ctx, p->value, separator);
+       return (const char **)str_list_make(ctx, p->value, separator);
 }
 
 int param_set_string_list(struct param_context *ctx, const char *param, const char **list, const char *section)
@@ -259,11 +257,8 @@ int param_use(struct loadparm_context *lp_ctx, struct param_context *ctx)
                                struct loadparm_service *service = 
                                                        lp_service(lp_ctx, section->name);
                                if (service == NULL)
-                                       service = lp_add_service(lp_ctx, &sDefault, section->name);
-                               lp_do_service_parameter(lp_ctx, 
-                                                       service,
-                                                       param->key,
-                                                       param->value);
+                                       service = lp_add_service(lp_ctx, lp_default_service(lp_ctx), section->name);
+                               lp_do_service_parameter(lp_ctx, service, param->key, param->value);
                        }
                }
        }