svn commit: samba r16569 - in branches/SAMBA_4_0/source: auth/ntlmssp libcli/auth torture/rap

[metze at samba.org]

Author: metze
Date: 2006-06-27 17:55:02 +0000 (Tue, 27 Jun 2006)
New Revision: 16569

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=16569

Log:
- use push_string()

metze
Modified:
   branches/SAMBA_4_0/source/auth/ntlmssp/ntlmssp_parse.c
   branches/SAMBA_4_0/source/libcli/auth/smbencrypt.c
   branches/SAMBA_4_0/source/torture/rap/rap.c


Changeset:
Modified: branches/SAMBA_4_0/source/auth/ntlmssp/ntlmssp_parse.c
===================================================================
--- branches/SAMBA_4_0/source/auth/ntlmssp/ntlmssp_parse.c	2006-06-27 17:46:57 UTC (rev 16568)
+++ branches/SAMBA_4_0/source/auth/ntlmssp/ntlmssp_parse.c	2006-06-27 17:55:02 UTC (rev 16569)
@@ -238,8 +238,8 @@
 					return False;
 
 				if (0 < len1) {
-					pull_ucs2(p, blob->data + ptr, sizeof(p), 
-						    len1, STR_NOALIGN);
+					pull_string(p, blob->data + ptr, sizeof(p), 
+						    len1, STR_UNICODE|STR_NOALIGN);
 					(*ps) = talloc_strdup(mem_ctx, p);
 					if (!(*ps)) {
 						return False;
@@ -268,8 +268,8 @@
 					return False;	
 
 				if (0 < len1) {
-					pull_ascii(p, blob->data + ptr, sizeof(p), 
-						    len1, STR_NOALIGN);
+					pull_string(p, blob->data + ptr, sizeof(p), 
+						    len1, STR_ASCII|STR_NOALIGN);
 					(*ps) = talloc_strdup(mem_ctx, p);
 					if (!(*ps)) {
 						return False;

Modified: branches/SAMBA_4_0/source/libcli/auth/smbencrypt.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/auth/smbencrypt.c	2006-06-27 17:46:57 UTC (rev 16568)
+++ branches/SAMBA_4_0/source/libcli/auth/smbencrypt.c	2006-06-27 17:55:02 UTC (rev 16569)
@@ -91,10 +91,10 @@
 	BOOL ret = True;
 	fstring dospwd; 
 	ZERO_STRUCT(dospwd);
-	
+
 	/* Password must be converted to DOS charset - null terminated, uppercase. */
-	push_ascii(dospwd, passwd, sizeof(dospwd), STR_UPPER|STR_TERMINATE);
-       
+	push_string(dospwd, passwd, sizeof(dospwd), STR_ASCII|STR_UPPER|STR_TERMINATE);
+
 	/* Only the fisrt 14 chars are considered, password need not be null terminated. */
 	E_P16((const uint8_t *)dospwd, p16);
 

Modified: branches/SAMBA_4_0/source/torture/rap/rap.c
===================================================================
--- branches/SAMBA_4_0/source/torture/rap/rap.c	2006-06-27 17:46:57 UTC (rev 16568)
+++ branches/SAMBA_4_0/source/torture/rap/rap.c	2006-06-27 17:55:02 UTC (rev 16569)
@@ -151,7 +151,7 @@
 		return NT_STATUS_INVALID_PARAMETER;
 
 	*dest = talloc_zero_size(mem_ctx, len+1);
-	pull_ascii(*dest, p, len+1, len, 0);
+	pull_string(*dest, p, len+1, len, STR_ASCII);
 
 	return NT_STATUS_OK;
 }