svn commit: samba r21246 - in branches: SAMBA_3_0/source/smbd SAMBA_3_0_25/source/smbd

jra at samba.org jra at samba.org
Thu Feb 8 19:42:28 GMT 2007


Author: jra
Date: 2007-02-08 19:42:27 +0000 (Thu, 08 Feb 2007)
New Revision: 21246

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

Log:
Remove incorrect control on unix set info.
We can take path or handle based calls.
Jeremy.

Modified:
   branches/SAMBA_3_0/source/smbd/trans2.c
   branches/SAMBA_3_0_25/source/smbd/trans2.c


Changeset:
Modified: branches/SAMBA_3_0/source/smbd/trans2.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/trans2.c	2007-02-08 19:40:54 UTC (rev 21245)
+++ branches/SAMBA_3_0/source/smbd/trans2.c	2007-02-08 19:42:27 UTC (rev 21246)
@@ -3921,7 +3921,7 @@
 		return NT_STATUS_OK;
 	}
 
-	DEBUG(10,("call_trans2setfilepathinfo: file %s : setting new size to %.0f\n",
+	DEBUG(10,("smb_set_file_size: file %s : setting new size to %.0f\n",
 		fname, (double)size ));
 
 	if (fsp && fsp->fh->fd != -1) {
@@ -5392,10 +5392,6 @@
 
 		case SMB_SET_FILE_UNIX_BASIC:
 		{
-			if (tran_call == TRANSACT2_SETFILEINFO) {
-				return ERROR_NT(NT_STATUS_INVALID_LEVEL);
-			}
-
 			status = smb_set_file_unix_basic(conn,
 							pdata,
 							total_data,
@@ -5460,7 +5456,7 @@
 
 		case SMB_SET_POSIX_LOCK:
 		{
-			if (tran_call == TRANSACT2_SETFILEINFO) {
+			if (tran_call != TRANSACT2_SETFILEINFO) {
 				return ERROR_NT(NT_STATUS_INVALID_LEVEL);
 			}
 			status = smb_set_posix_lock(conn,

Modified: branches/SAMBA_3_0_25/source/smbd/trans2.c
===================================================================
--- branches/SAMBA_3_0_25/source/smbd/trans2.c	2007-02-08 19:40:54 UTC (rev 21245)
+++ branches/SAMBA_3_0_25/source/smbd/trans2.c	2007-02-08 19:42:27 UTC (rev 21246)
@@ -3911,7 +3911,7 @@
 		return NT_STATUS_OK;
 	}
 
-	DEBUG(10,("call_trans2setfilepathinfo: file %s : setting new size to %.0f\n",
+	DEBUG(10,("smb_set_file_size: file %s : setting new size to %.0f\n",
 		fname, (double)size ));
 
 	if (fsp && fsp->fh->fd != -1) {
@@ -5386,10 +5386,6 @@
 
 		case SMB_SET_FILE_UNIX_BASIC:
 		{
-			if (tran_call == TRANSACT2_SETFILEINFO) {
-				return ERROR_NT(NT_STATUS_INVALID_LEVEL);
-			}
-
 			status = smb_set_file_unix_basic(conn,
 							pdata,
 							total_data,
@@ -5454,7 +5450,7 @@
 
 		case SMB_SET_POSIX_LOCK:
 		{
-			if (tran_call == TRANSACT2_SETFILEINFO) {
+			if (tran_call != TRANSACT2_SETFILEINFO) {
 				return ERROR_NT(NT_STATUS_INVALID_LEVEL);
 			}
 			status = smb_set_posix_lock(conn,



More information about the samba-cvs mailing list