<filename> element within Auth-Simple filter is now called <userRegister>.

diff --git a/doc/config b/doc/config
index 25cca27..8c924b4 100644 (file)
--- a/doc/config
+++ b/doc/config
@@ -1,4 +1,4 @@
-$Id: config,v 1.2 2006-01-17 17:57:43 mike Exp $
+$Id: config,v 1.3 2006-01-18 10:29:08 mike Exp $
 
 The Guerilla Guide to Configuring YP2
 =====================================
@@ -96,7 +96,7 @@ are as follows:
 </filter>
 
 <filter type="auth_simple">
-  <filename>../etc/example.simple-auth</filename>
+  <userRegister>../etc/example.simple-auth</userRegister>
 </filter>
 
 <filter type="backend_test"/>

diff --git a/etc/config-zurg.xml b/etc/config-zurg.xml
index e0a6eca..db9a2c0 100644 (file)
--- a/etc/config-zurg.xml
+++ b/etc/config-zurg.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- $Id: config-zurg.xml,v 1.3 2006-01-17 10:10:36 robstyles Exp $ -->
+<!-- $Id: config-zurg.xml,v 1.4 2006-01-18 10:29:23 mike Exp $ -->
 <yp2 xmlns="http://indexdata.dk/yp2/config/1">
   <start route="start"/>
   <filters>
@@ -14,7 +14,7 @@
         <message>F</message>
       </filter>
       <filter type="auth_simple">
-       <filename>../etc/example.simple-auth</filename>
+       <userRegister>../etc/example.simple-auth</userRegister>
       </filter>
       <filter type="virt_db">
         <virtual>

diff --git a/etc/config2.xml b/etc/config2.xml
index a4fd7bd..3ad9aa1 100644 (file)
--- a/etc/config2.xml
+++ b/etc/config2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<!-- $Id: config2.xml,v 1.5 2006-01-17 13:31:09 adam Exp $ -->
+<!-- $Id: config2.xml,v 1.6 2006-01-18 10:30:05 mike Exp $ -->
 <yp2 xmlns="http://indexdata.dk/yp2/config/1">
   <start route="start"/>
   <filters>
@@ -15,7 +15,7 @@
         <message>F</message>
       </filter>
       <filter type="auth_simple">
-        <filename>../etc/example.simple-auth</filename>
+        <userRegister>../etc/example.simple-auth</userRegister>
       </filter>
       <filter type="virt_db">
         <virtual>

diff --git a/src/filter_auth_simple.cpp b/src/filter_auth_simple.cpp
index 40b3a21..a6b225d 100644 (file)
--- a/src/filter_auth_simple.cpp
+++ b/src/filter_auth_simple.cpp
@@ -1,4 +1,4 @@
-/* $Id: filter_auth_simple.cpp,v 1.7 2006-01-17 17:58:46 mike Exp $
+/* $Id: filter_auth_simple.cpp,v 1.8 2006-01-18 10:30:32 mike Exp $
    Copyright (c) 2005, Index Data.
 
 %LICENSE%
@@ -53,15 +53,15 @@ yf::AuthSimple::~AuthSimple()
 // Read XML config.. Put config info in m_p.
 void yp2::filter::AuthSimple::configure(const xmlNode * ptr)
 {
-    std::string filename;
-    bool got_filename = false;
+    std::string userRegisterName;
+    bool got_userRegisterName = false;
 
     for (ptr = ptr->children; ptr != 0; ptr = ptr->next) {
         if (ptr->type != XML_ELEMENT_NODE)
             continue;
-        if (!strcmp((const char *) ptr->name, "filename")) {
-            filename = yp2::xml::get_text(ptr);
-            got_filename = true;
+        if (!strcmp((const char *) ptr->name, "userRegister")) {
+            userRegisterName = yp2::xml::get_text(ptr);
+            got_userRegisterName = true;
         } else {
             throw yp2::filter::FilterException("Bad element in auth_simple: <"
                                                + std::string((const char *)
@@ -69,15 +69,15 @@ void yp2::filter::AuthSimple::configure(const xmlNode * ptr)
         }
     }
 
-    if (!got_filename)
+    if (!got_userRegisterName)
         throw yp2::filter::FilterException("auth_simple: no user-register "
                                            "filename specified");
 
-    FILE *fp = fopen(filename.c_str(), "r");
+    FILE *fp = fopen(userRegisterName.c_str(), "r");
     if (fp == 0)
         throw yp2::filter::FilterException("can't open auth_simple " 
-                                           "user-register '" + filename +
-                                           "': " + strerror(errno));
+                                           "user-register '" + userRegisterName
+                                           + "': " + strerror(errno));
 
     char buf[1000];
     while (fgets(buf, sizeof buf, fp)) {
@@ -87,14 +87,14 @@ void yp2::filter::AuthSimple::configure(const xmlNode * ptr)
         char *passwdp = strchr(buf, ':');
         if (passwdp == 0)
             throw yp2::filter::FilterException("auth_simple user-register '" +
-                                               filename + "': " +
+                                               userRegisterName + "': " +
                                                "no password on line: '"
                                                + buf + "'");
         *passwdp++ = 0;
         char *databasesp = strchr(passwdp, ':');
         if (databasesp == 0)
             throw yp2::filter::FilterException("auth_simple user-register '" +
-                                               filename + "': " +
+                                               userRegisterName + "': " +
                                                "no databases on line: '" +
                                                buf + ":" + passwdp + "'");
         *databasesp++ = 0;