summaryrefslogtreecommitdiff
path: root/source3/lib
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/lib
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/lib')
-rw-r--r--source3/lib/popt_common.c3
-rw-r--r--source3/lib/util.c1
2 files changed, 1 insertions, 3 deletions
diff --git a/source3/lib/popt_common.c b/source3/lib/popt_common.c
index ec05762cdf..7cc066d667 100644
--- a/source3/lib/popt_common.c
+++ b/source3/lib/popt_common.c
@@ -33,7 +33,6 @@
* -i,--scope
*/
-extern pstring user_socket_options;
extern bool AllowDebugChange;
extern bool override_logfile;
@@ -92,7 +91,7 @@ static void popt_common_callback(poptContext con,
case 'O':
if (arg) {
- pstrcpy(user_socket_options,arg);
+ lp_do_parameter(-1, "socket options", arg);
}
break;
diff --git a/source3/lib/util.c b/source3/lib/util.c
index fd79a7eb46..7f0ec0b132 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -68,7 +68,6 @@ int chain_size = 0;
int trans_num = 0;
static enum remote_arch_types ra_type = RA_UNKNOWN;
-pstring user_socket_options=DEFAULT_SOCKET_OPTIONS;
/***********************************************************************
Definitions for all names.