summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2002-08-17 14:31:10 +0000
committerJelmer Vernooij <jelmer@samba.org>2002-08-17 14:31:10 +0000
commite51ed63864a4e334e0e5ca518750892480e37d52 (patch)
tree54bb97518b573e1b1ef23d7ee97efc76822f64cd
parent21d26afb2af6ae34219a4286eb7a8896d7e04a3a (diff)
downloadsamba-e51ed63864a4e334e0e5ca518750892480e37d52.tar.gz
samba-e51ed63864a4e334e0e5ca518750892480e37d52.tar.bz2
samba-e51ed63864a4e334e0e5ca518750892480e37d52.zip
sync 3.0 branch with head
(This used to be commit 18aeccd1b89f69f726212b6d5c3232c9d74116c7)
-rw-r--r--source3/wrepld/process.c2
-rw-r--r--source3/wrepld/server.c3
2 files changed, 2 insertions, 3 deletions
diff --git a/source3/wrepld/process.c b/source3/wrepld/process.c
index 7615b8c78a..56013d2e17 100644
--- a/source3/wrepld/process.c
+++ b/source3/wrepld/process.c
@@ -152,7 +152,7 @@ initialise and fill the in-memory partner table.
int init_wins_partner_table(void)
{
int i=1,j=0,k;
- char **partner = str_list_make(lp_wins_partners());
+ char **partner = str_list_make(lp_wins_partners(), NULL);
if (partner==NULL) {
DEBUG(0,("wrepld: no partner list in smb.conf, exiting\n"));
diff --git a/source3/wrepld/server.c b/source3/wrepld/server.c
index 740003035c..14d3e730f4 100644
--- a/source3/wrepld/server.c
+++ b/source3/wrepld/server.c
@@ -26,7 +26,6 @@ extern pstring global_myname;
extern pstring user_socket_options;
-extern fstring remote_machine;
extern WINS_OWNER *global_wins_table;
extern int partner_count;
@@ -637,7 +636,7 @@ static void process(void)
lp_set_logfile(logfile);
}
- pstrcpy(remote_machine, "wrepld");
+ set_remote_machine_name("wrepld");
setup_logging(argv[0],interactive);