diff options
| author | Christopher R. Hertel <crh@samba.org> | 2001-08-26 06:43:39 +0000 |
|---|---|---|
| committer | Christopher R. Hertel <crh@samba.org> | 2001-08-26 06:43:39 +0000 |
| commit | 7c09aa553da2f0b855e96396c13d854968537c30 (patch) | |
| tree | 5f8cc3d4422392781bc031239bebced9301d4d8e | |
| parent | 7fed75b4cbeb4110c27525d6e4824c9bf73ceb56 (diff) | |
| download | samba-7c09aa553da2f0b855e96396c13d854968537c30.tar.gz samba-7c09aa553da2f0b855e96396c13d854968537c30.tar.bz2 samba-7c09aa553da2f0b855e96396c13d854968537c30.zip | |
Same as nmbd.c. These now test wins_srv_count() instead of lp_wins_server
to determine whether the 'wins server' parameter is set.
(This used to be commit 5b975d3a9cea39e9992a9b556b8a6d9d3ec14807)
| -rw-r--r-- | source3/nmbd/nmbd_namelistdb.c | 2 | ||||
| -rw-r--r-- | source3/nmbd/nmbd_subnetdb.c | 2 | ||||
| -rw-r--r-- | source3/utils/testparm.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source3/nmbd/nmbd_namelistdb.c b/source3/nmbd/nmbd_namelistdb.c index 15328af33e..efac14c8c6 100644 --- a/source3/nmbd/nmbd_namelistdb.c +++ b/source3/nmbd/nmbd_namelistdb.c @@ -37,7 +37,7 @@ uint16 samba_nb_type = 0; /* samba's NetBIOS name type */ */ void set_samba_nb_type(void) { - if( lp_wins_support() || (*lp_wins_server()) ) + if( lp_wins_support() || wins_srv_count() ) samba_nb_type = NB_MFLAG; /* samba is a 'hybrid' node type. */ else samba_nb_type = NB_BFLAG; /* samba is broadcast-only node type. */ diff --git a/source3/nmbd/nmbd_subnetdb.c b/source3/nmbd/nmbd_subnetdb.c index 3bad3f9568..e77a47801d 100644 --- a/source3/nmbd/nmbd_subnetdb.c +++ b/source3/nmbd/nmbd_subnetdb.c @@ -277,7 +277,7 @@ BOOL create_subnets(void) * server address can change. crh */ - if(*lp_wins_server()) + if( wins_srv_count() ) { struct in_addr real_wins_ip; real_wins_ip = wins_srv_ip(); diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c index 9b19a6c0fd..28870fb272 100644 --- a/source3/utils/testparm.c +++ b/source3/utils/testparm.c @@ -54,7 +54,7 @@ static int do_global_checks(void) ret = 1; } - if (lp_wins_support() && *lp_wins_server()) { + if (lp_wins_support() && wins_srv_count()) { printf("ERROR: both 'wins support = true' and 'wins server = <server>' \ cannot be set in the smb.conf file. nmbd will abort with this setting.\n"); ret = 1; |