sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-09 08:58:35 +03:00
Code

sync 3.0 branch with head

Browse Source
This commit is contained in:
Jelmer Vernooij -
parent 19ab776bf9
commit 18aeccd1b8
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/wrepld/process.c
View File

@ -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"));

3
source/wrepld/server.c
View File

@ -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);