Changeset 547 for branches/client-2.0/src/smbwrp.c

Timestamp:

Feb 9, 2011, 11:02:12 AM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba Client 2.0: reconnect fix and text updates

File:

• branches/client-2.0/src/smbwrp.c (modified) (3 diffs)

branches/client-2.0/src/smbwrp.c

@@ -489 +489 @@
         }
 
+        cli_set_timeout(c, 10000); /* 10 seconds. */
+
         if (!NT_STATUS_IS_OK(cli_connect(c, server_n, &ip))) 
         {
@@ -907 +909 @@
         }
 //debuglocal(2,("getattr rc1 %d\n", os2cli_errno(cli)));
+
+        if (cli->fd == -1)
+        {
+           /* fd == -1 means the connection is broken */
+           return maperror(ENOTCONN);
+        }
 
         /* If the path is not on a share (it is a workgroup or a server),
@@ -932 +940 @@
         if (cli->capabilities & CAP_NT_SMBS && !(cli->capabilities & CAP_NOPATHINFO2)) 
         {
-                int rc = os2cli_errno(cli);
+                int ret = cli_errno(cli);
                 // cli_qpathinfo* reports EINVAL when path of given file not exists
                 // thus there is no real situation when EINVAL should be returned to 
                 // client at this point, we just replace it to ENOTDIR
-                if (rc == EINVAL)
-                {
-                        rc = maperror(ENOTDIR);
-                }
-                return rc;
+                if (ret == EINVAL)
+                {
+                        ret = ENOTDIR;
+                }
+                return maperror(ret);
         }