From: Andrea Zagli <a.zagli@comune.scandicci.fi.it>
Date: Wed, 19 Dec 2012 10:39:20 +0000 (+0100)
Subject: Autoz::is_allowed when exclude_null accepts resource NULL.
X-Git-Tag: v0.0.2^0
X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=38f66bfd10af6912cc10851be1ab69f435ad957a;p=zakautho%2Flibzakautho

Autoz::is_allowed when exclude_null accepts resource NULL.
---

diff --git a/src/autoz.c b/src/autoz.c
index 14befbf..406a716 100644
--- a/src/autoz.c
+++ b/src/autoz.c
@@ -1095,7 +1095,6 @@ autoz_is_allowed (Autoz *autoz, AutozIRole *irole, AutozIResource *iresource, gb
 
 	g_return_val_if_fail (IS_AUTOZ (autoz), FALSE);
 	g_return_val_if_fail (AUTOZ_IS_IROLE (irole), FALSE);
-	g_return_val_if_fail (AUTOZ_IS_IRESOURCE (iresource), FALSE);
 
 	_autoz_check_updated (autoz);
 
@@ -1110,13 +1109,6 @@ autoz_is_allowed (Autoz *autoz, AutozIRole *irole, AutozIResource *iresource, gb
 			return ret;
 		}
 
-	resource = _autoz_get_resource_from_id (autoz, _autoz_remove_resource_name_prefix_from_id (autoz, autoz_iresource_get_resource_id (iresource)));
-	if (resource == NULL)
-		{
-			g_warning ("Resource «%s» not found.", autoz_iresource_get_resource_id (iresource));
-			return ret;
-		}
-
 	if (!exclude_null)
 		{
 			/* first trying for a rule for every resource */
@@ -1136,6 +1128,15 @@ autoz_is_allowed (Autoz *autoz, AutozIRole *irole, AutozIResource *iresource, gb
 				}
 		}
 
+	g_return_val_if_fail (AUTOZ_IS_IRESOURCE (iresource), FALSE);
+
+	resource = _autoz_get_resource_from_id (autoz, _autoz_remove_resource_name_prefix_from_id (autoz, autoz_iresource_get_resource_id (iresource)));
+	if (resource == NULL)
+		{
+			g_warning ("Resource «%s» not found.", autoz_iresource_get_resource_id (iresource));
+			return ret;
+		}
+
 	/* and after for specific resource */
 	str_id = g_strconcat (autoz_irole_get_role_id (irole),
 	                      "|",