mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-08 10:58:15 +00:00
automerge commit
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@8202 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -1630,7 +1630,8 @@ static struct ast_conference *find_conf(struct ast_channel *chan, char *confno,
|
|||||||
if (dynamic_pin) {
|
if (dynamic_pin) {
|
||||||
if (dynamic_pin[0] == 'q') {
|
if (dynamic_pin[0] == 'q') {
|
||||||
/* Query the user to enter a PIN */
|
/* Query the user to enter a PIN */
|
||||||
ast_app_getdata(chan, "conf-getpin", dynamic_pin, AST_MAX_EXTENSION - 1, 0);
|
if (ast_app_getdata(chan, "conf-getpin", dynamic_pin, AST_MAX_EXTENSION - 1, 0) < 0)
|
||||||
|
return NULL;
|
||||||
}
|
}
|
||||||
cnf = build_conf(confno, dynamic_pin, "", make, dynamic);
|
cnf = build_conf(confno, dynamic_pin, "", make, dynamic);
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
Reference in New Issue
Block a user