automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@29966 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 5ab8bec02b2590e4179b4361db3c7e23b75058c4..25cde6be89749ed4528653a9ad1a0eaf1c58a5fe 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -7400,8 +7400,8 @@ static int check_user_full(struct sip_pvt *p, struct sip_request *req, int sipme
                        } else if (global_allowguest == 2) {
                                ast_copy_flags(p, &global_flags, SIP_OSPAUTH);
                                res = check_auth(p, req, p->randdata, sizeof(p->randdata), "", "", "", sipmethod, uri, reliable, ignore); 
-                       }
 #endif
+                       }
                }
 
        }