summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apps/app_meetme.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index dc2df7b21..469200e78 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -4458,13 +4458,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;