summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorDerrell Lipman <derrell@samba.org>2005-12-05 23:30:45 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:05:44 -0500
commit78631d38f11a631fe4added2b76deb60a3d835ab (patch)
treee0046484ca53aaf82a083226029ed8398c6ae115 /source3
parenta54f9eddcea6497451dd6c720e9804ad5c6f3ad7 (diff)
downloadsamba-78631d38f11a631fe4added2b76deb60a3d835ab.tar.gz
samba-78631d38f11a631fe4added2b76deb60a3d835ab.tar.bz2
samba-78631d38f11a631fe4added2b76deb60a3d835ab.zip
r12081: r10674@cabra: derrell | 2005-12-05 13:31:28 -0500
get rid of temporary #if 0 blocks (This used to be commit 376445c90b05c36206c87c974c13e5f9297f35eb)
Diffstat (limited to 'source3')
-rw-r--r--source3/libsmb/libsmbclient.c19
1 files changed, 0 insertions, 19 deletions
diff --git a/source3/libsmb/libsmbclient.c b/source3/libsmb/libsmbclient.c
index f482c9584f..9fda48a540 100644
--- a/source3/libsmb/libsmbclient.c
+++ b/source3/libsmb/libsmbclient.c
@@ -584,24 +584,9 @@ SMBCSRV *smbc_server(SMBCCTX *context,
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 @@ SMBCSRV *smbc_server(SMBCCTX *context,
/* 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;