nameserv.c: split add_domain_names() into three functions:

            add_domain_logon_names() - adds <1c> names on WINS and broadcast.
            add_domain_master_wins() - adds <1b> name only with WINS server
            add_domain_master_bcast() - adds <1b> names only by bcast.

          : made add_domain_names() add <1c> names, unconditionally, and
            add <1b> name with the WINS server if using a WINS server, or
            add <1b> name by broadcast if _not_ using a WINS server, but
            _not_ both.

          : removed the direct parameter from remove_name_entry() and
            add_my_name_entry().

nameelect.c: made become_domain_master(), on successful registration of
             the <1b> name with the WINS server, go ahead and register
             the <1b> names by broadcast.  if the <1b> name is _not_
             successfully registered with the WINS server, the broadcast
             registration of <1b> names will _not_ proceed.

namedbsubnet.c: sorted out calls to add_my_name_entry() and remove_my_name()
                which no longer has a direct parameter.


this is all added because...

in order to fix a compatibility bug with 1.9.16p2->p11, jeremy had added a
feature that got the <1b> broadcast registered names _directly_ into the nmbd
netbios lists, undefended.  the aim was to get round the aggressive netbios
registration of <1b> names of 1.9.16p2->p11.


however, because 1.9.16p2->p11 don't properly _provide_ netlogon services,
it is better that an error message appears in 1.9.17 logs, and that
administrators are made aware of the problems with 1.9.16p2->p11, and replace
1.9.16p2->p11 servers, rather than attempt to run 1.9.16 alonside 1.9.17.

(these warning messages will need to be added...)


in _addition_, they shouldn't _be_ getting two samba servers to provide
domain logon / domain master services for the same workgroup in the same
WINS scope!


lkcl
(This used to be commit 5a668ff7ba83433b5eaa9f7d03a42573ee26caf9)

1 files changed, 2 insertions, 2 deletions

diff --git a/source3/namedbsubnet.c b/source3/namedbsubnet.c
index e3a2ea6e68..5ddda0a282 100644
--- a/source3/namedbsubnet.c
+++ b/source3/namedbsubnet.c
@@ -214,8 +214,8 @@ void add_workgroup_to_subnet( struct subnet_record *d, char *group)
    */
   if (strequal(myworkgroup, group))
   {
-    add_my_name_entry(d,group,0x0 ,nb_type|NB_ACTIVE|NB_GROUP,False);
-    add_my_name_entry(d,group,0x1e,nb_type|NB_ACTIVE|NB_GROUP,False);
+    add_my_name_entry(d,group,0x0 ,nb_type|NB_ACTIVE|NB_GROUP);
+    add_my_name_entry(d,group,0x1e,nb_type|NB_ACTIVE|NB_GROUP);
     /* add samba server name to workgroup list. */
     add_server_entry(d,w,myname,w->ServerType|SV_TYPE_LOCAL_LIST_ONLY,0,
 		lp_serverstring(),True);