1) updated ipc.c NetUserGetInfo - load \\%L\%U instead of \\%L\HOMES

   because the share must be browseable by a w95 client

2) send_mailslot_reply - unique or group datagram argument added.

3) netlogon.c - rewrote response packet to do the right thing for w95.

4) server.c reply_nt1() - added OEMDomainstring to the end.

5) (deep breath) reworked the nmbd-browsing code a little bit.
   i discovered two months ago that becoming a primary domain controller
   (and domain master browser) is done independently of becoming a
   backup domain controller (logon server) is done independently of
   becoming a local master browser.

   therefore, three sets of state-machines (instead of just one) are in
   place - each of which is responsible for taking samba through the
   required stages to become:  a logon server; a domain master browser;
   and a local master browser.

   each of these three things can occur independently on each interface,
   _including_ the wins pseudo-interface.  the only slight caveat is that
   the wins pseudo-interface, by virtue of _not_ being a broadcast
   interface, does _not_ register as a local master browser with the wins
   server, as this doesn't make sense.

lkcl
(This used to be commit 88c6a00c3c1b430307f512986185b5ed7aea7181)

1 files changed, 31 insertions, 10 deletions

diff --git a/source3/include/nameserv.h b/source3/include/nameserv.h
index 7302f09e5d..75461ce5e6 100644
--- a/source3/include/nameserv.h
+++ b/source3/include/nameserv.h
@@ -73,7 +73,8 @@
 /* server type identifiers */
 #define AM_MASTER(work) (work->ServerType & SV_TYPE_MASTER_BROWSER)
 #define AM_BACKUP(work) (work->ServerType & SV_TYPE_BACKUP_BROWSER)
-#define AM_DOMCTL(work) (work->ServerType & SV_TYPE_DOMAIN_CTRL)
+#define AM_DOMMST(work) (work->ServerType & SV_TYPE_DOMAIN_MASTER)
+#define AM_DOMMEM(work) (work->ServerType & SV_TYPE_DOMAIN_MEMBER)
 
 /* microsoft browser NetBIOS name */
 #define MSBROWSE "\001\002__MSBROWSE__\002"
@@ -85,16 +86,27 @@
 enum name_source {STATUS_QUERY, LMHOSTS, REGISTER, SELF, DNS, DNSFAIL};
 enum node_type {B_NODE=0, P_NODE=1, M_NODE=2, NBDD_NODE=3};
 enum packet_type {NMB_PACKET, DGRAM_PACKET};
+
 enum master_state
 {
-   MST_NONE,
-   MST_WON,
+   MST_POTENTIAL,
+   MST_BACK,
    MST_MSB,
-   MST_BROWSER,
-   MST_DOMAIN_NONE,
-   MST_DOMAIN_MEM,
-   MST_DOMAIN_TST,
-   MST_DOMAIN
+   MST_BROWSER
+};
+
+enum domain_state
+{
+   DOMAIN_NONE,
+   DOMAIN_WAIT,
+   DOMAIN_MST
+};
+
+enum logon_state
+{
+   LOGON_NONE,
+   LOGON_WAIT,
+   LOGON_SRV
 };
 
 enum state_type
@@ -179,8 +191,14 @@ struct work_record
 
   struct server_record *serverlist;
 
-  /* stage of development from non-master to master browser / domain master */
-  enum master_state state;
+  /* stage of development from non-local-master up to local-master browser */
+  enum master_state mst_state;
+
+  /* stage of development from non-domain-master to domain master browser */
+  enum domain_state dom_state;
+
+  /* stage of development from non-logon-server to logon server */
+  enum logon_state log_state;
 
   /* work group info */
   fstring work_group;
@@ -367,6 +385,9 @@ struct packet_struct
 
 /* broadcast packet announcement intervals, in minutes */
 
+/* attempt to add domain logon and domain master names */
+#define CHECK_TIME_ADD_DOM_NAMES 5 
+
 /* search for master browsers of workgroups samba knows about, 
    except default */
 #define CHECK_TIME_MST_BROWSE       5