<p>Jenkins2 <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/6060">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Joshua Colp: Looks good to me, but someone else must approve
  George Joseph: Looks good to me, approved
  Jenkins2: Approved for Submit

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">app_voicemail.c: Allow mailbox entry on authentication retry prompt.<br><br>The following testsuite voicemail tests were failing to re-enter the<br>mailbox after the first login attempt.<br><br>tests/apps/voicemail/authenticate_invalid_mailbox<br>tests/apps/voicemail/authenticate_invalid_password<br><br>The tests were noting the start of the vm-incorrect-mailbox prompt and<br>immediately sending the mailbox for the next login attempt.  Since the<br>invalid message playback had to complete before the digits were<br>recognized, the test passed for the wrong reason and added approximately<br>20 seconds to the test times.<br><br>* Allow the vm-incorrect-mailbox prompt to get interrupted by the mailbox<br>digits like the initial vm-login prompt so the tests are able to enter the<br>intended mailbox.<br><br>Change-Id: I1dc53fe917bfe03a4587b2c4cd24c94696a69df8<br>---<br>M apps/app_voicemail.c<br>1 file changed, 7 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c<br>index 19a5d31..e25ea88 100644<br>--- a/apps/app_voicemail.c<br>+++ b/apps/app_voicemail.c<br>@@ -11066,7 +11066,7 @@<br>                   int skipuser, int max_logins, int silent)<br> {<br>         int useadsi = 0, valid = 0, logretries = 0;<br>-  char password[AST_MAX_EXTENSION]="", *passptr;<br>+     char password[AST_MAX_EXTENSION], *passptr;<br>   struct ast_vm_user vmus, *vmu = NULL;<br> <br>      /* If ADSI is supported, setup login screen */<br>@@ -11108,7 +11108,8 @@<br>                       adsi_password(chan);<br> <br>               if (!ast_strlen_zero(prefix)) {<br>-                      char fullusername[80] = "";<br>+                        char fullusername[80];<br>+<br>                     ast_copy_string(fullusername, prefix, sizeof(fullusername));<br>                  strncat(fullusername, mailbox, sizeof(fullusername) - 1 - strlen(fullusername));<br>                      ast_copy_string(mailbox, fullusername, mailbox_size);<br>@@ -11166,6 +11167,10 @@<br>                                       free_user(vmu);<br>                                       return -1;<br>                            }<br>+                            if (ast_waitstream(chan, "")) {       /* Channel is hung up */<br>+                                     free_user(vmu);<br>+                                      return -1;<br>+                           }<br>                     } else {<br>                              if (useadsi)<br>                                  adsi_login(chan);<br>@@ -11174,10 +11179,6 @@<br>                                   free_user(vmu);<br>                                       return -1;<br>                            }<br>-                    }<br>-                    if (ast_waitstream(chan, "")) {       /* Channel is hung up */<br>-                             free_user(vmu);<br>-                              return -1;<br>                    }<br>             }<br>     }<br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/6060">change 6060</a>. To unsubscribe, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/6060"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 14 </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I1dc53fe917bfe03a4587b2c4cd24c94696a69df8 </div>
<div style="display:none"> Gerrit-Change-Number: 6060 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Richard Mudgett <rmudgett@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>