sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-04 08:22:08 +03:00
Code Activity

r7796: Prepare for client setting capabilities to select posix pathnames on

Browse Source 
the wire. Jerry do not merge this please. New SMB_SET_FS_INFO - level
0x200 as was discussed on the mailing list.
Jeremy.
(This used to be commit 55029b1a0c)
This commit is contained in:
Jeremy Allison
2005-06-21 05:18:09 +00:00
committed by Gerald (Jerry) Carter
parent ef34e3336b
commit ea41eedc20
2 changed files with 51 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source3/include/trans2.h
View File

@ -450,11 +450,13 @@ Offset Size Name
/* /*
Info level for TRANS2_QFSINFO - returns version of CIFS UNIX extensions, plus Info level for TRANS2_QFSINFO - returns version of CIFS UNIX extensions, plus
64-bits worth of capability fun :-). 64-bits worth of capability fun :-).
Use the same info level for TRANS2_SETFSINFO
*/ */
#define SMB_QUERY_CIFS_UNIX_INFO 0x200 #define SMB_QUERY_CIFS_UNIX_INFO 0x200
#define SMB_SET_CIFS_UNIX_INFO 0x200
/* Returns the following. /* Returns or sets the following.
UINT16 major version number UINT16 major version number
UINT16 minor version number UINT16 minor version number
@ -474,12 +476,6 @@ Offset Size Name
(chflags) and lsattr */ (chflags) and lsattr */
#define CIFS_UNIX_POSIX_PATHNAMES_CAP 0x10 /* Use POSIX pathnames on the wire. */ #define CIFS_UNIX_POSIX_PATHNAMES_CAP 0x10 /* Use POSIX pathnames on the wire. */
/*
Info level for TRANSACT2_SETFSINFO - takes 64-bits of capabilies in the data section.
*/
#define SMB_SET_CIFS_UNIX_INFO 0x200
#define SMB_QUERY_POSIX_FS_INFO 0x201 #define SMB_QUERY_POSIX_FS_INFO 0x201

67
source3/smbd/trans2.c
View File

