sniper Sat Jan 18 02:00:49 2003 EDT Modified files: /php4/ext/imap config.m4 php_imap.c Log: 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.50 php4/ext/imap/config.m4:1.51 --- php4/ext/imap/config.m4:1.50 Sat Dec 28 10:33:25 2002 +++ php4/ext/imap/config.m4 Sat Jan 18 02:00:47 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.50 2002/12/28 15:33:25 sas Exp $ +dnl $Id: config.m4,v 1.51 2003/01/18 07:00:47 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.151 php4/ext/imap/php_imap.c:1.152 --- php4/ext/imap/php_imap.c:1.151 Fri Jan 17 11:07:39 2003 +++ php4/ext/imap/php_imap.c Sat Jan 18 02:00:47 2003 @@ -26,7 +26,7 @@ | PHP 4.0 updates: Zeev Suraski <[EMAIL PROTECTED]> | +----------------------------------------------------------------------+ */ -/* $Id: php_imap.c,v 1.151 2003/01/17 16:07:39 iliaa Exp $ */ +/* $Id: php_imap.c,v 1.152 2003/01/18 07:00:47 sniper Exp $ */ #define IMAP41 @@ -415,7 +415,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