diff options
Diffstat (limited to 'ext/imap/php_imap.c')
| -rw-r--r-- | ext/imap/php_imap.c | 27 |
1 files changed, 4 insertions, 23 deletions
diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c index d81de05344..015d136f35 100644 --- a/ext/imap/php_imap.c +++ b/ext/imap/php_imap.c @@ -177,12 +177,6 @@ static int le_pimap; static int le_pimapchain; #endif -#if HAVE_IMSP -/* This makes IMSP non thread safe */ -extern char imsp_user[80]; -extern char imsp_password[80]; -#endif - void mail_close_it(zend_rsrc_list_entry *rsrc) { @@ -4292,25 +4286,12 @@ void mm_login(NETMBX *mb, char *user, char *pwd, long trial) { IMAPLS_FETCH(); -#if HAVE_IMSP - if (*mb->service && strcmp(mb->service, "imsp") == 0) { - if (*mb->user) { - strlcpy(user, mb->user, MAILTMPLEN); - } else { - strlcpy(user, imsp_user, MAILTMPLEN); - } - strlcpy (pwd, imsp_password, MAILTMPLEN); + if (*mb->user) { + strlcpy (user,mb->user, MAILTMPLEN); } else { -#endif - if (*mb->user) { - strlcpy (user,mb->user, MAILTMPLEN); - } else { - strlcpy (user, IMAPG(imap_user), MAILTMPLEN); - } - strlcpy (pwd, IMAPG(imap_password), MAILTMPLEN); -#if HAVE_IMSP + strlcpy (user, IMAPG(imap_user), MAILTMPLEN); } -#endif + strlcpy (pwd, IMAPG(imap_password), MAILTMPLEN); } void mm_critical(MAILSTREAM *stream) |