r16923: remove unused substitude code

metze
(This used to be commit ea88c8c99eff2203d13f9877e590d9d7f2fbb910)

2 files changed, 0 insertions, 30 deletions

diff --git a/source4/smb_server/smb/negprot.c b/source4/smb_server/smb/negprot.c
index 3af80c2d63..0f55aaeae7 100644
--- a/source4/smb_server/smb/negprot.c
+++ b/source4/smb_server/smb/negprot.c
@@ -502,7 +502,6 @@ void smbsrv_reply_negprot(struct smbsrv_request *req)
 			if (strcmp(supported_protocols[protocol].proto_name, protos[i]) != 0) continue;
 
 			supported_protocols[protocol].proto_reply_fn(req, i);
-			sub_set_remote_proto(supported_protocols[protocol].short_name);
 			DEBUG(3,("Selected protocol [%d][%s]\n",
 				i, supported_protocols[protocol].proto_name));
 			return;
diff --git a/source4/smb_server/smb_server.h b/source4/smb_server/smb_server.h
index d38543bb67..7ad1af2d27 100644
--- a/source4/smb_server/smb_server.h
+++ b/source4/smb_server/smb_server.h
@@ -257,31 +257,6 @@ struct smbsrv_request {
 	struct request_buffer out;
 };
 
-/* this contains variables that should be used in % substitutions for
- * smb.conf parameters */
-struct substitute_context {
-	char *remote_arch;
-
-	/* our local netbios name, as give to us by the client */
-	char *local_machine;
-
-	/* the remote netbios name, as give to us by the client */
-	char *remote_machine;
-
-	/* the select remote protocol */
-	char *remote_proto;	
-
-	/* the name of the client as should be displayed in
-	 * smbstatus. Can be an IP or a netbios name */
-	char *client_name; 
-
-	/* the username for %U */
-	char *user_name;
-};
-
-/* Remote architectures we know about. */
-enum remote_arch_types {RA_UNKNOWN, RA_WFWG, RA_OS2, RA_WIN95, RA_WINNT, RA_WIN2K, RA_WINXP, RA_SAMBA};
-
 enum security_types {SEC_SHARE,SEC_USER};
 
 /* smb server context structure. This should contain all the state
@@ -313,10 +288,6 @@ struct smbsrv_connection {
 		 */
 		unsigned max_recv; /* init to BUFFER_SIZE */
 	
-		/* a guess at the remote architecture. Try not to rely on this - in almost
-		   all cases using these values is the wrong thing to do */
-		enum remote_arch_types ra_type;
-	
 		/* the negotiatiated protocol */
 		enum protocol_types protocol;