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

[derrell at samba.org]

Author: derrell
Date: 2005-12-05 23:30:45 +0000 (Mon, 05 Dec 2005)
New Revision: 12081

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

Log:
 r10674 at cabra:  derrell | 2005-12-05 13:31:28 -0500
 get rid of temporary #if 0 blocks

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


Changeset:

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

Modified: branches/SAMBA_3_0/source/libsmb/libsmbclient.c
===================================================================
--- branches/SAMBA_3_0/source/libsmb/libsmbclient.c	2005-12-05 23:30:40 UTC (rev 12080)
+++ branches/SAMBA_3_0/source/libsmb/libsmbclient.c	2005-12-05 23:30:45 UTC (rev 12081)
@@ -584,24 +584,9 @@
 		return NULL;
 	}
 
-#if 0 /* choice 1 */
-        /* Look for a cached connection, using the provided authinfo */
-        srv = find_server(context, server, share,
-                          workgroup, username, password);
-
-        /* If we didn't find one... */
-        if (! srv)
-        {
-            /* ... then see if there's one using anonymous login */
-            fstring anonymous = "";
-            srv = find_server(context, server, share,
-                              workgroup, anonymous, password);
-        }
-#else
         /* Look for a cached connection */
         srv = find_server(context, server, share,
                           workgroup, username, password);
-#endif
         
         /*
          * If we found a connection and we're only allowed one share per
@@ -796,11 +781,7 @@
 	/* now add it to the cache (internal or external)  */
 	/* Let the cache function set errno if it wants to */
 	errno = 0;
-#if 0 /* choice 2 */
-	if (context->callbacks.add_cached_srv_fn(context, srv, server, share, workgroup, username_used)) {
-#else
 	if (context->callbacks.add_cached_srv_fn(context, srv, server, share, workgroup, username)) {
-#endif
 		int saved_errno = errno;
 		DEBUG(3, (" Failed to add server to cache\n"));
 		errno = saved_errno;