Changeset 928 for branches

Timestamp:

Jul 24, 2016, 11:34:45 AM (9 years ago)

Author:

Paul Smedley

Message:

Apply changes from changeset 892 to client-3.0 branch

File:

• branches/client-3.0/src/ndpsmb.c (modified) (5 diffs)

branches/client-3.0/src/ndpsmb.c

@@ -163 +163 @@
 #define LEAVE() do { /* nothing */ } while (0)
 #endif
+
+int helperEASet (cli_state *cli, FEALIST *pFEAList, char *path)
+{
+        int rc = 0;
+
+        if (!path || !pFEAList || pFEAList->cbList <= sizeof(long))
+        {
+                return ERROR_EAS_NOT_SUPPORTED;
+        }
+
+        ENTER();
+
+        do {
+                // got FEA there
+                FEA * pfea;
+                unsigned long done = sizeof(long);
+                pfea = pFEAList->list;
+                while (done < pFEAList->cbList)
+                {
+                        rc = smbwrp_setea(cli, path, (char*)(pfea + 1), pfea->cbValue ? (char *)(pfea + 1) + pfea->cbName + 1: NULL, pfea->cbValue);
+                        if (rc)
+                        {
+                                break;
+                        }
+                        pfea = (FEA *)((char *)(pfea + 1) + pfea->cbName + 1 + pfea->cbValue);
+                        done += sizeof(FEA) + pfea->cbName + 1 + pfea->cbValue;
+                }
+        } while (0);
+        LEAVE();
+        return rc;
+}
 
 int APIENTRY NdpPluginLoad (PLUGINHELPERTABLE2L *pPHT)
@@ -1358 +1389 @@
         debuglocal(9,"NdpEASet in [%p]\n", pConn);
 
-        if (!pfi || !pfi->pszName || !pFEAList || pFEAList->cbList <= sizeof(long))
+        if (!pfi || !pfi->pszName)
         {
                 return ERROR_EAS_NOT_SUPPORTED;
@@ -1374 +1405 @@
         }
 
-        ENTER();
-
         finfo = (smbwrp_fileinfo *)fdata.pData;
         path = finfo->fname;
 
-        do {
-                // got FEA there
-                FEA * pfea;
-                unsigned long done = sizeof(long);
-                pfea = pFEAList->list;
-                while (done < pFEAList->cbList)
-                {
-                        rc = smbwrp_setea(pConn->cli, path, (char*)(pfea + 1), pfea->cbValue ? (char *)(pfea + 1) + pfea->cbName + 1: NULL, pfea->cbValue);
-                        if (rc)
-                        {
-                                break;
-                        }
-                        pfea = (FEA *)((char *)(pfea + 1) + pfea->cbName + 1 + pfea->cbValue);
-                        done += sizeof(FEA) + pfea->cbName + 1 + pfea->cbValue;
-                }
-        } while (0);
+        rc = helperEASet(pConn->cli, pFEAList, path);
         debuglocal(9,"NdpEASet %d\n", rc);
-        LEAVE();
         return rc;
 }
@@ -1554 +1567 @@
         Resource *pRes = pConn->pRes;
         int rc = 0;
+        int rcEASet = 0;
         unsigned long action;
         char path[CCHMAXPATH+1] = {0};
@@ -1572 +1586 @@
                 rc = smbwrp_mkdir(pConn->cli, path);
         } while (0);
-        debuglocal(9,"NdpCreateDir <%s> (%s) %d\n", szDirName, path, rc);
-        LEAVE();
+        LEAVE();
+
+        if (path && pRes->easupport)
+        {
+                rcEASet = helperEASet(pConn->cli, pFEAList, path);
+        }
+        debuglocal(9,"NdpCreateDir <%s> (%s) rc=%d, EASupport=%s rc=%d\n", szDirName, path, rc, pRes->easupport?"yes":"no", rcEASet);
+
         return rc;
 }