r7582: Better way to have a fast path searching for a specific DN.

Old way was ugly and had a bug, you couldn't add an attribute named
dn or distinguishedName and search for it, tdb would change that search in a dn search.
This makes it also possible to search by dn against an ldap server as the old method was
not supported by ldap syntaxes.

sss
(This used to be commit a614466dec2484a0d39bdfae53da822cfcf80926)

3 files changed, 50 insertions, 60 deletions

diff --git a/source4/rpc_server/lsa/dcesrv_lsa.c b/source4/rpc_server/lsa/dcesrv_lsa.c
index ea803559c4..b3de4e4ba1 100644
--- a/source4/rpc_server/lsa/dcesrv_lsa.c
+++ b/source4/rpc_server/lsa/dcesrv_lsa.c
@@ -266,8 +266,8 @@ static NTSTATUS lsa_get_policy_state(struct dcesrv_call_state *dce_call, TALLOC_
 		return NT_STATUS_NO_SUCH_DOMAIN;		
 	}
 
-	sid_str = samdb_search_string(state->sam_ldb, mem_ctx, NULL,
-				      "objectSid", "dn=%s", state->domain_dn);
+	sid_str = samdb_search_string(state->sam_ldb, mem_ctx,
+				      state->domain_dn, "objectSid", NULL);
 	if (!sid_str) {
 		return NT_STATUS_NO_SUCH_DOMAIN;		
 	}
@@ -283,8 +283,8 @@ static NTSTATUS lsa_get_policy_state(struct dcesrv_call_state *dce_call, TALLOC_
 	}
 
 	state->domain_name = talloc_reference(state, 
-					      samdb_search_string(state->sam_ldb, mem_ctx, NULL,
-								  "name", "dn=%s", state->domain_dn));
+					      samdb_search_string(state->sam_ldb, mem_ctx,
+								  state->domain_dn, "name", NULL));
 	if (!state->domain_name) {
 		return NT_STATUS_NO_SUCH_DOMAIN;		
 	}
