param: get rid of unnecessary get_default_loadparm_service pointer

[sfrench/samba-autobuild/.git] / source3 / param / loadparm_ctx.c

diff --git a/source3/param/loadparm_ctx.c b/source3/param/loadparm_ctx.c
index e80f6f1844442ea703a0a2c9bda81e590544cf52..fdad041e677ac50dd818e1e3e8bed86833e755a8 100644 (file)
--- a/source3/param/loadparm_ctx.c
+++ b/source3/param/loadparm_ctx.c
@@ -18,51 +18,66 @@
 */
 
 #include "includes.h"
-#include "../source4/param/s3_param.h"
+#include "lib/param/s3_param.h"
 
-static const char *get_parametric(const char *type, const char *option)
+static struct loadparm_service *lp_service_for_s4_ctx(const char *servicename)
 {
-       return lp_parm_const_string(-1, type, option, NULL);
-}
+       TALLOC_CTX *mem_ctx;
+       struct loadparm_service *service;
 
-/* These are in the order that they appear in the s4 loadparm file.
- * All of the s4 loadparm functions should be here eventually, once
- * they are implemented in the s3 loadparm, have the same format (enum
- * values in particular) and defaults. */
-static const struct loadparm_s3_context s3_fns = 
-{
-       .get_parametric = get_parametric,
+       mem_ctx = talloc_stackframe();
+       service = lp_service(servicename);
+       talloc_free(mem_ctx);
 
-       .server_role = lp_server_role,
+       return service;
+}
 
-       .winbind_separator = lp_winbind_separator,
-       .template_homedir = lp_template_homedir,
-       .template_shell = lp_template_shell,
+static struct loadparm_service *lp_servicebynum_for_s4_ctx(int servicenum)
+{
+       TALLOC_CTX *mem_ctx;
+       struct loadparm_service *service;
 
-       .dos_charset = lp_dos_charset,
-       .unix_charset = lp_unix_charset,
+       mem_ctx = talloc_stackframe();
+       service = lp_servicebynum(servicenum);
+       talloc_free(mem_ctx);
 
-       .realm = lp_realm,
-       .dnsdomain = lp_dnsdomain,
-       .socket_options = lp_socket_options,
-       .workgroup = lp_workgroup,
+       return service;
+}
 
-       .netbios_name = lp_netbios_name,
-       .netbios_scope = lp_netbios_scope,
+static bool lp_load_for_s4_ctx(const char *filename)
+{
+       TALLOC_CTX *mem_ctx;
+       bool status;
 
-       .lanman_auth = lp_lanman_auth,
-       .ntlm_auth = lp_ntlm_auth,
+       mem_ctx = talloc_stackframe();
+       status =  lp_load(filename, false, false, false, false);
+       talloc_free(mem_ctx);
 
-       .client_plaintext_auth = lp_client_plaintext_auth,
-       .client_lanman_auth = lp_client_lanman_auth,
-       .client_ntlmv2_auth = lp_client_ntlmv2_auth,
+       return status;
+}
 
-       .private_dir = lp_private_dir,
-       .ncalrpc_dir = lp_ncalrpc_dir,
-       .lockdir = lp_lockdir
+static struct loadparm_s3_helpers s3_fns =
+{
+       .get_parm_ptr = lp_parm_ptr,
+       .get_service = lp_service_for_s4_ctx,
+       .get_servicebynum = lp_servicebynum_for_s4_ctx,
+       .getservicebyname = getservicebyname,
+       .get_numservices = lp_numservices,
+       .load = lp_load_for_s4_ctx,
+       .store_cmdline = store_lp_set_cmdline,
+       .dump = lp_dump,
+       .lp_string = lp_string,
+       .lp_include = lp_include,
+       .init_ldap_debugging = init_ldap_debugging,
+       .set_netbios_aliases = set_netbios_aliases,
+       .do_section = lp_do_section,
 };
 
-const struct loadparm_s3_context *loadparm_s3_context(void)
+const struct loadparm_s3_helpers *loadparm_s3_helpers(void)
 {
-       return &s3_fns;
+       struct loadparm_s3_helpers *helpers;
+       helpers = &s3_fns;
+       helpers->globals = get_globals();
+       helpers->flags = get_flags();
+       return helpers;
 }