sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00
Code

Actually test vl's new code and make it work to fix the build farm :-).

Browse Source 
Jeremy.
This commit is contained in:
Jeremy Allison 2008-01-18 18:39:27 -08:00
parent e96cf1309e
commit 63defd3e9d
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source/smbd/trans2.c
View File

@ -3743,12 +3743,6 @@ static void call_trans2qfilepathinfo(connection_struct *conn,
} }
} }
nlink = sbuf.st_nlink;
if ((nlink > 0) && delete_pending) {
nlink -= 1;
}
if (INFO_LEVEL_IS_UNIX(info_level) && !lp_unix_extensions()) { if (INFO_LEVEL_IS_UNIX(info_level) && !lp_unix_extensions()) {
reply_nterror(req, NT_STATUS_INVALID_LEVEL); reply_nterror(req, NT_STATUS_INVALID_LEVEL);
return; return;
@ -3767,6 +3761,16 @@ static void call_trans2qfilepathinfo(connection_struct *conn,
if (!mode) if (!mode)
mode = FILE_ATTRIBUTE_NORMAL; mode = FILE_ATTRIBUTE_NORMAL;
nlink = sbuf.st_nlink;
if (nlink && (mode&aDIR)) {
nlink = 1;
}
if ((nlink > 0) && delete_pending) {
nlink -= 1;
}
fullpathname = fname; fullpathname = fname;
if (!(mode & aDIR)) if (!(mode & aDIR))
file_size = get_file_size(sbuf); file_size = get_file_size(sbuf);
@ -4013,7 +4017,7 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
data_size = 24; data_size = 24;
SOFF_T(pdata,0,allocation_size); SOFF_T(pdata,0,allocation_size);
SOFF_T(pdata,8,file_size); SOFF_T(pdata,8,file_size);
SIVAL(pdata,16,(mode&aDIR)?1:nlink); SIVAL(pdata,16,nlink);
SCVAL(pdata,20,delete_pending?1:0); SCVAL(pdata,20,delete_pending?1:0);
SCVAL(pdata,21,(mode&aDIR)?1:0); SCVAL(pdata,21,(mode&aDIR)?1:0);
SSVAL(pdata,22,0); /* Padding. */ SSVAL(pdata,22,0); /* Padding. */
@ -4091,7 +4095,7 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
pdata += 40; pdata += 40;
SOFF_T(pdata,0,allocation_size); SOFF_T(pdata,0,allocation_size);
SOFF_T(pdata,8,file_size); SOFF_T(pdata,8,file_size);
SIVAL(pdata,16,(mode&aDIR)?1:nlink); SIVAL(pdata,16,nlink);
SCVAL(pdata,20,delete_pending); SCVAL(pdata,20,delete_pending);
SCVAL(pdata,21,(mode&aDIR)?1:0); SCVAL(pdata,21,(mode&aDIR)?1:0);
SSVAL(pdata,22,0); SSVAL(pdata,22,0);