Rename param_opt.flags to priority.

2 files changed, 20 insertions, 5 deletions

diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index 18b3dcf75d8..b4098c840cd 100644
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -64,6 +64,7 @@
 #include "param/param.h"
 #include "param/loadparm.h"
 #include "libcli/raw/libcliraw.h"
+#include "rpc_server/common/common.h"
 
 #define standard_sub_basic talloc_strdup
 
@@ -1569,14 +1570,14 @@ static bool lp_do_parameter_parametric(struct loadparm_context *lp_ctx,
 		/* If we already have the option set, override it unless
 		   it was a command line option and the new one isn't */
 		if (strcmp(paramo->key, name) == 0) {
-			if ((paramo->flags & FLAG_CMDLINE) &&
+			if ((paramo->priority & FLAG_CMDLINE) &&
 			    !(flags & FLAG_CMDLINE)) {
 				return true;
 			}
 
 			talloc_free(paramo->value);
 			paramo->value = talloc_strdup(paramo, pszParmValue);
-			paramo->flags = flags;
+			paramo->priority = flags;
 			free(name);
 			return true;
 		}
@@ -1587,7 +1588,7 @@ static bool lp_do_parameter_parametric(struct loadparm_context *lp_ctx,
 		smb_panic("OOM");
 	paramo->key = talloc_strdup(paramo, name);
 	paramo->value = talloc_strdup(paramo, pszParmValue);
-	paramo->flags = flags;
+	paramo->priority = flags;
 	if (service == NULL) {
 		DLIST_ADD(lp_ctx->globals->param_opt, paramo);
 	} else {
@@ -2219,7 +2220,7 @@ static int lp_destructor(struct loadparm_context *lp_ctx)
 		struct param_opt *next;
 		for (data = lp_ctx->globals->param_opt; data; data=next) {
 			next = data->next;
-			if (data->flags & FLAG_CMDLINE) continue;
+			if (data->priority & FLAG_CMDLINE) continue;
 			DLIST_REMOVE(lp_ctx->globals->param_opt, data);
 			talloc_free(data);
 		}
@@ -2659,3 +2660,14 @@ _PUBLIC_ char *lp_tls_dhpfile(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_c
 	return private_path(mem_ctx, lp_ctx, lp_ctx->globals->tls_dhpfile);
 }
 
+_PUBLIC_ struct dcerpc_server_info *lp_dcerpc_server_info(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx)
+{
+	struct dcerpc_server_info *ret = talloc_zero(mem_ctx, struct dcerpc_server_info);
+
+	ret->domain_name = talloc_reference(mem_ctx, lp_workgroup(lp_ctx));
+	ret->version_major = lp_parm_int(lp_ctx, NULL, "server_info", "version_major", 5);
+	ret->version_minor = lp_parm_int(lp_ctx, NULL, "server_info", "version_minor", 2);
+	ret->version_build = lp_parm_int(lp_ctx, NULL, "server_info", "version_build", 3790);
+
+	return ret;
+}
diff --git a/source4/param/param.h b/source4/param/param.h
index 85db1c3857d..8a653be0a80 100644
--- 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 {
@@ -196,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);
@@ -327,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  */