From 79c9d6db55a72d630caa296691ea5ad54b30fc4c Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 26 Oct 2004 09:32:11 +0000
Subject: r3256: get rid of the unused session_claim() and session_yield()
 calls (This used to be commit f1c5be396b62203fb183431ea6218eed38976d0b)

---
 source4/smb_server/config.mk  |  1 -
 source4/smb_server/password.c | 11 -----------
 source4/smb_server/session.c  | 13 -------------
 3 files changed, 25 deletions(-)

(limited to 'source4')

diff --git a/source4/smb_server/config.mk b/source4/smb_server/config.mk
index 4059df1726..2521e8299e 100644
--- a/source4/smb_server/config.mk
+++ b/source4/smb_server/config.mk
@@ -14,7 +14,6 @@ ADD_OBJ_FILES = \
 		smb_server/request.o \
 		smb_server/search.o \
 		smb_server/service.o \
-		smb_server/session.o \
 		smb_server/sesssetup.o \
 		smb_server/srvtime.o \
 		smb_server/trans2.o \
diff --git a/source4/smb_server/password.c b/source4/smb_server/password.c
index d553d8612d..3995267377 100644
--- a/source4/smb_server/password.c
+++ b/source4/smb_server/password.c
@@ -56,8 +56,6 @@ void smbsrv_invalidate_vuid(struct smbsrv_connection *smb_conn, uint16_t vuid)
 	if (sess == NULL)
 		return;
 
-	session_yield(sess);
-
 	DLIST_REMOVE(smb_conn->sessions.session_list, sess);
 
 	/* clear the vuid from the 'cache' on each connection, and
@@ -144,14 +142,5 @@ uint16_t smbsrv_register_session(struct smbsrv_connection *smb_conn,
 	sess->smb_conn = smb_conn;
 	DLIST_ADD(smb_conn->sessions.session_list, sess);
 
-	/* we only need to do session_claim() when the session_setup is complete
-	 * for spnego session_info is NULL the first time
-	 */
-	if (session_info && !session_claim(sess)) {
-		DEBUG(1,("Failed to claim session for vuid=%d\n", sess->vuid));
-		smbsrv_invalidate_vuid(smb_conn, sess->vuid);
-		return UID_FIELD_INVALID;
-	}
-
 	return sess->vuid;
 }
diff --git a/source4/smb_server/session.c b/source4/smb_server/session.c
index 1567484a49..876702aa1c 100644
--- a/source4/smb_server/session.c
+++ b/source4/smb_server/session.c
@@ -27,16 +27,3 @@
 
 #include "includes.h"
 
-/* called when a session is created */
-BOOL session_claim(struct smbsrv_session *sess)
-{
-	DEBUG(0,("rewrite: Not doing session claim\n"));
-	return True;
-}
-
-/* called when a session is destroyed */
-void session_yield(struct smbsrv_session *sess)
-{
-	DEBUG(0,("rewrite: Not doing session yield\n"));
-}
-
-- 
cgit