summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2007-01-30 01:54:07 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:17:30 -0500
commit1e55fdb7b7b0bd5b75d32dd78b77d41fdf7cf860 (patch)
treecef70698c96403152d5f88183731ae3b4f47937d
parentc219ebd7e811e775bfe9e6ad6403dfce0c1b15cb (diff)
downloadsamba-1e55fdb7b7b0bd5b75d32dd78b77d41fdf7cf860.tar.gz
samba-1e55fdb7b7b0bd5b75d32dd78b77d41fdf7cf860.tar.bz2
samba-1e55fdb7b7b0bd5b75d32dd78b77d41fdf7cf860.zip
r21052: Refactoring.
Jeremy. (This used to be commit 9e31d7dba383c5c14f746537a631a4119dac0cd0)
-rw-r--r--source3/smbd/trans2.c68
1 files changed, 43 insertions, 25 deletions
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 90365348a0..8185f423e9 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -3749,7 +3749,6 @@ static int smb_info_set_ea(connection_struct *conn,
char *outbuf,
int bufsize,
char *params,
- int total_params,
char *pdata,
int total_data,
unsigned int max_data_bytes,
@@ -3811,7 +3810,6 @@ static int smb_set_file_disposition_info(connection_struct *conn,
char *outbuf,
int bufsize,
char *params,
- int total_params,
char *pdata,
int total_data,
unsigned int max_data_bytes,
@@ -3855,7 +3853,6 @@ static int smb_file_position_information(connection_struct *conn,
char *outbuf,
int bufsize,
char *params,
- int total_params,
char *pdata,
int total_data,
unsigned int max_data_bytes,
@@ -3867,6 +3864,10 @@ static int smb_file_position_information(connection_struct *conn,
return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
}
+ if (fsp == NULL) {
+ return(UNIXERROR(ERRDOS,ERRbadfid));
+ }
+
position_information = (SMB_BIG_UINT)IVAL(pdata,0);
#ifdef LARGE_SMB_OFF_T
position_information |= (((SMB_BIG_UINT)IVAL(pdata,4)) << 32);
@@ -3876,11 +3877,10 @@ static int smb_file_position_information(connection_struct *conn,
return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
}
#endif /* LARGE_SMB_OFF_T */
- if (fsp) {
- DEBUG(10,("call_trans2setfilepathinfo: Set file position information for file %s to %.0f\n",
- fsp->fsp_name, (double)position_information ));
- fsp->fh->position_information = position_information;
- }
+
+ DEBUG(10,("call_trans2setfilepathinfo: Set file position information for file %s to %.0f\n",
+ fsp->fsp_name, (double)position_information ));
+ fsp->fh->position_information = position_information;
/* We're done. We only set position info in this call. */
SSVAL(params,0,0);
@@ -3889,6 +3889,34 @@ static int smb_file_position_information(connection_struct *conn,
}
/****************************************************************************
+ Deal with SMB_FILE_MODE_INFORMATION.
+****************************************************************************/
+
+static int smb_file_mode_information(connection_struct *conn,
+ char *outbuf,
+ int bufsize,
+ char *params,
+ char *pdata,
+ int total_data,
+ unsigned int max_data_bytes)
+{
+ uint32 mode;
+
+ if (total_data < 4) {
+ return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
+ }
+ mode = IVAL(pdata,0);
+ if (mode != 0 && mode != 2 && mode != 4 && mode != 6) {
+ return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
+ }
+
+ /* We're done. We only set (?) mode info in this call. */
+ SSVAL(params,0,0);
+ send_trans2_replies(outbuf, bufsize, params, 2, pdata, 0, max_data_bytes);
+ return -1;
+}
+
+/****************************************************************************
Reply to a TRANS2_SETFILEINFO (set file info by fileid or pathname).
****************************************************************************/
@@ -4052,7 +4080,6 @@ static int call_trans2setfilepathinfo(connection_struct *conn, char *inbuf, char
outbuf,
bufsize,
params,
- total_params,
*ppdata,
total_data,
max_data_bytes,
@@ -4202,7 +4229,6 @@ static int call_trans2setfilepathinfo(connection_struct *conn, char *inbuf, char
outbuf,
bufsize,
params,
- total_params,
*ppdata,
total_data,
max_data_bytes,
@@ -4216,7 +4242,6 @@ static int call_trans2setfilepathinfo(connection_struct *conn, char *inbuf, char
outbuf,
bufsize,
params,
- total_params,
*ppdata,
total_data,
max_data_bytes,
@@ -4231,20 +4256,13 @@ static int call_trans2setfilepathinfo(connection_struct *conn, char *inbuf, char
case SMB_FILE_MODE_INFORMATION:
{
- uint32 mode;
-
- if (total_data < 4) {
- return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
- }
- mode = IVAL(pdata,0);
- if (mode != 0 && mode != 2 && mode != 4 && mode != 6) {
- return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
- }
-
- /* We're done. We only get mode info in this call. */
- SSVAL(params,0,0);
- send_trans2_replies(outbuf, bufsize, params, 2, *ppdata, 0, max_data_bytes);
- return(-1);
+ return smb_file_mode_information(conn,
+ outbuf,
+ bufsize,
+ params,
+ *ppdata,
+ total_data,
+ max_data_bytes);
}
/*