@@ -359,8 +359,7 @@ static NTSTATUS lsa_info_AccountDomain(struct lsa_policy_state *state, TALLOC_CT
 	int ret;
 	struct ldb_message **res;
 
-	ret = gendb_search(state->sam_ldb, mem_ctx, NULL, &res, attrs, 
-			   "dn=%s", state->domain_dn);
+	ret = gendb_search_dn(state->sam_ldb, mem_ctx, state->domain_dn, &res, attrs);
 	if (ret != 1) {
 		return NT_STATUS_INTERNAL_DB_CORRUPTION;
 	}
@@ -381,8 +380,7 @@ static NTSTATUS lsa_info_DNS(struct lsa_policy_state *state, TALLOC_CTX *mem_ctx
 	int ret;
 	struct ldb_message **res;
 
-	ret = gendb_search(state->sam_ldb, mem_ctx, NULL, &res, attrs, 
-			   "dn=%s", state->domain_dn);
+	ret = gendb_search_dn(state->sam_ldb, mem_ctx, state->domain_dn, &res, attrs);
 	if (ret != 1) {
 		return NT_STATUS_INTERNAL_DB_CORRUPTION;
 	}
@@ -850,8 +848,8 @@ static NTSTATUS lsa_QueryTrustedDomainInfo(struct dcesrv_call_state *dce_call, T
 	trusted_domain_state = h->data;
 
 	/* pull all the user attributes */
-	ret = gendb_search(trusted_domain_state->policy->sam_ldb, mem_ctx, NULL, &res, attrs,
-			   "dn=%s", trusted_domain_state->trusted_domain_dn);
+	ret = gendb_search_dn(trusted_domain_state->policy->sam_ldb, mem_ctx,
+			      trusted_domain_state->trusted_domain_dn, &res, attrs);
 	if (ret != 1) {
 		return NT_STATUS_INTERNAL_DB_CORRUPTION;
 	}
@@ -1373,8 +1371,8 @@ static NTSTATUS lsa_EnumPrivsAccount(struct dcesrv_call_state *dce_call,
 	r->out.privs->unknown = 0;
 	r->out.privs->set = NULL;
 
-	ret = gendb_search(astate->policy->sam_ldb, mem_ctx, NULL, &res, attrs, 
-			   "dn=%s", astate->account_dn);
+	ret = gendb_search_dn(astate->policy->sam_ldb, mem_ctx,
+			      astate->account_dn, &res, attrs);
 	if (ret != 1) {
 		return NT_STATUS_OK;
 	}
@@ -2048,9 +2046,8 @@ static NTSTATUS lsa_SetSecret(struct dcesrv_call_state *dce_call, TALLOC_CTX *me
 			};
 			
 			/* search for the secret record */
-			ret = gendb_search(secret_state->sam_ldb,
-					   mem_ctx, NULL, &res, attrs,
-					   "(dn=%s)", secret_state->secret_dn);
+			ret = gendb_search_dn(secret_state->sam_ldb,mem_ctx,
+					      secret_state->secret_dn, &res, attrs);
 			if (ret == 0) {
 				return NT_STATUS_OBJECT_NAME_NOT_FOUND;
 			}
@@ -2121,8 +2118,8 @@ static NTSTATUS lsa_QuerySecret(struct dcesrv_call_state *dce_call, TALLOC_CTX *
 	secret_state = h->data;
 
 	/* pull all the user attributes */
-	ret = gendb_search(secret_state->sam_ldb, mem_ctx, NULL, &res, attrs,
-			   "dn=%s", secret_state->secret_dn);
+	ret = gendb_search_dn(secret_state->sam_ldb, mem_ctx,
+			      secret_state->secret_dn, &res, attrs);
 	if (ret != 1) {
 		return NT_STATUS_INTERNAL_DB_CORRUPTION;
 	}
diff --git a/source4/rpc_server/samr/dcesrv_samr.c b/source4/rpc_server/samr/dcesrv_samr.c
index b40028b880..337c300203 100644
--- a/source4/rpc_server/samr/dcesrv_samr.c
+++ b/source4/rpc_server/samr/dcesrv_samr.c
@@ -343,8 +343,8 @@ static NTSTATUS samr_info_DomInfo1(struct samr_domain_state *state,
 	int ret;
 	struct ldb_message **res;
 
-	ret = gendb_search(state->sam_ctx, mem_ctx, NULL, &res, attrs, 
-			   "dn=%s", state->domain_dn);
+	ret = gendb_search_dn(state->sam_ctx, mem_ctx,
+			      state->domain_dn , &res, attrs);
 	if (ret != 1) {
 		return NT_STATUS_INTERNAL_DB_CORRUPTION;
 	}
@@ -373,8 +373,8 @@ static NTSTATUS samr_info_DomInfo2(struct samr_domain_state *state, TALLOC_CTX *
 	int ret;
 	struct ldb_message **res;
 
-	ret = gendb_search(state->sam_ctx, mem_ctx, NULL, &res, attrs, 
-			   "dn=%s", state->domain_dn);
+	ret = gendb_search_dn(state->sam_ctx, mem_ctx,
+			      state->domain_dn , &res, attrs);
 	if (ret != 1) {
 		return NT_STATUS_INTERNAL_DB_CORRUPTION;
 	}
@@ -527,10 +527,8 @@ static NTSTATUS samr_CreateDomainGroup(struct dcesrv_call_state *dce_call, TALLO
 	a_state->account_dn = talloc_steal(a_state, msg->dn);
 
 	/* retrieve the sidstring for the group just created */
-	sidstr = samdb_search_string(d_state->sam_ctx, a_state, NULL, 
-				   "objectSid",
-				   "dn=%s",
-				   msg->dn);
+	sidstr = samdb_search_string(d_state->sam_ctx, a_state,
+				     msg->dn, "objectSid", NULL);
 	if (sidstr == NULL) {
 		return NT_STATUS_UNSUCCESSFUL;
 	}
@@ -759,10 +757,8 @@ static NTSTATUS samr_CreateUser2(struct dcesrv_call_state *dce_call, TALLOC_CTX
 	a_state->account_dn = talloc_steal(a_state, msg->dn);
 
 	/* retrieve the sidstring for the group just created */
-	sidstr = samdb_search_string(d_state->sam_ctx, a_state, NULL, 
-				   "objectSid",
-				   "dn=%s",
-				   msg->dn);
+	sidstr = samdb_search_string(d_state->sam_ctx, a_state,
+				   msg->dn, "objectSid", NULL);
 	if (sidstr == NULL) {
 		return NT_STATUS_UNSUCCESSFUL;
 	}
@@ -965,10 +961,8 @@ static NTSTATUS samr_CreateDomAlias(struct dcesrv_call_state *dce_call, TALLOC_C
 	a_state->account_dn = talloc_steal(a_state, msg->dn);
 
 	/* retrieve the sidstring for the group just created */
-	sidstr = samdb_search_string(d_state->sam_ctx, a_state, NULL, 
-				   "objectSid",
-				   "dn=%s",
-				   msg->dn);
+	sidstr = samdb_search_string(d_state->sam_ctx, a_state,
+				   msg->dn, "objectSid", NULL);
 	if (sidstr == NULL) {
 		return NT_STATUS_UNSUCCESSFUL;
 	}
@@ -1490,8 +1484,8 @@ static NTSTATUS samr_QueryGroupInfo(struct dcesrv_call_state *dce_call, TALLOC_C
 	a_state = h->data;
 
 	/* pull all the group attributes */
-	ret = gendb_search(a_state->sam_ctx, mem_ctx, NULL, &res, attrs,
-			   "dn=%s", a_state->account_dn);
+	ret = gendb_search_dn(a_state->sam_ctx, mem_ctx,
+			      a_state->account_dn, &res, attrs);
 	if (ret != 1) {
 		return NT_STATUS_INTERNAL_DB_CORRUPTION;
 	}
@@ -1750,8 +1744,8 @@ static NTSTATUS samr_QueryGroupMember(struct dcesrv_call_state *dce_call, TALLOC
 	a_state = h->data;
 
 	/* pull the member attribute */
-	ret = gendb_search(a_state->sam_ctx, mem_ctx, NULL, &res, attrs,
-			   "dn=%s", a_state->account_dn);
+	ret = gendb_search_dn(a_state->sam_ctx, mem_ctx,
+			      a_state->account_dn, &res, attrs);
 
 	if (ret != 1) {
 		return NT_STATUS_INTERNAL_DB_CORRUPTION;
@@ -1784,9 +1778,9 @@ static NTSTATUS samr_QueryGroupMember(struct dcesrv_call_state *dce_call, TALLOC
 		for (i=0; i<el->num_values; i++) {
 			struct ldb_message **res2;
 			const char * const attrs2[2] = { "objectSid", NULL };
-			ret = gendb_search(a_state->sam_ctx, mem_ctx, NULL,
-					   &res2, attrs2, "dn=%s",
-					   (char *)el->values[i].data);
+			ret = gendb_search_dn(a_state->sam_ctx, mem_ctx,
+					   (char *)el->values[i].data,
+					   &res2, attrs2);
 			if (ret != 1)
 				return NT_STATUS_INTERNAL_DB_CORRUPTION;
 
@@ -1916,8 +1910,8 @@ static NTSTATUS samr_QueryAliasInfo(struct dcesrv_call_state *dce_call, TALLOC_C
 	a_state = h->data;
 
 	/* pull all the alias attributes */
-	ret = gendb_search(a_state->sam_ctx, mem_ctx, NULL, &res, attrs,
-			   "dn=%s", a_state->account_dn);
+	ret = gendb_search_dn(a_state->sam_ctx, mem_ctx,
+			      a_state->account_dn ,&res, attrs);
 	if (ret != 1) {
 		return NT_STATUS_INTERNAL_DB_CORRUPTION;
 	}
@@ -2229,8 +2223,8 @@ static NTSTATUS samr_GetMembersInAlias(struct dcesrv_call_state *dce_call, TALLO
 	a_state = h->data;
 	d_state = a_state->domain_state;
 
-	ret = gendb_search(d_state->sam_ctx, mem_ctx, NULL, &msgs, attrs,
-			   "dn=%s", a_state->account_dn);
+	ret = gendb_search_dn(d_state->sam_ctx, mem_ctx,
+			      a_state->account_dn, &msgs, attrs);
 
 	if (ret != 1)
 		return NT_STATUS_INTERNAL_DB_CORRUPTION;
@@ -2252,9 +2246,9 @@ static NTSTATUS samr_GetMembersInAlias(struct dcesrv_call_state *dce_call, TALLO
 		for (i=0; i<el->num_values; i++) {
 			struct ldb_message **msgs2;
 			const char * const attrs2[2] = { "objectSid", NULL };
-			ret = gendb_search(a_state->sam_ctx, mem_ctx, NULL,
-					   &msgs2, attrs2, "dn=%s",
-					   (char *)el->values[i].data);
+			ret = gendb_search_dn(a_state->sam_ctx, mem_ctx,
+					   (char *)el->values[i].data,
+					   &msgs2, attrs2);
 			if (ret != 1)
 				return NT_STATUS_INTERNAL_DB_CORRUPTION;
 
@@ -2391,8 +2385,8 @@ static NTSTATUS samr_QueryUserInfo(struct dcesrv_call_state *dce_call, TALLOC_CT
 	a_state = h->data;
 
 	/* pull all the user attributes */
-	ret = gendb_search(a_state->sam_ctx, mem_ctx, NULL, &res, NULL,
-			   "dn=%s", a_state->account_dn);
+	ret = gendb_search_dn(a_state->sam_ctx, mem_ctx,
+			      a_state->account_dn ,&res, NULL);
 	if (ret != 1) {
 		return NT_STATUS_INTERNAL_DB_CORRUPTION;
 	}
@@ -3117,10 +3111,10 @@ static NTSTATUS samr_GetUserPwInfo(struct dcesrv_call_state *dce_call, TALLOC_CT
 
 	a_state = h->data;
 
-	r->out.info.min_password_length = samdb_search_uint(a_state->sam_ctx, mem_ctx, 0, NULL, "minPwdLength", 
-							    "dn=%s", a_state->domain_state->domain_dn);
-	r->out.info.password_properties = samdb_search_uint(a_state->sam_ctx, mem_ctx, 0, NULL, "pwdProperties", 
-							    "dn=%s", a_state->account_dn);
+	r->out.info.min_password_length = samdb_search_uint(a_state->sam_ctx, mem_ctx, 0,
+							    a_state->domain_state->domain_dn, "minPwdLength", NULL);
+	r->out.info.password_properties = samdb_search_uint(a_state->sam_ctx, mem_ctx, 0,
+							    a_state->account_dn, "pwdProperties", NULL);
 	return NT_STATUS_OK;
 }
 
diff --git a/source4/rpc_server/samr/samr_password.c b/source4/rpc_server/samr/samr_password.c
index f5390cc1d5..e7f547bbf3 100644
--- a/source4/rpc_server/samr/samr_password.c
+++ b/source4/rpc_server/samr/samr_password.c
@@ -50,8 +50,8 @@ NTSTATUS samr_ChangePasswordUser(struct dcesrv_call_state *dce_call, TALLOC_CTX
 	a_state = h->data;
 
 	/* fetch the old hashes */
-	ret = gendb_search(a_state->sam_ctx, mem_ctx, NULL, &res, attrs,
-			   "dn=%s", a_state->account_dn);
+	ret = gendb_search_dn(a_state->sam_ctx, mem_ctx,
+			      a_state->account_dn, &res, attrs);
 	if (ret != 1) {
 		return NT_STATUS_INTERNAL_DB_CORRUPTION;
 	}
@@ -400,9 +400,8 @@ NTSTATUS samr_ChangePasswordUser3(struct dcesrv_call_state *dce_call,
 	return NT_STATUS_OK;
 
 failed:
-	ret = gendb_search(sam_ctx, 
-			   mem_ctx, NULL, &res, dom_attrs,
-			   "dn=%s", domain_dn);
+	ret = gendb_search_dn(sam_ctx, mem_ctx,
+			      domain_dn, &res, dom_attrs);
 
 	if (ret != 1) {
 		return status;
@@ -517,7 +516,7 @@ NTSTATUS samdb_set_password(void *ctx, TALLOC_CTX *mem_ctx,
 	unix_to_nt_time(&now_nt, now);
 
 	/* pull all the user parameters */
-	count = gendb_search(ctx, mem_ctx, NULL, &res, user_attrs, "dn=%s", user_dn);
+	count = gendb_search_dn(ctx, mem_ctx, user_dn, &res, user_attrs);
 	if (count != 1) {
 		return NT_STATUS_INTERNAL_DB_CORRUPTION;
 	}
@@ -533,7 +532,7 @@ NTSTATUS samdb_set_password(void *ctx, TALLOC_CTX *mem_ctx,
 	pwdLastSet =         samdb_result_uint64(res[0], "pwdLastSet", 0);
 
 	/* pull the domain parameters */
-	count = gendb_search(ctx, mem_ctx, NULL, &res, domain_attrs, "dn=%s", domain_dn);
+	count = gendb_search_dn(ctx, mem_ctx, domain_dn, &res, domain_attrs);
 	if (count != 1) {
 		return NT_STATUS_INTERNAL_DB_CORRUPTION;
 	}