svn commit: samba r13761 - in branches/SAMBA_3_0: . source/libsmb

[derrell at samba.org]

Author: derrell
Date: 2006-03-01 01:41:52 +0000 (Wed, 01 Mar 2006)
New Revision: 13761

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13761

Log:
 r13221 at cabra:  derrell | 2006-02-28 20:40:56 -0500
 When only allowing one connection per server, the cache needs to track which
 share is currently connected, or we never know whether a tdis()/tcon() for the
 new share is required.
 

Modified:
   branches/SAMBA_3_0/
   branches/SAMBA_3_0/source/libsmb/libsmb_cache.c


Changeset:

Property changes on: branches/SAMBA_3_0
___________________________________________________________________
Name: svk:merge
   - 3a72dc49-98ff-0310-ab52-9b7ed7945d91:/local/samba3:12422
   + 3a72dc49-98ff-0310-ab52-9b7ed7945d91:/local/samba3:13221

Modified: branches/SAMBA_3_0/source/libsmb/libsmb_cache.c
===================================================================
--- branches/SAMBA_3_0/source/libsmb/libsmb_cache.c	2006-02-28 19:47:02 UTC (rev 13760)
+++ branches/SAMBA_3_0/source/libsmb/libsmb_cache.c	2006-03-01 01:41:52 UTC (rev 13761)
@@ -156,6 +156,17 @@
                                         continue;
                                 }
 
+
+                                SAFE_FREE(srv->share_name);
+                                srv->share_name = SMB_STRDUP(share);
+                                if (!srv->share_name) {
+                                        /* Out of memory. */
+                                        cli_shutdown(&srv->server->cli);
+                                        context->callbacks.remove_cached_srv_fn(context, srv->server);
+                                        continue;
+                                }
+
+
                                 return srv->server;
                         }
                 }