diff options
| author | Volker Lendecke <vl@sernet.de> | 2007-11-01 18:13:00 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-11-09 15:11:54 +0100 |
| commit | e63bcdd720d801df278ef84063c46144df087793 (patch) | |
| tree | 5855a53c5612026b7b45836222d866f2f2088b86 /source3/torture | |
| parent | 9e5ef9a87424ce02d114c702c238fcd14a92de01 (diff) | |
| download | samba-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/torture')
| -rw-r--r-- | source3/torture/rpctorture.c | 5 | ||||
| -rw-r--r-- | source3/torture/vfstest.c | 5 |
2 files changed, 3 insertions, 7 deletions
diff --git a/source3/torture/rpctorture.c b/source3/torture/rpctorture.c index 64e7b580f3..a9748ba905 100644 --- a/source3/torture/rpctorture.c +++ b/source3/torture/rpctorture.c @@ -25,9 +25,6 @@ extern pstring global_myname; -extern pstring user_socket_options; - - extern file_info def_finfo; #define CNV_LANG(s) dos2unix_format(s,False) @@ -360,7 +357,7 @@ enum client_action case 'O': { - pstrcpy(user_socket_options,optarg); + lp_do_parameter(-1, "socket options", optarg); break; } diff --git a/source3/torture/vfstest.c b/source3/torture/vfstest.c index 0633d0c2e7..daecf3c2d1 100644 --- a/source3/torture/vfstest.c +++ b/source3/torture/vfstest.c @@ -32,8 +32,6 @@ static struct cmd_list { struct cmd_set *cmd_set; } *cmd_list; -extern pstring user_socket_options; - int get_client_fd(void) { return -1; @@ -470,7 +468,8 @@ bool reload_services(bool test) { if (smbd_server_fd() != -1) { set_socket_options(smbd_server_fd(),"SO_KEEPALIVE"); - set_socket_options(smbd_server_fd(), user_socket_options); + set_socket_options(smbd_server_fd(), + lp_socket_options()); } } |