@ -2433,7 +2433,7 @@ static int call_trans2setfsinfo(connection_struct *conn, char *inbuf, char *outb
ZERO_STRUCT(quotas); ZERO_STRUCT(quotas);
DEBUG(10,("call_trans2setfsinfo: SET_FS_QUOTA: for service [%s]\n",lp_servicename(SNUM(conn)))); DEBUG(10,("call_trans2setfsinfo: for service [%s]\n",lp_servicename(SNUM(conn))));
/* access check */ /* access check */
if ((current_user.uid != 0)||!CAN_WRITE(conn)) { if ((current_user.uid != 0)||!CAN_WRITE(conn)) {
@ -2449,25 +2449,54 @@ static int call_trans2setfsinfo(connection_struct *conn, char *inbuf, char *outb
return ERROR_NT(NT_STATUS_INVALID_PARAMETER); return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
} }
fsp = file_fsp(params,0);
if (!CHECK_NTQUOTA_HANDLE_OK(fsp,conn)) {
DEBUG(3,("TRANSACT_GET_USER_QUOTA: no valid QUOTA HANDLE\n"));
return ERROR_NT(NT_STATUS_INVALID_HANDLE);
}
info_level = SVAL(params,2); info_level = SVAL(params,2);
switch(info_level) { switch(info_level) {
case SMB_SET_CIFS_UNIX_INFO:
{
uint16 client_unix_major;
uint16 client_unix_minor;
uint32 client_unix_cap_low;
uint32 client_unix_cap_high;
if (!lp_unix_extensions()) {
return ERROR_DOS(ERRDOS,ERRunknownlevel);
}
/* There should be 12 bytes of capabilities set. */
if (total_data < 8) {
return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
}
client_unix_major = SVAL(pdata,0);
client_unix_minor = SVAL(pdata,2);
client_unix_cap_low = IVAL(pdata,4);
client_unix_cap_high = IVAL(pdata,8);
/* Just print these values for now. */
DEBUG(10,("call_trans2setfsinfo: set unix info. major = %u, minor = %u\
cap_low = 0x%x, cap_high = 0x%x\n",
(unsigned int)client_unix_major,
(unsigned int)client_unix_minor,
(unsigned int)client_unix_cap_low,
(unsigned int)client_unix_cap_high ));
outsize = set_message(outbuf,0,0,True);
break;
}
case SMB_FS_QUOTA_INFORMATION: case SMB_FS_QUOTA_INFORMATION:
/* note: normaly there're 48 bytes, /* note: normaly there're 48 bytes,
* but we didn't use the last 6 bytes for now * but we didn't use the last 6 bytes for now
* --metze * --metze
*/ */
fsp = file_fsp(params,0);
if (!CHECK_NTQUOTA_HANDLE_OK(fsp,conn)) {
DEBUG(3,("TRANSACT_GET_USER_QUOTA: no valid QUOTA HANDLE\n"));
return ERROR_NT(NT_STATUS_INVALID_HANDLE);
}
if (total_data < 42) { if (total_data < 42) {
DEBUG(0,("call_trans2setfsinfo: SET_FS_QUOTA: requires total_data(%d) >= 42 bytes!\n", DEBUG(0,("call_trans2setfsinfo: SET_FS_QUOTA: requires total_data(%d) >= 42 bytes!\n",
total_data)); total_data));
return ERROR_DOS(ERRDOS,ERRunknownlevel); return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
} }
/* unknown_1 24 NULL bytes in pdata*/ /* unknown_1 24 NULL bytes in pdata*/
@ -2481,7 +2510,7 @@ static int call_trans2setfsinfo(connection_struct *conn, char *inbuf, char *outb
((quotas.softlim != 0xFFFFFFFF)|| ((quotas.softlim != 0xFFFFFFFF)||
(IVAL(pdata,28)!=0xFFFFFFFF))) { (IVAL(pdata,28)!=0xFFFFFFFF))) {
/* more than 32 bits? */ /* more than 32 bits? */
return ERROR_DOS(ERRDOS,ERRunknownlevel); return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
} }
#endif /* LARGE_SMB_OFF_T */ #endif /* LARGE_SMB_OFF_T */
@ -2494,7 +2523,7 @@ static int call_trans2setfsinfo(connection_struct *conn, char *inbuf, char *outb
((quotas.hardlim != 0xFFFFFFFF)|| ((quotas.hardlim != 0xFFFFFFFF)||
(IVAL(pdata,36)!=0xFFFFFFFF))) { (IVAL(pdata,36)!=0xFFFFFFFF))) {
/* more than 32 bits? */ /* more than 32 bits? */
return ERROR_DOS(ERRDOS,ERRunknownlevel); return ERROR_NT(NT_STATUS_INVALID_PARAMETER);
} }
#endif /* LARGE_SMB_OFF_T */ #endif /* LARGE_SMB_OFF_T */
@ -2509,6 +2538,14 @@ static int call_trans2setfsinfo(connection_struct *conn, char *inbuf, char *outb
return ERROR_DOS(ERRSRV,ERRerror); return ERROR_DOS(ERRSRV,ERRerror);
} }
/*
* sending this reply works fine,
* but I'm not sure it's the same
* like windows do...
* --metze
*/
outsize = set_message(outbuf,10,0,True);
break; break;
default: default:
DEBUG(3,("call_trans2setfsinfo: unknown level (0x%X) not implemented yet.\n", DEBUG(3,("call_trans2setfsinfo: unknown level (0x%X) not implemented yet.\n",
@ -2517,14 +2554,6 @@ static int call_trans2setfsinfo(connection_struct *conn, char *inbuf, char *outb
break; break;
} }
/*
* sending this reply works fine,
* but I'm not sure it's the same
* like windows do...
* --metze
*/
outsize = set_message(outbuf,10,0,True);
return outsize; return outsize;
} }