Changeset 745 for trunk/server/source4/param/generic.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source4/param/generic.c (modified) (2 diffs)

trunk/server/source4/param/generic.c

@@ -19 +19 @@
 #include "includes.h"
 #include "../lib/util/dlinklist.h"
+#include "../lib/util/parmlist.h"
 #include "param/param.h"
 #include "param/loadparm.h"
@@ -233 +234 @@
                 for (param = section->parameters->entries; param; param = param->next) {
                         if (isglobal)
-                                lp_do_global_parameter(lp_ctx, param->key,
+                                lpcfg_do_global_parameter(lp_ctx, param->key,
                                                        param->value);
                         else {
                                 struct loadparm_service *service = 
-                                                        lp_service(lp_ctx, section->name);
+                                                        lpcfg_service(lp_ctx, section->name);
                                 if (service == NULL)
-                                        service = lp_add_service(lp_ctx, lp_default_service(lp_ctx), section->name);
-                                lp_do_service_parameter(lp_ctx, service, param->key, param->value);
+                                        service = lpcfg_add_service(lp_ctx, lpcfg_default_service(lp_ctx), section->name);
+                                lpcfg_do_service_parameter(lp_ctx, service, param->key, param->value);
                         }
                 }