Merge branch 'master' of ssh://git.samba.org/data/git/samba

10 files changed, 18 insertions, 18 deletions

diff --git a/source4/dsdb/samdb/ldb_modules/acl.c b/source4/dsdb/samdb/ldb_modules/acl.c
index 6e38bc46b1..eedeb1a8b3 100644
--- a/source4/dsdb/samdb/ldb_modules/acl.c
+++ b/source4/dsdb/samdb/ldb_modules/acl.c
@@ -150,7 +150,7 @@ static int acl_module_init(struct ldb_module *module)
 	}
 
 	data->password_attrs = NULL;
-	data->acl_perform = lp_parm_bool(ldb_get_opaque(ldb, "loadparm"),
+	data->acl_perform = lpcfg_parm_bool(ldb_get_opaque(ldb, "loadparm"),
 					 NULL, "acl", "perform", false);
 	ldb_module_set_private(module, data);
 
diff --git a/source4/dsdb/samdb/ldb_modules/kludge_acl.c b/source4/dsdb/samdb/ldb_modules/kludge_acl.c
index 86f9bc43cc..e6f288d01c 100644
--- a/source4/dsdb/samdb/ldb_modules/kludge_acl.c
+++ b/source4/dsdb/samdb/ldb_modules/kludge_acl.c
@@ -459,7 +459,7 @@ static int kludge_acl_init(struct ldb_module *module)
 	}
 
 	data->password_attrs = NULL;
-	data->acl_perform = lp_parm_bool(ldb_get_opaque(ldb, "loadparm"),
+	data->acl_perform = lpcfg_parm_bool(ldb_get_opaque(ldb, "loadparm"),
 					 NULL, "acl", "perform", false);
 	ldb_module_set_private(module, data);
 
diff --git a/source4/dsdb/samdb/ldb_modules/partition.c b/source4/dsdb/samdb/ldb_modules/partition.c
index e6a315d2ef..5065bd565e 100644
--- a/source4/dsdb/samdb/ldb_modules/partition.c
+++ b/source4/dsdb/samdb/ldb_modules/partition.c
@@ -582,7 +582,7 @@ static int partition_search(struct ldb_module *module, struct ldb_request *req)
 					    data->partitions[i]->ctrl->dn) != 0)) {
 				char *ref = talloc_asprintf(ac,
 							    "ldap://%s/%s%s",
-							    lp_dnsdomain(lp_ctx),
+							    lpcfg_dnsdomain(lp_ctx),
 							    ldb_dn_get_linearized(data->partitions[i]->ctrl->dn),
 							    req->op.search.scope == LDB_SCOPE_ONELEVEL ? "??base" : "");
 
diff --git a/source4/dsdb/samdb/ldb_modules/password_hash.c b/source4/dsdb/samdb/ldb_modules/password_hash.c
index 99bba57d10..0f078b5c76 100644
--- a/source4/dsdb/samdb/ldb_modules/password_hash.c
+++ b/source4/dsdb/samdb/ldb_modules/password_hash.c
@@ -1404,7 +1404,7 @@ static int setup_password_fields(struct setup_password_fields_io *io)
 		return ret;
 	}
 
