Author: jra
Date: 2007-06-04 22:29:23 +0000 (Mon, 04 Jun 2007)
New Revision: 23346

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

Log:
Fix offline caching with XP/Vista. It was an off-by-one
in storing the access mask. I shouldn't have made this
mistake. Damn. Fixes bug #4673.
Jeremy

Modified:
   branches/SAMBA_3_0/source/smbd/nttrans.c
   branches/SAMBA_3_0_25/source/smbd/nttrans.c
   branches/SAMBA_3_0_26/source/smbd/nttrans.c


Changeset:
Modified: branches/SAMBA_3_0/source/smbd/nttrans.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/nttrans.c    2007-06-04 19:58:11 UTC (rev 
23345)
+++ branches/SAMBA_3_0/source/smbd/nttrans.c    2007-06-04 22:29:23 UTC (rev 
23346)
@@ -420,7 +420,7 @@
        p += 4;
 
        if (flags & EXTENDED_RESPONSE_REQUIRED) {
-               p += 26;
+               p += 25;
                SIVAL(p,0,FILE_GENERIC_ALL);
                /* 
                 * For pipes W2K3 seems to return
@@ -950,7 +950,7 @@
 
        if (flags & EXTENDED_RESPONSE_REQUIRED) {
                uint32 perms = 0;
-               p += 26;
+               p += 25;
                if (fsp->is_directory || can_write_to_file(conn, fname, &sbuf)) 
{
                        perms = FILE_GENERIC_ALL;
                } else {
@@ -1035,7 +1035,7 @@
        p += 4;
        
        if (flags & EXTENDED_RESPONSE_REQUIRED) {
-               p += 26;
+               p += 25;
                SIVAL(p,0,FILE_GENERIC_ALL);
                /* 
                 * For pipes W2K3 seems to return
@@ -1631,7 +1631,7 @@
 
        if (flags & EXTENDED_RESPONSE_REQUIRED) {
                uint32 perms = 0;
-               p += 26;
+               p += 25;
                if (fsp->is_directory || can_write_to_file(conn, fname, &sbuf)) 
{
                        perms = FILE_GENERIC_ALL;
                } else {

Modified: branches/SAMBA_3_0_25/source/smbd/nttrans.c
===================================================================
--- branches/SAMBA_3_0_25/source/smbd/nttrans.c 2007-06-04 19:58:11 UTC (rev 
23345)
+++ branches/SAMBA_3_0_25/source/smbd/nttrans.c 2007-06-04 22:29:23 UTC (rev 
23346)
@@ -414,7 +414,7 @@
        p += 4;
 
        if (flags & EXTENDED_RESPONSE_REQUIRED) {
-               p += 26;
+               p += 25;
                SIVAL(p,0,FILE_GENERIC_ALL);
                /* 
                 * For pipes W2K3 seems to return
@@ -944,7 +944,7 @@
 
        if (flags & EXTENDED_RESPONSE_REQUIRED) {
                uint32 perms = 0;
-               p += 26;
+               p += 25;
                if (fsp->is_directory || can_write_to_file(conn, fname, &sbuf)) 
{
                        perms = FILE_GENERIC_ALL;
                } else {
@@ -1029,7 +1029,7 @@
        p += 4;
        
        if (flags & EXTENDED_RESPONSE_REQUIRED) {
-               p += 26;
+               p += 25;
                SIVAL(p,0,FILE_GENERIC_ALL);
                /* 
                 * For pipes W2K3 seems to return
@@ -1625,7 +1625,7 @@
 
        if (flags & EXTENDED_RESPONSE_REQUIRED) {
                uint32 perms = 0;
-               p += 26;
+               p += 25;
                if (fsp->is_directory || can_write_to_file(conn, fname, &sbuf)) 
{
                        perms = FILE_GENERIC_ALL;
                } else {

Modified: branches/SAMBA_3_0_26/source/smbd/nttrans.c
===================================================================
--- branches/SAMBA_3_0_26/source/smbd/nttrans.c 2007-06-04 19:58:11 UTC (rev 
23345)
+++ branches/SAMBA_3_0_26/source/smbd/nttrans.c 2007-06-04 22:29:23 UTC (rev 
23346)
@@ -414,7 +414,7 @@
        p += 4;
 
        if (flags & EXTENDED_RESPONSE_REQUIRED) {
-               p += 26;
+               p += 25;
                SIVAL(p,0,FILE_GENERIC_ALL);
                /* 
                 * For pipes W2K3 seems to return
@@ -944,7 +944,7 @@
 
        if (flags & EXTENDED_RESPONSE_REQUIRED) {
                uint32 perms = 0;
-               p += 26;
+               p += 25;
                if (fsp->is_directory || can_write_to_file(conn, fname, &sbuf)) 
{
                        perms = FILE_GENERIC_ALL;
                } else {
@@ -1029,7 +1029,7 @@
        p += 4;
        
        if (flags & EXTENDED_RESPONSE_REQUIRED) {
-               p += 26;
+               p += 25;
                SIVAL(p,0,FILE_GENERIC_ALL);
                /* 
                 * For pipes W2K3 seems to return
@@ -1625,7 +1625,7 @@
 
        if (flags & EXTENDED_RESPONSE_REQUIRED) {
                uint32 perms = 0;
-               p += 26;
+               p += 25;
                if (fsp->is_directory || can_write_to_file(conn, fname, &sbuf)) 
{
                        perms = FILE_GENERIC_ALL;
                } else {

Reply via email to