JHT ===> Moved MAJOR_VERSION and MINOR_VERSION defines to smb.h

	Made version info consistent in ipc.c and nameannounce.c
	Added define for BROWSER_ELECTION_VALUE and BROWSER_CONSTANT
	(see do_announce_host() in nameannounce.c).

	Sniffing with the latest bloodhound I found that the byte range
	occupied by the BROWSER_ELECTION_VALUE is interpreted depending
	on the type of announcement being made.

	In a Local_Master_Announcement it is BROWSER_ELECTION_VALUE
	but in both Workgroup_Announcement and Host_Announcement
	this is seen as Comment_String_Pointer. What does this mean?
	We need to know?

diff --git a/source/include/smb.h b/source/include/smb.h
index e9d74befc23cd61a2ce2afe83e29a29c9350aac8..506bbb9b1652633f3c339ceebf83044a79352446 100644 (file)
--- a/source/include/smb.h
+++ b/source/include/smb.h
@@ -794,7 +794,15 @@ char *Strstr(char *s, char *p);
 #define SV_TYPE_DOMAIN_ENUM         0x80000000
 #define SV_TYPE_ALL                 0xFFFFFFFF  
 
-/* what server type are we currently */
+/* what server type are we currently  - JHT Says we ARE 4.10 */
+/* this was set by JHT in liaison with Andrew Tridgell early 1996 */
+/* setting to 4.10 at same time as announcing ourselves as NT Server */
+#define MAJOR_VERSION 0x04
+#define MINOR_VERSION 0x01
+
+/* Browser Election Values */
+#define BROWSER_ELECT_VERSION  0x010f
+#define BROWSER_CONSTANT       0xaa55
 
 
 /* Capabilities.  see ftp.microsoft.com/developr/drg/cifs/cifs/cifs4.txt */

diff --git a/source/nameannounce.c b/source/nameannounce.c
index 990be00602de118be78088135b8d02cfe513485e..8dc0668f4eda28c5f4fb14499a821b6a150aa791 100644 (file)
--- a/source/nameannounce.c
+++ b/source/nameannounce.c
@@ -160,12 +160,13 @@ void do_announce_host(int command,
        StrnCpy(p+5,server_name,16);
        strupper(p+5);
 
-       CVAL(p,21) = 0x02; /* major version */
-       CVAL(p,22) = 0x02; /* minor version */
+       CVAL(p,21) = MAJOR_VERSION; /* major version */
+       CVAL(p,22) = MINOR_VERSION; /* minor version */
 
        SIVAL(p,23,server_type);
-       SSVAL(p,27,0x010f); /* browse version: got from NT/AS 4.00 */
-       SSVAL(p,29,0xaa55); /* browse signature */
+       /* browse version: got from NT/AS 4.00  - Value defined in smb.h (JHT)*/
+       SSVAL(p,27,BROWSER_ELECTION_VERSION);
+       SSVAL(p,29,BROWSER_CONSTANT); /* browse signature */
 
        strcpy(p+31,server_comment);
        p += 31;

diff --git a/source/smbd/ipc.c b/source/smbd/ipc.c
index 9f8369912c993abcd59b6281c38ac48a91d9c628..3a2df56b3e2c943097db546448ca48ae1f82dd13 100644 (file)
--- a/source/smbd/ipc.c
+++ b/source/smbd/ipc.c
@@ -60,9 +60,6 @@ extern fstring local_machine;
 #define SNLEN 15               /* service name length */
 #define QNLEN 12               /* queue name maximum length */
 
-#define MAJOR_VERSION 4
-#define MINOR_VERSION 1
-
 extern int Client;
 
 static BOOL api_Unsupported(int cnum,uint16 vuid, char *param,char *data,