-	if (lp_lanman_auth(lp_ctx)) {
+	if (lpcfg_lanman_auth(lp_ctx)) {
 		ret = setup_lm_fields(io);
 		if (ret != LDB_SUCCESS) {
 			return ret;
@@ -1807,12 +1807,12 @@ static int setup_io(struct ph_context *ac,
 		return LDB_ERR_UNWILLING_TO_PERFORM;
 	}
 
-	if (lp_lanman_auth(lp_ctx) && (lm_hash != NULL)) {
+	if (lpcfg_lanman_auth(lp_ctx) && (lm_hash != NULL)) {
 		io->n.lm_hash = talloc(io->ac, struct samr_Password);
 		memcpy(io->n.lm_hash->hash, lm_hash->data, MIN(lm_hash->length,
 		       sizeof(io->n.lm_hash->hash)));
 	}
-	if (lp_lanman_auth(lp_ctx) && (old_lm_hash != NULL)) {
+	if (lpcfg_lanman_auth(lp_ctx) && (old_lm_hash != NULL)) {
 		io->og.lm_hash = talloc(io->ac, struct samr_Password);
 		memcpy(io->og.lm_hash->hash, old_lm_hash->data, MIN(old_lm_hash->length,
 		       sizeof(io->og.lm_hash->hash)));
@@ -2061,9 +2061,9 @@ static int get_domain_data_callback(struct ldb_request *req,
 		lp_ctx = talloc_get_type(ldb_get_opaque(ldb, "loadparm"),
 					 struct loadparm_context);
 
-		ac->status->domain_data.dns_domain = lp_dnsdomain(lp_ctx);
-		ac->status->domain_data.realm = lp_realm(lp_ctx);
-		ac->status->domain_data.netbios_domain = lp_sam_name(lp_ctx);
+		ac->status->domain_data.dns_domain = lpcfg_dnsdomain(lp_ctx);
+		ac->status->domain_data.realm = lpcfg_realm(lp_ctx);
+		ac->status->domain_data.netbios_domain = lpcfg_sam_name(lp_ctx);
 
 		ac->status->reject_reason = SAM_PWD_CHANGE_NO_ERROR;
 
diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
index 2205be07c1..160f60f18c 100644
--- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
+++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
@@ -2180,7 +2180,7 @@ static int replmd_modify(struct ldb_module *module, struct ldb_request *req)
 
 		referral = talloc_asprintf(req,
 					   "ldap://%s/%s",
-					   lp_dnsdomain(lp_ctx),
+					   lpcfg_dnsdomain(lp_ctx),
 					   ldb_dn_get_linearized(msg->dn));
 		ret = ldb_module_send_referral(req, referral);
 		return ldb_module_done(req, NULL, NULL, ret);
diff --git a/source4/dsdb/samdb/ldb_modules/ridalloc.c b/source4/dsdb/samdb/ldb_modules/ridalloc.c
index 2b0c4b9fa8..9cde5c89f7 100644
--- a/source4/dsdb/samdb/ldb_modules/ridalloc.c
+++ b/source4/dsdb/samdb/ldb_modules/ridalloc.c
@@ -72,7 +72,7 @@ static void ridalloc_poke_rid_manager(struct ldb_module *module)
 		(struct loadparm_context *)ldb_get_opaque(ldb, "loadparm");
 	TALLOC_CTX *tmp_ctx = talloc_new(module);
 
-	msg = messaging_client_init(tmp_ctx, lp_messaging_path(tmp_ctx, lp_ctx),
+	msg = messaging_client_init(tmp_ctx, lpcfg_messaging_path(tmp_ctx, lp_ctx),
 				    ldb_get_event_context(ldb));
 	if (!msg) {
 		DEBUG(3,(__location__ ": Failed to create messaging context\n"));
diff --git a/source4/dsdb/samdb/ldb_modules/samba3sid.c b/source4/dsdb/samdb/ldb_modules/samba3sid.c
index 6c21382cd3..9368e0d007 100644
--- a/source4/dsdb/samdb/ldb_modules/samba3sid.c
+++ b/source4/dsdb/samdb/ldb_modules/samba3sid.c
@@ -56,7 +56,7 @@ static int samba3sid_next_sid(struct ldb_module *module,
 				 DSDB_FLAG_NEXT_MODULE |
 				 DSDB_SEARCH_SEARCH_ALL_PARTITIONS,
 				 "(&(objectClass=sambaDomain)(sambaDomainName=%s))",
-				 lp_sam_name(ldb_get_opaque(ldb, "loadparm")));
+				 lpcfg_sam_name(ldb_get_opaque(ldb, "loadparm")));
 	if (ret != LDB_SUCCESS) {
 		ldb_asprintf_errstring(ldb,
 				       __location__
diff --git a/source4/dsdb/samdb/ldb_modules/samldb.c b/source4/dsdb/samdb/ldb_modules/samldb.c
index b9a9720018..9ae308b9bc 100644
--- a/source4/dsdb/samdb/ldb_modules/samldb.c
+++ b/source4/dsdb/samdb/ldb_modules/samldb.c
@@ -950,7 +950,7 @@ static int samldb_fill_object(struct samldb_ctx *ac, const char *type)
 	}
 
 	if ( ! ac->sid) {
-		sid_generator = lp_sid_generator(lp_ctx);
+		sid_generator = lpcfg_sid_generator(lp_ctx);
 		if (sid_generator == SID_GENERATOR_INTERNAL) {
 			ret = samldb_add_step(ac, samldb_allocate_sid);
 			if (ret != LDB_SUCCESS) return ret;
diff --git a/source4/dsdb/samdb/samdb.c b/source4/dsdb/samdb/samdb.c
index 67b55385cb..2b4e9a1438 100644
--- a/source4/dsdb/samdb/samdb.c
+++ b/source4/dsdb/samdb/samdb.c
@@ -83,7 +83,7 @@ static int samdb_credentials_destructor(struct cli_credentials *creds)
   that we always get the same pointer in ldb_wrap_connect()
  */
 struct cli_credentials *samdb_credentials(struct tevent_context *event_ctx, 
-					  struct loadparm_context *lp_ctx) 
+					  struct loadparm_context *lp_ctx)
 {
 	static struct cli_credentials *static_credentials;
 	struct cli_credentials *cred;
@@ -126,9 +126,9 @@ struct ldb_context *samdb_connect(TALLOC_CTX *mem_ctx,
 				  struct auth_session_info *session_info)
 {
 	struct ldb_context *ldb;
-	ldb = ldb_wrap_connect(mem_ctx, ev_ctx, lp_ctx, 
-			       lp_sam_url(lp_ctx), session_info,
-			       samdb_credentials(ev_ctx, lp_ctx), 
+	ldb = ldb_wrap_connect(mem_ctx, ev_ctx, lp_ctx,
+			       lpcfg_sam_url(lp_ctx), session_info,
+			       samdb_credentials(ev_ctx, lp_ctx),
 			       0);
 	if (!ldb) {
 		return NULL;
diff --git a/source4/dsdb/samdb/samdb_privilege.c b/source4/dsdb/samdb/samdb_privilege.c
index ad0312dd72..f05b7e2a18 100644
--- a/source4/dsdb/samdb/samdb_privilege.c
+++ b/source4/dsdb/samdb/samdb_privilege.c
@@ -33,7 +33,7 @@ struct ldb_context *privilege_connect(TALLOC_CTX *mem_ctx,
 				      struct tevent_context *ev_ctx,
 				      struct loadparm_context *lp_ctx)
 {
-	return ldb_wrap_connect(mem_ctx, ev_ctx, lp_ctx, "privilege.ldb", 
+	return ldb_wrap_connect(mem_ctx, ev_ctx, lp_ctx, "privilege.ldb",
 				NULL, NULL, 0);
 }