From: Kinsey Moore <kmoore@digium.com>
Date: Wed, 9 Nov 2011 17:13:53 +0000 (+0000)
Subject: Fix pin parameter behavior regression in MeetMe
X-Git-Tag: 1.8.9.0-rc1~94
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e2a8d16dfd5762efcc96f4380e5a2c857cd2692;p=thirdparty%2Fasterisk.git

Fix pin parameter behavior regression in MeetMe

The last time this code was touched (by me), a subtlety was missed based on the
difference between needing to check a pin's validity and the need to prompt
for a pin.

(closes issue ASTERISK-18488)


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

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index b7ec372d8b..c93adddaeb 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -4342,13 +4342,14 @@ static int conf_exec(struct ast_channel *chan, const char *data)
 					res = -1;
 				}
 			} else {
-				/* Check to see if the conference requires a pin
-				 * and we ALWAYS prompt or no pin was provided */
+				/* Check to see if the conference requires pin
+				 * validation and check for exemptions to that
+				 * requirement. */
 				if ((!ast_strlen_zero(cnf->pin) ||
 					(!ast_strlen_zero(cnf->pinadmin) &&
 						ast_test_flag64(&confflags, CONFFLAG_ADMIN))) &&
 				    (ast_test_flag64(&confflags, CONFFLAG_ALWAYSPROMPT) ||
-						ast_strlen_zero(args.pin))) {
+						ast_strlen_zero(args.pin) || !cnf->isdynamic)) {
 					char pin[MAX_PIN] = "";
 					int j;