first pass at updating head branch to be to be the same as the SAMBA_2_0 branch

[kai/samba.git] / source3 / include / nameserv.h

diff --git a/source3/include/nameserv.h b/source3/include/nameserv.h
index 0de00f363689a825f0c10a88b9cdf666fdb2389a..3473c74a56a700c145ff4c2c6f8558bdf279cd91 100644 (file)
--- a/source3/include/nameserv.h
+++ b/source3/include/nameserv.h
@@ -142,7 +142,7 @@ enum netbios_reply_type_code { NMB_QUERY, NMB_STATUS, NMB_REG, NMB_REG_REFRESH,
 enum name_source {LMHOSTS_NAME, REGISTER_NAME, SELF_NAME, DNS_NAME, 
                   DNSFAIL_NAME, PERMANENT_NAME, WINS_PROXY_NAME};
 enum node_type {B_NODE=0, P_NODE=1, M_NODE=2, NBDD_NODE=3};
-enum packet_type {NMB_PACKET, DGRAM_PACKET, NMB_SOCK_PACKET, DGRAM_SOCK_PACKET };
+enum packet_type {NMB_PACKET, DGRAM_PACKET};
 
 enum master_state
 {
@@ -501,7 +501,6 @@ struct packet_struct
 #define QUERYFORPDC_R  12 /* Response to Query for PDC. */
 #define SAMLOGON       18
 #define SAMLOGON_R     19
-#define SAMLOGON_UNK_R 21
 
 
 /* Ids for netbios packet types. */
@@ -547,11 +546,6 @@ struct packet_struct
    affects non-permanent self names (in seconds) */
 #define MAX_REFRESH_TIME (60*20)
 
-/* Types of machine we can announce as. */
-#define ANNOUNCE_AS_NT 1
-#define ANNOUNCE_AS_WIN95 2
-#define ANNOUNCE_AS_WFW 3
-
 /* Macro's to enumerate subnets either with or without
    the UNICAST subnet. */