sniper Sat Jan 18 02:01:12 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/imap config.m4 php_imap.c
Log:
MFH: Fix bug: #21687, imap extension does not include gss authentication mechanism
Index: php4/ext/imap/config.m4
diff -u php4/ext/imap/config.m4:1.49 php4/ext/imap/config.m4:1.49.2.1
--- php4/ext/imap/config.m4:1.49 Fri Nov 1 11:45:59 2002
+++ php4/ext/imap/config.m4 Sat Jan 18 02:01:11 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.49 2002/11/01 16:45:59 sniper Exp $
+dnl $Id: config.m4,v 1.49.2.1 2003/01/18 07:01:11 sniper Exp $
dnl
AC_DEFUN(IMAP_INC_CHK,[if test -r "$i$1/c-client.h"; then
@@ -21,10 +21,10 @@
done
])
-dnl PHP_IMAP_TEST_BUILD(action-if-ok, action-if-not-ok [, extra-libs])
+dnl PHP_IMAP_TEST_BUILD(function, action-if-ok, action-if-not-ok [, extra-libs])
AC_DEFUN(PHP_IMAP_TEST_BUILD, [
old_LIBS=$LIBS
- LIBS="$3 $LIBS"
+ LIBS="$4 $LIBS"
AC_TRY_RUN([
void mm_log(void){}
void mm_dlog(void){}
@@ -41,17 +41,17 @@
void mm_exists(void){}
void mm_searched(void){}
void mm_expunged(void){}
- char mail_open();
+ char $1();
int main() {
- mail_open(0,"",0);
+ $1();
return 0;
}
], [
LIBS=$old_LIBS
- $1
+ $2
],[
LIBS=$old_LIBS
- $2
+ $3
])
])
@@ -127,7 +127,7 @@
TST_LIBS="$TST_LIBS -L$PHP_KERBEROS/lib -lgssapi_krb5 -lkrb5 -lk5crypto
-lcom_err"
fi
- PHP_IMAP_TEST_BUILD([
+ PHP_IMAP_TEST_BUILD(ssl_onceonlyinit, [
AC_MSG_RESULT(no)
], [
AC_MSG_RESULT(yes)
@@ -204,8 +204,14 @@
dnl Test the build in the end
TST_LIBS="$DLIBS $IMAP_SHARED_LIBADD"
+
+ dnl Check if auth_gss exists
+ PHP_IMAP_TEST_BUILD(auth_gssapi_valid, [
+ AC_DEFINE(HAVE_IMAP_AUTH_GSS, 1, [ ])
+ ], [], $TST_LIBS)
+
AC_MSG_CHECKING(whether IMAP works)
- PHP_IMAP_TEST_BUILD([
+ PHP_IMAP_TEST_BUILD(mail_open, [
AC_MSG_RESULT(yes)
], [
AC_MSG_RESULT(no)
Index: php4/ext/imap/php_imap.c
diff -u php4/ext/imap/php_imap.c:1.142.2.5 php4/ext/imap/php_imap.c:1.142.2.6
--- php4/ext/imap/php_imap.c:1.142.2.5 Tue Dec 31 11:34:43 2002
+++ php4/ext/imap/php_imap.c Sat Jan 18 02:01:11 2003
@@ -26,7 +26,7 @@
| PHP 4.0 updates: Zeev Suraski <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_imap.c,v 1.142.2.5 2002/12/31 16:34:43 sebastian Exp $ */
+/* $Id: php_imap.c,v 1.142.2.6 2003/01/18 07:01:11 sniper Exp $ */
#define IMAP41
@@ -420,7 +420,11 @@
#ifndef PHP_WIN32
auth_link(&auth_log); /* link in the log authenticator */
auth_link(&auth_md5); /* link in the cram-md5 authenticator */
-#ifdef HAVE_IMAP_SSL
+#ifdef HAVE_IMAP_AUTH_GSS
+ auth_link(&auth_gss); /* link in the gss authenticator */
+#endif
+
+#ifdef HAVE_IMAP_SSL
ssl_onceonlyinit ();
#endif
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
