From 0633c0f6003a21de0417143c6fb7ec5dd207397a Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 12 Jul 2011 08:55:58 +0200
Subject: [PATCH] s3:smbd: s/SMBkeepalive/NBSSkeepalive

metze
---
 source3/smbd/process.c |  4 ++--
 source3/smbd/reply.c   | 20 ++++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index d3957fe936a..785486137c3 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -1592,7 +1592,7 @@ static void process_smb(struct smbd_server_connection *sconn,
 	DEBUG(3, ("Transaction %d of length %d (%u toread)\n",
 		  sconn->trans_num, (int)nread, (unsigned int)unread_bytes));
 
-	if (msg_type != 0) {
+	if (msg_type != NBSSmessage) {
 		/*
 		 * NetBIOS session request, keepalive, etc.
 		 */
@@ -2501,7 +2501,7 @@ static bool smbd_echo_reply(uint8_t *inbuf, size_t inbuf_len,
 	char *outbuf;
 	bool ok;
 
-	if ((inbuf_len == 4) && (CVAL(inbuf, 0) == SMBkeepalive)) {
+	if ((inbuf_len == 4) && (CVAL(inbuf, 0) == NBSSkeepalive)) {
 		DEBUG(10, ("Got netbios keepalive\n"));
 		/*
 		 * Just swallow it
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 2f37b61b126..25e1aafa0ec 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -519,7 +519,7 @@ void reply_special(struct smbd_server_connection *sconn, char *inbuf, size_t inb
 	smb_setlen(outbuf,0);
 
 	switch (msg_type) {
-	case 0x81: /* session request */
+	case NBSSrequest: /* session request */
 	{
 		/* inbuf_size is guarenteed to be at least 4. */
 		fstring name1,name2;
@@ -532,7 +532,7 @@ void reply_special(struct smbd_server_connection *sconn, char *inbuf, size_t inb
 			exit_server_cleanly("multiple session request not permitted");
 		}
 
-		SCVAL(outbuf,0,0x82);
+		SCVAL(outbuf,0,NBSSpositive);
 		SCVAL(outbuf,3,0);
 
 		/* inbuf_size is guaranteed to be at least 4. */
@@ -614,17 +614,17 @@ void reply_special(struct smbd_server_connection *sconn, char *inbuf, size_t inb
 
 	case 0x89: /* session keepalive request 
 		      (some old clients produce this?) */
-		SCVAL(outbuf,0,SMBkeepalive);
+		SCVAL(outbuf,0,NBSSkeepalive);
 		SCVAL(outbuf,3,0);
 		break;
 
-	case 0x82: /* positive session response */
-	case 0x83: /* negative session response */
-	case 0x84: /* retarget session response */
+	case NBSSpositive: /* positive session response */
+	case NBSSnegative: /* negative session response */
+	case NBSSretarget: /* retarget session response */
 		DEBUG(0,("Unexpected session response\n"));
 		break;
 
-	case SMBkeepalive: /* session keepalive */
+	case NBSSkeepalive: /* session keepalive */
 	default:
 		return;
 	}
@@ -3880,9 +3880,9 @@ void error_to_writebrawerr(struct smb_request *req)
 static NTSTATUS read_smb_length(int fd, char *inbuf, unsigned int timeout,
 				size_t *len)
 {
-	uint8_t msgtype = SMBkeepalive;
+	uint8_t msgtype = NBSSkeepalive;
 
-	while (msgtype == SMBkeepalive) {
+	while (msgtype == NBSSkeepalive) {
 		NTSTATUS status;
 
 		status = read_smb_length_return_keepalive(fd, inbuf, timeout,
@@ -4136,7 +4136,7 @@ void reply_writebraw(struct smb_request *req)
 #if RABBIT_PELLET_FIX
 		/*
 		 * Fix for "rabbit pellet" mode, trigger an early TCP ack by
-		 * sending a SMBkeepalive. Thanks to DaveCB at Sun for this.
+		 * sending a NBSSkeepalive. Thanks to DaveCB at Sun for this.
 		 * JRA.
 		 */
 		if (!send_keepalive(req->sconn->sock)) {
-- 
2.34.1