Changeset 179 for branches/client-1.5/src

Timestamp:

Apr 23, 2009, 5:56:01 PM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Fix for Ticket #47

Location:

branches/client-1.5/src

Files:

• ndpsmb.c (modified) (2 diffs)
• smbwrp.c (modified) (3 diffs)

branches/client-1.5/src/ndpsmb.c

@@ -709 +709 @@
         debug_printf("checkMountResource in tid#%d\n", _gettid());
         rc = smbwrp_connect( pRes, &cli);
-        if (rc)
-            rc = (rc == 7 ? ERROR_BAD_DEV_TYPE : ERROR_ACCESS_DENIED);
+/* changed to real error codes SCS 
+    if (rc)
+        rc = (rc == 7 ? ERROR_BAD_DEV_TYPE : ERROR_ACCESS_DENIED); */
+        switch (rc) {
+        case 0:
+                rc = NO_ERROR;
+                break;
+        case 1:
+        case 10:
+        case 11:
+                rc = ERROR_BAD_NET_NAME;
+                break;
+        case 2:
+                rc = ERROR_INIT_ROUTINE_FAILED;
+                break;
+        case 3:
+                rc = ERROR_BAD_NET_RESP;
+                break;
+        case 4:
+                rc = ERROR_NETWORK_BUSY;
+                break;
+        case 6:
+                rc = ERROR_NETWORK_ACCESS_DENIED;
+                break;
+        case 7:
+                rc = ERROR_BAD_NETPATH;
+                break;
+        default:
+                rc = ERROR_UNEXP_NET_ERR;
+          break;
+        } /* endswitch */ 
+
         smbwrp_disconnect( pRes, cli);
 
@@ -725 +755 @@
 
         // init code
-        smbwrp_init();
+        smbwrp_init();
 
         /* since samba plugin support only 1 type of resources we do not need */

branches/client-1.5/src/smbwrp.c

@@ -411 +411 @@
         struct cli_state * c;
         char* dev_type;
+        int loginerror = 0;
 
         zero_ip(&ip);
@@ -491 +492 @@
                                workgroup))) {
                 debuglocal(4,"%s/******** login failed\n", srv->username);
+                loginerror = 1; // save the login error
+
                 /* try an anonymous login if it failed */
                 if (!NT_STATUS_IS_OK(cli_session_setup(c, "", "", 1,"", 0, workgroup))) {
@@ -511 +514 @@
                             srv->password, strlen(srv->password)+1)) {
                 cli_shutdown(c);
-                return 7;
+                // if loginerror is != 0 means normal login failed, but anonymous login worked
+                if (loginerror !=0)
+                        return 6;
+                else
+                        return 7;
         }