@DPATCH@
diff -urNad mod-auth-mysql~/DIRECTIVES mod-auth-mysql/DIRECTIVES
---- mod-auth-mysql~/DIRECTIVES 2008-05-14 21:03:35.000000000 +0200
-+++ mod-auth-mysql/DIRECTIVES 2008-05-14 21:03:35.000000000 +0200
+--- mod-auth-mysql~/DIRECTIVES 2008-05-14 21:05:45.000000000 +0200
++++ mod-auth-mysql/DIRECTIVES 2008-05-14 21:05:45.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
-AuthMySQL <on/off>
- Synonym for Auth_MYSQL.
diff -urNad mod-auth-mysql~/USAGE mod-auth-mysql/USAGE
---- mod-auth-mysql~/USAGE 2008-05-14 21:03:35.000000000 +0200
-+++ mod-auth-mysql/USAGE 2008-05-14 21:03:35.000000000 +0200
+--- mod-auth-mysql~/USAGE 2008-05-14 21:05:45.000000000 +0200
++++ mod-auth-mysql/USAGE 2008-05-14 21:05:45.000000000 +0200
@@ -44,9 +44,9 @@
or
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 21:03:35.000000000 +0200
-+++ mod-auth-mysql/mod_auth_mysql.c 2008-05-14 21:03:42.000000000 +0200
+--- mod-auth-mysql~/mod_auth_mysql.c 2008-05-14 21:05:45.000000000 +0200
++++ mod-auth-mysql/mod_auth_mysql.c 2008-05-14 21:16:30.000000000 +0200
@@ -674,14 +674,30 @@
NULL,
RSRC_CONF, "host, user and password of the MySQL database" ),
(void*)APR_OFFSETOF(mysql_auth_config_rec, db_host),
OR_AUTHCFG, "database host" ),
-@@ -735,7 +767,7 @@
+@@ -730,12 +762,20 @@
+ (void*)APR_OFFSETOF(mysql_auth_config_rec, db_user),
+ OR_AUTHCFG, "database user" ),
+
++ AP_INIT_TAKE1( "AuthMySQL_Username", ap_set_string_slot,
++ (void*)APR_OFFSETOF(mysql_auth_config_rec, db_user),
++ OR_AUTHCFG, "database user" ),
++
++ AP_INIT_TAKE1( "Auth_MySQL_User", ap_set_string_slot,
++ (void*)APR_OFFSETOF(mysql_auth_config_rec, db_user),
++ OR_AUTHCFG, "database user" ),
++
+ AP_INIT_TAKE1( "AuthMySQL_User", ap_set_string_slot,
+ (void*)APR_OFFSETOF(mysql_auth_config_rec, db_user),
OR_AUTHCFG, "database user" ),
AP_INIT_TAKE1( "Auth_MySQL_Password", ap_set_string_slot,
OR_AUTHCFG, "database password" ),
AP_INIT_TAKE1( "AuthMySQL_Password", ap_set_string_slot,
-@@ -782,6 +814,10 @@
+@@ -762,13 +802,17 @@
+ (void*)APR_OFFSETOF(mysql_auth_config_rec, group_table),
+ OR_AUTHCFG, "Name of the MySQL table containing the group-name/user-name combination; can be the same as the password-table." ),
+
++ AP_INIT_TAKE1( "AuthMySQL_Group_Table", ap_set_string_slot,
++ (void*)APR_OFFSETOF(mysql_auth_config_rec, group_table),
++ OR_AUTHCFG, "Name of the MySQL table containing the group-name/user-name combination; can be the same as the password-table." ),
++
+ AP_INIT_TAKE1( "Auth_MySQL_Group_Clause", ap_set_string_slot,
+ (void*)APR_OFFSETOF(mysql_auth_config_rec, group_where_clause),
+ OR_AUTHCFG, "Additional WHERE clause for group/user-name lookup" ),
+
+- AP_INIT_TAKE1( "AuthMySQL_Group_Table", ap_set_string_slot,
+- (void*)APR_OFFSETOF(mysql_auth_config_rec, group_table),
+- OR_AUTHCFG, "Name of the MySQL table containing the group-name/user-name combination; can be the same as the password-table." ),
++ AP_INIT_TAKE1( "AuthMySQL_Group_Clause", ap_set_string_slot,
++ (void*)APR_OFFSETOF(mysql_auth_config_rec, group_where_clause),
++ OR_AUTHCFG, "Additional WHERE clause for group/user-name lookup" ),
+
+ AP_INIT_TAKE1( "Auth_MySQL_Password_Field", ap_set_string_slot,
+ (void*)APR_OFFSETOF(mysql_auth_config_rec, password_field),
+@@ -782,6 +826,10 @@
(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,
(void*)APR_OFFSETOF(mysql_auth_config_rec, user_field),
OR_AUTHCFG, "The name of the user-name field in the MySQL password (and possibly group) table(s)." ),
-@@ -822,6 +858,10 @@
+@@ -822,6 +870,10 @@
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,
NULL,
RSRC_CONF, "Allow directory overrides of configuration" ),
-@@ -854,6 +894,14 @@
+@@ -854,6 +906,14 @@
NULL,
OR_AUTHCFG, "Use non-persistent MySQL links" ),
AP_INIT_FLAG( "AuthMySQL_Persistent", set_persistent,
NULL,
OR_AUTHCFG, "Use non-persistent MySQL links" ),
-@@ -870,6 +918,10 @@
+@@ -870,6 +930,10 @@
(void*)APR_OFFSETOF(mysql_auth_config_rec, password_where_clause),
OR_AUTHCFG, "Additional WHERE clause for group password/user-name lookup" ),
{ NULL }
};
#else
-@@ -878,14 +930,30 @@
+@@ -878,14 +942,30 @@
NULL,
RSRC_CONF, TAKE3, "host, user and password of the MySQL database" },
{ "AuthMySQL_DefaultPassword", set_auth_mysql_pwd,
NULL,
RSRC_CONF, TAKE1, "Default MySQL password" },
-@@ -894,23 +962,39 @@
+@@ -894,23 +974,39 @@
NULL,
RSRC_CONF, TAKE1, "Default MySQL server port" },
(void *) XtOffsetOf(mysql_auth_config_rec, db_host),
OR_AUTHCFG, TAKE1, "database host" },
-@@ -918,14 +1002,30 @@
+@@ -918,14 +1014,30 @@
(void *) XtOffsetOf(mysql_auth_config_rec, db_socket),
OR_AUTHCFG, TAKE1, "database host socket" },
{ "AuthMySQL_User", ap_set_string_slot,
(void *) XtOffsetOf(mysql_auth_config_rec, db_user),
OR_AUTHCFG, TAKE1, "database user" },
-@@ -958,14 +1058,18 @@
+@@ -958,14 +1070,18 @@
(void *) XtOffsetOf(mysql_auth_config_rec, group_table),
OR_AUTHCFG, TAKE1, "Name of the MySQL table containing the group-name/user-name combination; can be the same as the password-table." },
{ "Auth_MySQL_Password_Field", ap_set_string_slot,
(void *) XtOffsetOf(mysql_auth_config_rec, password_field),
OR_AUTHCFG, TAKE1, "The name of the field in the MySQL password table" },
-@@ -978,6 +1082,10 @@
+@@ -978,6 +1094,10 @@
(void *) XtOffsetOf(mysql_auth_config_rec, password_where_clause),
OR_AUTHCFG, TAKE1, "Additional WHERE clause for group password/user-name lookup" },
{ "Auth_MySQL_Username_Field", ap_set_string_slot,
(void *) XtOffsetOf(mysql_auth_config_rec, user_field),
OR_AUTHCFG, TAKE1, "The name of the user-name field in the MySQL password (and possibly group) table(s)." },
-@@ -1018,6 +1126,10 @@
+@@ -1018,6 +1138,10 @@
NULL,
OR_AUTHCFG, FLAG, "When 'on' the MySQL database is taken to be authoritative and access control is not passed along to other db or access modules." },
{ "AuthMySQL_AllowOverride", set_auth_mysql_override,
NULL,
RSRC_CONF, FLAG, "Allow directory overrides of configuration" },
-@@ -1050,6 +1162,14 @@
+@@ -1050,6 +1174,14 @@
NULL,
OR_AUTHCFG, FLAG, "Use non-persistent MySQL links" },
{ "AuthMySQL_Persistent", set_persistent,
NULL,
OR_AUTHCFG, FLAG, "Use non-persistent MySQL links" },
-@@ -1066,6 +1186,10 @@
+@@ -1066,6 +1198,10 @@
(void *) XtOffsetOf(mysql_auth_config_rec, password_where_clause),
OR_AUTHCFG, TAKE1, "Additional WHERE clause for group password/user-name lookup" },