From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 2 Jun 2009 14:07:08 +0000 (+0200)
Subject: s3:smbd: make smbd_server_connection_terminate() a macro
X-Git-Tag: tdb-1.1.5~280
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b806d83b723216e3e16778ce33ae710fab2c011;p=thirdparty%2Fsamba.git

s3:smbd: make smbd_server_connection_terminate() a macro

metze
---

diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h
index 2e5bc913d05..26e63f1be4e 100644
--- a/source3/smbd/globals.h
+++ b/source3/smbd/globals.h
@@ -170,6 +170,12 @@ NTSTATUS smb2_signing_check_pdu(DATA_BLOB session_key,
 				const struct iovec *vector,
 				int count);
 
+void smbd_server_connection_terminate_ex(struct smbd_server_connection *sconn,
+					 const char *reason,
+					 const char *location);
+#define smbd_server_connection_terminate(sconn, reason) \
+	smbd_server_connection_terminate_ex(sconn, reason, __location__)
+
 bool smbd_is_smb2_header(const uint8_t *inbuf, size_t size);
 
 void reply_smb2002(struct smb_request *req, uint16_t choice);
diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c
index f4dc7c4f466..e797bdd9eeb 100644
--- a/source3/smbd/smb2_server.c
+++ b/source3/smbd/smb2_server.c
@@ -277,10 +277,12 @@ static NTSTATUS smbd_smb2_request_setup_out(struct smbd_smb2_request *req)
 	return NT_STATUS_OK;
 }
 
-static void smbd_server_connection_terminate(struct smbd_server_connection *conn,
-					     const char *reason)
+void smbd_server_connection_terminate_ex(struct smbd_server_connection *sconn,
+					 const char *reason,
+					 const char *location)
 {
-	DEBUG(10,("smbd_server_connection_terminate: reason[%s]\n", reason));
+	DEBUG(10,("smbd_server_connection_terminate_ex: reason[%s] at %s\n",
+		  reason, location));
 	exit_server_cleanly(reason);
 }