summaryrefslogtreecommitdiff
path: root/source3/libsmb/cliconnect.c
diff options
context:
space:
mode:
authorVolker Lendecke <vl@sernet.de>2007-11-01 18:13:00 +0100
committerStefan Metzmacher <metze@samba.org>2007-11-09 15:11:54 +0100
commite63bcdd720d801df278ef84063c46144df087793 (patch)
tree5855a53c5612026b7b45836222d866f2f2088b86 /source3/libsmb/cliconnect.c
parent9e5ef9a87424ce02d114c702c238fcd14a92de01 (diff)
downloadsamba-e63bcdd720d801df278ef84063c46144df087793.tar.gz
samba-e63bcdd720d801df278ef84063c46144df087793.tar.bz2
samba-e63bcdd720d801df278ef84063c46144df087793.zip
Remove the silly "user_socket_options" global variable
This is better done with a 'lp_do_parameter(-1, "socket options", ..); (This used to be commit 814bed029efa391e664ac432d0d68dfeab26381f)
Diffstat (limited to 'source3/libsmb/cliconnect.c')
-rw-r--r--source3/libsmb/cliconnect.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index 8b180f0135..2fdd1223f0 100644
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -20,8 +20,6 @@
#include "includes.h"
-extern pstring user_socket_options;
-
static const struct {
int prot;
const char *name;
@@ -1382,7 +1380,7 @@ bool cli_session_request(struct cli_state *cli,
DEBUG(3,("Retargeted\n"));
- set_socket_options(cli->fd,user_socket_options);
+ set_socket_options(cli->fd, lp_socket_options());
/* Try again */
{
@@ -1469,7 +1467,7 @@ NTSTATUS cli_connect(struct cli_state *cli,
return map_nt_error_from_unix(errno);
}
- set_socket_options(cli->fd,user_socket_options);
+ set_socket_options(cli->fd, lp_socket_options());
return NT_STATUS_OK;
}