Variable cleanup for the rest

1 files changed, 7 insertions, 7 deletions

diff --git a/src/common/msproxy.c b/src/common/msproxy.c
index 5103233a..01b6120a 100644
--- a/src/common/msproxy.c
+++ b/src/common/msproxy.c
@@ -124,7 +124,7 @@ traverse_msproxy (int sok, char *serverAddr, int port, struct msproxy_state_t *s
 	guint32 destaddr;
 	guint32 flags;
 
-	if (!prefs.proxy_auth || !prefs.proxy_user[0] || !prefs.proxy_pass[0] )
+	if (!prefs.hex_net_proxy_auth || !prefs.hex_net_proxy_user[0] || !prefs.hex_net_proxy_pass[0] )
 		return 1;
 
 	/* MS proxy protocol implementation currently doesn't support IPv6 */
@@ -158,8 +158,8 @@ traverse_msproxy (int sok, char *serverAddr, int port, struct msproxy_state_t *s
 	req.packet.hello.magic45	= htons(0x4400);
 	req.packet.hello.magic50	= htons(0x3900);
 	data = req.packet.hello.data;
-	strcpy (data, prefs.proxy_user);		/* Append a username				*/
-	data += strlen (prefs.proxy_user)+2;		/* +2 automatically creates second empty string	*/
+	strcpy (data, prefs.hex_net_proxy_user);		/* Append a username				*/
+	data += strlen (prefs.hex_net_proxy_user)+2;		/* +2 automatically creates second empty string	*/
 	strcpy (data, MSPROXY_EXECUTABLE);		/* Append an application name			*/
 	data += strlen (MSPROXY_EXECUTABLE)+1;
 	strcpy (data, hostname);				/* Append a hostname				*/
@@ -290,13 +290,13 @@ traverse_msproxy (int sok, char *serverAddr, int port, struct msproxy_state_t *s
 		req.packet.auth2.ntlm_resp.len = 24;				/* Fill in NTLM response security buffer	*/
 		req.packet.auth2.ntlm_resp.alloc = 24;
 		req.packet.auth2.ntlm_resp.offset = data - req.packet.auth2.NTLMSSP;
-		ntlm_smb_nt_encrypt(prefs.proxy_pass, challenge, data);		/* Append an NTLM response			*/
+		ntlm_smb_nt_encrypt(prefs.hex_net_proxy_pass, challenge, data);		/* Append an NTLM response			*/
 		data += 24;	
 	} else {
 		req.packet.auth2.lm_resp.len	= 24;				/* Fill in LM response security buffer		*/
 		req.packet.auth2.lm_resp.alloc	= 24;
 		req.packet.auth2.lm_resp.offset	= data - req.packet.auth2.NTLMSSP;
-		ntlm_smb_encrypt(prefs.proxy_pass, challenge, data);		/* Append an LM response			*/
+		ntlm_smb_encrypt(prefs.hex_net_proxy_pass, challenge, data);		/* Append an LM response			*/
 		data += 24;
 		req.packet.auth2.ntlm_resp.len = 0;				/* NTLM response is empty			*/
 		req.packet.auth2.ntlm_resp.alloc = 0;
@@ -307,10 +307,10 @@ traverse_msproxy (int sok, char *serverAddr, int port, struct msproxy_state_t *s
 	req.packet.auth2.ntdomain_buf.offset = data - req.packet.auth2.NTLMSSP;
 	strcpy(data, ntdomain);
 	data += req.packet.auth2.ntdomain_buf.len;
-	req.packet.auth2.username_buf.len = strlen(prefs.proxy_user);		/* Username					*/
+	req.packet.auth2.username_buf.len = strlen(prefs.hex_net_proxy_user);		/* Username					*/
 	req.packet.auth2.username_buf.alloc = req.packet.auth2.username_buf.len;
 	req.packet.auth2.username_buf.offset = data - req.packet.auth2.NTLMSSP;
-	strcpy(data, prefs.proxy_user);
+	strcpy(data, prefs.hex_net_proxy_user);
 	data += req.packet.auth2.username_buf.len;
 	req.packet.auth2.clienthost_buf.len = strlen(hostname);			/* Hostname					*/
 	req.packet.auth2.clienthost_buf.alloc = req.packet.auth2.clienthost_buf.len;