From 27aa7a3382cf0ed4973fa7e207d4ffc9733f69d5 Mon Sep 17 00:00:00 2001
From: David Troy <dave@popvox.com>
Date: Fri, 7 Apr 2006 20:55:51 +0000
Subject: git-svn-id:
 http://svncommunity.digium.com/svn/astmanproxy/branches/1.20pre@94
 f02b47b9-160a-0410-81a6-dc3441afb0ec

---
 src/proxyfunc.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'src/proxyfunc.c')

diff --git a/src/proxyfunc.c b/src/proxyfunc.c
index d1d5f38..434baff 100644
--- a/src/proxyfunc.c
+++ b/src/proxyfunc.c
@@ -156,10 +156,12 @@ void *ProxyLogin(struct mansession *s, struct message *m) {
                 AddHeader(&mo, "Response: Success");
                 AddHeader(&mo, "Message: Authentication accepted");
                 s->output->write(s, &mo);
-                s->authenticated = 1;
+    		pthread_mutex_lock(&s->lock);
+    		s->authenticated = 1;
                 strcpy(s->user.channel, pu->channel);
                 strcpy(s->user.icontext, pu->icontext);
                 strcpy(s->user.ocontext, pu->ocontext);
+    		pthread_mutex_unlock(&s->lock);
                 if( debug )
                     debugmsg("Login as: %s", user);
                 break;
@@ -171,11 +173,14 @@ void *ProxyLogin(struct mansession *s, struct message *m) {
 
     if( !pu ) {
 	SendError(s, "Authentication failed");
+    	pthread_mutex_lock(&s->lock);
         s->authenticated = 0;
+    	pthread_mutex_unlock(&s->lock);
         if( debug )
             debugmsg("Login failed as: %s/%s", user, secret);
     }
 
+
     return 0;
 }
 
@@ -334,7 +339,7 @@ int ValidateAction(struct message *m, struct mansession *s, int inbound) {
     char *uchannel;
     char *ucontext;
 
-    if( !s->authenticated )
+    if( pc.authrequired && !s->authenticated )
         return 0;
 
     if( inbound )
-- 
cgit