summaryrefslogtreecommitdiff
path: root/source4/rpc_server/samr
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-07-17 09:20:52 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:29:34 -0500
commite835621799647ee70630b389fb53d15b15d68355 (patch)
tree429a4ab67cf53f2853ba93f4628b63cd5aac2b02 /source4/rpc_server/samr
parentccc65fb995154451537879b57b900b8b4e340bd2 (diff)
downloadsamba-e835621799647ee70630b389fb53d15b15d68355.tar.gz
samba-e835621799647ee70630b389fb53d15b15d68355.tar.bz2
samba-e835621799647ee70630b389fb53d15b15d68355.zip
r8520: fixed a pile of warnings from the build farm gcc -Wall output on
S390. This is an attempt to avoid the panic we're seeing in the automatic builds. The main fixes are: - assumptions that sizeof(size_t) == sizeof(int), mostly in printf formats - use of NULL format statements to perform dn searches. - assumption that sizeof() returns an int (This used to be commit a58ea6b3854973b694d2b1e22323ed7eb00e3a3f)
Diffstat (limited to 'source4/rpc_server/samr')
-rw-r--r--source4/rpc_server/samr/dcesrv_samr.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/source4/rpc_server/samr/dcesrv_samr.c b/source4/rpc_server/samr/dcesrv_samr.c
index 31b49bcd86..5539cdde96 100644
--- a/source4/rpc_server/samr/dcesrv_samr.c
+++ b/source4/rpc_server/samr/dcesrv_samr.c
@@ -515,7 +515,7 @@ static NTSTATUS samr_CreateDomainGroup(struct dcesrv_call_state *dce_call, TALLO
/* retrieve the sid for the group just created */
sid = samdb_search_dom_sid(d_state->sam_ctx, a_state,
- msg->dn, "objectSid", NULL);
+ msg->dn, "objectSid", "dn=%s", msg->dn);
if (sid == NULL) {
return NT_STATUS_UNSUCCESSFUL;
}
@@ -749,7 +749,7 @@ static NTSTATUS samr_CreateUser2(struct dcesrv_call_state *dce_call, TALLOC_CTX
/* retrieve the sid for the group just created */
sid = samdb_search_dom_sid(d_state->sam_ctx, a_state,
- msg->dn, "objectSid", NULL);
+ msg->dn, "objectSid", "dn=%s", msg->dn);
if (sid == NULL) {
return NT_STATUS_UNSUCCESSFUL;
}
@@ -949,7 +949,7 @@ static NTSTATUS samr_CreateDomAlias(struct dcesrv_call_state *dce_call, TALLOC_C
/* retrieve the sid for the alias just created */
sid = samdb_search_dom_sid(d_state->sam_ctx, a_state,
- msg->dn, "objectSid", NULL);
+ msg->dn, "objectSid", "dn=%s", msg->dn);
a_state->account_name = talloc_strdup(a_state, alias_name);
if (!a_state->account_name) {
@@ -3072,9 +3072,13 @@ 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,
- a_state->domain_state->domain_dn, "minPwdLength", NULL);
+ a_state->domain_state->domain_dn, "minPwdLength",
+ "dn=%s",
+ a_state->domain_state->domain_dn);
r->out.info.password_properties = samdb_search_uint(a_state->sam_ctx, mem_ctx, 0,
- a_state->account_dn, "pwdProperties", NULL);
+ a_state->account_dn,
+ "pwdProperties",
+ "dn=%s", a_state->account_dn);
return NT_STATUS_OK;
}