WHATSNEW.txt: Updated for alpha3.

server.c: int16 -> uint16 fix for port comparisons in oplock code.
          Needed for Solaris.
version.h: Updated to alpha3.
Jeremy (jallison@whistle.com)
(This used to be commit 2d9645e99ba30a5cce4372ff80d1bd26c516ac34)

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 69d6185e02ae4b539fd7faa1c1552a35798e2aa7..53b02a63abd0275f83be87d91cf805e2a70034a7 100644 (file)
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,10 +1,18 @@
-          WHATS NEW IN 1.9.18alpha2 Oct 21st 1997
+          WHATS NEW IN 1.9.18alpha3 Oct 21st 1997
           =======================================
 
 This is NOT a production release of Samba code.
 For production servers please run Samba 1.9.17p4
 or later releases in the 1.9.17 series.
 
+This release is being made as alpha3, as an
+incorrect alpha2 was temporarily available from
+the Samba ftp site. As we have no way of knowing
+if some people downloaded this incorrect release
+the safest course seemed to be to increment the
+alpha release number as we wish there to be no
+confusion between releases.
+
 This release contains some experimental features and
 changes and is being made available so people can
 test and provide feedback and patches for ongoing

diff --git a/source3/include/version.h b/source3/include/version.h
index 129c695d8b9e8640b05a408b8b49ba387ec79f78..dae7bc777646db097fb01eb4b298a627c3e6e611 100644 (file)
--- a/source3/include/version.h
+++ b/source3/include/version.h
@@ -1 +1 @@
-#define VERSION "1.9.18alpha2"
+#define VERSION "1.9.18alpha3"

diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 68f2dca27cca845aaf730c7cae2a85d6915359bc..d67247481fff3eff1b3bc7f29d510f6c83021364 100644 (file)
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -2631,7 +2631,7 @@ address %x. Error was %s\n", htonl(INADDR_LOOPBACK), strerror(errno)));
 static BOOL process_local_message(int sock, char *buffer, int buf_size)
 {
   int32 msg_len;
-  int16 from_port;
+  uint16 from_port;
   char *msg_start;
 
   msg_len = IVAL(buffer,UDP_CMD_LEN_OFFSET);
@@ -2995,7 +2995,7 @@ to pid %d on port %d for dev = %x, inode = %x. Error was %s\n",
   {
     char op_break_reply[UDP_CMD_HEADER_LEN+OPLOCK_BREAK_MSG_LEN];
     int32 reply_msg_len;
-    int16 reply_from_port;
+    uint16 reply_from_port;
     char *reply_msg_start;
 
     if(receive_local_message(oplock_sock, op_break_reply, sizeof(op_break_reply),