--- mod_auth_plain.c.orig	Sat Jan 19 02:32:34 2008
+++ mod_authn_plain.c	Tue Mar 18 02:42:46 2008
@@ -35,26 +35,26 @@
 
 typedef struct {
     char *pwfile;
-} auth_plain_config_rec;
+} authn_plain_config_rec;
 
-static void *create_auth_plain_dir_config(apr_pool_t *p, char *d)
+static void *create_authn_plain_dir_config(apr_pool_t *p, char *d)
 {
-    auth_plain_config_rec *conf = apr_palloc(p, sizeof(*conf));
+    authn_plain_config_rec *conf = apr_palloc(p, sizeof(*conf));
 
     conf->pwfile = NULL;     /* just to illustrate the default really */
     return conf;
 }
 
-static const char *set_auth_plain_slot(cmd_parms *cmd, void *offset,
+static const char *set_authn_plain_slot(cmd_parms *cmd, void *offset,
                                        const char *f, const char *t)
 {
+    const char *path;
+
     if (t && strcmp(t, "standard")) {
         return apr_pstrcat(cmd->pool, "Invalid auth file type: ", t, NULL);
     }
      
-    // Prepend current directory to relative arg. 
-    const char *path;
-
+    /* Prepend current directory to relative arg. */ 
     if (ap_os_is_path_absolute(cmd->pool, f)) {
         path = f;
     } else {
@@ -64,21 +64,21 @@
     return ap_set_file_slot(cmd, offset, path);
 }
 
-static const command_rec auth_plain_cmds[] =
+static const command_rec authn_plain_cmds[] =
 {
-    AP_INIT_TAKE12("AuthUserFile", set_auth_plain_slot,
-                   (void *)APR_OFFSETOF(auth_plain_config_rec, pwfile),
+    AP_INIT_TAKE12("AuthnPlainUserFile", set_authn_plain_slot,
+                   (void *)APR_OFFSETOF(authn_plain_config_rec, pwfile),
                    OR_AUTHCFG, "text file containing user IDs and passwords"),
     {NULL}
 };
 
-module AP_MODULE_DECLARE_DATA auth_plain_module;
+module AP_MODULE_DECLARE_DATA authn_plain_module;
 
 static authn_status check_password(request_rec *r, const char *user,
                                    const char *password)
 {
-    auth_plain_config_rec *conf = ap_get_module_config(r->per_dir_config,
-                                                       &auth_plain_module);
+    authn_plain_config_rec *conf = ap_get_module_config(r->per_dir_config,
+                                                       &authn_plain_module);
     ap_configfile_t *f;
     char l[MAX_STRING_LEN];
     apr_status_t status;
@@ -115,16 +115,16 @@
     }
 
     if (strcmp(password, file_password)==0)
-	    return AUTH_GRANTED;
+        return AUTH_GRANTED;
     else 
-	    return AUTH_DENIED;
+        return AUTH_DENIED;
 }
 
 static authn_status get_realm_hash(request_rec *r, const char *user,
                                    const char *realm, char **rethash)
 {
-    auth_plain_config_rec *conf = ap_get_module_config(r->per_dir_config,
-                                                       &auth_plain_module);
+    authn_plain_config_rec *conf = ap_get_module_config(r->per_dir_config,
+                                                       &authn_plain_module);
     ap_configfile_t *f;
     char l[MAX_STRING_LEN];
     apr_status_t status;
@@ -167,7 +167,7 @@
     return AUTH_USER_FOUND;
 }
 
-static const authn_provider auth_plain_provider =
+static const authn_provider authn_plain_provider =
 {
     &check_password,
     &get_realm_hash,
@@ -176,16 +176,16 @@
 static void register_hooks(apr_pool_t *p)
 {
     ap_register_provider(p, AUTHN_PROVIDER_GROUP, "file_plain", "0",
-                         &auth_plain_provider);
+                         &authn_plain_provider);
 }
 
-module AP_MODULE_DECLARE_DATA auth_plain_module =
+module AP_MODULE_DECLARE_DATA authn_plain_module =
 {
     STANDARD20_MODULE_STUFF,
-    create_auth_plain_dir_config,    /* dir config creater */
+    create_authn_plain_dir_config,   /* dir config creater */
     NULL,                            /* dir merger --- default is to override */
     NULL,                            /* server config */
     NULL,                            /* merge server config */
-    auth_plain_cmds,                 /* command apr_table_t */
+    authn_plain_cmds,                /* command apr_table_t */
     register_hooks                   /* register hooks */
 };