diff options
| author | Simo Sorce <idra@samba.org> | 2005-08-26 16:12:25 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:34:38 -0500 |
| commit | 61aaf82b6280292ad29439b15ab3bcde065a4c45 (patch) | |
| tree | da46c5b8661d391800e7ef95d52dfe657f9c2c32 /source4/rpc_server/samr | |
| parent | 44a27265fb2aed8ce976aa6cd5875faaa5aec4d9 (diff) | |
| download | samba-61aaf82b6280292ad29439b15ab3bcde065a4c45.tar.gz samba-61aaf82b6280292ad29439b15ab3bcde065a4c45.tar.bz2 samba-61aaf82b6280292ad29439b15ab3bcde065a4c45.zip | |
r9654: introduce the samdb_search_dn call
(This used to be commit 333ebb40d55c60465564b894d5028b364e99ee00)
Diffstat (limited to 'source4/rpc_server/samr')
| -rw-r--r-- | source4/rpc_server/samr/dcesrv_samr.c | 7 | ||||
| -rw-r--r-- | source4/rpc_server/samr/samr_password.c | 14 |
2 files changed, 8 insertions, 13 deletions
diff --git a/source4/rpc_server/samr/dcesrv_samr.c b/source4/rpc_server/samr/dcesrv_samr.c index ff15eb43bb..aeea3a120c 100644 --- a/source4/rpc_server/samr/dcesrv_samr.c +++ b/source4/rpc_server/samr/dcesrv_samr.c @@ -2117,11 +2117,8 @@ static NTSTATUS samr_AddAliasMember(struct dcesrv_call_state *dce_call, TALLOC_C * cn=For...,cn=Builtin,dc={BASEDN}. -- vl */ - basedn = ldb_dn_explode(mem_ctx, - samdb_search_string(d_state->sam_ctx, - mem_ctx, NULL, "dn", - "(&(objectClass=container)" - "(cn=ForeignSecurityPrincipals))")); + basedn = samdb_search_dn(d_state->sam_ctx, mem_ctx, NULL, + "(&(objectClass=container)(cn=ForeignSecurityPrincipals))"); if (basedn == NULL) { DEBUG(0, ("Failed to find DN for " diff --git a/source4/rpc_server/samr/samr_password.c b/source4/rpc_server/samr/samr_password.c index c862763101..ab99b69458 100644 --- a/source4/rpc_server/samr/samr_password.c +++ b/source4/rpc_server/samr/samr_password.c @@ -210,10 +210,9 @@ NTSTATUS samr_OemChangePasswordUser2(struct dcesrv_call_state *dce_call, TALLOC_ return NT_STATUS_NO_SUCH_USER; } - domain_dn = ldb_dn_explode(mem_ctx, - samdb_search_string(sam_ctx, mem_ctx, NULL, "dn", - "(objectSid=%s)", - ldap_encode_ndr_dom_sid(mem_ctx, domain_sid))); + domain_dn = samdb_search_dn(sam_ctx, mem_ctx, NULL, + "(objectSid=%s)", + ldap_encode_ndr_dom_sid(mem_ctx, domain_sid)); if (!domain_dn) { return NT_STATUS_INTERNAL_DB_CORRUPTION; } @@ -361,10 +360,9 @@ NTSTATUS samr_ChangePasswordUser3(struct dcesrv_call_state *dce_call, goto failed; } - domain_dn = ldb_dn_explode(mem_ctx, - samdb_search_string(sam_ctx, mem_ctx, NULL, "dn", - "(objectSid=%s)", - ldap_encode_ndr_dom_sid(mem_ctx, domain_sid))); + domain_dn = samdb_search_dn(sam_ctx, mem_ctx, NULL, + "(objectSid=%s)", + ldap_encode_ndr_dom_sid(mem_ctx, domain_sid)); if (!domain_dn) { status = NT_STATUS_INTERNAL_DB_CORRUPTION; goto failed; |