diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2009-03-17 14:04:43 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2009-04-14 12:11:00 +1000 |
| commit | 4786a493f70070dce6de4cbe488c9de1bdbb75ad (patch) | |
| tree | a568260a9cf5d255674d0e31dddf4f5e3644e0da /source3/libsmb/ntlmssp_parse.c | |
| parent | 41e4f12c482082d6e622d1fdc830e38853cdbd8b (diff) | |
| download | samba-4786a493f70070dce6de4cbe488c9de1bdbb75ad.tar.gz samba-4786a493f70070dce6de4cbe488c9de1bdbb75ad.tar.xz samba-4786a493f70070dce6de4cbe488c9de1bdbb75ad.zip | |
Solve some of the conflict between Samba3 and Samba4 push_string
This renames push_string in Samba3 into push_string_base and
push_string_check for the two different use cases.
This should allow push_string to be imported from Samba4, using it's
calling conventions.
Diffstat (limited to 'source3/libsmb/ntlmssp_parse.c')
| -rw-r--r-- | source3/libsmb/ntlmssp_parse.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source3/libsmb/ntlmssp_parse.c b/source3/libsmb/ntlmssp_parse.c index 70377cba7d..98c50596be 100644 --- a/source3/libsmb/ntlmssp_parse.c +++ b/source3/libsmb/ntlmssp_parse.c @@ -106,8 +106,8 @@ bool msrpc_gen(DATA_BLOB *blob, SSVAL(blob->data, head_ofs, n*2); head_ofs += 2; SSVAL(blob->data, head_ofs, n*2); head_ofs += 2; SIVAL(blob->data, head_ofs, data_ofs); head_ofs += 4; - push_string(NULL, blob->data+data_ofs, - s, n*2, STR_UNICODE|STR_NOALIGN); + push_string_check(blob->data+data_ofs, + s, n*2, STR_UNICODE|STR_NOALIGN); data_ofs += n*2; break; case 'A': @@ -116,8 +116,8 @@ bool msrpc_gen(DATA_BLOB *blob, SSVAL(blob->data, head_ofs, n); head_ofs += 2; SSVAL(blob->data, head_ofs, n); head_ofs += 2; SIVAL(blob->data, head_ofs, data_ofs); head_ofs += 4; - push_string(NULL, blob->data+data_ofs, - s, n, STR_ASCII|STR_NOALIGN); + push_string_check(blob->data+data_ofs, + s, n, STR_ASCII|STR_NOALIGN); data_ofs += n; break; case 'a': @@ -127,7 +127,7 @@ bool msrpc_gen(DATA_BLOB *blob, n = str_charnum(s); SSVAL(blob->data, data_ofs, n*2); data_ofs += 2; if (0 < n) { - push_string(NULL, blob->data+data_ofs, s, n*2, + push_string_check(blob->data+data_ofs, s, n*2, STR_UNICODE|STR_NOALIGN); } data_ofs += n*2; @@ -156,8 +156,8 @@ bool msrpc_gen(DATA_BLOB *blob, case 'C': s = va_arg(ap, char *); n = str_charnum(s) + 1; - head_ofs += push_string(NULL, blob->data+head_ofs, s, n, - STR_ASCII|STR_TERMINATE); + head_ofs += push_string_check(blob->data+head_ofs, s, n, + STR_ASCII|STR_TERMINATE); break; } } |