Changeset 728 for trunk/client/src

Timestamp:

Nov 12, 2012, 10:56:54 AM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Client 2.2: prevent crash like in ticket 204

Location:

trunk/client/src

Files:

• help/changelog.txt (modified) (1 diff)
• ndpsmb.c (modified) (2 diffs)

trunk/client/src/help/changelog.txt

@@ -773 +773 @@
    <$LI> wis Skript Žnderungen
 #endif
+#ifndef txt
+:eul.
+#endif
+
+ <$UL>GA:
+#ifndef txt
+:ul compact.
+#endif
+#ifdef en
+   <$LI> Ticket #204
+   <$LI> wis script changes
+#endif
+#ifdef fr
+   <$LI> Ticket nø 204
+   <$LI> Modification de script wis
+#endif
+#ifdef de
+   <$LI> Ticket #204
+   <$LI> wis Skript Žnderungen
+#endif
 
 #ifndef txt

trunk/client/src/ndpsmb.c

@@ -947 +947 @@
         smbwrp_fileinfo finfo;
         int rc = 0;
+        int rcCon = 0;
         unsigned long action;
         char path[CCHMAXPATH+1] = {0};
@@ -1008 +1009 @@
                                     smbwrp_disconnect( pRes, pConn->cli);
                                     // reconnect
-                                    smbwrp_connect( pRes, &pConn->cli);
-                                    // try file list again
+                                    rcCon = smbwrp_connect( pRes, &pConn->cli);
+                                    if (rcCon != NO_ERROR)
+                                    debuglocal(9,"NdpQueryPathInfo smbwrp_connect rc = %d\n", rcCon);
+
+                                    // try file list again if reconnecting worked
+                                    if (rcCon == NO_ERROR)
                                     rc = smbwrp_getattr( &pRes->srv, pConn->cli, &finfo);
-                                    debuglocal(9,"NdpQueryPathInfo remote connection lost, rc = %d\n", rc);
                                 }
+                                debuglocal(9,"NdpQueryPathInfo smbwrp_getattr, rc = %d\n", rc);
                                 switch (rc)
                                 {