Rename param_opt.flags to priority.

[ira/wip.git] / source4 / param / param.h

diff --git a/source4/param/param.h b/source4/param/param.h
index 4c6e8b79a2283eabed1ed18ef3833445f04d6a22..8a653be0a8041ff3657a2b389337d5239cc72aa7 100644 (file)
--- a/source4/param/param.h
+++ b/source4/param/param.h
@@ -24,7 +24,7 @@ struct param_opt {
        struct param_opt *prev, *next;
        char *key;
        char *value;
-       int flags;
+       int priority;
 };
 
 struct param_context {
@@ -44,6 +44,12 @@ struct smbsrv_connection;
 
 typedef NTSTATUS (*init_module_fn) (void);
 
+/* this needs to be a string which is not in the C library. We
+   previously used "init_module", but that meant that modules which
+   did not define this function ended up calling the C library
+   function init_module() which makes a system call */
+#define SAMBA_INIT_MODULE "samba_init_module"
+
 enum server_role {
        ROLE_STANDALONE=0,
        ROLE_DOMAIN_MEMBER=1,
@@ -64,7 +70,7 @@ struct smbcli_session_options;
 
 void reload_charcnv(struct loadparm_context *lp_ctx);
 
-extern struct loadparm_context *global_loadparm;
+extern _DEPRECATED_ struct loadparm_context *global_loadparm;
 
 struct loadparm_service *lp_default_service(struct loadparm_context *lp_ctx);
 struct parm_struct *lp_parm_table(void);
@@ -78,11 +84,11 @@ int lp_kpasswd_port(struct loadparm_context *);
 int lp_web_port(struct loadparm_context *);
 const char *lp_swat_directory(struct loadparm_context *);
 bool lp_tls_enabled(struct loadparm_context *);
-const char *lp_tls_keyfile(struct loadparm_context *);
-const char *lp_tls_certfile(struct loadparm_context *);
-const char *lp_tls_cafile(struct loadparm_context *);
-const char *lp_tls_crlfile(struct loadparm_context *);
-const char *lp_tls_dhpfile(struct loadparm_context *);
+char *lp_tls_keyfile(TALLOC_CTX *mem_ctx, struct loadparm_context *);
+char *lp_tls_certfile(TALLOC_CTX *mem_ctx, struct loadparm_context *);
+char *lp_tls_cafile(TALLOC_CTX *mem_ctx, struct loadparm_context *);
+char *lp_tls_crlfile(TALLOC_CTX *mem_ctx, struct loadparm_context *);
+char *lp_tls_dhpfile(TALLOC_CTX *mem_ctx, struct loadparm_context *);
 const char *lp_share_backend(struct loadparm_context *);
 const char *lp_sam_url(struct loadparm_context *);
 const char *lp_idmap_url(struct loadparm_context *);
@@ -190,6 +196,7 @@ int lp_server_signing(struct loadparm_context *);
 int lp_client_signing(struct loadparm_context *);
 const char *lp_ntp_signd_socket_directory(struct loadparm_context *);
 
+
 const char *lp_get_parametric(struct loadparm_context *lp_ctx,
                              struct loadparm_service *service,
                              const char *type, const char *option);
@@ -321,6 +328,8 @@ void lp_smbcli_options(struct loadparm_context *lp_ctx,
                         struct smbcli_options *options);
 void lp_smbcli_session_options(struct loadparm_context *lp_ctx,
                                 struct smbcli_session_options *options);
+struct dcerpc_server_info *lp_dcerpc_server_info(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx);
+
 
 /* The following definitions come from param/generic.c  */