summaryrefslogtreecommitdiff
path: root/source3/nmbd
diff options
context:
space:
mode:
Diffstat (limited to 'source3/nmbd')
-rw-r--r--source3/nmbd/nmbd.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c
index 7795958ed0..87c539371b 100644
--- a/source3/nmbd/nmbd.c
+++ b/source3/nmbd/nmbd.c
@@ -298,12 +298,15 @@ static BOOL reload_nmbd_services(BOOL test)
}
/* Do a sanity check for a misconfigured nmbd */
- if( lp_wins_support() && *lp_wins_server() )
- {
- DEBUG(0,("ERROR: both 'wins support = true' and 'wins server = <server>' \
-cannot be set in the smb.conf file. nmbd aborting.\n"));
+ if( lp_wins_support() && wins_srv_count() )
+ {
+ if( DEBUGLVL(0) )
+ {
+ dbgtext( "ERROR: 'wins support = true' and 'wins server = <server>'\n" );
+ dbgtext( "are conflicting settings. nmbd aborting.\n" );
+ }
exit(10);
- }
+ }
return(ret);
} /* reload_nmbd_services */