[SCM] Samba Shared Repository - branch v3-2-test updated -
initial-v3-2-unstable-282-gdf42038
Stefan Metzmacher
metze at samba.org
Fri Nov 9 14:18:47 GMT 2007
The branch, v3-2-test has been updated
via df42038f8801ca65ed7d44f7ae26640e2d840dba (commit)
via b401450e8409c19d12d944c61e5553ed3334bc11 (commit)
via 0a1f524e8cce9bbe4fd10467c1f64f7a8862d298 (commit)
via fc58f2f45ab93ecea855e1dc07b6fdccce041c8d (commit)
via 5f205ab48d8ac3b7af573ea0be1ce095ab835448 (commit)
via 814bed029efa391e664ac432d0d68dfeab26381f (commit)
via 0ee896827215a24e70a4ac6bde5ded13f9497296 (commit)
via 9f9c933c16abacb2d0aa7bc7faa5b1ddac61b0e5 (commit)
from 0dc2d7ec010610c4bdab8eb6d488295a0259fbc9 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit df42038f8801ca65ed7d44f7ae26640e2d840dba
Author: Volker Lendecke <vl at sernet.de>
Date: Fri Nov 9 14:23:16 2007 +0100
Fix some warnings
commit b401450e8409c19d12d944c61e5553ed3334bc11
Author: Volker Lendecke <vl at sernet.de>
Date: Fri Nov 9 14:23:16 2007 +0100
nss_wrapper: Fix some warnings
commit 0a1f524e8cce9bbe4fd10467c1f64f7a8862d298
Author: Volker Lendecke <vl at sernet.de>
Date: Fri Nov 9 14:23:16 2007 +0100
Fix some warnings
commit fc58f2f45ab93ecea855e1dc07b6fdccce041c8d
Author: Volker Lendecke <vl at sernet.de>
Date: Wed Nov 7 23:24:36 2007 +0100
Add some comments
commit 5f205ab48d8ac3b7af573ea0be1ce095ab835448
Author: Volker Lendecke <vl at sernet.de>
Date: Sun Oct 28 19:15:08 2007 +0100
Make base64_encode_data_blob return a talloced string
commit 814bed029efa391e664ac432d0d68dfeab26381f
Author: Volker Lendecke <vl at sernet.de>
Date: Thu Nov 1 18:13:00 2007 +0100
Remove the silly "user_socket_options" global variable
This is better done with a 'lp_do_parameter(-1, "socket options", ..);
commit 0ee896827215a24e70a4ac6bde5ded13f9497296
Author: Volker Lendecke <vl at sernet.de>
Date: Wed Nov 7 18:47:32 2007 +0100
pstring removal
commit 9f9c933c16abacb2d0aa7bc7faa5b1ddac61b0e5
Author: Volker Lendecke <vl at sernet.de>
Date: Wed Nov 7 19:06:30 2007 +0100
Fix dbwrap debug output
-----------------------------------------------------------------------
Summary of changes:
source/client/smbmount.c | 3 +--
source/lib/afs.c | 6 +++---
source/lib/dbwrap_ctdb.c | 5 +++--
source/lib/dbwrap_tdb.c | 6 +++---
source/lib/nss_wrapper/nss_wrapper.c | 2 +-
source/lib/popt_common.c | 3 +--
source/lib/tdb/include/tdb.h | 6 +++---
source/lib/util.c | 1 -
source/lib/util_str.c | 3 ++-
source/librpc/ndr/ndr_string.c | 27 ++++++++++++++++++---------
source/libsmb/cliconnect.c | 6 ++----
source/libsmb/doserr.c | 9 +++++----
source/libsmb/libsmbclient.c | 3 ++-
source/param/loadparm.c | 6 +++---
source/rpc_server/srv_samr_util.c | 8 ++++----
source/smbd/process.c | 2 +-
source/smbd/server.c | 14 ++++++++------
source/torture/rpctorture.c | 5 +----
source/torture/vfstest.c | 5 ++---
source/utils/net_rpc_samsync.c | 4 ++--
source/utils/ntlm_auth.c | 20 ++++++++++----------
21 files changed, 75 insertions(+), 69 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/client/smbmount.c b/source/client/smbmount.c
index 7befd6e..5e69cf9 100644
--- a/source/client/smbmount.c
+++ b/source/client/smbmount.c
@@ -24,7 +24,6 @@
#include <linux/smb_fs.h>
extern bool in_client;
-extern pstring user_socket_options;
extern char *optarg;
extern int optind;
@@ -807,7 +806,7 @@ static void parse_mount_smb(int argc, char **argv)
} else if(!strcmp(opts, "workgroup")) {
pstrcpy(workgroup,opteq+1);
} else if(!strcmp(opts, "sockopt")) {
- pstrcpy(user_socket_options,opteq+1);
+ lp_do_parameter(-1, "socket options", opteq+1);
} else if(!strcmp(opts, "scope")) {
set_global_scope(opteq+1);
} else {
diff --git a/source/lib/afs.c b/source/lib/afs.c
index e9a7059..35f213f 100644
--- a/source/lib/afs.c
+++ b/source/lib/afs.c
@@ -53,7 +53,7 @@ static char *afs_encode_token(const char *cell, const DATA_BLOB ticket,
base64_key = base64_encode_data_blob(key);
if (base64_key == NULL) {
- free(base64_ticket);
+ TALLOC_FREE(base64_ticket);
return NULL;
}
@@ -63,8 +63,8 @@ static char *afs_encode_token(const char *cell, const DATA_BLOB ticket,
DEBUG(10, ("Got ticket string:\n%s\n", result));
- free(base64_ticket);
- free(base64_key);
+ TALLOC_FREE(base64_ticket);
+ TALLOC_FREE(base64_key);
return result;
}
diff --git a/source/lib/dbwrap_ctdb.c b/source/lib/dbwrap_ctdb.c
index c5cb8d0..90d0b26 100644
--- a/source/lib/dbwrap_ctdb.c
+++ b/source/lib/dbwrap_ctdb.c
@@ -86,7 +86,8 @@ static int db_ctdb_record_destr(struct db_record* data)
data->private_data, struct db_ctdb_rec);
DEBUG(10, (DEBUGLEVEL > 10
- ? "Unlocking db %u key %s\n" : "Unlocking db %u key %20s\n",
+ ? "Unlocking db %u key %s\n"
+ : "Unlocking db %u key %.20s\n",
(int)crec->ctdb_ctx->db_id,
hex_encode(data, (unsigned char *)data->key.dptr,
data->key.dsize)));
@@ -141,7 +142,7 @@ again:
char *keystr = hex_encode(result, key.dptr, key.dsize);
DEBUG(10, (DEBUGLEVEL > 10
? "Locking db %u key %s\n"
- : "Locking db %u key %20s\n",
+ : "Locking db %u key %.20s\n",
(int)crec->ctdb_ctx->db_id, keystr));
TALLOC_FREE(keystr);
}
diff --git a/source/lib/dbwrap_tdb.c b/source/lib/dbwrap_tdb.c
index 24462d6..593a8ac 100644
--- a/source/lib/dbwrap_tdb.c
+++ b/source/lib/dbwrap_tdb.c
@@ -32,7 +32,7 @@ static int db_tdb_record_destr(struct db_record* data)
talloc_get_type_abort(data->private_data, struct db_tdb_ctx);
DEBUG(10, (DEBUGLEVEL > 10
- ? "Unlocking key %s\n" : "Unlocking key %20s\n",
+ ? "Unlocking key %s\n" : "Unlocking key %.20s\n",
hex_encode(data, (unsigned char *)data->key.dptr,
data->key.dsize)));
@@ -71,10 +71,10 @@ static struct db_record *db_tdb_fetch_locked(struct db_context *db,
result->store = db_tdb_store;
result->delete_rec = db_tdb_delete;
- if (DEBUGLEVEL > 10) {
+ if (DEBUGLEVEL >= 10) {
char *keystr = hex_encode(NULL, key.dptr, key.dsize);
DEBUG(10, (DEBUGLEVEL > 10
- ? "Locking key %s\n" : "Locking key %20s\n",
+ ? "Locking key %s\n" : "Locking key %.20s\n",
keystr));
TALLOC_FREE(keystr);
}
diff --git a/source/lib/nss_wrapper/nss_wrapper.c b/source/lib/nss_wrapper/nss_wrapper.c
index 5bf7ebd..5d443fa 100644
--- a/source/lib/nss_wrapper/nss_wrapper.c
+++ b/source/lib/nss_wrapper/nss_wrapper.c
@@ -239,7 +239,7 @@ static bool nwrap_parse_file(struct nwrap_cache *nwrap)
goto failed;
}
- buf = malloc(nwrap->st.st_size + 1);
+ buf = (uint8_t *)malloc(nwrap->st.st_size + 1);
if (!buf) {
NWRAP_ERROR(("%s: malloc failed\n",__location__));
goto failed;
diff --git a/source/lib/popt_common.c b/source/lib/popt_common.c
index ec05762..7cc066d 100644
--- a/source/lib/popt_common.c
+++ b/source/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/source/lib/tdb/include/tdb.h b/source/lib/tdb/include/tdb.h
index 7de4c41..fce6628 100644
--- a/source/lib/tdb/include/tdb.h
+++ b/source/lib/tdb/include/tdb.h
@@ -32,9 +32,9 @@ extern "C" {
/* flags to tdb_store() */
-#define TDB_REPLACE 1
-#define TDB_INSERT 2
-#define TDB_MODIFY 3
+#define TDB_REPLACE 1 /* Unused */
+#define TDB_INSERT 2 /* Don't overwrite an existing entry */
+#define TDB_MODIFY 3 /* Don't create an existing entry */
/* flags for tdb_open() */
#define TDB_DEFAULT 0 /* just a readability place holder */
diff --git a/source/lib/util.c b/source/lib/util.c
index fd79a7e..7f0ec0b 100644
--- a/source/lib/util.c
+++ b/source/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.
diff --git a/source/lib/util_str.c b/source/lib/util_str.c
index 6458ae3..f1078c6 100644
--- a/source/lib/util_str.c
+++ b/source/lib/util_str.c
@@ -2528,7 +2528,8 @@ char *base64_encode_data_blob(DATA_BLOB data)
out_cnt = 0;
len = data.length;
output_len = data.length * 2;
- result = (char *)SMB_MALLOC(output_len); /* get us plenty of space */
+ result = TALLOC_ARRAY(talloc_tos(), char, output_len); /* get us plenty of space */
+ SMB_ASSERT(result != NULL);
while (len-- && out_cnt < (data.length * 2) - 5) {
int c = (unsigned char) *(data.data++);
diff --git a/source/librpc/ndr/ndr_string.c b/source/librpc/ndr/ndr_string.c
index 375cb00..7446ea2 100644
--- a/source/librpc/ndr/ndr_string.c
+++ b/source/librpc/ndr/ndr_string.c
@@ -85,7 +85,8 @@ _PUBLIC_ NTSTATUS ndr_pull_string(struct ndr_pull *ndr, int ndr_flags, const cha
chset, CH_UNIX,
ndr->data+ndr->offset,
(len2 + c_len_term)*byte_mul,
- (void **)&as, false);
+ (void **)(void *)&as,
+ false);
if (ret == -1) {
return ndr_pull_error(ndr, NDR_ERR_CHARCNV,
"Bad character conversion");
@@ -122,7 +123,8 @@ _PUBLIC_ NTSTATUS ndr_pull_string(struct ndr_pull *ndr, int ndr_flags, const cha
chset, CH_UNIX,
ndr->data+ndr->offset,
(len1 + c_len_term)*byte_mul,
- (void **)&as, false);
+ (void **)(void *)&as,
+ false);
if (ret == -1) {
return ndr_pull_error(ndr, NDR_ERR_CHARCNV,
"Bad character conversion");
@@ -160,7 +162,8 @@ _PUBLIC_ NTSTATUS ndr_pull_string(struct ndr_pull *ndr, int ndr_flags, const cha
chset, CH_UNIX,
ndr->data+ndr->offset,
(len1 + c_len_term)*byte_mul,
- (void **)&as, false);
+ (void **)(void *)&as,
+ false);
if (ret == -1) {
return ndr_pull_error(ndr, NDR_ERR_CHARCNV,
"Bad character conversion");
@@ -194,7 +197,8 @@ _PUBLIC_ NTSTATUS ndr_pull_string(struct ndr_pull *ndr, int ndr_flags, const cha
chset, CH_UNIX,
ndr->data+ndr->offset,
(len3 + c_len_term)*byte_mul,
- (void **)&as, false);
+ (void **)(void *)&as,
+ false);
if (ret == -1) {
return ndr_pull_error(ndr, NDR_ERR_CHARCNV,
"Bad character conversion");
@@ -226,7 +230,8 @@ _PUBLIC_ NTSTATUS ndr_pull_string(struct ndr_pull *ndr, int ndr_flags, const cha
chset, CH_UNIX,
ndr->data+ndr->offset,
len3,
- (void **)&as, false);
+ (void **)(void *)&as,
+ false);
if (ret == -1) {
return ndr_pull_error(ndr, NDR_ERR_CHARCNV,
"Bad character conversion");
@@ -246,7 +251,8 @@ _PUBLIC_ NTSTATUS ndr_pull_string(struct ndr_pull *ndr, int ndr_flags, const cha
chset, CH_UNIX,
ndr->data+ndr->offset,
len1,
- (void **)&as, false);
+ (void **)(void *)&as,
+ false);
if (ret == -1) {
return ndr_pull_error(ndr, NDR_ERR_CHARCNV,
"Bad character conversion");
@@ -263,7 +269,8 @@ _PUBLIC_ NTSTATUS ndr_pull_string(struct ndr_pull *ndr, int ndr_flags, const cha
chset, CH_UNIX,
ndr->data+ndr->offset,
len1*byte_mul,
- (void **)&as, false);
+ (void **)(void *)&as,
+ false);
if (ret == -1) {
return ndr_pull_error(ndr, NDR_ERR_CHARCNV,
"Bad character conversion");
@@ -288,7 +295,8 @@ _PUBLIC_ NTSTATUS ndr_pull_string(struct ndr_pull *ndr, int ndr_flags, const cha
chset, CH_UNIX,
ndr->data+ndr->offset,
len1,
- (void **)&as, false);
+ (void **)(void *)&as,
+ false);
if (ret == -1) {
return ndr_pull_error(ndr, NDR_ERR_CHARCNV,
"Bad character conversion");
@@ -349,7 +357,8 @@ _PUBLIC_ NTSTATUS ndr_push_string(struct ndr_push *ndr, int ndr_flags, const cha
LIBNDR_FLAG_STR_FIXLEN32))) {
s_len++;
}
- d_len = convert_string_talloc(ndr, CH_UNIX, chset, s, s_len, (void **)&dest, false);
+ d_len = convert_string_talloc(ndr, CH_UNIX, chset, s, s_len,
+ (void **)(void *)&dest, false);
if (d_len == -1) {
return ndr_push_error(ndr, NDR_ERR_CHARCNV,
"Bad character conversion");
diff --git a/source/libsmb/cliconnect.c b/source/libsmb/cliconnect.c
index 8b180f0..2fdd122 100644
--- a/source/libsmb/cliconnect.c
+++ b/source/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;
}
diff --git a/source/libsmb/doserr.c b/source/libsmb/doserr.c
index b8cb8b4..478b87d 100644
--- a/source/libsmb/doserr.c
+++ b/source/libsmb/doserr.c
@@ -94,11 +94,9 @@ werror_code_struct dos_errs[] =
const char *dos_errstr(WERROR werror)
{
- static pstring msg;
+ char *result;
int idx = 0;
- slprintf(msg, sizeof(msg), "DOS code 0x%08x", W_ERROR_V(werror));
-
while (dos_errs[idx].dos_errstr != NULL) {
if (W_ERROR_V(dos_errs[idx].werror) ==
W_ERROR_V(werror))
@@ -106,7 +104,10 @@ const char *dos_errstr(WERROR werror)
idx++;
}
- return msg;
+ result = talloc_asprintf(talloc_tos(), "DOS code 0x%08x",
+ W_ERROR_V(werror));
+ SMB_ASSERT(result != NULL);
+ return result;
}
/* compat function for samba4 */
diff --git a/source/libsmb/libsmbclient.c b/source/libsmb/libsmbclient.c
index ff434d2..dbc51d1 100644
--- a/source/libsmb/libsmbclient.c
+++ b/source/libsmb/libsmbclient.c
@@ -2671,7 +2671,8 @@ smbc_opendir_ctx(SMBCCTX *context,
return NULL;
}
- ip_list = memdup(&server_addr, sizeof(server_addr));
+ ip_list = (struct ip_service *)memdup(
+ &server_addr, sizeof(server_addr));
if (ip_list == NULL) {
errno = ENOMEM;
return NULL;
diff --git a/source/param/loadparm.c b/source/param/loadparm.c
index 07f8dc4..94f1c0e 100644
--- a/source/param/loadparm.c
+++ b/source/param/loadparm.c
@@ -55,7 +55,6 @@
bool in_client = False; /* Not in the client by default */
bool bLoaded = False;
-extern pstring user_socket_options;
extern enum protocol_types Protocol;
extern userdom_struct current_user_info;
@@ -1052,7 +1051,7 @@ static struct parm_struct parm_table[] = {
{"max open files", P_INTEGER, P_GLOBAL, &Globals.max_open_files, NULL, NULL, FLAG_ADVANCED},
{"min print space", P_INTEGER, P_LOCAL, &sDefault.iMinPrintSpace, NULL, NULL, FLAG_ADVANCED | FLAG_PRINT},
- {"socket options", P_GSTRING, P_GLOBAL, user_socket_options, NULL, NULL, FLAG_ADVANCED},
+ {"socket options", P_STRING, P_GLOBAL, &Globals.szSocketOptions, NULL, NULL, FLAG_ADVANCED},
{"strict allocate", P_BOOL, P_LOCAL, &sDefault.bStrictAllocate, NULL, NULL, FLAG_ADVANCED | FLAG_SHARE},
{"strict sync", P_BOOL, P_LOCAL, &sDefault.bStrictSync, NULL, NULL, FLAG_ADVANCED | FLAG_SHARE},
{"sync always", P_BOOL, P_LOCAL, &sDefault.bSyncAlways, NULL, NULL, FLAG_ADVANCED | FLAG_SHARE},
@@ -1505,7 +1504,7 @@ static void init_globals(bool first_time_only)
string_set(&Globals.szPanicAction, "/bin/sleep 999999999");
#endif
- pstrcpy(user_socket_options, DEFAULT_SOCKET_OPTIONS);
+ string_set(&Globals.szSocketOptions, DEFAULT_SOCKET_OPTIONS);
string_set(&Globals.szLogonDrive, "");
/* %N is the NIS auto.home server if -DAUTOHOME is used, else same as %L */
@@ -2032,6 +2031,7 @@ FN_GLOBAL_INTEGER(lp_map_to_guest, &Globals.map_to_guest)
FN_GLOBAL_INTEGER(lp_oplock_break_wait_time, &Globals.oplock_break_wait_time)
FN_GLOBAL_INTEGER(lp_lock_spin_time, &Globals.iLockSpinTime)
FN_GLOBAL_INTEGER(lp_usershare_max_shares, &Globals.iUsershareMaxShares)
+FN_GLOBAL_CONST_STRING(lp_socket_options, &Globals.szSocketOptions)
FN_LOCAL_STRING(lp_preexec, szPreExec)
FN_LOCAL_STRING(lp_postexec, szPostExec)
diff --git a/source/rpc_server/srv_samr_util.c b/source/rpc_server/srv_samr_util.c
index 7bac25e..f7e2079 100644
--- a/source/rpc_server/srv_samr_util.c
+++ b/source/rpc_server/srv_samr_util.c
@@ -58,7 +58,7 @@ void copy_id20_to_sam_passwd(struct samu *to, SAM_USER_INFO_20 *from)
if (STRING_CHANGED_NC(old_string,new_string))
pdb_set_munged_dial(to , new_string, PDB_CHANGED);
- SAFE_FREE(new_string);
+ TALLOC_FREE(new_string);
}
}
@@ -201,7 +201,7 @@ void copy_id21_to_sam_passwd(struct samu *to, SAM_USER_INFO_21 *from)
if (STRING_CHANGED_NC(old_string,newstr))
pdb_set_munged_dial(to , newstr, PDB_CHANGED);
- SAFE_FREE(newstr);
+ TALLOC_FREE(newstr);
}
if (from->fields_present & ACCT_RID) {
@@ -425,7 +425,7 @@ void copy_id23_to_sam_passwd(struct samu *to, SAM_USER_INFO_23 *from)
if (STRING_CHANGED_NC(old_string, newstr))
pdb_set_munged_dial(to , newstr, PDB_CHANGED);
- SAFE_FREE(newstr);
+ TALLOC_FREE(newstr);
}
if (from->fields_present & ACCT_RID) {
@@ -637,7 +637,7 @@ void copy_id25_to_sam_passwd(struct samu *to, SAM_USER_INFO_25 *from)
if (STRING_CHANGED_NC(old_string,newstr))
pdb_set_munged_dial(to , newstr, PDB_CHANGED);
- SAFE_FREE(newstr);
+ TALLOC_FREE(newstr);
}
if (from->fields_present & ACCT_RID) {
diff --git a/source/smbd/process.c b/source/smbd/process.c
index 24497de..5601a7f 100644
--- a/source/smbd/process.c
+++ b/source/smbd/process.c
@@ -190,7 +190,7 @@ ssize_t receive_smb_raw_talloc_partial_read(TALLOC_CTX *mem_ctx,
/* Copy the header we've written. */
- *buffer = TALLOC_MEMDUP(mem_ctx,
+ *buffer = (char *)TALLOC_MEMDUP(mem_ctx,
writeX_header,
sizeof(writeX_header));
diff --git a/source/smbd/server.c b/source/smbd/server.c
index fbf886e..547e9c6 100644
--- a/source/smbd/server.c
+++ b/source/smbd/server.c
@@ -34,7 +34,6 @@ int last_message = -1;
#define LAST_MESSAGE() smb_fn_name(last_message)
extern struct auth_context *negprot_global_auth_context;
-extern pstring user_socket_options;
extern SIG_ATOMIC_T got_sig_term;
extern SIG_ATOMIC_T reload_after_sighup;
static SIG_ATOMIC_T got_sig_cld;
@@ -186,7 +185,7 @@ static bool open_sockets_inetd(void)
close_low_fds(False); /* Don't close stderr */
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());
return True;
}
@@ -380,7 +379,8 @@ static bool open_sockets_smbd(bool is_daemon, bool interactive, const char *smb_
/* ready to listen */
set_socket_options(s,"SO_KEEPALIVE");
- set_socket_options(s,user_socket_options);
+ set_socket_options(smbd_server_fd(),
+ lp_socket_options());
/* Set server socket to
* non-blocking for the accept. */
@@ -446,7 +446,8 @@ static bool open_sockets_smbd(bool is_daemon, bool interactive, const char *smb_
/* ready to listen */
set_socket_options(s,"SO_KEEPALIVE");
- set_socket_options(s,user_socket_options);
+ set_socket_options(smbd_server_fd(),
+ lp_socket_options());
/* Set server socket to non-blocking
* for the accept. */
@@ -623,7 +624,8 @@ static bool open_sockets_smbd(bool is_daemon, bool interactive, const char *smb_
am_parent = 0;
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());
/* this is needed so that we get decent entries
in smbstatus for port 445 connects */
@@ -758,7 +760,7 @@ 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());
}
mangle_reset_cache();
diff --git a/source/torture/rpctorture.c b/source/torture/rpctorture.c
index 64e7b58..a9748ba 100644
--- a/source/torture/rpctorture.c
+++ b/source/torture/rpctorture.c
@@ -25,9 +25,6 @@
extern pstring global_myname;
-extern pstring user_socket_options;
-
--
Samba Shared Repository
More information about the samba-cvs
mailing list