svn commit: lorikeet r548 - in trunk/mod_ntlm_winbind: .

jerry at samba.org jerry at samba.org
Wed May 10 20:05:58 GMT 2006


Author: jerry
Date: 2006-05-10 20:05:58 +0000 (Wed, 10 May 2006)
New Revision: 548

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=lorikeet&rev=548

Log:
patch from Ronan Waide <waider at waider.ie> for Apache 2.2 compatibility
Modified:
   trunk/mod_ntlm_winbind/mod_ntlm_winbind.c


Changeset:
Modified: trunk/mod_ntlm_winbind/mod_ntlm_winbind.c
===================================================================
--- trunk/mod_ntlm_winbind/mod_ntlm_winbind.c	2006-05-08 23:33:26 UTC (rev 547)
+++ trunk/mod_ntlm_winbind/mod_ntlm_winbind.c	2006-05-10 20:05:58 UTC (rev 548)
@@ -487,7 +487,7 @@
         apr_pool_t *pool;
 #ifdef APACHE2
         char **argv_out;
-        apr_pool_sub_make( &pool, NULL, NULL ); /* xxx return code */
+        apr_pool_create_ex( &pool, NULL, NULL, NULL ); /* xxx return code */
 #else
         pool = ap_make_sub_pool( NULL );
 #endif
@@ -555,7 +555,7 @@
         RDEBUG( "creating auth user" );
 
 #ifdef APACHE2
-        apr_pool_sub_make( &pool, r->connection->pool, NULL );
+        apr_pool_create_ex( &pool, r->connection->pool, NULL, NULL );
 #else
         pool = ap_make_sub_pool(r->connection->pool);
 #endif
@@ -699,7 +699,7 @@
         RDEBUG( "creating auth user" );
 
 #ifdef APACHE2
-        apr_pool_sub_make( &pool, r->connection->pool, NULL );
+        apr_pool_create_ex( &pool, r->connection->pool, NULL, NULL );
 #else
         pool = ap_make_sub_pool(r->connection->pool);
 #endif



More information about the samba-cvs mailing list