svn commit: samba r11743 - in branches/SAMBA_4_0/source/libcli/smb2: .

[metze at samba.org]

Author: metze
Date: 2005-11-16 15:47:44 +0000 (Wed, 16 Nov 2005)
New Revision: 11743

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

Log:
- push the length at the correct offset
- let us push empty strings

metze
Modified:
   branches/SAMBA_4_0/source/libcli/smb2/request.c


Changeset:
Modified: branches/SAMBA_4_0/source/libcli/smb2/request.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/smb2/request.c	2005-11-16 13:34:56 UTC (rev 11742)
+++ branches/SAMBA_4_0/source/libcli/smb2/request.c	2005-11-16 15:47:44 UTC (rev 11743)
@@ -254,7 +254,7 @@
 
 	if (blob.length == 0) {
 		SSVAL(ptr, 0, 0);
-		SSVAL(ptr, 4, 0);
+		SSVAL(ptr, 2, 0);
 		return NT_STATUS_OK;
 	}
 
@@ -326,7 +326,7 @@
 
 	if (blob.length == 0) {
 		SSVAL(ptr, 0, 0);
-		SIVAL(ptr, 4, 0);
+		SIVAL(ptr, 2, 0);
 		return NT_STATUS_OK;
 	}
 
@@ -457,6 +457,13 @@
 	NTSTATUS status;
 	ssize_t size;
 
+	if (strcmp("", str) == 0) {
+		blob = data_blob(NULL, 0);
+		status = smb2_push_o16s16_blob(buf, ptr, blob);
+		NT_STATUS_NOT_OK_RETURN(status);
+		return NT_STATUS_OK;
+	}
+
 	size = convert_string_talloc(buf->buffer, CH_UNIX, CH_UTF16, 
 				     str, strlen(str), (void **)&blob.data);
 	if (size == -1) {