Changeset 942

Timestamp:

Jul 27, 2016, 11:35:56 AM (9 years ago)

Author:

Paul Smedley

Message:

Make connections work with Samba 4.x

File:

• branches/client-3.0/src/smbwrp.c (modified) (6 diffs)

branches/client-3.0/src/smbwrp.c

@@ -390 +390 @@
         debuglocal(4," session setup ok. Sending tconx <%s> <********>\n", share);
 
+#if 0 /* Causes connections to fail with Samba 4.x */
         // YD ticket:58 we need to check resource type to avoid connecting to printers.
         // dev type is set to IPC for IPC$, A: for everything else (printers use LPT1:)
@@ -406 +407 @@
                         return 7;
         }
+#endif
 
         /* must be a normal share */
@@ -766 +768 @@
          */
         if (   *srv->server_name == 0
+#if 0 /* Causes crashes with Samba 4.x */
             || (strcmp(cli->dev,"IPC") == 0)
+#endif
             || *srv->share_name == 0 
             || (stricmp(srv->share_name,"IPC$") == 0)
+#if 0 /* Causes crashes with Samba 4.x */
             || (strncmp(cli->dev,"LPT",3) == 0) 
+#endif
            ) 
         {
@@ -1234 +1240 @@
                                    smbwrp_share_add, state);
         } else 
+#if 0 /* Causes crashes with Samba 4.x */
         if ((strcmp(cli->dev,"IPC") == 0) || *srv->share_name == 0 || (stricmp(srv->share_name,"IPC$") == 0)) 
+#else
+        if (/*(strcmp(cli->dev,"IPC") == 0) ||*/ *srv->share_name == 0 || (stricmp(srv->share_name,"IPC$") == 0)) 
+#endif
         {
                 smbwrp_special_add(".", state);
@@ -1245 +1255 @@
                 }
         } else 
+#if 0 /* Causes crashes with Samba 4.x */
         if (strncmp(cli->dev,"LPT",3) == 0) 
         {
@@ -1255 +1266 @@
         } 
         else 
+#endif
         {
                 if (list_files(cli, state->mask, aHIDDEN|aSYSTEM|aDIR,