diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2010-05-09 17:20:01 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2010-05-18 11:45:30 +0200 |
| commit | f9ca9e46ad24036bf00cb361a6cef4b2e7e98d7d (patch) | |
| tree | 9a0a6cb6617d855c28eb891396898096c4214e88 /source4/cldap_server | |
| parent | e9f5bdf6b5a1aeb7e2e556cf41f7cbc2abed7856 (diff) | |
| download | samba-f9ca9e46ad24036bf00cb361a6cef4b2e7e98d7d.tar.gz samba-f9ca9e46ad24036bf00cb361a6cef4b2e7e98d7d.tar.bz2 samba-f9ca9e46ad24036bf00cb361a6cef4b2e7e98d7d.zip | |
Finish removal of iconv_convenience in public API's.
Diffstat (limited to 'source4/cldap_server')
| -rw-r--r-- | source4/cldap_server/netlogon.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/source4/cldap_server/netlogon.c b/source4/cldap_server/netlogon.c index 414f08a6f6..7667d9bf3e 100644 --- a/source4/cldap_server/netlogon.c +++ b/source4/cldap_server/netlogon.c @@ -137,7 +137,7 @@ NTSTATUS fill_netlogon_samlogon_response(struct ldb_context *sam_ctx, enum ndr_err_code ndr_err; /* Rather than go via the string, just push into the NDR form */ - ndr_err = ndr_push_struct_blob(&sid_val, mem_ctx, NULL, &sid, + ndr_err = ndr_push_struct_blob(&sid_val, mem_ctx, &sid, (ndr_push_flags_fn_t)ndr_push_dom_sid); if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { return NT_STATUS_INVALID_PARAMETER; @@ -427,8 +427,7 @@ void cldapd_netlogon_request(struct cldap_socket *cldap, goto failed; } ndr_err = ndr_pull_struct_blob(&t->u.equality.value, - domain_sid, NULL, - domain_sid, + domain_sid, domain_sid, (ndr_pull_flags_fn_t)ndr_pull_dom_sid); if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { talloc_free(domain_sid); @@ -472,10 +471,7 @@ void cldapd_netlogon_request(struct cldap_socket *cldap, goto failed; } - status = cldap_netlogon_reply(cldap, - lp_iconv_convenience(cldapd->task->lp_ctx), - message_id, src, version, - &netlogon); + status = cldap_netlogon_reply(cldap, message_id, src, version, &netlogon); if (!NT_STATUS_IS_OK(status)) { goto failed; } |