Changeset 7 for trunk/samba-3.0.25pre1/source/ndpsmb/ndpsmb.c

Timestamp:

Mar 25, 2007, 1:05:20 PM (18 years ago)

Author:

Yuri Dario

Message:

Fixes EA handling, closes ticket:5.

File:

• trunk/samba-3.0.25pre1/source/ndpsmb/ndpsmb.c (modified) (6 diffs)

trunk/samba-3.0.25pre1/source/ndpsmb/ndpsmb.c

@@ -1344 +1344 @@
         FEALIST * pFEASrc;
         NDDATABUF fdata = {0};
+        smbwrp_fileinfo *finfo;
 
         if (!pfi || !pfi->pszName || !pFEAList)
@@ -1360 +1361 @@
                 return ERROR_EAS_NOT_SUPPORTED;
         }
-        path = (char *)fdata.pData;
+        finfo = (smbwrp_fileinfo *)fdata.pData;
+        path = finfo->fname;
 
         log("NdpEAQuery in <%s> %08x %d\n", path, pGEAList, pGEAList ? pGEAList->cbList : 0);
@@ -1417 +1419 @@
         unsigned long action;
         NDDATABUF fdata = {0};
+        smbwrp_fileinfo *finfo;
 
         log("NdpEASet in\n");
@@ -1440 +1443 @@
                 return ERROR_EAS_NOT_SUPPORTED;
         }
-        path = (char *)fdata.pData;
+        finfo = (smbwrp_fileinfo *)fdata.pData;
+        path = finfo->fname;
 
         do {
@@ -1476 +1480 @@
         FEALIST * pfealist;
         NDDATABUF fdata = {0};
+        smbwrp_fileinfo *finfo;
         int easize;
 
@@ -1493 +1498 @@
                 return ERROR_EAS_NOT_SUPPORTED;
         }
-        easize = ((smbwrp_fileinfo *)fdata.pData)->easize;
-        ((smbwrp_fileinfo *)fdata.pData)->easize = -1;
-        path = ((smbwrp_fileinfo *)fdata.pData)->fname;
+        finfo = (smbwrp_fileinfo *)fdata.pData;
+        easize = finfo->easize;
+        finfo->easize = -1;
+        path = finfo->fname;
         if (easize >= 0)
         {