diff options
| author | Stefan Metzmacher <metze@samba.org> | 2004-06-28 06:46:27 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:56:48 -0500 |
| commit | 25bf685da5c037d1875f96e7e7127106dee2865d (patch) | |
| tree | f204ac4b192220a1156c5394940a609ea1d6253f /source4/libcli/util | |
| parent | 4cc054b4f9cda60a302ee197e917a10ff7c59e64 (diff) | |
| download | samba-25bf685da5c037d1875f96e7e7127106dee2865d.tar.gz samba-25bf685da5c037d1875f96e7e7127106dee2865d.tar.bz2 samba-25bf685da5c037d1875f96e7e7127106dee2865d.zip | |
r1274: revert -r 1239 as discussed with abartlet
metze
(This used to be commit 52e2d038252bd745d53c687d266ad3ad62efa6fc)
Diffstat (limited to 'source4/libcli/util')
| -rw-r--r-- | source4/libcli/util/smbencrypt.c | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/source4/libcli/util/smbencrypt.c b/source4/libcli/util/smbencrypt.c index e2fb033279..72c6589097 100644 --- a/source4/libcli/util/smbencrypt.c +++ b/source4/libcli/util/smbencrypt.c @@ -267,12 +267,10 @@ DATA_BLOB NTLMv2_generate_names_blob(TALLOC_CTX *mem_ctx, { DATA_BLOB names_blob = data_blob_talloc(mem_ctx, NULL, 0); - ndr_push_format_blob(&names_blob ,mem_ctx, - "aaa", - NTLMSSP_NAME_TYPE_DOMAIN, domain, - NTLMSSP_NAME_TYPE_SERVER, hostname, - 0, ""); - + msrpc_gen(mem_ctx, &names_blob, "aaa", + NTLMSSP_NAME_TYPE_DOMAIN, domain, + NTLMSSP_NAME_TYPE_SERVER, hostname, + 0, ""); return names_blob; } @@ -291,14 +289,13 @@ static DATA_BLOB NTLMv2_generate_client_data(TALLOC_CTX *mem_ctx, const DATA_BLO /* See http://www.ubiqx.org/cifs/SMB.html#SMB.8.5 */ - ndr_push_format_blob(&response, mem_ctx, - "ddbbdb", - 0x00000101, /* Header */ - 0, /* 'Reserved' */ - long_date, 8, /* Timestamp */ - client_chal, 8, /* client challenge */ - 0, /* Unknown */ - names_blob->data, names_blob->length); /* End of name list */ + msrpc_gen(mem_ctx, &response, "ddbbdb", + 0x00000101, /* Header */ + 0, /* 'Reserved' */ + long_date, 8, /* Timestamp */ + client_chal, 8, /* client challenge */ + 0, /* Unknown */ + names_blob->data, names_blob->length); /* End of name list */ return response; } |