Author: jelmer Date: 2006-01-26 22:22:26 +0000 (Thu, 26 Jan 2006) New Revision: 13170
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13170 Log: Remove some dependencies on -1 implying the size of pstring Modified: branches/SAMBA_4_0/source/auth/ntlmssp/ntlmssp_parse.c branches/SAMBA_4_0/source/torture/basic/scanner.c Changeset: Modified: branches/SAMBA_4_0/source/auth/ntlmssp/ntlmssp_parse.c =================================================================== --- branches/SAMBA_4_0/source/auth/ntlmssp/ntlmssp_parse.c 2006-01-26 22:16:38 UTC (rev 13169) +++ branches/SAMBA_4_0/source/auth/ntlmssp/ntlmssp_parse.c 2006-01-26 22:22:26 UTC (rev 13170) @@ -238,9 +238,8 @@ return False; if (0 < len1) { - pull_string(p, blob->data + ptr, sizeof(p), - len1, - STR_UNICODE|STR_NOALIGN); + pull_ucs2(p, blob->data + ptr, sizeof(p), + len1, STR_NOALIGN); (*ps) = talloc_strdup(mem_ctx, p); if (!(*ps)) { return False; @@ -269,9 +268,8 @@ return False; if (0 < len1) { - pull_string(p, blob->data + ptr, sizeof(p), - len1, - STR_ASCII|STR_NOALIGN); + pull_ascii(p, blob->data + ptr, sizeof(p), + len1, STR_NOALIGN); (*ps) = talloc_strdup(mem_ctx, p); if (!(*ps)) { return False; Modified: branches/SAMBA_4_0/source/torture/basic/scanner.c =================================================================== --- branches/SAMBA_4_0/source/torture/basic/scanner.c 2006-01-26 22:16:38 UTC (rev 13169) +++ branches/SAMBA_4_0/source/torture/basic/scanner.c 2006-01-26 22:22:26 UTC (rev 13170) @@ -448,7 +448,7 @@ SSVAL(param, 0, level); SSVAL(param, 2, 0); SSVAL(param, 4, 0); - param_len += push_string(¶m[6], fname, -1, STR_TERMINATE | STR_UNICODE); + param_len += push_string(¶m[6], fname, sizeof(pstring), STR_TERMINATE | STR_UNICODE); status = try_nttrans_len(cli, "fname", op, level, param, data, param_len, &data_len, &rparam_len, &rdata_len); @@ -459,7 +459,7 @@ SSVAL(param, 0, level); SSVAL(param, 2, 0); SSVAL(param, 4, 0); - param_len += push_string(¶m[6], "\\newfile.dat", -1, STR_TERMINATE | STR_UNICODE); + param_len += push_string(¶m[6], "\\newfile.dat", sizeof(pstring), STR_TERMINATE | STR_UNICODE); status = try_nttrans_len(cli, "newfile", op, level, param, data, param_len, &data_len, &rparam_len, &rdata_len); @@ -471,7 +471,7 @@ smbcli_mkdir(cli->tree, "\\testdir"); param_len = 2; SSVAL(param, 0, level); - param_len += push_string(¶m[2], "\\testdir", -1, STR_TERMINATE | STR_UNICODE); + param_len += push_string(¶m[2], "\\testdir", sizeof(pstring), STR_TERMINATE | STR_UNICODE); status = try_nttrans_len(cli, "dfs", op, level, param, data, param_len, &data_len, &rparam_len, &rdata_len);