Mandatory configuration parameters.

diff --git a/src/mod_authz_zakautho.c b/src/mod_authz_zakautho.c
index 4021e4be97c2db439b9eaf8aeef40a71cfde0bd1..3a439bfae7b0575461ec0a2466ace994470e6687 100644 (file)
--- a/src/mod_authz_zakautho.c
+++ b/src/mod_authz_zakautho.c
@@ -113,6 +113,12 @@ check_authorization (request_rec *r,
 
        zakautho_config *config;
 
 
        zakautho_config *config;
 

+       xmlDocPtr xdoc;
+       xmlNodePtr xnode;
+
+       GError *error;
+       GdaConnection *gdacon;
+

        if (!r->user)
                {
                        return AUTHZ_DENIED_NO_USER;
        if (!r->user)
                {
                        return AUTHZ_DENIED_NO_USER;


@@ -139,9 +145,6 @@ check_authorization (request_rec *r,
 
        if (config->xml_filename != NULL)
                {
 
        if (config->xml_filename != NULL)
                {

-                       xmlDocPtr xdoc;
-                       xmlNodePtr xnode;
-

                        xdoc = xmlParseFile (config->xml_filename);
                        if (xdoc != NULL)
                                {
                        xdoc = xmlParseFile (config->xml_filename);
                        if (xdoc != NULL)
                                {


@@ -162,9 +165,6 @@ check_authorization (request_rec *r,
                }
        else if (config->db_cnc_string != NULL)
                {
                }
        else if (config->db_cnc_string != NULL)
                {

-                       GError *error;
-                       GdaConnection *gdacon;
-

                        error = NULL;
                        gdacon = gda_connection_open_from_string (NULL, config->db_cnc_string, NULL, 0, &error);
                        if (gdacon == NULL || error != NULL)
                        error = NULL;
                        gdacon = gda_connection_open_from_string (NULL, config->db_cnc_string, NULL, 0, &error);
                        if (gdacon == NULL || error != NULL)


@@ -184,6 +184,13 @@ check_authorization (request_rec *r,
                                        return AUTHZ_DENIED;
                                }
                }
                                        return AUTHZ_DENIED;
                                }
                }

+       else
+               {
+                       ap_log_rerror (APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(02594)
+                                      "libzakautho configuration must be loaded from xml file or from database. "
+                                      "Please use AuthZakAuthoXmlFilename or AuthZakAuthoDbCncString in apache configuration.");
+                       return AUTHZ_DENIED;
+               }

 
        _user = g_strdup_printf (config->user_decoration != NULL ? config->user_decoration : "%s", r->user);
        role_user = zak_autho_get_role_from_id (autho, _user);
 
        _user = g_strdup_printf (config->user_decoration != NULL ? config->user_decoration : "%s", r->user);
        role_user = zak_autho_get_role_from_id (autho, _user);