sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

s4:dsdb - remove some calls of "samdb_msg_add_string" when we have talloc'ed strings

Browse Source 
They can be substituted by "ldb_msg_add_string" if the string was already
talloc'ed.

Autobuild-User: Matthias Dieter Wallnöfer <mdw@samba.org>
Autobuild-Date: Sun Oct 24 20:03:27 UTC 2010 on sn-devel-104
This commit is contained in:
Matthias Dieter Wallnöfer 2010-10-14 22:26:44 +02:00
parent 177aad556f
commit 7b3dbbde04
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source4/dsdb/samdb/ldb_modules/samldb.c
View File

@ -604,9 +604,8 @@ static int samldb_fill_object(struct samldb_ctx *ac)
* caller. Use the entry DN for it. */
ac->dn = ac->msg->dn;
ret = samdb_msg_add_string(ldb, ac->msg, ac->msg,
"defaultObjectCategory",
ldb_dn_get_linearized(ac->dn));
ret = ldb_msg_add_string(ac->msg, "defaultObjectCategory",
ldb_dn_alloc_linearized(ac, ac->dn));
if (ret != LDB_SUCCESS) {
ldb_oom(ldb);
return ret;

16
source4/rpc_server/netlogon/dcerpc_netlogon.c
View File

@ -1431,16 +1431,12 @@ static NTSTATUS dcesrv_netr_LogonGetDomainInfo(struct dcesrv_call_state *dce_cal
"dNSHostname",
r->in.query->workstation_info->dns_hostname);
samdb_msg_add_string(sam_ctx, mem_ctx, new_msg,
"servicePrincipalName",
talloc_asprintf(mem_ctx, "HOST/%s",
r->in.computer_name)
);
samdb_msg_add_string(sam_ctx, mem_ctx, new_msg,
"servicePrincipalName",
talloc_asprintf(mem_ctx, "HOST/%s",
r->in.query->workstation_info->dns_hostname)
);
ldb_msg_add_string(new_msg, "servicePrincipalName",
talloc_asprintf(new_msg, "HOST/%s",
r->in.computer_name));
ldb_msg_add_string(new_msg, "servicePrincipalName",
talloc_asprintf(new_msg, "HOST/%s",
r->in.query->workstation_info->dns_hostname));
}
if (dsdb_replace(sam_ctx, new_msg, 0) != LDB_SUCCESS) {