mirror of
https://github.com/samba-team/samba.git
synced 2024-12-24 21:34:56 +03:00
Actually test vl's new code and make it work to fix the build farm :-).
Jeremy.
This commit is contained in:
parent
e96cf1309e
commit
63defd3e9d
@ -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()) {
|
||||
reply_nterror(req, NT_STATUS_INVALID_LEVEL);
|
||||
return;
|
||||
@ -3767,6 +3761,16 @@ static void call_trans2qfilepathinfo(connection_struct *conn,
|
||||
if (!mode)
|
||||
mode = FILE_ATTRIBUTE_NORMAL;
|
||||
|
||||
nlink = sbuf.st_nlink;
|
||||
|
||||
if (nlink && (mode&aDIR)) {
|
||||
nlink = 1;
|
||||
}
|
||||
|
||||
if ((nlink > 0) && delete_pending) {
|
||||
nlink -= 1;
|
||||
}
|
||||
|
||||
fullpathname = fname;
|
||||
if (!(mode & aDIR))
|
||||
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;
|
||||
SOFF_T(pdata,0,allocation_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,21,(mode&aDIR)?1:0);
|
||||
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;
|
||||
SOFF_T(pdata,0,allocation_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,21,(mode&aDIR)?1:0);
|
||||
SSVAL(pdata,22,0);
|
||||
|
Loading…
Reference in New Issue
Block a user