diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-04-10 05:25:18 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-04-10 05:25:18 +0200 |
| commit | 73302b8b08d2528bbfb1eea4e9538e3e545d4641 (patch) | |
| tree | 335146ea9146aef768ec8aeb682c761b92d21d46 /source4 | |
| parent | ad8e3e41923e20d401294eccd4da028e0f40c904 (diff) | |
| parent | 55809f5029788892919bd7f6ec305ae9df858038 (diff) | |
| download | samba-73302b8b08d2528bbfb1eea4e9538e3e545d4641.tar.gz | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into cprovision
(This used to be commit 3522c7e2cf8c6d6129d941a08adcbe2ecbe0758d)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/libcli/cldap/cldap.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source4/libcli/cldap/cldap.c b/source4/libcli/cldap/cldap.c index d10eeb8ffd7..d9910285d94 100644 --- a/source4/libcli/cldap/cldap.c +++ b/source4/libcli/cldap/cldap.c @@ -601,8 +601,11 @@ NTSTATUS cldap_netlogon_recv(struct cldap_request *req, NTSTATUS status; enum ndr_err_code ndr_err; struct cldap_search search; + struct cldap_socket *cldap; DATA_BLOB *data; + cldap = req->cldap; + status = cldap_search_recv(req, mem_ctx, &search); if (!NT_STATUS_IS_OK(status)) { return status; @@ -620,7 +623,7 @@ NTSTATUS cldap_netlogon_recv(struct cldap_request *req, data = search.out.response->attributes[0].values; ndr_err = ndr_pull_union_blob_all(data, mem_ctx, - req->cldap->iconv_convenience, + cldap->iconv_convenience, &io->out.netlogon, io->in.version & 0xF, (ndr_pull_flags_fn_t)ndr_pull_nbt_cldap_netlogon); |