Adjusted patch to actually apply *sigh*

diff --git a/debian/patches/006-options.dpatch b/debian/patches/006-options.dpatch
index dd6d787..0da73f9 100644 (file)
--- a/debian/patches/006-options.dpatch
+++ b/debian/patches/006-options.dpatch
@@ -6,9 +6,9 @@
 
 @DPATCH@
 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 16:59:28.000000000 +0200
-+++ mod-auth-mysql/mod_auth_mysql.c    2008-05-14 17:07:43.000000000 +0200
-@@ -644,6 +644,24 @@
+--- mod-auth-mysql~/mod_auth_mysql.c   2008-05-14 19:35:05.000000000 +0200
++++ mod-auth-mysql/mod_auth_mysql.c    2008-05-14 20:05:44.000000000 +0200
+@@ -645,6 +645,24 @@
        return NULL;
  }
  
@@ -33,36 +33,36 @@ diff -urNad mod-auth-mysql~/mod_auth_mysql.c mod-auth-mysql/mod_auth_mysql.c
  /* The command list.  What it's called, when it's legal to use it, and
   * what to do when we find it.  Pretty cool, IMHO.
   */
-@@ -787,20 +805,20 @@
-                 (void*)APR_XtOffsetOf(mysql_auth_config_rec, group_user_field),
+@@ -788,20 +806,20 @@
+                 (void*)APR_OFFSETOF(mysql_auth_config_rec, group_user_field),
                  OR_AUTHCFG,   "The name of the user-name field in the MySQL group table; defaults to the same as the username field for the password table." ),
  
 -   AP_INIT_FLAG( "Auth_MySQL_Empty_Passwords",                ap_set_flag_slot,
--               (void*)APR_XtOffsetOf(mysql_auth_config_rec, allow_empty_passwords),
+-               (void*)APR_OFFSETOF(mysql_auth_config_rec, allow_empty_passwords),
 +   AP_INIT_FLAG( "Auth_MySQL_Empty_Passwords",                set_empty_passwords,
 +               NULL,
                 OR_AUTHCFG,    "Enable (on) or disable (off) empty password strings; in which case any user password is accepted." ),
  
 -   AP_INIT_FLAG( "AuthMySQL_Empty_Passwords",         ap_set_flag_slot,
--               (void*)APR_XtOffsetOf(mysql_auth_config_rec, allow_empty_passwords),
+-               (void*)APR_OFFSETOF(mysql_auth_config_rec, allow_empty_passwords),
 +   AP_INIT_FLAG( "AuthMySQL_Empty_Passwords",         set_empty_passwords,
 +               NULL,
                 OR_AUTHCFG,    "Enable (on) or disable (off) empty password strings; in which case any user password is accepted." ),
  
 -   AP_INIT_FLAG( "Auth_MySQL_Authoritative",          ap_set_flag_slot,
--               (void*)APR_XtOffsetOf(mysql_auth_config_rec, authoritative),
+-               (void*)APR_OFFSETOF(mysql_auth_config_rec, authoritative),
 +   AP_INIT_FLAG( "Auth_MySQL_Authoritative",          set_authoritative,
 +               NULL,
                 OR_AUTHCFG,    "When 'on' the MySQL database is taken to be authoritative and access control is not passed along to other db or access modules." ),
  
 -   AP_INIT_FLAG( "AuthMySQL_Authoritative",           ap_set_flag_slot,
--               (void*)APR_XtOffsetOf(mysql_auth_config_rec, authoritative),
+-               (void*)APR_OFFSETOF(mysql_auth_config_rec, authoritative),
 +   AP_INIT_FLAG( "AuthMySQL_Authoritative",           set_authoritative,
 +               NULL,
                 OR_AUTHCFG,    "When 'on' the MySQL database is taken to be authoritative and access control is not passed along to other db or access modules." ),
  
     AP_INIT_FLAG( "AuthMySQL_AllowOverride",           set_auth_mysql_override,
-@@ -983,20 +1001,20 @@
+@@ -984,20 +1002,20 @@
          (void *) XtOffsetOf(mysql_auth_config_rec, group_user_field),
          OR_AUTHCFG,   TAKE1,  "The name of the user-name field in the MySQL group table; defaults to the same as the username field for the password table." },