an initial fix for handling sparse files in smbd

This gets my test code working, where we previously failed with files
above 20G in size.

I'm still not completely happy with this. There are just too many
fields in trans2.c that we don't fill in.
(This used to be commit 7dfdb456d4c9bcf6ecb1f7e5c5e79989f95e5627)

1 files changed, 39 insertions, 12 deletions

diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index 8f6b4ab374..cf69dfddb0 100644
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -851,7 +851,7 @@ int reply_ntcreate_and_X(connection_struct *conn,
 	p += 8;
 	SIVAL(p,0,fmode); /* File Attributes. */
 	p += 4;
-	SOFF_T(p, 0, SMB_ROUNDUP_ALLOCATION(file_len));
+	SOFF_T(p, 0, get_allocation_size(&sbuf));
 	p += 8;
 	SOFF_T(p,0,file_len);
 	p += 12;
@@ -1295,7 +1295,7 @@ static int call_nt_transact_create(connection_struct *conn,
 	p += 8;
 	SIVAL(p,0,fmode); /* File Attributes. */
 	p += 4;
-	SOFF_T(p, 0, SMB_ROUNDUP_ALLOCATION(file_len));
+	SOFF_T(p, 0, get_allocation_size(&sbuf));
 	p += 8;
 	SOFF_T(p,0,file_len);
 
@@ -1594,21 +1594,46 @@ static int call_nt_transact_set_security_desc(connection_struct *conn,
 }
    
 /****************************************************************************
- Reply to IOCTL - not implemented - no plans.
+ Reply to NT IOCTL
 ****************************************************************************/
-
 static int call_nt_transact_ioctl(connection_struct *conn,
 				  char *inbuf, char *outbuf, int length,
                                   int bufsize, 
-                                  char **ppsetup, char **ppparams, char **ppdata)
+                                  char **ppsetup, int setup_count,
+				  char **ppparams, int parameter_count,
+				  char **ppdata, int data_count)
 {
-	static BOOL logged_message = False;
+	unsigned fnum, control;
+	static BOOL logged_message;
 
-	if(!logged_message) {
-		DEBUG(3,("call_nt_transact_ioctl: Currently not implemented.\n"));
-		logged_message = True; /* Only print this once... */
+	if (setup_count != 8) {
+		DEBUG(3,("call_nt_transact_ioctl: invalid setup count %d\n", setup_count));
+		return ERROR_NT(NT_STATUS_NOT_SUPPORTED);
 	}
-	return ERROR_DOS(ERRSRV,ERRnosupport);
+
+	fnum = SVAL(*ppsetup, 4);
+	control = IVAL(*ppsetup, 0);
+
+	DEBUG(6,("call_nt_transact_ioctl: fnum=%d control=0x%x\n", 
+		 fnum, control));
+
+	switch (control) {
+	case NTIOCTL_SET_SPARSE:
+		/* pretend this succeeded - tho strictly we should
+		   mark the file sparse (if the local fs supports it)
+		   so we can know if we need to pre-allocate or not */
+		send_nt_replies(inbuf, outbuf, bufsize, NT_STATUS_OK, NULL, 0, NULL, 0);
+		return -1;
+
+	default:
+		if (!logged_message) {
+			logged_message = True; /* Only print this once... */
+			DEBUG(3,("call_nt_transact_ioctl(0x%x): Currently not implemented.\n",
+				 control));
+		}
+	}
+
+	return ERROR_NT(NT_STATUS_NOT_SUPPORTED);
 }
    
 /****************************************************************************
@@ -1769,8 +1794,10 @@ due to being in oplock break state.\n", (unsigned int)function_code ));
 		case NT_TRANSACT_IOCTL:
 			START_PROFILE_NESTED(NT_transact_ioctl);
 			outsize = call_nt_transact_ioctl(conn, inbuf, outbuf,
-					length, bufsize, 
-					&setup, &params, &data);
+							 length, bufsize, 
+							 &setup, setup_count,
+							 &params, parameter_count, 
+							 &data, data_count);
 			END_PROFILE_NESTED(NT_transact_ioctl);
 			break;
 		case NT_TRANSACT_SET_SECURITY_DESC: