svn commit: samba r8658 - in branches/SAMBA_4_0/source/smb_server: .

[tridge at samba.org]

Author: tridge
Date: 2005-07-21 01:43:26 +0000 (Thu, 21 Jul 2005)
New Revision: 8658

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=8658

Log:
move use of lp_security() and lp_nt_status_support() into the connection structure.
This massively reduces the number of lp_*() calls made

Modified:
   branches/SAMBA_4_0/source/smb_server/request.c
   branches/SAMBA_4_0/source/smb_server/smb_server.c
   branches/SAMBA_4_0/source/smb_server/smb_server.h


Changeset:
Modified: branches/SAMBA_4_0/source/smb_server/request.c
===================================================================
--- branches/SAMBA_4_0/source/smb_server/request.c	2005-07-20 20:30:21 UTC (rev 8657)
+++ branches/SAMBA_4_0/source/smb_server/request.c	2005-07-21 01:43:26 UTC (rev 8658)
@@ -340,7 +340,7 @@
 */
 void req_setup_error(struct smbsrv_request *req, NTSTATUS status)
 {
-	if (!lp_nt_status_support() || !(req->smb_conn->negotiate.client_caps & CAP_STATUS32)) {
+	if (!req->smb_conn->config.nt_status_support || !(req->smb_conn->negotiate.client_caps & CAP_STATUS32)) {
 		/* convert to DOS error codes */
 		uint8_t eclass;
 		uint32_t ecode;

Modified: branches/SAMBA_4_0/source/smb_server/smb_server.c
===================================================================
--- branches/SAMBA_4_0/source/smb_server/smb_server.c	2005-07-20 20:30:21 UTC (rev 8657)
+++ branches/SAMBA_4_0/source/smb_server/smb_server.c	2005-07-21 01:43:26 UTC (rev 8658)
@@ -500,7 +500,7 @@
 		   chaining) */
 
 		/* In share mode security we must ignore the vuid. */
-		if (lp_security() == SEC_SHARE) {
+		if (smb_conn->config.security == SEC_SHARE) {
 			session_tag = UID_FIELD_INVALID;
 		} else {
 			session_tag = SVAL(req->in.hdr,HDR_UID);
@@ -770,6 +770,8 @@
 
 	smb_conn->connection = conn;
 	smb_conn->processing = False;
+	smb_conn->config.security = lp_security();
+	smb_conn->config.nt_status_support = lp_nt_status_support();
 
 	conn->private = smb_conn;
 

Modified: branches/SAMBA_4_0/source/smb_server/smb_server.h
===================================================================
--- branches/SAMBA_4_0/source/smb_server/smb_server.h	2005-07-20 20:30:21 UTC (rev 8657)
+++ branches/SAMBA_4_0/source/smb_server/smb_server.h	2005-07-21 01:43:26 UTC (rev 8658)
@@ -264,4 +264,10 @@
 	} *trans_partial;
 
 	BOOL processing;
+
+	/* configuration parameters */
+	struct {
+		enum security_types security;
+		BOOL nt_status_support;
+	} config;
 };