automerge commit

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

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 70c9a17294d9ac8db66f5eab0b22dd4af1fd3461..a2773dd7a84f2845879d7d649a8643114748f43c 100644 (file)
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -3806,7 +3806,9 @@ static int open_mailbox(struct vm_state *vms, struct ast_vm_user *vmu,int box)
         */
        snprintf(vms->vmbox, sizeof(vms->vmbox), "vm-%s", vms->curbox);
        
-       make_dir(vms->curdir, sizeof(vms->curdir), vmu->context, vms->username, vms->curbox);
+       /* Faster to make the directory than to check if it exists. */
+       create_dirpath(vms->curdir, sizeof(vms->curdir), vmu->context, vms->username, vms->curbox);
+
        count_msg = count_messages(vmu, vms->curdir);
        if (count_msg < 0)
                return count_msg;