Adjusted more code

diff --git a/debian/patches/007-unify_namespace.dpatch b/debian/patches/007-unify_namespace.dpatch
index 240ec1a..9752e4c 100644 (file)
--- a/debian/patches/007-unify_namespace.dpatch
+++ b/debian/patches/007-unify_namespace.dpatch
@@ -6,8 +6,8 @@
 
 @DPATCH@
 diff -urNad mod-auth-mysql~/DIRECTIVES mod-auth-mysql/DIRECTIVES
---- mod-auth-mysql~/DIRECTIVES 2008-05-14 20:24:12.000000000 +0200
-+++ mod-auth-mysql/DIRECTIVES  2008-05-14 20:46:56.000000000 +0200
+--- mod-auth-mysql~/DIRECTIVES 2008-05-14 21:03:35.000000000 +0200
++++ mod-auth-mysql/DIRECTIVES  2008-05-14 21:03:35.000000000 +0200
 @@ -1,23 +1,27 @@
  All the directives understood by this version of mod-auth-mysql are listed
 -below.  The huge number of synonym directives is due to the merging of two
@@ -229,8 +229,8 @@ diff -urNad mod-auth-mysql~/DIRECTIVES mod-auth-mysql/DIRECTIVES
 -AuthMySQL <on/off>
 -      Synonym for Auth_MYSQL.
 diff -urNad mod-auth-mysql~/USAGE mod-auth-mysql/USAGE
---- mod-auth-mysql~/USAGE      2008-05-14 20:24:12.000000000 +0200
-+++ mod-auth-mysql/USAGE       2008-05-14 20:24:12.000000000 +0200
+--- mod-auth-mysql~/USAGE      2008-05-14 21:03:35.000000000 +0200
++++ mod-auth-mysql/USAGE       2008-05-14 21:03:35.000000000 +0200
 @@ -44,9 +44,9 @@
  
  or
@@ -260,8 +260,8 @@ diff -urNad mod-auth-mysql~/USAGE mod-auth-mysql/USAGE
  and the host, user, password, and database name cannot be changed.
  
 diff -urNad mod-auth-mysql~/mod_auth_mysql.c mod-auth-mysql/mod_auth_mysql.c
---- mod-auth-mysql~/mod_auth_mysql.c   2008-05-14 20:24:12.000000000 +0200
-+++ mod-auth-mysql/mod_auth_mysql.c    2008-05-14 20:52:32.000000000 +0200
+--- mod-auth-mysql~/mod_auth_mysql.c   2008-05-14 21:03:35.000000000 +0200
++++ mod-auth-mysql/mod_auth_mysql.c    2008-05-14 21:03:42.000000000 +0200
 @@ -674,14 +674,30 @@
                  NULL,
                  RSRC_CONF,    "host, user and password of the MySQL database" ),
@@ -349,7 +349,7 @@ diff -urNad mod-auth-mysql~/mod_auth_mysql.c mod-auth-mysql/mod_auth_mysql.c
                  OR_AUTHCFG,   "Additional WHERE clause for group password/user-name lookup" ),
  
 +   AP_INIT_TAKE1( "AuthMySQL_Password_Clause",                ap_set_string_slot,
-+                (void*)APR_XtOffsetOf(mysql_auth_config_rec, password_where_clause),
++                (void*)APR_OFFSETOF(mysql_auth_config_rec, password_where_clause),
 +                OR_AUTHCFG,   "Additional WHERE clause for group password/user-name lookup" ),
 +
     AP_INIT_TAKE1( "Auth_MySQL_Username_Field",                ap_set_string_slot,
@@ -386,7 +386,7 @@ diff -urNad mod-auth-mysql~/mod_auth_mysql.c mod-auth-mysql/mod_auth_mysql.c
                  OR_AUTHCFG,   "Additional WHERE clause for group password/user-name lookup" ),
  
 +   AP_INIT_TAKE1( "AuthMySQL_Where",          ap_set_string_slot,
-+                (void*)APR_XtOffsetOf(mysql_auth_config_rec, password_where_clause),
++                (void*)APR_OFFSETOF(mysql_auth_config_rec, password_where_clause),
 +                OR_AUTHCFG,   "Additional WHERE clause for group password/user-name lookup" ),
 +
    { NULL }