diff options
| author | Stefan Metzmacher <metze@samba.org> | 2004-06-24 17:07:19 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:56:46 -0500 |
| commit | 81db9ef4425ed0d3397767f722b9f156b334867c (patch) | |
| tree | 16a8578777d203ac45cb0a11524dd445782054e5 /source4/libcli/util | |
| parent | db8c78c497be9406d45acd4cff1ebbb566c0356a (diff) | |
| download | samba-81db9ef4425ed0d3397767f722b9f156b334867c.tar.gz samba-81db9ef4425ed0d3397767f722b9f156b334867c.tar.bz2 samba-81db9ef4425ed0d3397767f722b9f156b334867c.zip | |
r1239: move the old msrpc_<gen|parse>() functions to ndr_<push|pull>_format_blob()
simular to ndr_<push|pull>_struct_blob()
metze
(This used to be commit b25dd341e0febd550a2936ca484b6fecce2ff8c2)
Diffstat (limited to 'source4/libcli/util')
| -rw-r--r-- | source4/libcli/util/smbencrypt.c | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/source4/libcli/util/smbencrypt.c b/source4/libcli/util/smbencrypt.c index 72c6589097..e2fb033279 100644 --- a/source4/libcli/util/smbencrypt.c +++ b/source4/libcli/util/smbencrypt.c @@ -267,10 +267,12 @@ DATA_BLOB NTLMv2_generate_names_blob(TALLOC_CTX *mem_ctx, { DATA_BLOB names_blob = data_blob_talloc(mem_ctx, NULL, 0); - msrpc_gen(mem_ctx, &names_blob, "aaa", - NTLMSSP_NAME_TYPE_DOMAIN, domain, - NTLMSSP_NAME_TYPE_SERVER, hostname, - 0, ""); + ndr_push_format_blob(&names_blob ,mem_ctx, + "aaa", + NTLMSSP_NAME_TYPE_DOMAIN, domain, + NTLMSSP_NAME_TYPE_SERVER, hostname, + 0, ""); + return names_blob; } @@ -289,13 +291,14 @@ 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 */ - 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 */ + 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 */ return response; } |