kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

protect curhst and curusr

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@42283 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matt O'Gorman
2006-09-07 17:05:51 +00:00
parent 53cf63c33a
commit 36935ffc42
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apps/app_voicemail.c
View File

@@ -89,6 +89,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#endif #endif
#ifdef IMAP_STORAGE #ifdef IMAP_STORAGE
AST_MUTEX_DEFINE_STATIC(curhstusr_lock);
static char *curhst = NIL; /* currently connected host */ static char *curhst = NIL; /* currently connected host */
static char *curusr = NIL; /* current login user */ static char *curusr = NIL; /* current login user */
@@ -4377,8 +4378,6 @@ static int play_message(struct ast_channel *chan, struct ast_vm_user *vmu, struc
if (res == '1') if (res == '1')
res = 0; res = 0;
/* What is the category thing? JAR */
if ((!res) && !ast_strlen_zero(category)) { if ((!res) && !ast_strlen_zero(category)) {
res = play_message_category(chan, category); res = play_message_category(chan, category);
} }
@@ -7626,7 +7625,6 @@ static int advanced_options(struct ast_channel *chan, struct ast_vm_user *vmu, s
memset(&leave_options, 0, sizeof(leave_options)); memset(&leave_options, 0, sizeof(leave_options));
leave_options.record_gain = record_gain; leave_options.record_gain = record_gain;
/* Changed to mailbox instead of num - JAR */
res = leave_voicemail(chan, mailbox, &leave_options); res = leave_voicemail(chan, mailbox, &leave_options);
if (!res) if (!res)
res = 't'; res = 't';
@@ -7870,10 +7868,9 @@ static int init_mailstream(struct vm_state *vms)
stream = vms->mailstream; stream = vms->mailstream;
/* return 0; */ /* return 0; */
} }
ast_mutex_lock(&curhstusr_lock);
curusr = cpystr (vms->imapuser); curusr = cpystr (vms->imapuser);
curhst = cpystr (mylocalhost ()); curhst = cpystr (mylocalhost ());
/* debug = T; user wants protocol telemetry? */ /* debug = T; user wants protocol telemetry? */
debug = NIL; /* NO protocol telemetry? */ debug = NIL; /* NO protocol telemetry? */
if (strlen(authuser) > 0) { if (strlen(authuser) > 0) {
@@ -7883,6 +7880,7 @@ static int init_mailstream(struct vm_state *vms)
} }
if(option_debug > 2) if(option_debug > 2)
ast_log (LOG_DEBUG,"Before mail_open, curusr: %s, mbox:%s\n",curusr,mbox); ast_log (LOG_DEBUG,"Before mail_open, curusr: %s, mbox:%s\n",curusr,mbox);
ast_mutex_unlock(&curhstusr_lock);
vms->mailstream = mail_open (stream, mbox, debug ? OP_DEBUG : NIL); vms->mailstream = mail_open (stream, mbox, debug ? OP_DEBUG : NIL);
if (vms->mailstream == NIL) { if (vms->mailstream == NIL) {
return -1; return -1;
@@ -8207,6 +8205,7 @@ void mm_login(NETMBX * mb, char *user, char *pwd, long trial)
char tmp[MAILTMPLEN]; char tmp[MAILTMPLEN];
if(option_debug > 3) if(option_debug > 3)
ast_log(LOG_DEBUG, "Entering callback mm_login\n"); ast_log(LOG_DEBUG, "Entering callback mm_login\n");
ast_mutex_lock(&curhstusr_lock);
if (curhst) if (curhst)
fs_give ((void **) &curhst); fs_give ((void **) &curhst);
curhst = (char *) fs_get (1 + strlen (mb->host)); curhst = (char *) fs_get (1 + strlen (mb->host));
@@ -8220,7 +8219,7 @@ void mm_login(NETMBX * mb, char *user, char *pwd, long trial)
} }
if (curusr) if (curusr)
fs_give ((void **) &curusr); fs_give ((void **) &curusr);
ast_mutex_unlock(&curhstusr_lock);
/* strcpy (pwd, getpass (tmp));*/ /* strcpy (pwd, getpass (tmp));*/
/* We should only do this when necessary */ /* We should only do this when necessary */
if (strlen(authpassword) > 0) { if (strlen(authpassword) > 0) {
@@ -8408,7 +8407,6 @@ static void vmstate_insert(struct vm_state *vms)
ast_log(LOG_DEBUG, "Duplicate mailbox %s, copying message info...\n",vms->username); ast_log(LOG_DEBUG, "Duplicate mailbox %s, copying message info...\n",vms->username);
vms->newmessages = altvms->newmessages; vms->newmessages = altvms->newmessages;
vms->oldmessages = altvms->oldmessages; vms->oldmessages = altvms->oldmessages;
/* JAR - START HERE - this copy may not be right */
if(option_debug > 2) if(option_debug > 2)
ast_log(LOG_DEBUG, "check_msgArray before memcpy\n"); ast_log(LOG_DEBUG, "check_msgArray before memcpy\n");
check_msgArray(vms); check_msgArray(vms);