Changeset 5024 for trunk/gsdl/src/recpt/documentaction.cpp

Timestamp:

2003-07-25T04:57:48+12:00 (21 years ago)

Author:

sjboddie

Message:

Changed the authentication directives to more easier to use ones.
authenticate option replaces auth_collection and takes the same options. The
options public_documents and private_documents replace the allowallexcept
and denyallexcept ACLs. The allow_acls has been removed. The auth_group remains
the same.

File:

• trunk/gsdl/src/recpt/documentaction.cpp (modified) (4 diffs)

trunk/gsdl/src/recpt/documentaction.cpp

@@ -178 +178 @@
            ColInfoResponse_t *cinfo = recpt->get_collectinfo_ptr (collectproto, args["c"], logout);
            
-           if(cinfo->auth_collection == "document" && cinfo->allow_acls) 
+           if(cinfo->authenticate == "document") 
           {
              // both are either commented out or uncomment and are empty
-             if (cinfo->allowallexcept.empty() && cinfo->denyallexcept.empty())
+             if (cinfo->public_documents.empty() && cinfo->private_documents.empty())
             {
                //deny everything
@@ -188 +188 @@
             }
 
-             // both allowallexcept and denyallexcept are turned on !
-             else if (!cinfo->allowallexcept.empty() && !cinfo->denyallexcept.empty())
+             // both public_documents and private_documents are turned on !
+             else if (!cinfo->public_documents.empty() && !cinfo->private_documents.empty())
             {
                //deny everything
@@ -196 +196 @@
             }
              
-             // only allowallexcept is set, so ask to authenticate for that article/doc
-             else if (cinfo->allowallexcept.find(docTop) != cinfo->allowallexcept.end() )
+             // only public_documents is set, so ask to authenticate for that article/doc
+             else if (cinfo->public_documents.find(docTop) != cinfo->public_documents.end() )
             {
                
@@ -204 +204 @@
             }
              
-             // only denyallexcept is set, so ask to authenticate for that article/doc
-             else if (cinfo->denyallexcept.find(docTop) == cinfo->denyallexcept.end() )
+             // only private_documents is set, so ask to authenticate for that article/doc
+             else if (cinfo->private_documents.find(docTop) == cinfo->private_documents.end() )
             {
                args["uan"] = "1";