From f31a96bf09b151f4023009b96fbb72a270fbb795 Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Thu, 10 Sep 2015 10:04:32 +0200 Subject: [PATCH] Changed name and namespace. --- .gitignore | 2 + Makefile.am | 4 +- config.h.in | 65 --- configure.ac | 4 +- libautoz.pc.in => libzakautho.pc.in | 2 +- src/Makefile.am | 12 +- src/autoz.c | 812 ++++++++++++++-------------- src/autoz.h | 82 +-- src/resource.c | 78 +-- src/resource.h | 32 +- src/resource_interface.c | 16 +- src/resource_interface.h | 28 +- src/role.c | 78 +-- src/role.h | 32 +- src/role_interface.c | 16 +- src/role_interface.h | 28 +- tests/Makefile.am | 2 +- tests/test.c | 68 +-- tests/test_from_xml.c | 38 +- tests/test_from_xml_to_db.c | 38 +- 20 files changed, 690 insertions(+), 747 deletions(-) delete mode 100644 config.h.in rename libautoz.pc.in => libzakautho.pc.in (88%) diff --git a/.gitignore b/.gitignore index 9d8b867..7dcae62 100644 --- a/.gitignore +++ b/.gitignore @@ -49,3 +49,5 @@ stamp-it intltool-* Rules-quot *.exe +config.h.in +compile \ No newline at end of file diff --git a/Makefile.am b/Makefile.am index e398d34..b4a0df0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,10 +4,10 @@ SUBDIRS = src tests docs ACLOCAL_AMFLAGS = -I m4 -EXTRA_DIST = libautoz.pc.in +EXTRA_DIST = libzakautho.pc.in pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libautoz.pc +pkgconfig_DATA = libzakautho.pc distclean-local: if test "$(srcdir)" = "."; then :; else \ diff --git a/config.h.in b/config.h.in deleted file mode 100644 index 8ee95d7..0000000 --- a/config.h.in +++ /dev/null @@ -1,65 +0,0 @@ -/* config.h.in. Generated from configure.ac by autoheader. */ - -/* Define to 1 if you have the header file. */ -#undef HAVE_DLFCN_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_INTTYPES_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_MEMORY_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDINT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDLIB_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRINGS_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRING_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_STAT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_TYPES_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_UNISTD_H - -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ -#undef LT_OBJDIR - -/* Name of package */ -#undef PACKAGE - -/* Define to the address where bug reports for this package should be sent. */ -#undef PACKAGE_BUGREPORT - -/* Define to the full name of this package. */ -#undef PACKAGE_NAME - -/* Define to the full name and version of this package. */ -#undef PACKAGE_STRING - -/* Define to the one symbol short name of this package. */ -#undef PACKAGE_TARNAME - -/* Define to the home page for this package. */ -#undef PACKAGE_URL - -/* Define to the version of this package. */ -#undef PACKAGE_VERSION - -/* Define to 1 if you have the ANSI C header files. */ -#undef STDC_HEADERS - -/* Version number of package */ -#undef VERSION - -/* Define to empty if `const' does not conform to ANSI C. */ -#undef const diff --git a/configure.ac b/configure.ac index 72507fb..fa68d5f 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.65) -AC_INIT([libautoz], [0.0.5], [azagli@libero.it]) +AC_INIT([libzakautho], [0.0.5], [azagli@libero.it]) AC_CONFIG_SRCDIR([src/autoz.c]) AC_CONFIG_HEADER([config.h]) @@ -48,7 +48,7 @@ AC_C_CONST # Checks for library functions. AC_CONFIG_FILES([ - libautoz.pc + libzakautho.pc Makefile src/Makefile tests/Makefile diff --git a/libautoz.pc.in b/libzakautho.pc.in similarity index 88% rename from libautoz.pc.in rename to libzakautho.pc.in index da9a23f..347a290 100644 --- a/libautoz.pc.in +++ b/libzakautho.pc.in @@ -7,5 +7,5 @@ Name: @PACKAGE_NAME@ Description: Class to manage authorizations. Version: @PACKAGE_VERSION@ Requires: glib-2.0 -Libs: -L${libdir} -lautoz +Libs: -L${libdir} -lzakautho Cflags: -I${includedir} diff --git a/src/Makefile.am b/src/Makefile.am index 07369d0..c5ab778 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,22 +1,22 @@ LIBS = $(AUTOZ_LIBS) AM_CPPFLAGS = $(AUTOZ_CFLAGS) \ - -DG_LOG_DOMAIN=\"Autoz\" + -DG_LOG_DOMAIN=\"ZakAutho\" -lib_LTLIBRARIES = libautoz.la +lib_LTLIBRARIES = libzakautho.la -libautoz_la_SOURCES = autoz.c \ +libzakautho_la_SOURCES = autoz.c \ resource_interface.c \ role_interface.c \ resource.c \ role.c -libautoz_la_LDFLAGS = -no-undefined +libzakautho_la_LDFLAGS = -no-undefined -libautoz_include_HEADERS = autoz.h \ +libzakautho_include_HEADERS = autoz.h \ resource_interface.h \ role_interface.h \ resource.h \ role.h -libautoz_includedir = $(includedir)/libautoz +libzakautho_includedir = $(includedir)/libzakautho diff --git a/src/autoz.c b/src/autoz.c index cd5d312..6e6a56d 100644 --- a/src/autoz.c +++ b/src/autoz.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2013 Andrea Zagli + * Copyright (C) 2010-2015 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -31,14 +31,14 @@ typedef struct _Role Role; struct _Role { - AutozIRole *irole; + ZakAuthoIRole *irole; GList *parents; /* struct Role */ }; typedef struct _Resource Resource; struct _Resource { - AutozIResource *iresource; + ZakAuthoIResource *iresource; GList *parents; /* struct Resource */ }; @@ -49,45 +49,45 @@ struct _Rule Resource *resource; }; -typedef enum AutozIsAllowed +typedef enum ZakAuthoIsAllowed { - AUTOZ_ALLOWED, - AUTOZ_DENIED, - AUTOZ_NOT_FOUND - } AutozIsAllowed; + ZAK_AUTHO_ALLOWED, + ZAK_AUTHO_DENIED, + ZAK_AUTHO_NOT_FOUND + } ZakAuthoIsAllowed; -static void autoz_class_init (AutozClass *class); -static void autoz_init (Autoz *autoz); +static void zak_autho_class_init (ZakAuthoClass *class); +static void zak_autho_init (ZakAutho *zak_autho); -static AutozIsAllowed _autoz_is_allowed_role (Autoz *autoz, Role *role, Resource *resource, gboolean exclude_null); -static AutozIsAllowed _autoz_is_allowed_resource (Autoz *autoz, Role *role, Resource *resource); +static ZakAuthoIsAllowed _zak_autho_is_allowed_role (ZakAutho *zak_autho, Role *role, Resource *resource, gboolean exclude_null); +static ZakAuthoIsAllowed _zak_autho_is_allowed_resource (ZakAutho *zak_autho, Role *role, Resource *resource); -static gboolean _autoz_delete_table_content (GdaConnection *gdacon, const gchar *table_prefix); -static guint _autoz_find_new_table_id (GdaConnection *gdacon, const gchar *table_name); -static guint _autoz_get_role_id_db (GdaConnection *gdacon, const gchar *table_name, const gchar *role_id); -static guint _autoz_get_resource_id_db (GdaConnection *gdacon, const gchar *table_name, const gchar *resource_id); +static gboolean _zak_autho_delete_table_content (GdaConnection *gdacon, const gchar *table_prefix); +static guint _zak_autho_find_new_table_id (GdaConnection *gdacon, const gchar *table_name); +static guint _zak_autho_get_role_id_db (GdaConnection *gdacon, const gchar *table_name, const gchar *role_id); +static guint _zak_autho_get_resource_id_db (GdaConnection *gdacon, const gchar *table_name, const gchar *resource_id); -static void _autoz_check_updated (Autoz *autoz); +static void _zak_autho_check_updated (ZakAutho *zak_autho); -static Role *_autoz_get_role_from_id (Autoz *autoz, const gchar *role_id); -static Resource *_autoz_get_resource_from_id (Autoz *autoz, const gchar *resource_id); +static Role *_zak_autho_get_role_from_id (ZakAutho *zak_autho, const gchar *role_id); +static Resource *_zak_autho_get_resource_from_id (ZakAutho *zak_autho, const gchar *resource_id); -static gchar *_autoz_remove_role_name_prefix_from_id (Autoz *autoz, const gchar *role_id); -static gchar *_autoz_remove_resource_name_prefix_from_id (Autoz *autoz, const gchar *resource_id); +static gchar *_zak_autho_remove_role_name_prefix_from_id (ZakAutho *zak_autho, const gchar *role_id); +static gchar *_zak_autho_remove_resource_name_prefix_from_id (ZakAutho *zak_autho, const gchar *resource_id); -static void autoz_set_property (GObject *object, +static void zak_autho_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec); -static void autoz_get_property (GObject *object, +static void zak_autho_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec); -#define AUTOZ_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_AUTOZ, AutozPrivate)) +#define ZAK_AUTHO_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), ZAK_TYPE_AUTHO, ZakAuthoPrivate)) -typedef struct _AutozPrivate AutozPrivate; -struct _AutozPrivate +typedef struct _ZakAuthoPrivate ZakAuthoPrivate; +struct _ZakAuthoPrivate { gchar *role_name_prefix; gchar *resource_name_prefix; @@ -104,23 +104,23 @@ struct _AutozPrivate gboolean on_loading; }; -G_DEFINE_TYPE (Autoz, autoz, G_TYPE_OBJECT) +G_DEFINE_TYPE (ZakAutho, zak_autho, G_TYPE_OBJECT) static void -autoz_class_init (AutozClass *class) +zak_autho_class_init (ZakAuthoClass *class) { GObjectClass *object_class = G_OBJECT_CLASS (class); - object_class->set_property = autoz_set_property; - object_class->get_property = autoz_get_property; + object_class->set_property = zak_autho_set_property; + object_class->get_property = zak_autho_get_property; - g_type_class_add_private (object_class, sizeof (AutozPrivate)); + g_type_class_add_private (object_class, sizeof (ZakAuthoPrivate)); } static void -autoz_init (Autoz *autoz) +zak_autho_init (ZakAutho *zak_autho) { - AutozPrivate *priv = AUTOZ_GET_PRIVATE (autoz); + ZakAuthoPrivate *priv = ZAK_AUTHO_GET_PRIVATE (zak_autho); priv->role_name_prefix = NULL; priv->resource_name_prefix = NULL; @@ -138,30 +138,30 @@ autoz_init (Autoz *autoz) } /** - * autoz_new: + * zak_autho_new: * - * Returns: the newly created #Autoz object. + * Returns: the newly created #ZakAutho object. */ -Autoz -*autoz_new () +ZakAutho +*zak_autho_new () { - return AUTOZ (g_object_new (autoz_get_type (), NULL)); + return ZAK_AUTHO (g_object_new (zak_autho_get_type (), NULL)); } /** - * autoz_set_role_name_prefix: - * @autoz: an #Autoz object. + * zak_autho_set_role_name_prefix: + * @zak_autho: an #ZakAutho object. * @prefix: * */ void -autoz_set_role_name_prefix (Autoz *autoz, const gchar *prefix) +zak_autho_set_role_name_prefix (ZakAutho *zak_autho, const gchar *prefix) { - AutozPrivate *priv; + ZakAuthoPrivate *priv; - g_return_if_fail (IS_AUTOZ (autoz)); + g_return_if_fail (IS_ZAK_AUTHO (zak_autho)); - priv = AUTOZ_GET_PRIVATE (autoz); + priv = ZAK_AUTHO_GET_PRIVATE (zak_autho); if (priv->role_name_prefix != NULL) { @@ -179,36 +179,36 @@ autoz_set_role_name_prefix (Autoz *autoz, const gchar *prefix) } /** - * autoz_get_role_name_prefix: - * @autoz: an #Autoz object. + * zak_autho_get_role_name_prefix: + * @zak_autho: an #ZakAutho object. * */ const gchar -*autoz_get_role_name_prefix (Autoz *autoz) +*zak_autho_get_role_name_prefix (ZakAutho *zak_autho) { - AutozPrivate *priv; + ZakAuthoPrivate *priv; - g_return_val_if_fail (IS_AUTOZ (autoz), NULL); + g_return_val_if_fail (IS_ZAK_AUTHO (zak_autho), NULL); - priv = AUTOZ_GET_PRIVATE (autoz); + priv = ZAK_AUTHO_GET_PRIVATE (zak_autho); return priv->role_name_prefix == NULL ? NULL : g_strdup (priv->role_name_prefix); } /** - * autoz_set_resource_name_prefix: - * @autoz: an #Autoz object. + * zak_autho_set_resource_name_prefix: + * @zak_autho: an #ZakAutho object. * @prefix: * */ void -autoz_set_resource_name_prefix (Autoz *autoz, const gchar *prefix) +zak_autho_set_resource_name_prefix (ZakAutho *zak_autho, const gchar *prefix) { - AutozPrivate *priv; + ZakAuthoPrivate *priv; - g_return_if_fail (IS_AUTOZ (autoz)); + g_return_if_fail (IS_ZAK_AUTHO (zak_autho)); - priv = AUTOZ_GET_PRIVATE (autoz); + priv = ZAK_AUTHO_GET_PRIVATE (zak_autho); if (priv->resource_name_prefix != NULL) { @@ -226,62 +226,62 @@ autoz_set_resource_name_prefix (Autoz *autoz, const gchar *prefix) } /** - * autoz_get_resource_name_prefix: - * @autoz: an #Autoz object. + * zak_autho_get_resource_name_prefix: + * @zak_autho: an #ZakAutho object. * */ const gchar -*autoz_get_resource_name_prefix (Autoz *autoz) +*zak_autho_get_resource_name_prefix (ZakAutho *zak_autho) { - AutozPrivate *priv; + ZakAuthoPrivate *priv; - g_return_val_if_fail (IS_AUTOZ (autoz), NULL); + g_return_val_if_fail (IS_ZAK_AUTHO (zak_autho), NULL); - priv = AUTOZ_GET_PRIVATE (autoz); + priv = ZAK_AUTHO_GET_PRIVATE (zak_autho); return priv->resource_name_prefix == NULL ? NULL : g_strdup (priv->resource_name_prefix); } /** - * autoz_add_role: - * @autoz: an #Autoz object. + * zak_autho_add_role: + * @zak_autho: an #ZakAutho object. * @irole: - * + * */ void -autoz_add_role (Autoz *autoz, AutozIRole *irole) +zak_autho_add_role (ZakAutho *zak_autho, ZakAuthoIRole *irole) { - autoz_add_role_with_parents (autoz, irole, NULL); + zak_autho_add_role_with_parents (zak_autho, irole, NULL); } /** - * autoz_add_role_with_parents: - * @autoz: an #Autoz object. + * zak_autho_add_role_with_parents: + * @zak_autho: an #ZakAutho object. * @irole: * @...: - * + * */ void -autoz_add_role_with_parents (Autoz *autoz, AutozIRole *irole, ...) +zak_autho_add_role_with_parents (ZakAutho *zak_autho, ZakAuthoIRole *irole, ...) { - AutozPrivate *priv; + ZakAuthoPrivate *priv; const gchar *role_id; const gchar *role_id_parent; - g_return_if_fail (IS_AUTOZ (autoz)); - g_return_if_fail (AUTOZ_IS_IROLE (irole)); + g_return_if_fail (IS_ZAK_AUTHO (zak_autho)); + g_return_if_fail (ZAK_AUTHO_IS_IROLE (irole)); - priv = AUTOZ_GET_PRIVATE (autoz); + priv = ZAK_AUTHO_GET_PRIVATE (zak_autho); - role_id = autoz_irole_get_role_id (irole); + role_id = zak_autho_irole_get_role_id (irole); if (g_hash_table_lookup (priv->roles, role_id) == NULL) { va_list args; Role *role; - AutozIRole *irole_parent; + ZakAuthoIRole *irole_parent; Role *role_parent; role = (Role *)g_malloc0 (sizeof (Role)); @@ -289,9 +289,9 @@ autoz_add_role_with_parents (Autoz *autoz, AutozIRole *irole, ...) role->parents = NULL; va_start (args, irole); - while ((irole_parent = va_arg (args, AutozIRole *)) != NULL) + while ((irole_parent = va_arg (args, ZakAuthoIRole *)) != NULL) { - role_id_parent = autoz_irole_get_role_id (irole_parent); + role_id_parent = zak_autho_irole_get_role_id (irole_parent); if (g_strcmp0 (role_id, role_id_parent) == 0) { g_warning ("The parent cannot be himself (%s).", role_id); @@ -305,7 +305,7 @@ autoz_add_role_with_parents (Autoz *autoz, AutozIRole *irole, ...) } else { - g_warning ("Role «%s» not found.", autoz_irole_get_role_id (irole_parent)); + g_warning ("Role «%s» not found.", zak_autho_irole_get_role_id (irole_parent)); } } } @@ -320,54 +320,54 @@ autoz_add_role_with_parents (Autoz *autoz, AutozIRole *irole, ...) } /** - * autoz_add_parent_to_role: - * @autoz: an #Autoz object. + * zak_autho_add_parent_to_role: + * @zak_autho: an #ZakAutho object. * @irole: * @irole_parent: - * + * */ void -autoz_add_parent_to_role (Autoz *autoz, AutozIRole *irole, AutozIRole *irole_parent) +zak_autho_add_parent_to_role (ZakAutho *zak_autho, ZakAuthoIRole *irole, ZakAuthoIRole *irole_parent) { - autoz_add_parents_to_role (autoz, irole, irole_parent, NULL); + zak_autho_add_parents_to_role (zak_autho, irole, irole_parent, NULL); } /** - * autoz_add_parents_to_role: - * @autoz: an #Autoz object. + * zak_autho_add_parents_to_role: + * @zak_autho: an #ZakAutho object. * @irole: * @...: - * + * */ void -autoz_add_parents_to_role (Autoz *autoz, AutozIRole *irole, ...) +zak_autho_add_parents_to_role (ZakAutho *zak_autho, ZakAuthoIRole *irole, ...) { - AutozPrivate *priv; + ZakAuthoPrivate *priv; Role *role; const gchar *role_id; const gchar *role_id_parent; - g_return_if_fail (IS_AUTOZ (autoz)); - g_return_if_fail (AUTOZ_IS_IROLE (irole)); + g_return_if_fail (IS_ZAK_AUTHO (zak_autho)); + g_return_if_fail (ZAK_AUTHO_IS_IROLE (irole)); - priv = AUTOZ_GET_PRIVATE (autoz); + priv = ZAK_AUTHO_GET_PRIVATE (zak_autho); - role_id = autoz_irole_get_role_id (irole); + role_id = zak_autho_irole_get_role_id (irole); role = g_hash_table_lookup (priv->roles, role_id); if (role != NULL) { va_list args; - AutozIRole *irole_parent; + ZakAuthoIRole *irole_parent; Role *role_parent; va_start (args, irole); - while ((irole_parent = va_arg (args, AutozIRole *)) != NULL) + while ((irole_parent = va_arg (args, ZakAuthoIRole *)) != NULL) { - role_id_parent = autoz_irole_get_role_id (irole_parent); + role_id_parent = zak_autho_irole_get_role_id (irole_parent); if (g_strcmp0 (role_id, role_id_parent) == 0) { g_warning ("The parent cannot be himself (%s).", role_id); @@ -394,17 +394,17 @@ autoz_add_parents_to_role (Autoz *autoz, AutozIRole *irole, ...) } /** - * autoz_role_is_child: - * @autoz: an #Autoz object. - * @irole: an #AutozIRole object. - * @irole_parent: an #AutozIRole object. - * + * zak_autho_role_is_child: + * @zak_autho: an #ZakAutho object. + * @irole: an #ZakAuthoIRole object. + * @irole_parent: an #ZakAuthoIRole object. + * * Returns: #TRUE if @irole is a @irole_parent's child; #FALSE otherwise. */ gboolean -autoz_role_is_child (Autoz *autoz, AutozIRole *irole, AutozIRole *irole_parent) +zak_autho_role_is_child (ZakAutho *zak_autho, ZakAuthoIRole *irole, ZakAuthoIRole *irole_parent) { - AutozPrivate *priv; + ZakAuthoPrivate *priv; gboolean ret; Role *role; @@ -412,22 +412,22 @@ autoz_role_is_child (Autoz *autoz, AutozIRole *irole, AutozIRole *irole_parent) const gchar *role_id_parent; GList *parent; - 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_IROLE (irole_parent), FALSE); + g_return_val_if_fail (IS_ZAK_AUTHO (zak_autho), FALSE); + g_return_val_if_fail (ZAK_AUTHO_IS_IROLE (irole), FALSE); + g_return_val_if_fail (ZAK_AUTHO_IS_IROLE (irole_parent), FALSE); - _autoz_check_updated (autoz); + _zak_autho_check_updated (zak_autho); ret = FALSE; - priv = AUTOZ_GET_PRIVATE (autoz); + priv = ZAK_AUTHO_GET_PRIVATE (zak_autho); - role = g_hash_table_lookup (priv->roles, autoz_irole_get_role_id (irole)); + role = g_hash_table_lookup (priv->roles, zak_autho_irole_get_role_id (irole)); if (role == NULL) { - g_warning ("Role «%s» not found.", autoz_irole_get_role_id (irole)); + g_warning ("Role «%s» not found.", zak_autho_irole_get_role_id (irole)); return ret; } - role_id_parent = autoz_irole_get_role_id (irole_parent); + role_id_parent = zak_autho_irole_get_role_id (irole_parent); role_parent = g_hash_table_lookup (priv->roles, role_id_parent); if (role_parent == NULL) { @@ -440,7 +440,7 @@ autoz_role_is_child (Autoz *autoz, AutozIRole *irole, AutozIRole *irole_parent) { /* TODO recursion */ role_parent = (Role *)parent->data; - if (g_strcmp0 (role_id_parent, autoz_irole_get_role_id (role_parent->irole)) == 0) + if (g_strcmp0 (role_id_parent, zak_autho_irole_get_role_id (role_parent->irole)) == 0) { ret = TRUE; break; @@ -453,18 +453,18 @@ autoz_role_is_child (Autoz *autoz, AutozIRole *irole, AutozIRole *irole_parent) } static Role -*_autoz_get_role_from_id (Autoz *autoz, const gchar *role_id) +*_zak_autho_get_role_from_id (ZakAutho *zak_autho, const gchar *role_id) { - AutozPrivate *priv; + ZakAuthoPrivate *priv; Role *role; gchar *_role_id; - g_return_val_if_fail (IS_AUTOZ (autoz), NULL); + g_return_val_if_fail (IS_ZAK_AUTHO (zak_autho), NULL); - _autoz_check_updated (autoz); + _zak_autho_check_updated (zak_autho); - priv = AUTOZ_GET_PRIVATE (autoz); + priv = ZAK_AUTHO_GET_PRIVATE (zak_autho); if (priv->role_name_prefix != NULL) { @@ -482,17 +482,17 @@ static Role } /** - * autoz_get_role_from_id: - * @autoz: an #Autoz object. + * zak_autho_get_role_from_id: + * @zak_autho: an #ZakAutho object. * @role_id: - * + * */ -AutozIRole -*autoz_get_role_from_id (Autoz *autoz, const gchar *role_id) +ZakAuthoIRole +*zak_autho_get_role_from_id (ZakAutho *zak_autho, const gchar *role_id) { Role *role; - role = _autoz_get_role_from_id (autoz, role_id); + role = _zak_autho_get_role_from_id (zak_autho, role_id); if (role == NULL) { return NULL; @@ -504,43 +504,43 @@ AutozIRole } /** - * autoz_add_resource: - * @autoz: an #Autoz object. + * zak_autho_add_resource: + * @zak_autho: an #ZakAutho object. * @iresource: - * + * */ void -autoz_add_resource (Autoz *autoz, AutozIResource *iresource) +zak_autho_add_resource (ZakAutho *zak_autho, ZakAuthoIResource *iresource) { - autoz_add_resource_with_parents (autoz, iresource, NULL); + zak_autho_add_resource_with_parents (zak_autho, iresource, NULL); } /** - * autoz_add_resource_with_parents: - * @autoz: an #Autoz object. + * zak_autho_add_resource_with_parents: + * @zak_autho: an #ZakAutho object. * @iresource: * @...: - * + * */ void -autoz_add_resource_with_parents (Autoz *autoz, AutozIResource *iresource, ...) +zak_autho_add_resource_with_parents (ZakAutho *zak_autho, ZakAuthoIResource *iresource, ...) { - AutozPrivate *priv = AUTOZ_GET_PRIVATE (autoz); + ZakAuthoPrivate *priv = ZAK_AUTHO_GET_PRIVATE (zak_autho); const gchar *resource_id; const gchar *resource_id_parent; - g_return_if_fail (IS_AUTOZ (autoz)); - g_return_if_fail (AUTOZ_IS_IRESOURCE (iresource)); + g_return_if_fail (IS_ZAK_AUTHO (zak_autho)); + g_return_if_fail (ZAK_AUTHO_IS_IRESOURCE (iresource)); - resource_id = autoz_iresource_get_resource_id (iresource); + resource_id = zak_autho_iresource_get_resource_id (iresource); if (g_hash_table_lookup (priv->resources, resource_id) == NULL) { va_list args; Resource *resource; - AutozIResource *iresource_parent; + ZakAuthoIResource *iresource_parent; Resource *resource_parent; resource = (Resource *)g_malloc0 (sizeof (Resource)); @@ -548,9 +548,9 @@ autoz_add_resource_with_parents (Autoz *autoz, AutozIResource *iresource, ...) resource->parents = NULL; va_start (args, iresource); - while ((iresource_parent = va_arg (args, AutozIResource *)) != NULL) + while ((iresource_parent = va_arg (args, ZakAuthoIResource *)) != NULL) { - resource_id_parent = autoz_iresource_get_resource_id (iresource_parent); + resource_id_parent = zak_autho_iresource_get_resource_id (iresource_parent); if (g_strcmp0 (resource_id, resource_id_parent) == 0) { g_warning ("The parent cannot be himself (%s).", resource_id); @@ -561,12 +561,12 @@ autoz_add_resource_with_parents (Autoz *autoz, AutozIResource *iresource, ...) if (resource_parent != NULL) { resource->parents = g_list_append (resource->parents, resource_parent); - } + } else { - g_warning ("Resource «%s» not found.", autoz_iresource_get_resource_id (iresource_parent)); + g_warning ("Resource «%s» not found.", zak_autho_iresource_get_resource_id (iresource_parent)); } - } + } } va_end (args); @@ -579,54 +579,54 @@ autoz_add_resource_with_parents (Autoz *autoz, AutozIResource *iresource, ...) } /** - * autoz_add_parent_to_resource: - * @autoz: an #Autoz object. - * @iresource: an #AutozIResource object. - * @iresource_parent: an #AutozIResource object. - * + * zak_autho_add_parent_to_resource: + * @zak_autho: an #ZakAutho object. + * @iresource: an #ZakAuthoIResource object. + * @iresource_parent: an #ZakAuthoIResource object. + * */ void -autoz_add_parent_to_resource (Autoz *autoz, AutozIResource *iresource, AutozIResource *iresource_parent) +zak_autho_add_parent_to_resource (ZakAutho *zak_autho, ZakAuthoIResource *iresource, ZakAuthoIResource *iresource_parent) { - autoz_add_parents_to_resource (autoz, iresource, iresource_parent, NULL); + zak_autho_add_parents_to_resource (zak_autho, iresource, iresource_parent, NULL); } /** - * autoz_add_parents_to_resource: - * @autoz: an #Autoz object. + * zak_autho_add_parents_to_resource: + * @zak_autho: an #ZakAutho object. * @iresource: * @...: - * + * */ void -autoz_add_parents_to_resource (Autoz *autoz, AutozIResource *iresource, ...) +zak_autho_add_parents_to_resource (ZakAutho *zak_autho, ZakAuthoIResource *iresource, ...) { - AutozPrivate *priv; + ZakAuthoPrivate *priv; Resource *resource; const gchar *resource_id; const gchar *resource_id_parent; - g_return_if_fail (IS_AUTOZ (autoz)); - g_return_if_fail (AUTOZ_IS_IRESOURCE (iresource)); + g_return_if_fail (IS_ZAK_AUTHO (zak_autho)); + g_return_if_fail (ZAK_AUTHO_IS_IRESOURCE (iresource)); - priv = AUTOZ_GET_PRIVATE (autoz); + priv = ZAK_AUTHO_GET_PRIVATE (zak_autho); - resource_id = autoz_iresource_get_resource_id (iresource); + resource_id = zak_autho_iresource_get_resource_id (iresource); resource = g_hash_table_lookup (priv->resources, resource_id); if (resource != NULL) { va_list args; - AutozIResource *iresource_parent; + ZakAuthoIResource *iresource_parent; Resource *resource_parent; va_start (args, iresource); - while ((iresource_parent = va_arg (args, AutozIResource *)) != NULL) + while ((iresource_parent = va_arg (args, ZakAuthoIResource *)) != NULL) { - resource_id_parent = autoz_iresource_get_resource_id (iresource_parent); + resource_id_parent = zak_autho_iresource_get_resource_id (iresource_parent); if (g_strcmp0 (resource_id, resource_id_parent) == 0) { g_warning ("The parent cannot be himself (%s).", resource_id); @@ -653,17 +653,17 @@ autoz_add_parents_to_resource (Autoz *autoz, AutozIResource *iresource, ...) } /** - * autoz_resource_is_child: - * @autoz: an #Autoz object. - * @iresource: an #AutozIResource object. - * @iresource_parent: an #AutozIResource object. - * + * zak_autho_resource_is_child: + * @zak_autho: an #ZakAutho object. + * @iresource: an #ZakAuthoIResource object. + * @iresource_parent: an #ZakAuthoIResource object. + * * Returns: #TRUE if @iresource is a @iresource_parent's child; #FALSE otherwise. */ gboolean -autoz_resource_is_child (Autoz *autoz, AutozIResource *iresource, AutozIResource *iresource_parent) +zak_autho_resource_is_child (ZakAutho *zak_autho, ZakAuthoIResource *iresource, ZakAuthoIResource *iresource_parent) { - AutozPrivate *priv; + ZakAuthoPrivate *priv; gboolean ret; Resource *resource; @@ -671,22 +671,22 @@ autoz_resource_is_child (Autoz *autoz, AutozIResource *iresource, AutozIResource const gchar *resource_id_parent; GList *parent; - g_return_val_if_fail (IS_AUTOZ (autoz), FALSE); - g_return_val_if_fail (AUTOZ_IS_IRESOURCE (iresource), FALSE); - g_return_val_if_fail (AUTOZ_IS_IRESOURCE (iresource_parent), FALSE); + g_return_val_if_fail (IS_ZAK_AUTHO (zak_autho), FALSE); + g_return_val_if_fail (ZAK_AUTHO_IS_IRESOURCE (iresource), FALSE); + g_return_val_if_fail (ZAK_AUTHO_IS_IRESOURCE (iresource_parent), FALSE); - _autoz_check_updated (autoz); + _zak_autho_check_updated (zak_autho); ret = FALSE; - priv = AUTOZ_GET_PRIVATE (autoz); + priv = ZAK_AUTHO_GET_PRIVATE (zak_autho); - resource = g_hash_table_lookup (priv->resources, autoz_iresource_get_resource_id (iresource)); + resource = g_hash_table_lookup (priv->resources, zak_autho_iresource_get_resource_id (iresource)); if (resource == NULL) { - g_warning ("Resource «%s» not found.", autoz_iresource_get_resource_id (iresource)); + g_warning ("Resource «%s» not found.", zak_autho_iresource_get_resource_id (iresource)); return ret; } - resource_id_parent = autoz_iresource_get_resource_id (iresource_parent); + resource_id_parent = zak_autho_iresource_get_resource_id (iresource_parent); resource_parent = g_hash_table_lookup (priv->resources, resource_id_parent); if (resource_parent == NULL) { @@ -699,7 +699,7 @@ autoz_resource_is_child (Autoz *autoz, AutozIResource *iresource, AutozIResource { /* TODO recursion */ resource_parent = (Resource *)parent->data; - if (g_strcmp0 (resource_id_parent, autoz_iresource_get_resource_id (resource_parent->iresource)) == 0) + if (g_strcmp0 (resource_id_parent, zak_autho_iresource_get_resource_id (resource_parent->iresource)) == 0) { ret = TRUE; break; @@ -712,18 +712,18 @@ autoz_resource_is_child (Autoz *autoz, AutozIResource *iresource, AutozIResource } static Resource -*_autoz_get_resource_from_id (Autoz *autoz, const gchar *resource_id) +*_zak_autho_get_resource_from_id (ZakAutho *zak_autho, const gchar *resource_id) { - AutozPrivate *priv; + ZakAuthoPrivate *priv; Resource *resource; gchar *_resource_id; - g_return_val_if_fail (IS_AUTOZ (autoz), NULL); + g_return_val_if_fail (IS_ZAK_AUTHO (zak_autho), NULL); - _autoz_check_updated (autoz); + _zak_autho_check_updated (zak_autho); - priv = AUTOZ_GET_PRIVATE (autoz); + priv = ZAK_AUTHO_GET_PRIVATE (zak_autho); if (priv->resource_name_prefix != NULL) { @@ -741,17 +741,17 @@ static Resource } /** - * autoz_get_resource_from_id: - * @autoz: an #Autoz object. + * zak_autho_get_resource_from_id: + * @zak_autho: an #ZakAutho object. * @resource_id: - * + * */ -AutozIResource -*autoz_get_resource_from_id (Autoz *autoz, const gchar *resource_id) +ZakAuthoIResource +*zak_autho_get_resource_from_id (ZakAutho *zak_autho, const gchar *resource_id) { Resource *resource; - resource = _autoz_get_resource_from_id (autoz, resource_id); + resource = _zak_autho_get_resource_from_id (zak_autho, resource_id); if (resource == NULL) { return NULL; @@ -763,16 +763,16 @@ AutozIResource } /** - * autoz_allow: - * @autoz: an #Autoz object. + * zak_autho_allow: + * @zak_autho: an #ZakAutho object. * @irole: * @iresource: - * + * */ void -autoz_allow (Autoz *autoz, AutozIRole *irole, AutozIResource *iresource) +zak_autho_allow (ZakAutho *zak_autho, ZakAuthoIRole *irole, ZakAuthoIResource *iresource) { - AutozPrivate *priv; + ZakAuthoPrivate *priv; Role *role; Resource *resource; @@ -781,15 +781,15 @@ autoz_allow (Autoz *autoz, AutozIRole *irole, AutozIResource *iresource) gchar *str_id; - g_return_if_fail (IS_AUTOZ (autoz)); + g_return_if_fail (IS_ZAK_AUTHO (zak_autho)); - priv = AUTOZ_GET_PRIVATE (autoz); + priv = ZAK_AUTHO_GET_PRIVATE (zak_autho); /* check if exists */ - role = g_hash_table_lookup (priv->roles, autoz_irole_get_role_id (irole)); + role = g_hash_table_lookup (priv->roles, zak_autho_irole_get_role_id (irole)); if (role == NULL) { - g_warning ("Role «%s» not found.", autoz_irole_get_role_id (irole)); + g_warning ("Role «%s» not found.", zak_autho_irole_get_role_id (irole)); return; } @@ -800,12 +800,12 @@ autoz_allow (Autoz *autoz, AutozIRole *irole, AutozIResource *iresource) } else { - g_return_if_fail (AUTOZ_IS_IRESOURCE (iresource)); + g_return_if_fail (ZAK_AUTHO_IS_IRESOURCE (iresource)); - resource = g_hash_table_lookup (priv->resources, autoz_iresource_get_resource_id (iresource)); + resource = g_hash_table_lookup (priv->resources, zak_autho_iresource_get_resource_id (iresource)); if (resource == NULL) { - g_warning ("Resource «%s» not found.", autoz_iresource_get_resource_id (iresource)); + g_warning ("Resource «%s» not found.", zak_autho_iresource_get_resource_id (iresource)); return; } } @@ -814,9 +814,9 @@ autoz_allow (Autoz *autoz, AutozIRole *irole, AutozIResource *iresource) r->role = role; r->resource = resource; - str_id = g_strconcat (autoz_irole_get_role_id (r->role->irole), + str_id = g_strconcat (zak_autho_irole_get_role_id (r->role->irole), "|", - (resource == NULL ? "NULL" : autoz_iresource_get_resource_id (r->resource->iresource)), + (resource == NULL ? "NULL" : zak_autho_iresource_get_resource_id (r->resource->iresource)), NULL); if (g_hash_table_lookup (priv->rules_allow, str_id) == NULL) @@ -826,16 +826,16 @@ autoz_allow (Autoz *autoz, AutozIRole *irole, AutozIResource *iresource) } /** - * autoz_deny: - * @autoz: an #Autoz object. + * zak_autho_deny: + * @zak_autho: an #ZakAutho object. * @irole: * @iresource: - * + * */ void -autoz_deny (Autoz *autoz, AutozIRole *irole, AutozIResource *iresource) +zak_autho_deny (ZakAutho *zak_autho, ZakAuthoIRole *irole, ZakAuthoIResource *iresource) { - AutozPrivate *priv; + ZakAuthoPrivate *priv; Role *role; Resource *resource; @@ -844,15 +844,15 @@ autoz_deny (Autoz *autoz, AutozIRole *irole, AutozIResource *iresource) gchar *str_id; - g_return_if_fail (IS_AUTOZ (autoz)); + g_return_if_fail (IS_ZAK_AUTHO (zak_autho)); - priv = AUTOZ_GET_PRIVATE (autoz); + priv = ZAK_AUTHO_GET_PRIVATE (zak_autho); /* check if exists */ - role = g_hash_table_lookup (priv->roles, autoz_irole_get_role_id (irole)); + role = g_hash_table_lookup (priv->roles, zak_autho_irole_get_role_id (irole)); if (role == NULL) { - g_warning ("Role «%s» not found.", autoz_irole_get_role_id (irole)); + g_warning ("Role «%s» not found.", zak_autho_irole_get_role_id (irole)); return; } @@ -863,9 +863,9 @@ autoz_deny (Autoz *autoz, AutozIRole *irole, AutozIResource *iresource) } else { - g_return_if_fail (AUTOZ_IS_IRESOURCE (iresource)); + g_return_if_fail (ZAK_AUTHO_IS_IRESOURCE (iresource)); - resource = g_hash_table_lookup (priv->resources, autoz_iresource_get_resource_id (iresource)); + resource = g_hash_table_lookup (priv->resources, zak_autho_iresource_get_resource_id (iresource)); if (resource == NULL) { return; @@ -876,9 +876,9 @@ autoz_deny (Autoz *autoz, AutozIRole *irole, AutozIResource *iresource) r->role = role; r->resource = resource; - str_id = g_strconcat (autoz_irole_get_role_id (r->role->irole), + str_id = g_strconcat (zak_autho_irole_get_role_id (r->role->irole), "|", - (resource == NULL ? "NULL" : autoz_iresource_get_resource_id (r->resource->iresource)), + (resource == NULL ? "NULL" : zak_autho_iresource_get_resource_id (r->resource->iresource)), NULL); if (g_hash_table_lookup (priv->rules_deny, str_id) == NULL) @@ -887,54 +887,54 @@ autoz_deny (Autoz *autoz, AutozIRole *irole, AutozIResource *iresource) } } -static AutozIsAllowed -_autoz_is_allowed_role (Autoz *autoz, Role *role, Resource *resource, gboolean exclude_null) +static ZakAuthoIsAllowed +_zak_autho_is_allowed_role (ZakAutho *zak_autho, Role *role, Resource *resource, gboolean exclude_null) { - AutozIsAllowed ret; + ZakAuthoIsAllowed ret; gchar *str_id; - AutozPrivate *priv = AUTOZ_GET_PRIVATE (autoz); + ZakAuthoPrivate *priv = ZAK_AUTHO_GET_PRIVATE (zak_autho); - ret = AUTOZ_NOT_FOUND; + ret = ZAK_AUTHO_NOT_FOUND; if (!exclude_null) { /* first trying for a rule for every resource */ - str_id = g_strconcat (autoz_irole_get_role_id (role->irole), + str_id = g_strconcat (zak_autho_irole_get_role_id (role->irole), "|NULL", NULL); if (g_hash_table_lookup (priv->rules_deny, str_id) != NULL) { - ret = AUTOZ_DENIED; + ret = ZAK_AUTHO_DENIED; return ret; } if (g_hash_table_lookup (priv->rules_allow, str_id) != NULL) { - ret = AUTOZ_ALLOWED; + ret = ZAK_AUTHO_ALLOWED; return ret; } } /* and after for specific resource */ - str_id = g_strconcat (autoz_irole_get_role_id (role->irole), + str_id = g_strconcat (zak_autho_irole_get_role_id (role->irole), "|", - autoz_iresource_get_resource_id (resource->iresource), + zak_autho_iresource_get_resource_id (resource->iresource), NULL); if (g_hash_table_lookup (priv->rules_deny, str_id) != NULL) { - ret = AUTOZ_DENIED; + ret = ZAK_AUTHO_DENIED; return ret; } if (g_hash_table_lookup (priv->rules_allow, str_id) != NULL) { - ret = AUTOZ_ALLOWED; + ret = ZAK_AUTHO_ALLOWED; return ret; } - if (ret == AUTOZ_NOT_FOUND && resource->parents != NULL) + if (ret == ZAK_AUTHO_NOT_FOUND && resource->parents != NULL) { /* trying parents */ GList *parents; @@ -942,8 +942,8 @@ _autoz_is_allowed_role (Autoz *autoz, Role *role, Resource *resource, gboolean e parents = g_list_first (resource->parents); while (parents != NULL) { - ret = _autoz_is_allowed_resource (autoz, role, (Resource *)parents->data); - if (ret != AUTOZ_NOT_FOUND) + ret = _zak_autho_is_allowed_resource (zak_autho, role, (Resource *)parents->data); + if (ret != ZAK_AUTHO_NOT_FOUND) { break; } @@ -952,7 +952,7 @@ _autoz_is_allowed_role (Autoz *autoz, Role *role, Resource *resource, gboolean e } } - if (ret == AUTOZ_NOT_FOUND && role->parents != NULL) + if (ret == ZAK_AUTHO_NOT_FOUND && role->parents != NULL) { /* trying parents */ GList *parents; @@ -960,8 +960,8 @@ _autoz_is_allowed_role (Autoz *autoz, Role *role, Resource *resource, gboolean e parents = g_list_first (role->parents); while (parents != NULL) { - ret = _autoz_is_allowed_role (autoz, (Role *)parents->data, resource, exclude_null); - if (ret != AUTOZ_NOT_FOUND) + ret = _zak_autho_is_allowed_role (zak_autho, (Role *)parents->data, resource, exclude_null); + if (ret != ZAK_AUTHO_NOT_FOUND) { break; } @@ -973,30 +973,30 @@ _autoz_is_allowed_role (Autoz *autoz, Role *role, Resource *resource, gboolean e return ret; } -static AutozIsAllowed -_autoz_is_allowed_resource (Autoz *autoz, Role *role, Resource *resource) +static ZakAuthoIsAllowed +_zak_autho_is_allowed_resource (ZakAutho *zak_autho, Role *role, Resource *resource) { - AutozIsAllowed ret; + ZakAuthoIsAllowed ret; gchar *str_id; - AutozPrivate *priv = AUTOZ_GET_PRIVATE (autoz); + ZakAuthoPrivate *priv = ZAK_AUTHO_GET_PRIVATE (zak_autho); - ret = AUTOZ_NOT_FOUND; + ret = ZAK_AUTHO_NOT_FOUND; - str_id = g_strconcat (autoz_irole_get_role_id (role->irole), + str_id = g_strconcat (zak_autho_irole_get_role_id (role->irole), "|", - autoz_iresource_get_resource_id (resource->iresource), + zak_autho_iresource_get_resource_id (resource->iresource), NULL); if (g_hash_table_lookup (priv->rules_deny, str_id) != NULL) { - ret = AUTOZ_DENIED; + ret = ZAK_AUTHO_DENIED; return ret; } else if (g_hash_table_lookup (priv->rules_allow, str_id) != NULL) { - ret = AUTOZ_ALLOWED; + ret = ZAK_AUTHO_ALLOWED; return ret; } else if (resource->parents != NULL) @@ -1007,8 +1007,8 @@ _autoz_is_allowed_resource (Autoz *autoz, Role *role, Resource *resource) parents = g_list_first (resource->parents); while (parents != NULL) { - ret = _autoz_is_allowed_resource (autoz, role, (Resource *)parents->data); - if (ret != AUTOZ_NOT_FOUND) + ret = _zak_autho_is_allowed_resource (zak_autho, role, (Resource *)parents->data); + if (ret != ZAK_AUTHO_NOT_FOUND) { break; } @@ -1021,15 +1021,15 @@ _autoz_is_allowed_resource (Autoz *autoz, Role *role, Resource *resource) } static gchar -*_autoz_remove_role_name_prefix_from_id (Autoz *autoz, const gchar *role_id) +*_zak_autho_remove_role_name_prefix_from_id (ZakAutho *zak_autho, const gchar *role_id) { gchar *ret; - AutozPrivate *priv; + ZakAuthoPrivate *priv; - g_return_val_if_fail (IS_AUTOZ (autoz), FALSE); + g_return_val_if_fail (IS_ZAK_AUTHO (zak_autho), FALSE); - priv = AUTOZ_GET_PRIVATE (autoz); + priv = ZAK_AUTHO_GET_PRIVATE (zak_autho); ret = NULL; @@ -1047,15 +1047,15 @@ static gchar } static gchar -*_autoz_remove_resource_name_prefix_from_id (Autoz *autoz, const gchar *resource_id) +*_zak_autho_remove_resource_name_prefix_from_id (ZakAutho *zak_autho, const gchar *resource_id) { gchar *ret; - AutozPrivate *priv; + ZakAuthoPrivate *priv; - g_return_val_if_fail (IS_AUTOZ (autoz), FALSE); + g_return_val_if_fail (IS_ZAK_AUTHO (zak_autho), FALSE); - priv = AUTOZ_GET_PRIVATE (autoz); + priv = ZAK_AUTHO_GET_PRIVATE (zak_autho); ret = NULL; @@ -1073,46 +1073,46 @@ static gchar } /** - * autoz_is_allowed: - * @autoz: an #Autoz object. - * @irole: an #AutozIRole object. - * @iresource: an #AutozIResource object. + * zak_autho_is_allowed: + * @zak_autho: an #ZakAutho object. + * @irole: an #ZakAuthoIRole object. + * @iresource: an #ZakAuthoIResource object. * @exclude_null: whether or not to exclude roles allowed to every resource. - * + * */ gboolean -autoz_is_allowed (Autoz *autoz, AutozIRole *irole, AutozIResource *iresource, gboolean exclude_null) +zak_autho_is_allowed (ZakAutho *zak_autho, ZakAuthoIRole *irole, ZakAuthoIResource *iresource, gboolean exclude_null) { gboolean ret; - AutozIsAllowed isAllowed; + ZakAuthoIsAllowed isAllowed; Role *role; Resource *resource; gchar *str_id; - AutozPrivate *priv; + ZakAuthoPrivate *priv; - g_return_val_if_fail (IS_AUTOZ (autoz), FALSE); - g_return_val_if_fail (AUTOZ_IS_IROLE (irole), FALSE); + g_return_val_if_fail (IS_ZAK_AUTHO (zak_autho), FALSE); + g_return_val_if_fail (ZAK_AUTHO_IS_IROLE (irole), FALSE); - _autoz_check_updated (autoz); + _zak_autho_check_updated (zak_autho); - priv = AUTOZ_GET_PRIVATE (autoz); + priv = ZAK_AUTHO_GET_PRIVATE (zak_autho); ret = FALSE; - isAllowed = AUTOZ_NOT_FOUND; + isAllowed = ZAK_AUTHO_NOT_FOUND; - role = _autoz_get_role_from_id (autoz, _autoz_remove_role_name_prefix_from_id (autoz, autoz_irole_get_role_id (irole))); + role = _zak_autho_get_role_from_id (zak_autho, _zak_autho_remove_role_name_prefix_from_id (zak_autho, zak_autho_irole_get_role_id (irole))); if (role == NULL) { - g_warning ("Role «%s» not found.", autoz_irole_get_role_id (irole)); + g_warning ("Role «%s» not found.", zak_autho_irole_get_role_id (irole)); return ret; } if (!exclude_null) { /* first trying for a rule for every resource */ - str_id = g_strconcat (autoz_irole_get_role_id (irole), + str_id = g_strconcat (zak_autho_irole_get_role_id (irole), "|NULL", NULL); @@ -1128,19 +1128,19 @@ autoz_is_allowed (Autoz *autoz, AutozIRole *irole, AutozIResource *iresource, gb } } - g_return_val_if_fail (AUTOZ_IS_IRESOURCE (iresource), FALSE); + g_return_val_if_fail (ZAK_AUTHO_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))); + resource = _zak_autho_get_resource_from_id (zak_autho, _zak_autho_remove_resource_name_prefix_from_id (zak_autho, zak_autho_iresource_get_resource_id (iresource))); if (resource == NULL) { - g_warning ("Resource «%s» not found.", autoz_iresource_get_resource_id (iresource)); + g_warning ("Resource «%s» not found.", zak_autho_iresource_get_resource_id (iresource)); return ret; } /* and after for specific resource */ - str_id = g_strconcat (autoz_irole_get_role_id (irole), + str_id = g_strconcat (zak_autho_irole_get_role_id (irole), "|", - autoz_iresource_get_resource_id (iresource), + zak_autho_iresource_get_resource_id (iresource), NULL); if (g_hash_table_lookup (priv->rules_deny, str_id) != NULL) @@ -1162,13 +1162,13 @@ autoz_is_allowed (Autoz *autoz, AutozIRole *irole, AutozIResource *iresource, gb parents = g_list_first (resource->parents); while (parents != NULL) { - isAllowed = _autoz_is_allowed_resource (autoz, role, (Resource *)parents->data); - if (isAllowed == AUTOZ_DENIED) + isAllowed = _zak_autho_is_allowed_resource (zak_autho, role, (Resource *)parents->data); + if (isAllowed == ZAK_AUTHO_DENIED) { ret = FALSE; break; } - else if (isAllowed == AUTOZ_ALLOWED) + else if (isAllowed == ZAK_AUTHO_ALLOWED) { ret = TRUE; break; @@ -1178,7 +1178,7 @@ autoz_is_allowed (Autoz *autoz, AutozIRole *irole, AutozIResource *iresource, gb } } - if (!ret && isAllowed == AUTOZ_NOT_FOUND && role->parents != NULL) + if (!ret && isAllowed == ZAK_AUTHO_NOT_FOUND && role->parents != NULL) { /* trying parents */ GList *parents; @@ -1186,13 +1186,13 @@ autoz_is_allowed (Autoz *autoz, AutozIRole *irole, AutozIResource *iresource, gb parents = g_list_first (role->parents); while (parents != NULL) { - isAllowed = _autoz_is_allowed_role (autoz, (Role *)parents->data, resource, exclude_null); - if (isAllowed == AUTOZ_DENIED) + isAllowed = _zak_autho_is_allowed_role (zak_autho, (Role *)parents->data, resource, exclude_null); + if (isAllowed == ZAK_AUTHO_DENIED) { ret = FALSE; break; } - else if (isAllowed == AUTOZ_ALLOWED) + else if (isAllowed == ZAK_AUTHO_ALLOWED) { ret = TRUE; break; @@ -1206,20 +1206,20 @@ autoz_is_allowed (Autoz *autoz, AutozIRole *irole, AutozIResource *iresource, gb } /** - * autoz_clear: - * @autoz: + * zak_autho_clear: + * @zak_autho: * */ gboolean -autoz_clear (Autoz *autoz) +zak_autho_clear (ZakAutho *zak_autho) { gboolean ret; - AutozPrivate *priv; + ZakAuthoPrivate *priv; - g_return_val_if_fail (IS_AUTOZ (autoz), FALSE); + g_return_val_if_fail (IS_ZAK_AUTHO (zak_autho), FALSE); - priv = AUTOZ_GET_PRIVATE (autoz); + priv = ZAK_AUTHO_GET_PRIVATE (zak_autho); ret = TRUE; @@ -1237,14 +1237,14 @@ autoz_clear (Autoz *autoz) } /** - * autoz_get_xml: - * @autoz: an #Autoz object. - * + * zak_autho_get_xml: + * @zak_autho: an #ZakAutho object. + * */ xmlNodePtr -autoz_get_xml (Autoz *autoz) +zak_autho_get_xml (ZakAutho *zak_autho) { - AutozPrivate *priv; + ZakAuthoPrivate *priv; xmlNodePtr ret; xmlNodePtr xnode_parent; xmlNodePtr xnode; @@ -1258,20 +1258,20 @@ autoz_get_xml (Autoz *autoz) GList *parent; - g_return_val_if_fail (IS_AUTOZ (autoz), FALSE); + g_return_val_if_fail (IS_ZAK_AUTHO (zak_autho), FALSE); - priv = AUTOZ_GET_PRIVATE (autoz); + priv = ZAK_AUTHO_GET_PRIVATE (zak_autho); - ret = xmlNewNode (NULL, "autoz"); + ret = xmlNewNode (NULL, "zak_autho"); /* roles */ g_hash_table_iter_init (&iter, priv->roles); - while (g_hash_table_iter_next (&iter, &key, &value)) + while (g_hash_table_iter_next (&iter, &key, &value)) { xnode_parent = xmlNewNode (NULL, "role"); role = (Role *)value; - xmlSetProp (xnode_parent, "id", autoz_irole_get_role_id (AUTOZ_IROLE (role->irole))); + xmlSetProp (xnode_parent, "id", zak_autho_irole_get_role_id (ZAK_AUTHO_IROLE (role->irole))); xmlAddChild (ret, xnode_parent); @@ -1281,22 +1281,22 @@ autoz_get_xml (Autoz *autoz) xnode = xmlNewNode (NULL, "parent"); role = (Role *)parent->data; - xmlSetProp (xnode, "id", autoz_irole_get_role_id (AUTOZ_IROLE (role->irole))); + xmlSetProp (xnode, "id", zak_autho_irole_get_role_id (ZAK_AUTHO_IROLE (role->irole))); xmlAddChild (xnode_parent, xnode); - + parent = g_list_next (parent); } } /* resources */ g_hash_table_iter_init (&iter, priv->resources); - while (g_hash_table_iter_next (&iter, &key, &value)) + while (g_hash_table_iter_next (&iter, &key, &value)) { xnode_parent = xmlNewNode (NULL, "resource"); resource = (Resource *)value; - xmlSetProp (xnode_parent, "id", autoz_iresource_get_resource_id (AUTOZ_IRESOURCE (resource->iresource))); + xmlSetProp (xnode_parent, "id", zak_autho_iresource_get_resource_id (ZAK_AUTHO_IRESOURCE (resource->iresource))); xmlAddChild (ret, xnode_parent); @@ -1306,27 +1306,27 @@ autoz_get_xml (Autoz *autoz) xnode = xmlNewNode (NULL, "parent"); resource = (Resource *)parent->data; - xmlSetProp (xnode, "id", autoz_iresource_get_resource_id (AUTOZ_IRESOURCE (resource->iresource))); + xmlSetProp (xnode, "id", zak_autho_iresource_get_resource_id (ZAK_AUTHO_IRESOURCE (resource->iresource))); xmlAddChild (xnode_parent, xnode); - + parent = g_list_next (parent); } } /* rules allow */ g_hash_table_iter_init (&iter, priv->rules_allow); - while (g_hash_table_iter_next (&iter, &key, &value)) + while (g_hash_table_iter_next (&iter, &key, &value)) { xnode = xmlNewNode (NULL, "rule"); xmlSetProp (xnode, "allow", "yes"); rule = (Rule *)value; - xmlSetProp (xnode, "role", autoz_irole_get_role_id (AUTOZ_IROLE (rule->role->irole))); + xmlSetProp (xnode, "role", zak_autho_irole_get_role_id (ZAK_AUTHO_IROLE (rule->role->irole))); if (rule->resource != NULL) { - xmlSetProp (xnode, "resource", autoz_iresource_get_resource_id (AUTOZ_IRESOURCE (rule->resource->iresource))); + xmlSetProp (xnode, "resource", zak_autho_iresource_get_resource_id (ZAK_AUTHO_IRESOURCE (rule->resource->iresource))); } else { @@ -1338,17 +1338,17 @@ autoz_get_xml (Autoz *autoz) /* rules deny */ g_hash_table_iter_init (&iter, priv->rules_deny); - while (g_hash_table_iter_next (&iter, &key, &value)) + while (g_hash_table_iter_next (&iter, &key, &value)) { xnode = xmlNewNode (NULL, "rule"); xmlSetProp (xnode, "allow", "no"); rule = (Rule *)value; - xmlSetProp (xnode, "role", autoz_irole_get_role_id (AUTOZ_IROLE (rule->role->irole))); + xmlSetProp (xnode, "role", zak_autho_irole_get_role_id (ZAK_AUTHO_IROLE (rule->role->irole))); if (rule->resource != NULL) { - xmlSetProp (xnode, "resource", autoz_iresource_get_resource_id (AUTOZ_IRESOURCE (rule->resource->iresource))); + xmlSetProp (xnode, "resource", zak_autho_iresource_get_resource_id (ZAK_AUTHO_IRESOURCE (rule->resource->iresource))); } else { @@ -1362,40 +1362,40 @@ autoz_get_xml (Autoz *autoz) } /** - * autoz_load_from_xml: - * @autoz: an #Autoz object. + * zak_autho_load_from_xml: + * @zak_autho: an #ZakAutho object. * @xnode: * @replace: - * + * */ gboolean -autoz_load_from_xml (Autoz *autoz, xmlNodePtr xnode, gboolean replace) +zak_autho_load_from_xml (ZakAutho *zak_autho, xmlNodePtr xnode, gboolean replace) { gboolean ret; - AutozPrivate *priv; + ZakAuthoPrivate *priv; xmlNodePtr current; xmlNodePtr current_parent; - AutozIRole *irole; - AutozIResource *iresource; + ZakAuthoIRole *irole; + ZakAuthoIResource *iresource; gchar *prop; - g_return_val_if_fail (IS_AUTOZ (autoz), FALSE); + g_return_val_if_fail (IS_ZAK_AUTHO (zak_autho), FALSE); g_return_val_if_fail (xnode != NULL, FALSE); - priv = AUTOZ_GET_PRIVATE (autoz); + priv = ZAK_AUTHO_GET_PRIVATE (zak_autho); ret = TRUE; if (replace) { /* clearing current authorizations */ - autoz_clear (autoz); + zak_autho_clear (zak_autho); } - if (xmlStrcmp (xnode->name, "autoz") != 0) + if (xmlStrcmp (xnode->name, "zak_autho") != 0) { g_warning ("Invalid xml structure."); ret = FALSE; @@ -1412,9 +1412,9 @@ autoz_load_from_xml (Autoz *autoz, xmlNodePtr xnode, gboolean replace) prop = g_strstrip (g_strdup ((gchar *)xmlGetProp (current, "id"))); if (g_strcmp0 (prop, "") != 0) { - irole = AUTOZ_IROLE (autoz_role_new (prop)); + irole = ZAK_AUTHO_IROLE (zak_autho_role_new (prop)); g_free (prop); - autoz_add_role (autoz, irole); + zak_autho_add_role (zak_autho, irole); current_parent = current->children; while (current_parent != NULL) @@ -1425,7 +1425,7 @@ autoz_load_from_xml (Autoz *autoz, xmlNodePtr xnode, gboolean replace) prop = g_strstrip (g_strdup ((gchar *)xmlGetProp (current_parent, "id"))); if (g_strcmp0 (prop, "") != 0) { - autoz_add_parent_to_role (autoz, irole, autoz_get_role_from_id (autoz, prop)); + zak_autho_add_parent_to_role (zak_autho, irole, zak_autho_get_role_from_id (zak_autho, prop)); } g_free (prop); } @@ -1438,8 +1438,8 @@ autoz_load_from_xml (Autoz *autoz, xmlNodePtr xnode, gboolean replace) prop = g_strstrip (g_strdup ((gchar *)xmlGetProp (current, "id"))); if (g_strcmp0 (prop, "") != 0) { - iresource = AUTOZ_IRESOURCE (autoz_resource_new (prop)); - autoz_add_resource (autoz, iresource); + iresource = ZAK_AUTHO_IRESOURCE (zak_autho_resource_new (prop)); + zak_autho_add_resource (zak_autho, iresource); g_free (prop); current_parent = current->children; @@ -1451,7 +1451,7 @@ autoz_load_from_xml (Autoz *autoz, xmlNodePtr xnode, gboolean replace) prop = g_strstrip (g_strdup ((gchar *)xmlGetProp (current_parent, "id"))); if (g_strcmp0 (prop, "") != 0) { - autoz_add_parent_to_resource (autoz, iresource, autoz_get_resource_from_id (autoz, prop)); + zak_autho_add_parent_to_resource (zak_autho, iresource, zak_autho_get_resource_from_id (zak_autho, prop)); } g_free (prop); } @@ -1462,7 +1462,7 @@ autoz_load_from_xml (Autoz *autoz, xmlNodePtr xnode, gboolean replace) else if (xmlStrcmp (current->name, "rule") == 0) { prop = g_strstrip (g_strdup ((gchar *)xmlGetProp (current, "role"))); - irole = autoz_get_role_from_id (autoz, prop); + irole = zak_autho_get_role_from_id (zak_autho, prop); if (irole != NULL) { prop = g_strstrip (g_strdup ((gchar *)xmlGetProp (current, "resource"))); @@ -1472,18 +1472,18 @@ autoz_load_from_xml (Autoz *autoz, xmlNodePtr xnode, gboolean replace) } else { - iresource = autoz_get_resource_from_id (autoz, prop); + iresource = zak_autho_get_resource_from_id (zak_autho, prop); } g_free (prop); prop = g_strstrip (g_strdup ((gchar *)xmlGetProp (current, "allow"))); if (g_strcmp0 (prop, "yes") == 0) { - autoz_allow (autoz, irole, iresource); + zak_autho_allow (zak_autho, irole, iresource); } else { - autoz_deny (autoz, irole, iresource); + zak_autho_deny (zak_autho, irole, iresource); } g_free (prop); } @@ -1498,7 +1498,7 @@ autoz_load_from_xml (Autoz *autoz, xmlNodePtr xnode, gboolean replace) } static gboolean -_autoz_delete_table_content (GdaConnection *gdacon, const gchar *table_prefix) +_zak_autho_delete_table_content (GdaConnection *gdacon, const gchar *table_prefix) { gboolean ret; @@ -1557,7 +1557,7 @@ _autoz_delete_table_content (GdaConnection *gdacon, const gchar *table_prefix) } static guint -_autoz_find_new_table_id (GdaConnection *gdacon, const gchar *table_name) +_zak_autho_find_new_table_id (GdaConnection *gdacon, const gchar *table_name) { gchar *sql; GError *error; @@ -1591,7 +1591,7 @@ _autoz_find_new_table_id (GdaConnection *gdacon, const gchar *table_name) } static guint -_autoz_get_role_id_db (GdaConnection *gdacon, const gchar *table_name, const gchar *role_id) +_zak_autho_get_role_id_db (GdaConnection *gdacon, const gchar *table_name, const gchar *role_id) { gchar *sql; GError *error; @@ -1623,7 +1623,7 @@ _autoz_get_role_id_db (GdaConnection *gdacon, const gchar *table_name, const gch } static guint -_autoz_get_resource_id_db (GdaConnection *gdacon, const gchar *table_name, const gchar *resource_id) +_zak_autho_get_resource_id_db (GdaConnection *gdacon, const gchar *table_name, const gchar *resource_id) { gchar *sql; GError *error; @@ -1655,18 +1655,18 @@ _autoz_get_resource_id_db (GdaConnection *gdacon, const gchar *table_name, const } /** - * autoz_save_to_db: - * @autoz: an #Autoz object. + * zak_autho_save_to_db: + * @zak_autho: an #ZakAutho object. * @gdacon: * @table_prefix: * @replace: - * + * */ gboolean -autoz_save_to_db (Autoz *autoz, GdaConnection *gdacon, +zak_autho_save_to_db (ZakAutho *zak_autho, GdaConnection *gdacon, const gchar *table_prefix, gboolean replace) { - AutozPrivate *priv; + ZakAuthoPrivate *priv; gboolean ret; @@ -1694,15 +1694,15 @@ autoz_save_to_db (Autoz *autoz, GdaConnection *gdacon, guint id_roles; guint id_resources; - g_return_val_if_fail (IS_AUTOZ (autoz), FALSE); + g_return_val_if_fail (IS_ZAK_AUTHO (zak_autho), FALSE); g_return_val_if_fail (GDA_IS_CONNECTION (gdacon), FALSE); - priv = AUTOZ_GET_PRIVATE (autoz); + priv = ZAK_AUTHO_GET_PRIVATE (zak_autho); ret = TRUE; error = NULL; - in_trans = gda_connection_begin_transaction (gdacon, "autoz-save-to-db", 0, &error); + in_trans = gda_connection_begin_transaction (gdacon, "zak_autho-save-to-db", 0, &error); if (!in_trans) { g_warning ("Error on starting transaction: %s", @@ -1721,16 +1721,16 @@ autoz_save_to_db (Autoz *autoz, GdaConnection *gdacon, if (replace) { /* deleting table's content */ - _autoz_delete_table_content (gdacon, prefix); + _zak_autho_delete_table_content (gdacon, prefix); } /* roles */ table_name = g_strdup_printf ("%sroles", prefix); table_name_parent = g_strdup_printf ("%s_parents", table_name); g_hash_table_iter_init (&iter, priv->roles); - while (g_hash_table_iter_next (&iter, &key, &value)) + while (g_hash_table_iter_next (&iter, &key, &value)) { - new_id = _autoz_find_new_table_id (gdacon, table_name); + new_id = _zak_autho_find_new_table_id (gdacon, table_name); if (new_id <= 0) { ret = FALSE; @@ -1745,13 +1745,13 @@ autoz_save_to_db (Autoz *autoz, GdaConnection *gdacon, " VALUES (%d, '%s')", table_name, new_id, - autoz_irole_get_role_id (AUTOZ_IROLE (role->irole))); + zak_autho_irole_get_role_id (ZAK_AUTHO_IROLE (role->irole))); gda_connection_execute_non_select_command (gdacon, sql, &error); g_free (sql); if (error != NULL) { g_warning ("Error on saving role «%s»: %s", - autoz_irole_get_role_id (AUTOZ_IROLE (role->irole)), + zak_autho_irole_get_role_id (ZAK_AUTHO_IROLE (role->irole)), error->message != NULL ? error->message : "no details"); continue; } @@ -1761,7 +1761,7 @@ autoz_save_to_db (Autoz *autoz, GdaConnection *gdacon, { role = (Role *)parent->data; - id_parent = _autoz_get_role_id_db (gdacon, table_name, autoz_irole_get_role_id (AUTOZ_IROLE (role->irole))); + id_parent = _zak_autho_get_role_id_db (gdacon, table_name, zak_autho_irole_get_role_id (ZAK_AUTHO_IROLE (role->irole))); if (id_parent > 0) { error = NULL; @@ -1776,7 +1776,7 @@ autoz_save_to_db (Autoz *autoz, GdaConnection *gdacon, if (error != NULL) { g_warning ("Error on saving role parent «%s»: %s", - autoz_irole_get_role_id (AUTOZ_IROLE (role->irole)), + zak_autho_irole_get_role_id (ZAK_AUTHO_IROLE (role->irole)), error->message != NULL ? error->message : "no details"); continue; } @@ -1784,7 +1784,7 @@ autoz_save_to_db (Autoz *autoz, GdaConnection *gdacon, else { g_warning ("Unable to find parent role «%s»", - autoz_irole_get_role_id (AUTOZ_IROLE (role->irole))); + zak_autho_irole_get_role_id (ZAK_AUTHO_IROLE (role->irole))); } parent = g_list_next (parent); @@ -1802,9 +1802,9 @@ autoz_save_to_db (Autoz *autoz, GdaConnection *gdacon, table_name = g_strdup_printf ("%sresources", prefix); table_name_parent = g_strdup_printf ("%s_parents", table_name); g_hash_table_iter_init (&iter, priv->resources); - while (g_hash_table_iter_next (&iter, &key, &value)) + while (g_hash_table_iter_next (&iter, &key, &value)) { - new_id = _autoz_find_new_table_id (gdacon, table_name); + new_id = _zak_autho_find_new_table_id (gdacon, table_name); if (new_id <= 0) { ret = FALSE; @@ -1819,13 +1819,13 @@ autoz_save_to_db (Autoz *autoz, GdaConnection *gdacon, " VALUES (%d, '%s')", table_name, new_id, - autoz_iresource_get_resource_id (AUTOZ_IRESOURCE (resource->iresource))); + zak_autho_iresource_get_resource_id (ZAK_AUTHO_IRESOURCE (resource->iresource))); gda_connection_execute_non_select_command (gdacon, sql, &error); g_free (sql); if (error != NULL) { g_warning ("Error on saving resource «%s»: %s", - autoz_iresource_get_resource_id (AUTOZ_IRESOURCE (resource->iresource)), + zak_autho_iresource_get_resource_id (ZAK_AUTHO_IRESOURCE (resource->iresource)), error->message != NULL ? error->message : "no details"); continue; } @@ -1835,7 +1835,7 @@ autoz_save_to_db (Autoz *autoz, GdaConnection *gdacon, { resource = (Resource *)parent->data; - id_parent = _autoz_get_resource_id_db (gdacon, table_name, autoz_iresource_get_resource_id (AUTOZ_IRESOURCE (resource->iresource))); + id_parent = _zak_autho_get_resource_id_db (gdacon, table_name, zak_autho_iresource_get_resource_id (ZAK_AUTHO_IRESOURCE (resource->iresource))); if (id_parent > 0) { error = NULL; @@ -1850,7 +1850,7 @@ autoz_save_to_db (Autoz *autoz, GdaConnection *gdacon, if (error != NULL) { g_warning ("Error on saving resource parent «%s»: %s", - autoz_iresource_get_resource_id (AUTOZ_IRESOURCE (resource->iresource)), + zak_autho_iresource_get_resource_id (ZAK_AUTHO_IRESOURCE (resource->iresource)), error->message != NULL ? error->message : "no details"); continue; } @@ -1858,7 +1858,7 @@ autoz_save_to_db (Autoz *autoz, GdaConnection *gdacon, else { g_warning ("Unable to find parent resource «%s»", - autoz_iresource_get_resource_id (AUTOZ_IRESOURCE (resource->iresource))); + zak_autho_iresource_get_resource_id (ZAK_AUTHO_IRESOURCE (resource->iresource))); } parent = g_list_next (parent); @@ -1874,9 +1874,9 @@ autoz_save_to_db (Autoz *autoz, GdaConnection *gdacon, table_name = g_strdup_printf ("%srules", prefix); table_name_parent = g_strdup_printf ("%s_parents", table_name); g_hash_table_iter_init (&iter, priv->rules_allow); - while (g_hash_table_iter_next (&iter, &key, &value)) + while (g_hash_table_iter_next (&iter, &key, &value)) { - new_id = _autoz_find_new_table_id (gdacon, table_name); + new_id = _zak_autho_find_new_table_id (gdacon, table_name); if (new_id <= 0) { ret = FALSE; @@ -1885,12 +1885,12 @@ autoz_save_to_db (Autoz *autoz, GdaConnection *gdacon, rule = (Rule *)value; - id_roles = _autoz_get_role_id_db (gdacon, g_strdup_printf ("%sroles", prefix), autoz_irole_get_role_id (AUTOZ_IROLE (rule->role->irole))); + id_roles = _zak_autho_get_role_id_db (gdacon, g_strdup_printf ("%sroles", prefix), zak_autho_irole_get_role_id (ZAK_AUTHO_IROLE (rule->role->irole))); if (id_roles > 0) { if (rule->resource != NULL) { - id_resources = _autoz_get_resource_id_db (gdacon, g_strdup_printf ("%sresources", prefix), autoz_iresource_get_resource_id (AUTOZ_IRESOURCE (rule->resource->iresource))); + id_resources = _zak_autho_get_resource_id_db (gdacon, g_strdup_printf ("%sresources", prefix), zak_autho_iresource_get_resource_id (ZAK_AUTHO_IRESOURCE (rule->resource->iresource))); } else { @@ -1917,9 +1917,9 @@ autoz_save_to_db (Autoz *autoz, GdaConnection *gdacon, /* rules deny */ g_hash_table_iter_init (&iter, priv->rules_deny); - while (g_hash_table_iter_next (&iter, &key, &value)) + while (g_hash_table_iter_next (&iter, &key, &value)) { - new_id = _autoz_find_new_table_id (gdacon, table_name); + new_id = _zak_autho_find_new_table_id (gdacon, table_name); if (new_id <= 0) { ret = FALSE; @@ -1928,12 +1928,12 @@ autoz_save_to_db (Autoz *autoz, GdaConnection *gdacon, rule = (Rule *)value; - id_roles = _autoz_get_role_id_db (gdacon, g_strdup_printf ("%sroles", prefix), autoz_irole_get_role_id (AUTOZ_IROLE (rule->role->irole))); + id_roles = _zak_autho_get_role_id_db (gdacon, g_strdup_printf ("%sroles", prefix), zak_autho_irole_get_role_id (ZAK_AUTHO_IROLE (rule->role->irole))); if (id_roles > 0) { if (rule->resource != NULL) { - id_resources = _autoz_get_resource_id_db (gdacon, g_strdup_printf ("%sresources", prefix), autoz_iresource_get_resource_id (AUTOZ_IRESOURCE (rule->resource->iresource))); + id_resources = _zak_autho_get_resource_id_db (gdacon, g_strdup_printf ("%sresources", prefix), zak_autho_iresource_get_resource_id (ZAK_AUTHO_IRESOURCE (rule->resource->iresource))); } else { @@ -1959,7 +1959,7 @@ autoz_save_to_db (Autoz *autoz, GdaConnection *gdacon, } error = NULL; - if (in_trans && !gda_connection_commit_transaction (gdacon, "autoz-save-to-db", &error)) + if (in_trans && !gda_connection_commit_transaction (gdacon, "zak_autho-save-to-db", &error)) { g_warning ("Error on committing transaction: %s", error != NULL && error->message != NULL ? error->message : "No details"); @@ -1973,17 +1973,17 @@ autoz_save_to_db (Autoz *autoz, GdaConnection *gdacon, } /** - * autoz_load_from_db: - * @autoz: an #Autoz object. + * zak_autho_load_from_db: + * @zak_autho: an #ZakAutho object. * @gdacon: * @table_prefix: * @replace: - * + * */ gboolean -autoz_load_from_db (Autoz *autoz, GdaConnection *gdacon, const gchar *table_prefix, gboolean replace) +zak_autho_load_from_db (ZakAutho *zak_autho, GdaConnection *gdacon, const gchar *table_prefix, gboolean replace) { - AutozPrivate *priv; + ZakAuthoPrivate *priv; gboolean ret; @@ -1998,19 +1998,19 @@ autoz_load_from_db (Autoz *autoz, GdaConnection *gdacon, const gchar *table_pref gchar *resource_id; guint rule_type; - AutozIRole *irole; - AutozIRole *irole_parent; - AutozIResource *iresource; - AutozIResource *iresource_parent; + ZakAuthoIRole *irole; + ZakAuthoIRole *irole_parent; + ZakAuthoIResource *iresource; + ZakAuthoIResource *iresource_parent; Rule *rule; guint row; guint rows; - g_return_val_if_fail (IS_AUTOZ (autoz), FALSE); + g_return_val_if_fail (IS_ZAK_AUTHO (zak_autho), FALSE); g_return_val_if_fail (GDA_IS_CONNECTION (gdacon), FALSE); - priv = AUTOZ_GET_PRIVATE (autoz); + priv = ZAK_AUTHO_GET_PRIVATE (zak_autho); priv->on_loading = TRUE; @@ -2019,7 +2019,7 @@ autoz_load_from_db (Autoz *autoz, GdaConnection *gdacon, const gchar *table_pref if (replace) { /* clearing current authorizations */ - autoz_clear (autoz); + zak_autho_clear (zak_autho); } if (table_prefix == NULL) @@ -2043,8 +2043,8 @@ autoz_load_from_db (Autoz *autoz, GdaConnection *gdacon, const gchar *table_pref for (row = 0; row < rows; row++) { error = NULL; - irole = AUTOZ_IROLE (autoz_role_new (gda_value_stringify (gda_data_model_get_value_at (dm, 0, row, &error)))); - autoz_add_role (autoz, irole); + irole = ZAK_AUTHO_IROLE (zak_autho_role_new (gda_value_stringify (gda_data_model_get_value_at (dm, 0, row, &error)))); + zak_autho_add_role (zak_autho, irole); } } else if (error != NULL) @@ -2073,10 +2073,10 @@ autoz_load_from_db (Autoz *autoz, GdaConnection *gdacon, const gchar *table_pref for (row = 0; row < rows; row++) { error = NULL; - irole = AUTOZ_IROLE (autoz_role_new (gda_value_stringify (gda_data_model_get_value_at (dm, 0, row, &error)))); + irole = ZAK_AUTHO_IROLE (zak_autho_role_new (gda_value_stringify (gda_data_model_get_value_at (dm, 0, row, &error)))); error = NULL; - irole_parent = AUTOZ_IROLE (autoz_role_new (gda_value_stringify (gda_data_model_get_value_at (dm, 1, row, &error)))); - autoz_add_parent_to_role (autoz, irole, irole_parent); + irole_parent = ZAK_AUTHO_IROLE (zak_autho_role_new (gda_value_stringify (gda_data_model_get_value_at (dm, 1, row, &error)))); + zak_autho_add_parent_to_role (zak_autho, irole, irole_parent); } } else if (error != NULL) @@ -2099,8 +2099,8 @@ autoz_load_from_db (Autoz *autoz, GdaConnection *gdacon, const gchar *table_pref for (row = 0; row < rows; row++) { error = NULL; - iresource = AUTOZ_IRESOURCE (autoz_resource_new (gda_value_stringify (gda_data_model_get_value_at (dm, 0, row, &error)))); - autoz_add_resource (autoz, iresource); + iresource = ZAK_AUTHO_IRESOURCE (zak_autho_resource_new (gda_value_stringify (gda_data_model_get_value_at (dm, 0, row, &error)))); + zak_autho_add_resource (zak_autho, iresource); } } else if (error != NULL) @@ -2129,10 +2129,10 @@ autoz_load_from_db (Autoz *autoz, GdaConnection *gdacon, const gchar *table_pref for (row = 0; row < rows; row++) { error = NULL; - iresource = AUTOZ_IRESOURCE (autoz_resource_new (gda_value_stringify (gda_data_model_get_value_at (dm, 0, row, &error)))); + iresource = ZAK_AUTHO_IRESOURCE (zak_autho_resource_new (gda_value_stringify (gda_data_model_get_value_at (dm, 0, row, &error)))); error = NULL; - iresource_parent = AUTOZ_IRESOURCE (autoz_resource_new (gda_value_stringify (gda_data_model_get_value_at (dm, 1, row, &error)))); - autoz_add_parent_to_resource (autoz, iresource, iresource_parent); + iresource_parent = ZAK_AUTHO_IRESOURCE (zak_autho_resource_new (gda_value_stringify (gda_data_model_get_value_at (dm, 1, row, &error)))); + zak_autho_add_parent_to_resource (zak_autho, iresource, iresource_parent); } } else if (error != NULL) @@ -2169,7 +2169,7 @@ autoz_load_from_db (Autoz *autoz, GdaConnection *gdacon, const gchar *table_pref else if (gval != NULL && error == NULL && !gda_value_is_null (gval)) { role_id = gda_value_stringify (gval); - irole = autoz_get_role_from_id (autoz, role_id); + irole = zak_autho_get_role_from_id (zak_autho, role_id); if (irole != NULL) { error = NULL; @@ -2186,7 +2186,7 @@ autoz_load_from_db (Autoz *autoz, GdaConnection *gdacon, const gchar *table_pref else { resource_id = gda_value_stringify (gval); - iresource = autoz_get_resource_from_id (autoz, resource_id); + iresource = zak_autho_get_resource_from_id (zak_autho, resource_id); } error = NULL; @@ -2201,11 +2201,11 @@ autoz_load_from_db (Autoz *autoz, GdaConnection *gdacon, const gchar *table_pref rule_type = g_value_get_int (gval); if (rule_type == 1) { - autoz_allow (autoz, irole, iresource); + zak_autho_allow (zak_autho, irole, iresource); } else if (rule_type == 2) { - autoz_deny (autoz, irole, iresource); + zak_autho_deny (zak_autho, irole, iresource); } else { @@ -2238,11 +2238,11 @@ autoz_load_from_db (Autoz *autoz, GdaConnection *gdacon, const gchar *table_pref } gboolean -autoz_load_from_db_with_monitor (Autoz *autoz, GdaConnection *gdacon, const gchar *table_prefix, gboolean replace) +zak_autho_load_from_db_with_monitor (ZakAutho *zak_autho, GdaConnection *gdacon, const gchar *table_prefix, gboolean replace) { - AutozPrivate *priv = AUTOZ_GET_PRIVATE (autoz); + ZakAuthoPrivate *priv = ZAK_AUTHO_GET_PRIVATE (zak_autho); - g_return_val_if_fail (IS_AUTOZ (autoz), FALSE); + g_return_val_if_fail (IS_ZAK_AUTHO (zak_autho), FALSE); g_return_val_if_fail (GDA_IS_CONNECTION (gdacon), FALSE); priv->gdacon = gdacon; @@ -2259,11 +2259,11 @@ autoz_load_from_db_with_monitor (Autoz *autoz, GdaConnection *gdacon, const gcha priv->table_prefix = g_strdup (table_prefix); } - autoz_load_from_db (autoz, gdacon, table_prefix, replace); + zak_autho_load_from_db (zak_autho, gdacon, table_prefix, replace); } static void -_autoz_check_updated (Autoz *autoz) +_zak_autho_check_updated (ZakAutho *zak_autho) { GError *error; gchar *sql; @@ -2273,9 +2273,9 @@ _autoz_check_updated (Autoz *autoz) const GdaTimestamp *gda_timestamp; GDateTime *gda_datetime; - AutozPrivate *priv = AUTOZ_GET_PRIVATE (autoz); + ZakAuthoPrivate *priv = ZAK_AUTHO_GET_PRIVATE (zak_autho); - g_return_if_fail (IS_AUTOZ (autoz)); + g_return_if_fail (IS_ZAK_AUTHO (zak_autho)); if (priv->on_loading) { @@ -2308,7 +2308,7 @@ _autoz_check_updated (Autoz *autoz) if (g_date_time_compare (priv->gdt_last_load, gda_datetime) < 0) { /* to reload */ - autoz_load_from_db_with_monitor (autoz, priv->gdacon, priv->table_prefix, TRUE); + zak_autho_load_from_db_with_monitor (zak_autho, priv->gdacon, priv->table_prefix, TRUE); } g_date_time_unref (gda_datetime); } @@ -2324,13 +2324,13 @@ _autoz_check_updated (Autoz *autoz) /* PRIVATE */ static void -autoz_set_property (GObject *object, +zak_autho_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec) { - Autoz *autoz = (Autoz *)object; - AutozPrivate *priv = AUTOZ_GET_PRIVATE (autoz); + ZakAutho *zak_autho = (ZakAutho *)object; + ZakAuthoPrivate *priv = ZAK_AUTHO_GET_PRIVATE (zak_autho); switch (property_id) { @@ -2341,13 +2341,13 @@ autoz_set_property (GObject *object, } static void -autoz_get_property (GObject *object, +zak_autho_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec) { - Autoz *autoz = (Autoz *)object; - AutozPrivate *priv = AUTOZ_GET_PRIVATE (autoz); + ZakAutho *zak_autho = (ZakAutho *)object; + ZakAuthoPrivate *priv = ZAK_AUTHO_GET_PRIVATE (zak_autho); switch (property_id) { diff --git a/src/autoz.h b/src/autoz.h index 2a0558c..a8f0064 100644 --- a/src/autoz.h +++ b/src/autoz.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2012 Andrea Zagli + * Copyright (C) 2010-2015 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __LIBAUTOZ_H__ -#define __LIBAUTOZ_H__ +#ifndef __LIB_ZAK_AUTHO_H__ +#define __LIB_ZAK_AUTHO_H__ #include #include @@ -32,71 +32,71 @@ G_BEGIN_DECLS #include "role_interface.h" #include "resource_interface.h" -#define TYPE_AUTOZ (autoz_get_type ()) -#define AUTOZ(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_AUTOZ, Autoz)) -#define AUTOZ_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_AUTOZ, AutozClass)) -#define IS_AUTOZ(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_AUTOZ)) -#define IS_AUTOZ_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_AUTOZ)) -#define AUTOZ_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_AUTOZ, AutozClass)) +#define ZAK_TYPE_AUTHO (zak_autho_get_type ()) +#define ZAK_AUTHO(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ZAK_TYPE_AUTHO, ZakAutho)) +#define ZAK_AUTHO_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ZAK_TYPE_AUTHO, ZakAuthoClass)) +#define IS_ZAK_AUTHO(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ZAK_TYPE_AUTHO)) +#define IS_ZAK_AUTHO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ZAK_TYPE_AUTHO)) +#define ZAK_AUTHO_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ZAK_TYPE_AUTHO, ZakAuthoClass)) -typedef struct _Autoz Autoz; -typedef struct _AutozClass AutozClass; +typedef struct _ZakAutho ZakAutho; +typedef struct _ZakAuthoClass ZakAuthoClass; -struct _Autoz +struct _ZakAutho { GObject parent; }; -struct _AutozClass +struct _ZakAuthoClass { GObjectClass parent_class; }; -GType autoz_get_type (void) G_GNUC_CONST; +GType zak_autho_get_type (void) G_GNUC_CONST; -Autoz *autoz_new (void); +ZakAutho *zak_autho_new (void); -void autoz_set_role_name_prefix (Autoz *autoz, const gchar *prefix); -const gchar *autoz_get_role_name_prefix (Autoz *autoz); -void autoz_set_resource_name_prefix (Autoz *autoz, const gchar *prefix); -const gchar *autoz_get_resource_name_prefix (Autoz *autoz); +void zak_autho_set_role_name_prefix (ZakAutho *zak_autho, const gchar *prefix); +const gchar *zak_autho_get_role_name_prefix (ZakAutho *zak_autho); +void zak_autho_set_resource_name_prefix (ZakAutho *zak_autho, const gchar *prefix); +const gchar *zak_autho_get_resource_name_prefix (ZakAutho *zak_autho); -void autoz_add_role (Autoz *autoz, AutozIRole *irole); -void autoz_add_role_with_parents (Autoz *autoz, AutozIRole *irole, ...); -void autoz_add_parent_to_role (Autoz *autoz, AutozIRole *irole, AutozIRole *irole_parent); -void autoz_add_parents_to_role (Autoz *autoz, AutozIRole *irole, ...); +void zak_autho_add_role (ZakAutho *zak_autho, ZakAuthoIRole *irole); +void zak_autho_add_role_with_parents (ZakAutho *zak_autho, ZakAuthoIRole *irole, ...); +void zak_autho_add_parent_to_role (ZakAutho *zak_autho, ZakAuthoIRole *irole, ZakAuthoIRole *irole_parent); +void zak_autho_add_parents_to_role (ZakAutho *zak_autho, ZakAuthoIRole *irole, ...); -gboolean autoz_role_is_child (Autoz *autoz, AutozIRole *irole, AutozIRole *irole_parent); +gboolean zak_autho_role_is_child (ZakAutho *zak_autho, ZakAuthoIRole *irole, ZakAuthoIRole *irole_parent); -AutozIRole *autoz_get_role_from_id (Autoz *autoz, const gchar *role_id); +ZakAuthoIRole *zak_autho_get_role_from_id (ZakAutho *zak_autho, const gchar *role_id); -void autoz_add_resource (Autoz *autoz, AutozIResource *iresource); -void autoz_add_resource_with_parents (Autoz *autoz, AutozIResource *iresource, ...); -void autoz_add_parent_to_resource (Autoz *autoz, AutozIResource *iresource, AutozIResource *iresource_parent); -void autoz_add_parents_to_resource (Autoz *autoz, AutozIResource *iresource, ...); +void zak_autho_add_resource (ZakAutho *zak_autho, ZakAuthoIResource *iresource); +void zak_autho_add_resource_with_parents (ZakAutho *zak_autho, ZakAuthoIResource *iresource, ...); +void zak_autho_add_parent_to_resource (ZakAutho *zak_autho, ZakAuthoIResource *iresource, ZakAuthoIResource *iresource_parent); +void zak_autho_add_parents_to_resource (ZakAutho *zak_autho, ZakAuthoIResource *iresource, ...); -gboolean autoz_resource_is_child (Autoz *autoz, AutozIResource *iresource, AutozIResource *iresource_parent); +gboolean zak_autho_resource_is_child (ZakAutho *zak_autho, ZakAuthoIResource *iresource, ZakAuthoIResource *iresource_parent); -AutozIResource *autoz_get_resource_from_id (Autoz *autoz, const gchar *resource_id); +ZakAuthoIResource *zak_autho_get_resource_from_id (ZakAutho *zak_autho, const gchar *resource_id); -void autoz_allow (Autoz *autoz, AutozIRole *irole, AutozIResource *iresource); -void autoz_deny (Autoz *autoz, AutozIRole *irole, AutozIResource *iresource); +void zak_autho_allow (ZakAutho *zak_autho, ZakAuthoIRole *irole, ZakAuthoIResource *iresource); +void zak_autho_deny (ZakAutho *zak_autho, ZakAuthoIRole *irole, ZakAuthoIResource *iresource); -gboolean autoz_is_allowed (Autoz *autoz, AutozIRole *irole, AutozIResource *iresource, gboolean exclude_null); +gboolean zak_autho_is_allowed (ZakAutho *zak_autho, ZakAuthoIRole *irole, ZakAuthoIResource *iresource, gboolean exclude_null); -gboolean autoz_clear (Autoz *autoz); +gboolean zak_autho_clear (ZakAutho *zak_autho); -xmlNodePtr autoz_get_xml (Autoz *autoz); -gboolean autoz_load_from_xml (Autoz *autoz, xmlNodePtr xnode, gboolean replace); +xmlNodePtr zak_autho_get_xml (ZakAutho *zak_autho); +gboolean zak_autho_load_from_xml (ZakAutho *zak_autho, xmlNodePtr xnode, gboolean replace); -gboolean autoz_save_to_db (Autoz *autoz, GdaConnection *gdacon, const gchar *table_prefix, gboolean replace); -gboolean autoz_load_from_db (Autoz *autoz, GdaConnection *gdacon, const gchar *table_prefix, gboolean replace); -gboolean autoz_load_from_db_with_monitor (Autoz *autoz, GdaConnection *gdacon, const gchar *table_prefix, gboolean replace); +gboolean zak_autho_save_to_db (ZakAutho *zak_autho, GdaConnection *gdacon, const gchar *table_prefix, gboolean replace); +gboolean zak_autho_load_from_db (ZakAutho *zak_autho, GdaConnection *gdacon, const gchar *table_prefix, gboolean replace); +gboolean zak_autho_load_from_db_with_monitor (ZakAutho *zak_autho, GdaConnection *gdacon, const gchar *table_prefix, gboolean replace); G_END_DECLS -#endif /* __LIBAUTOZ_H__ */ +#endif /* __LIB_ZAK_AUTHO_H__ */ diff --git a/src/resource.c b/src/resource.c index 3bebecf..b8f284f 100644 --- a/src/resource.c +++ b/src/resource.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 Andrea Zagli + * Copyright (C) 2010-2015 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -23,72 +23,72 @@ #include "resource.h" #include "resource_interface.h" -static void autoz_resource_class_init (AutozResourceClass *class); -static void autoz_resource_init (AutozResource *form); +static void zak_autho_resource_class_init (ZakAuthoResourceClass *class); +static void zak_autho_resource_init (ZakAuthoResource *form); -static void autoz_iresource_interface_init (AutozIResourceIface *iface); +static void zak_autho_iresource_interface_init (ZakAuthoIResourceIface *iface); -static const gchar *autoz_resource_get_resource_id (AutozIResource *iresource); +static const gchar *zak_autho_resource_get_resource_id (ZakAuthoIResource *iresource); -static void autoz_resource_set_property (GObject *object, +static void zak_autho_resource_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec); -static void autoz_resource_get_property (GObject *object, +static void zak_autho_resource_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec); -#define AUTOZ_RESOURCE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), AUTOZ_TYPE_RESOURCE, AutozResourcePrivate)) +#define ZAK_AUTHO_RESOURCE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), ZAK_AUTHO_TYPE_RESOURCE, ZakAuthoResourcePrivate)) -typedef struct _AutozResourcePrivate AutozResourcePrivate; -struct _AutozResourcePrivate +typedef struct _ZakAuthoResourcePrivate ZakAuthoResourcePrivate; +struct _ZakAuthoResourcePrivate { gchar *resource_id; }; -G_DEFINE_TYPE_WITH_CODE (AutozResource, autoz_resource, G_TYPE_OBJECT, - G_IMPLEMENT_INTERFACE (AUTOZ_TYPE_IRESOURCE, - autoz_iresource_interface_init)); +G_DEFINE_TYPE_WITH_CODE (ZakAuthoResource, zak_autho_resource, G_TYPE_OBJECT, + G_IMPLEMENT_INTERFACE (ZAK_AUTHO_TYPE_IRESOURCE, + zak_autho_iresource_interface_init)); static void -autoz_resource_class_init (AutozResourceClass *class) +zak_autho_resource_class_init (ZakAuthoResourceClass *class) { GObjectClass *object_class = G_OBJECT_CLASS (class); - object_class->set_property = autoz_resource_set_property; - object_class->get_property = autoz_resource_get_property; + object_class->set_property = zak_autho_resource_set_property; + object_class->get_property = zak_autho_resource_get_property; - g_type_class_add_private (object_class, sizeof (AutozResourcePrivate)); + g_type_class_add_private (object_class, sizeof (ZakAuthoResourcePrivate)); } static void -autoz_resource_init (AutozResource *form) +zak_autho_resource_init (ZakAuthoResource *form) { - AutozResourcePrivate *priv = AUTOZ_RESOURCE_GET_PRIVATE (form); + ZakAuthoResourcePrivate *priv = ZAK_AUTHO_RESOURCE_GET_PRIVATE (form); } static void -autoz_iresource_interface_init (AutozIResourceIface *iface) +zak_autho_iresource_interface_init (ZakAuthoIResourceIface *iface) { - iface->get_resource_id = autoz_resource_get_resource_id; + iface->get_resource_id = zak_autho_resource_get_resource_id; } /** - * autoz_resource_new: + * zak_autho_resource_new: * @resource_id: * - * Returns: the newly created #AutozResource object. + * Returns: the newly created #ZakAuthoResource object. */ -AutozResource -*autoz_resource_new (const gchar *resource_id) +ZakAuthoResource +*zak_autho_resource_new (const gchar *resource_id) { - AutozResource *resource; - AutozResourcePrivate *priv; + ZakAuthoResource *resource; + ZakAuthoResourcePrivate *priv; - resource = AUTOZ_RESOURCE (g_object_new (autoz_resource_get_type (), NULL)); + resource = ZAK_AUTHO_RESOURCE (g_object_new (zak_autho_resource_get_type (), NULL)); - priv = AUTOZ_RESOURCE_GET_PRIVATE (resource); + priv = ZAK_AUTHO_RESOURCE_GET_PRIVATE (resource); priv->resource_id = g_strdup (resource_id); @@ -97,17 +97,17 @@ AutozResource /* PRIVATE */ static const gchar -*autoz_resource_get_resource_id (AutozIResource *iresource) +*zak_autho_resource_get_resource_id (ZakAuthoIResource *iresource) { - AutozResourcePrivate *priv; + ZakAuthoResourcePrivate *priv; const gchar *ret; ret = NULL; - g_return_val_if_fail (AUTOZ_IS_RESOURCE (iresource), ret); + g_return_val_if_fail (ZAK_AUTHO_IS_RESOURCE (iresource), ret); - priv = AUTOZ_RESOURCE_GET_PRIVATE (iresource); + priv = ZAK_AUTHO_RESOURCE_GET_PRIVATE (iresource); ret = (const gchar *)g_strdup (priv->resource_id); @@ -115,14 +115,14 @@ static const gchar } static void -autoz_resource_set_property (GObject *object, +zak_autho_resource_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec) { - AutozResource *form = (AutozResource *)object; + ZakAuthoResource *form = (ZakAuthoResource *)object; - AutozResourcePrivate *priv = AUTOZ_RESOURCE_GET_PRIVATE (form); + ZakAuthoResourcePrivate *priv = ZAK_AUTHO_RESOURCE_GET_PRIVATE (form); switch (property_id) { @@ -133,14 +133,14 @@ autoz_resource_set_property (GObject *object, } static void -autoz_resource_get_property (GObject *object, +zak_autho_resource_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec) { - AutozResource *form = (AutozResource *)object; + ZakAuthoResource *form = (ZakAuthoResource *)object; - AutozResourcePrivate *priv = AUTOZ_RESOURCE_GET_PRIVATE (form); + ZakAuthoResourcePrivate *priv = ZAK_AUTHO_RESOURCE_GET_PRIVATE (form); switch (property_id) { diff --git a/src/resource.h b/src/resource.h index eafaa79..def6377 100644 --- a/src/resource.h +++ b/src/resource.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 Andrea Zagli + * Copyright (C) 2010-2015 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __LIBAUTOZ_RESOURCE_H__ -#define __LIBAUTOZ_RESOURCE_H__ +#ifndef __LIB_ZAK_AUTHO_RESOURCE_H__ +#define __LIB_ZAK_AUTHO_RESOURCE_H__ #include #include @@ -26,34 +26,34 @@ G_BEGIN_DECLS -#define AUTOZ_TYPE_RESOURCE (autoz_resource_get_type ()) -#define AUTOZ_RESOURCE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), AUTOZ_TYPE_RESOURCE, AutozResource)) -#define AUTOZ_RESOURCE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), AUTOZ_TYPE_RESOURCE, AutozResourceClass)) -#define AUTOZ_IS_RESOURCE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), AUTOZ_TYPE_RESOURCE)) -#define AUTOZ_IS_RESOURCE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), AUTOZ_TYPE_RESOURCE)) -#define AUTOZ_RESOURCE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), AUTOZ_TYPE_RESOURCE, AutozResourceClass)) +#define ZAK_AUTHO_TYPE_RESOURCE (zak_autho_resource_get_type ()) +#define ZAK_AUTHO_RESOURCE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ZAK_AUTHO_TYPE_RESOURCE, ZakAuthoResource)) +#define ZAK_AUTHO_RESOURCE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ZAK_AUTHO_TYPE_RESOURCE, ZakAuthoResourceClass)) +#define ZAK_AUTHO_IS_RESOURCE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ZAK_AUTHO_TYPE_RESOURCE)) +#define ZAK_AUTHO_IS_RESOURCE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ZAK_AUTHO_TYPE_RESOURCE)) +#define ZAK_AUTHO_RESOURCE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ZAK_AUTHO_TYPE_RESOURCE, ZakAuthoResourceClass)) -typedef struct _AutozResource AutozResource; -typedef struct _AutozResourceClass AutozResourceClass; +typedef struct _ZakAuthoResource ZakAuthoResource; +typedef struct _ZakAuthoResourceClass ZakAuthoResourceClass; -struct _AutozResource +struct _ZakAuthoResource { GObject parent; }; -struct _AutozResourceClass +struct _ZakAuthoResourceClass { GObjectClass parent_class; }; -GType autoz_resource_get_type (void) G_GNUC_CONST; +GType zak_autho_resource_get_type (void) G_GNUC_CONST; -AutozResource *autoz_resource_new (const gchar *resource_id); +ZakAuthoResource *zak_autho_resource_new (const gchar *resource_id); G_END_DECLS -#endif /* __LIBAUTOZ_RESOURCE_H__ */ +#endif /* __LIBZAK_AUTHO_RESOURCE_H__ */ diff --git a/src/resource_interface.c b/src/resource_interface.c index b2d15f8..4f45b9e 100644 --- a/src/resource_interface.c +++ b/src/resource_interface.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 Andrea Zagli + * Copyright (C) 2010-2015 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,26 +22,26 @@ #include "resource_interface.h" -typedef AutozIResourceIface AutozIResourceInterface; -G_DEFINE_INTERFACE (AutozIResource, autoz_iresource, G_TYPE_OBJECT) +typedef ZakAuthoIResourceIface ZakAuthoIResourceInterface; +G_DEFINE_INTERFACE (ZakAuthoIResource, zak_autho_iresource, G_TYPE_OBJECT) static void -autoz_iresource_default_init (AutozIResourceInterface *iface) +zak_autho_iresource_default_init (ZakAuthoIResourceInterface *iface) { } const gchar -*autoz_iresource_get_resource_id (AutozIResource *iresource) +*zak_autho_iresource_get_resource_id (ZakAuthoIResource *iresource) { - AutozIResourceIface *iface; + ZakAuthoIResourceIface *iface; gchar *ret; ret = NULL; - g_return_val_if_fail (AUTOZ_IS_IRESOURCE (iresource), ret); + g_return_val_if_fail (ZAK_AUTHO_IS_IRESOURCE (iresource), ret); - iface = AUTOZ_IRESOURCE_GET_IFACE (iresource); + iface = ZAK_AUTHO_IRESOURCE_GET_IFACE (iresource); if (iface->get_resource_id) { diff --git a/src/resource_interface.h b/src/resource_interface.h index d145e41..ecbd180 100644 --- a/src/resource_interface.h +++ b/src/resource_interface.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 Andrea Zagli + * Copyright (C) 2010-2015 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __LIBAUTOZ_IRESOURCE_H__ -#define __LIBAUTOZ_IRESOURCE_H__ +#ifndef __LIB_ZAK_AUTHO_IRESOURCE_H__ +#define __LIB_ZAK_AUTHO_IRESOURCE_H__ #include @@ -25,28 +25,28 @@ G_BEGIN_DECLS -#define AUTOZ_TYPE_IRESOURCE (autoz_iresource_get_type ()) -#define AUTOZ_IRESOURCE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), AUTOZ_TYPE_IRESOURCE, AutozIResource)) -#define AUTOZ_IS_IRESOURCE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), AUTOZ_TYPE_IRESOURCE)) -#define AUTOZ_IRESOURCE_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), AUTOZ_TYPE_IRESOURCE, AutozIResourceIface)) +#define ZAK_AUTHO_TYPE_IRESOURCE (zak_autho_iresource_get_type ()) +#define ZAK_AUTHO_IRESOURCE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ZAK_AUTHO_TYPE_IRESOURCE, ZakAuthoIResource)) +#define ZAK_AUTHO_IS_IRESOURCE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ZAK_AUTHO_TYPE_IRESOURCE)) +#define ZAK_AUTHO_IRESOURCE_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ZAK_AUTHO_TYPE_IRESOURCE, ZakAuthoIResourceIface)) -typedef struct _AutozIResource AutozIResource; -typedef struct _AutozIResourceIface AutozIResourceIface; +typedef struct _ZakAuthoIResource ZakAuthoIResource; +typedef struct _ZakAuthoIResourceIface ZakAuthoIResourceIface; -struct _AutozIResourceIface +struct _ZakAuthoIResourceIface { GTypeInterface g_iface; - const gchar *(*get_resource_id) (AutozIResource *iresource); + const gchar *(*get_resource_id) (ZakAuthoIResource *iresource); }; -GType autoz_iresource_get_type (void) G_GNUC_CONST; +GType zak_autho_iresource_get_type (void) G_GNUC_CONST; -const gchar *autoz_iresource_get_resource_id (AutozIResource *iresource); +const gchar *zak_autho_iresource_get_resource_id (ZakAuthoIResource *iresource); G_END_DECLS -#endif /* __LIBAUTOZ_IRESOURCE_H__ */ +#endif /* __LIB_ZAK_AUTHO_IRESOURCE_H__ */ diff --git a/src/role.c b/src/role.c index 68b397f..1af6c4d 100644 --- a/src/role.c +++ b/src/role.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 Andrea Zagli + * Copyright (C) 2010-2015 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -23,72 +23,72 @@ #include "role.h" #include "role_interface.h" -static void autoz_role_class_init (AutozRoleClass *class); -static void autoz_role_init (AutozRole *role); +static void zak_autho_role_class_init (ZakAuthoRoleClass *class); +static void zak_autho_role_init (ZakAuthoRole *role); -static void autoz_irole_interface_init (AutozIRoleIface *iface); +static void zak_autho_irole_interface_init (ZakAuthoIRoleIface *iface); -static const gchar *autoz_role_get_role_id (AutozIRole *irole); +static const gchar *zak_autho_role_get_role_id (ZakAuthoIRole *irole); -static void autoz_role_set_property (GObject *object, +static void zak_autho_role_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec); -static void autoz_role_get_property (GObject *object, +static void zak_autho_role_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec); -#define AUTOZ_ROLE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), AUTOZ_TYPE_ROLE, AutozRolePrivate)) +#define ZAK_AUTHO_ROLE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), ZAK_AUTHO_TYPE_ROLE, ZakAuthoRolePrivate)) -typedef struct _AutozRolePrivate AutozRolePrivate; -struct _AutozRolePrivate +typedef struct _ZakAuthoRolePrivate ZakAuthoRolePrivate; +struct _ZakAuthoRolePrivate { gchar *role_id; }; -G_DEFINE_TYPE_WITH_CODE (AutozRole, autoz_role, G_TYPE_OBJECT, - G_IMPLEMENT_INTERFACE (AUTOZ_TYPE_IROLE, - autoz_irole_interface_init)); +G_DEFINE_TYPE_WITH_CODE (ZakAuthoRole, zak_autho_role, G_TYPE_OBJECT, + G_IMPLEMENT_INTERFACE (ZAK_AUTHO_TYPE_IROLE, + zak_autho_irole_interface_init)); static void -autoz_role_class_init (AutozRoleClass *class) +zak_autho_role_class_init (ZakAuthoRoleClass *class) { GObjectClass *object_class = G_OBJECT_CLASS (class); - object_class->set_property = autoz_role_set_property; - object_class->get_property = autoz_role_get_property; + object_class->set_property = zak_autho_role_set_property; + object_class->get_property = zak_autho_role_get_property; - g_type_class_add_private (object_class, sizeof (AutozRolePrivate)); + g_type_class_add_private (object_class, sizeof (ZakAuthoRolePrivate)); } static void -autoz_role_init (AutozRole *form) +zak_autho_role_init (ZakAuthoRole *form) { - AutozRolePrivate *priv = AUTOZ_ROLE_GET_PRIVATE (form); + ZakAuthoRolePrivate *priv = ZAK_AUTHO_ROLE_GET_PRIVATE (form); } static void -autoz_irole_interface_init (AutozIRoleIface *iface) +zak_autho_irole_interface_init (ZakAuthoIRoleIface *iface) { - iface->get_role_id = autoz_role_get_role_id; + iface->get_role_id = zak_autho_role_get_role_id; } /** - * autoz_role_new: + * zak_autho_role_new: * @role_id: * - * Returns: the newly created #AutozRole object. + * Returns: the newly created #ZakAuthoRole object. */ -AutozRole -*autoz_role_new (const gchar *role_id) +ZakAuthoRole +*zak_autho_role_new (const gchar *role_id) { - AutozRole *role; - AutozRolePrivate *priv; + ZakAuthoRole *role; + ZakAuthoRolePrivate *priv; - role = AUTOZ_ROLE (g_object_new (autoz_role_get_type (), NULL)); + role = ZAK_AUTHO_ROLE (g_object_new (zak_autho_role_get_type (), NULL)); - priv = AUTOZ_ROLE_GET_PRIVATE (role); + priv = ZAK_AUTHO_ROLE_GET_PRIVATE (role); priv->role_id = g_strdup (role_id); @@ -97,17 +97,17 @@ AutozRole /* PRIVATE */ static const gchar -*autoz_role_get_role_id (AutozIRole *irole) +*zak_autho_role_get_role_id (ZakAuthoIRole *irole) { - AutozRolePrivate *priv; + ZakAuthoRolePrivate *priv; const gchar *ret; ret = NULL; - g_return_val_if_fail (AUTOZ_IS_ROLE (irole), ret); + g_return_val_if_fail (ZAK_AUTHO_IS_ROLE (irole), ret); - priv = AUTOZ_ROLE_GET_PRIVATE (irole); + priv = ZAK_AUTHO_ROLE_GET_PRIVATE (irole); ret = (const gchar *)g_strdup (priv->role_id); @@ -115,14 +115,14 @@ static const gchar } static void -autoz_role_set_property (GObject *object, +zak_autho_role_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec) { - AutozRole *form = (AutozRole *)object; + ZakAuthoRole *form = (ZakAuthoRole *)object; - AutozRolePrivate *priv = AUTOZ_ROLE_GET_PRIVATE (form); + ZakAuthoRolePrivate *priv = ZAK_AUTHO_ROLE_GET_PRIVATE (form); switch (property_id) { @@ -133,14 +133,14 @@ autoz_role_set_property (GObject *object, } static void -autoz_role_get_property (GObject *object, +zak_autho_role_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec) { - AutozRole *form = (AutozRole *)object; + ZakAuthoRole *form = (ZakAuthoRole *)object; - AutozRolePrivate *priv = AUTOZ_ROLE_GET_PRIVATE (form); + ZakAuthoRolePrivate *priv = ZAK_AUTHO_ROLE_GET_PRIVATE (form); switch (property_id) { diff --git a/src/role.h b/src/role.h index dbbca36..7e38f8c 100644 --- a/src/role.h +++ b/src/role.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 Andrea Zagli + * Copyright (C) 2010-2015 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __LIBAUTOZ_ROLE_H__ -#define __LIBAUTOZ_ROLE_H__ +#ifndef __LIB_ZAK_AUTHO_ROLE_H__ +#define __LIB_ZAK_AUTHO_ROLE_H__ #include #include @@ -26,34 +26,34 @@ G_BEGIN_DECLS -#define AUTOZ_TYPE_ROLE (autoz_role_get_type ()) -#define AUTOZ_ROLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), AUTOZ_TYPE_ROLE, AutozRole)) -#define AUTOZ_ROLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), AUTOZ_TYPE_ROLE, AutozRoleClass)) -#define AUTOZ_IS_ROLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), AUTOZ_TYPE_ROLE)) -#define AUTOZ_IS_ROLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), AUTOZ_TYPE_ROLE)) -#define AUTOZ_ROLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), AUTOZ_TYPE_ROLE, AutozRoleClass)) +#define ZAK_AUTHO_TYPE_ROLE (zak_autho_role_get_type ()) +#define ZAK_AUTHO_ROLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ZAK_AUTHO_TYPE_ROLE, ZakAuthoRole)) +#define ZAK_AUTHO_ROLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ZAK_AUTHO_TYPE_ROLE, ZakAuthoRoleClass)) +#define ZAK_AUTHO_IS_ROLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ZAK_AUTHO_TYPE_ROLE)) +#define ZAK_AUTHO_IS_ROLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ZAK_AUTHO_TYPE_ROLE)) +#define ZAK_AUTHO_ROLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ZAK_AUTHO_TYPE_ROLE, ZakAuthoRoleClass)) -typedef struct _AutozRole AutozRole; -typedef struct _AutozRoleClass AutozRoleClass; +typedef struct _ZakAuthoRole ZakAuthoRole; +typedef struct _ZakAuthoRoleClass ZakAuthoRoleClass; -struct _AutozRole +struct _ZakAuthoRole { GObject parent; }; -struct _AutozRoleClass +struct _ZakAuthoRoleClass { GObjectClass parent_class; }; -GType autoz_role_get_type (void) G_GNUC_CONST; +GType zak_autho_role_get_type (void) G_GNUC_CONST; -AutozRole *autoz_role_new (const gchar *role_id); +ZakAuthoRole *zak_autho_role_new (const gchar *role_id); G_END_DECLS -#endif /* __LIBAUTOZ_ROLE_H__ */ +#endif /* __LIB_ZAK_AUTHO_ROLE_H__ */ diff --git a/src/role_interface.c b/src/role_interface.c index 815b417..5e12b09 100644 --- a/src/role_interface.c +++ b/src/role_interface.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 Andrea Zagli + * Copyright (C) 2010-2015 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,26 +22,26 @@ #include "role_interface.h" -typedef AutozIRoleIface AutozIRoleInterface; -G_DEFINE_INTERFACE (AutozIRole, autoz_irole, G_TYPE_OBJECT) +typedef ZakAuthoIRoleIface ZakAuthoIRoleInterface; +G_DEFINE_INTERFACE (ZakAuthoIRole, zak_autho_irole, G_TYPE_OBJECT) static void -autoz_irole_default_init (AutozIRoleInterface *iface) +zak_autho_irole_default_init (ZakAuthoIRoleInterface *iface) { } const gchar -*autoz_irole_get_role_id (AutozIRole *irole) +*zak_autho_irole_get_role_id (ZakAuthoIRole *irole) { - AutozIRoleIface *iface; + ZakAuthoIRoleIface *iface; gchar *ret; ret = NULL; - g_return_val_if_fail (AUTOZ_IS_IROLE (irole), ret); + g_return_val_if_fail (ZAK_AUTHO_IS_IROLE (irole), ret); - iface = AUTOZ_IROLE_GET_IFACE (irole); + iface = ZAK_AUTHO_IROLE_GET_IFACE (irole); if (iface->get_role_id) { diff --git a/src/role_interface.h b/src/role_interface.h index b5fbc72..175013b 100644 --- a/src/role_interface.h +++ b/src/role_interface.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 Andrea Zagli + * Copyright (C) 2010-2015 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef __LIBAUTOZ_IROLE_H__ -#define __LIBAUTOZ_IROLE_H__ +#ifndef __LIB_ZAK_AUTHO_IROLE_H__ +#define __LIB_ZAK_AUTHO_IROLE_H__ #include @@ -25,28 +25,28 @@ G_BEGIN_DECLS -#define AUTOZ_TYPE_IROLE (autoz_irole_get_type ()) -#define AUTOZ_IROLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), AUTOZ_TYPE_IROLE, AutozIRole)) -#define AUTOZ_IS_IROLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), AUTOZ_TYPE_IROLE)) -#define AUTOZ_IROLE_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), AUTOZ_TYPE_IROLE, AutozIRoleIface)) +#define ZAK_AUTHO_TYPE_IROLE (zak_autho_irole_get_type ()) +#define ZAK_AUTHO_IROLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ZAK_AUTHO_TYPE_IROLE, ZakAuthoIRole)) +#define ZAK_AUTHO_IS_IROLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ZAK_AUTHO_TYPE_IROLE)) +#define ZAK_AUTHO_IROLE_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), ZAK_AUTHO_TYPE_IROLE, ZakAuthoIRoleIface)) -typedef struct _AutozIRole AutozIRole; -typedef struct _AutozIRoleIface AutozIRoleIface; +typedef struct _ZakAuthoIRole ZakAuthoIRole; +typedef struct _ZakAuthoIRoleIface ZakAuthoIRoleIface; -struct _AutozIRoleIface +struct _ZakAuthoIRoleIface { GTypeInterface g_iface; - const gchar *(*get_role_id) (AutozIRole *irole); + const gchar *(*get_role_id) (ZakAuthoIRole *irole); }; -GType autoz_irole_get_type (void) G_GNUC_CONST; +GType zak_autho_irole_get_type (void) G_GNUC_CONST; -const gchar *autoz_irole_get_role_id (AutozIRole *irole); +const gchar *zak_autho_irole_get_role_id (ZakAuthoIRole *irole); G_END_DECLS -#endif /* __LIBAUTOZ_IROLE_H__ */ +#endif /* __LIB_ZAK_AUTHO_IROLE_H__ */ diff --git a/tests/Makefile.am b/tests/Makefile.am index f6fe04d..8f12fb9 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -9,7 +9,7 @@ noinst_PROGRAMS = test \ test_from_xml \ test_from_xml_to_db -LDADD = $(top_builddir)/src/libautoz.la +LDADD = $(top_builddir)/src/libzakautho.la EXTRA_DIST = test_from_xml.xml \ test_to_db.db diff --git a/tests/test.c b/tests/test.c index 8f0d667..8ce2581 100644 --- a/tests/test.c +++ b/tests/test.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2013 Andrea Zagli + * Copyright (C) 2010-2015 Andrea Zagli * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,6 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include + #include #include "autoz.h" @@ -25,48 +27,48 @@ int main (int argc, char **argv) { - Autoz *autoz; - AutozRole *role_writer; - AutozRole *role_writer_child; - AutozRole *role_read_only; - AutozResource *resource_page; + ZakAutho *zak_autho; + ZakAuthoRole *role_writer; + ZakAuthoRole *role_writer_child; + ZakAuthoRole *role_read_only; + ZakAuthoResource *resource_page; xmlDocPtr xdoc; xmlNodePtr xnode; - autoz = autoz_new (); + zak_autho = zak_autho_new (); - autoz_add_role (autoz, AUTOZ_IROLE (autoz_role_new ("super-admin"))); + zak_autho_add_role (zak_autho, ZAK_AUTHO_IROLE (zak_autho_role_new ("super-admin"))); - autoz_allow (autoz, - autoz_get_role_from_id (autoz, "super-admin"), + zak_autho_allow (zak_autho, + zak_autho_get_role_from_id (zak_autho, "super-admin"), NULL); - role_writer = autoz_role_new ("writer"); - autoz_add_role (autoz, AUTOZ_IROLE (role_writer)); + role_writer = zak_autho_role_new ("writer"); + zak_autho_add_role (zak_autho, ZAK_AUTHO_IROLE (role_writer)); - role_writer_child = autoz_role_new ("writer-child"); - autoz_add_role_with_parents (autoz, AUTOZ_IROLE (role_writer_child), - AUTOZ_IROLE (role_writer), + role_writer_child = zak_autho_role_new ("writer-child"); + zak_autho_add_role_with_parents (zak_autho, ZAK_AUTHO_IROLE (role_writer_child), + ZAK_AUTHO_IROLE (role_writer), NULL); - role_read_only = autoz_role_new ("read-only"); - autoz_add_role (autoz, AUTOZ_IROLE (role_read_only)); + role_read_only = zak_autho_role_new ("read-only"); + zak_autho_add_role (zak_autho, ZAK_AUTHO_IROLE (role_read_only)); - resource_page = autoz_resource_new ("page"); - autoz_add_resource (autoz, AUTOZ_IRESOURCE (resource_page)); + resource_page = zak_autho_resource_new ("page"); + zak_autho_add_resource (zak_autho, ZAK_AUTHO_IRESOURCE (resource_page)); - autoz_add_resource_with_parents (autoz, - AUTOZ_IRESOURCE (autoz_resource_new ("paragraph")), - autoz_get_resource_from_id (autoz, "page"), + zak_autho_add_resource_with_parents (zak_autho, + ZAK_AUTHO_IRESOURCE (zak_autho_resource_new ("paragraph")), + zak_autho_get_resource_from_id (zak_autho, "page"), NULL); - autoz_allow (autoz, AUTOZ_IROLE (role_writer), AUTOZ_IRESOURCE (resource_page)); + zak_autho_allow (zak_autho, ZAK_AUTHO_IROLE (role_writer), ZAK_AUTHO_IRESOURCE (resource_page)); - autoz_deny (autoz, AUTOZ_IROLE (role_writer_child), AUTOZ_IRESOURCE (autoz_get_resource_from_id (autoz, "paragraph"))); + zak_autho_deny (zak_autho, ZAK_AUTHO_IROLE (role_writer_child), ZAK_AUTHO_IRESOURCE (zak_autho_get_resource_from_id (zak_autho, "paragraph"))); /* get xml */ - xnode = autoz_get_xml (autoz); + xnode = zak_autho_get_xml (zak_autho); if (xnode != NULL) { xdoc = xmlNewDoc ("1.0"); @@ -77,21 +79,21 @@ main (int argc, char **argv) } g_message ("super-admin %s allowed to page.", - (autoz_is_allowed (autoz, autoz_get_role_from_id (autoz, "super-admin"), AUTOZ_IRESOURCE (resource_page), FALSE) ? "is" : "isn't")); + (zak_autho_is_allowed (zak_autho, zak_autho_get_role_from_id (zak_autho, "super-admin"), ZAK_AUTHO_IRESOURCE (resource_page), FALSE) ? "is" : "isn't")); g_message ("super-admin %s allowed to paragraph.", - (autoz_is_allowed (autoz, autoz_get_role_from_id (autoz, "super-admin"), AUTOZ_IRESOURCE (autoz_get_resource_from_id (autoz, "paragraph")), FALSE) ? "is" : "isn't")); + (zak_autho_is_allowed (zak_autho, zak_autho_get_role_from_id (zak_autho, "super-admin"), ZAK_AUTHO_IRESOURCE (zak_autho_get_resource_from_id (zak_autho, "paragraph")), FALSE) ? "is" : "isn't")); g_message ("writer %s allowed to page.", - (autoz_is_allowed (autoz, AUTOZ_IROLE (role_writer), AUTOZ_IRESOURCE (resource_page), FALSE) ? "is" : "isn't")); + (zak_autho_is_allowed (zak_autho, ZAK_AUTHO_IROLE (role_writer), ZAK_AUTHO_IRESOURCE (resource_page), FALSE) ? "is" : "isn't")); g_message ("writer-child %s allowed to page.", - (autoz_is_allowed (autoz, AUTOZ_IROLE (role_writer_child), AUTOZ_IRESOURCE (resource_page), FALSE) ? "is" : "isn't")); + (zak_autho_is_allowed (zak_autho, ZAK_AUTHO_IROLE (role_writer_child), ZAK_AUTHO_IRESOURCE (resource_page), FALSE) ? "is" : "isn't")); g_message ("writer %s allowed to paragraph.", - (autoz_is_allowed (autoz, AUTOZ_IROLE (role_writer), AUTOZ_IRESOURCE (autoz_get_resource_from_id (autoz, "paragraph")), FALSE) ? "is" : "isn't")); + (zak_autho_is_allowed (zak_autho, ZAK_AUTHO_IROLE (role_writer), ZAK_AUTHO_IRESOURCE (zak_autho_get_resource_from_id (zak_autho, "paragraph")), FALSE) ? "is" : "isn't")); g_message ("writer-child %s allowed to paragraph.", - (autoz_is_allowed (autoz, AUTOZ_IROLE (role_writer_child), AUTOZ_IRESOURCE (autoz_get_resource_from_id (autoz, "paragraph")), FALSE) ? "is" : "isn't")); + (zak_autho_is_allowed (zak_autho, ZAK_AUTHO_IROLE (role_writer_child), ZAK_AUTHO_IRESOURCE (zak_autho_get_resource_from_id (zak_autho, "paragraph")), FALSE) ? "is" : "isn't")); g_message ("read-only %s allowed to page.", - (autoz_is_allowed (autoz, AUTOZ_IROLE (role_read_only), AUTOZ_IRESOURCE (resource_page), FALSE) ? "is" : "isn't")); + (zak_autho_is_allowed (zak_autho, ZAK_AUTHO_IROLE (role_read_only), ZAK_AUTHO_IRESOURCE (resource_page), FALSE) ? "is" : "isn't")); g_message ("read-only %s allowed to paragraph.", - (autoz_is_allowed (autoz, AUTOZ_IROLE (role_read_only), AUTOZ_IRESOURCE (autoz_get_resource_from_id (autoz, "paragraph")), FALSE) ? "is" : "isn't")); + (zak_autho_is_allowed (zak_autho, ZAK_AUTHO_IROLE (role_read_only), ZAK_AUTHO_IRESOURCE (zak_autho_get_resource_from_id (zak_autho, "paragraph")), FALSE) ? "is" : "isn't")); return 0; } diff --git a/tests/test_from_xml.c b/tests/test_from_xml.c index 80dd907..f71349e 100644 --- a/tests/test_from_xml.c +++ b/tests/test_from_xml.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2013 Andrea Zagli + * Copyright (C) 2010-2015 Andrea Zagli * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,6 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include + #include #include "autoz.h" @@ -23,12 +25,12 @@ int main (int argc, char **argv) { - Autoz *autoz; + ZakAutho *zak_autho; xmlDocPtr xdoc; xmlNodePtr xnode; - autoz = autoz_new (); + zak_autho = zak_autho_new (); if (argc <= 1) { @@ -43,10 +45,10 @@ main (int argc, char **argv) return 0; } - autoz_load_from_xml (autoz, xmlDocGetRootElement (xdoc), TRUE); + zak_autho_load_from_xml (zak_autho, xmlDocGetRootElement (xdoc), TRUE); /* get xml */ - xnode = autoz_get_xml (autoz); + xnode = zak_autho_get_xml (zak_autho); if (xnode != NULL) { xdoc = xmlNewDoc ("1.0"); @@ -57,33 +59,33 @@ main (int argc, char **argv) } g_message ("super-admin %s allowed to page.", - (autoz_is_allowed (autoz, autoz_get_role_from_id (autoz, "super-admin"), autoz_get_resource_from_id (autoz, "page"), FALSE) ? "is" : "isn't")); + (zak_autho_is_allowed (zak_autho, zak_autho_get_role_from_id (zak_autho, "super-admin"), zak_autho_get_resource_from_id (zak_autho, "page"), FALSE) ? "is" : "isn't")); g_message ("super-admin %s allowed to paragraph.", - (autoz_is_allowed (autoz, autoz_get_role_from_id (autoz, "super-admin"), autoz_get_resource_from_id (autoz, "paragraph"), FALSE) ? "is" : "isn't")); + (zak_autho_is_allowed (zak_autho, zak_autho_get_role_from_id (zak_autho, "super-admin"), zak_autho_get_resource_from_id (zak_autho, "paragraph"), FALSE) ? "is" : "isn't")); g_message ("super-admin %s allowed to paragraph (exclude_null).", - (autoz_is_allowed (autoz, autoz_get_role_from_id (autoz, "super-admin"), autoz_get_resource_from_id (autoz, "paragraph"), TRUE) ? "is" : "isn't")); + (zak_autho_is_allowed (zak_autho, zak_autho_get_role_from_id (zak_autho, "super-admin"), zak_autho_get_resource_from_id (zak_autho, "paragraph"), TRUE) ? "is" : "isn't")); g_message ("writer %s allowed to page.", - (autoz_is_allowed (autoz, autoz_get_role_from_id (autoz, "writer"), autoz_get_resource_from_id (autoz, "page"), FALSE) ? "is" : "isn't")); + (zak_autho_is_allowed (zak_autho, zak_autho_get_role_from_id (zak_autho, "writer"), zak_autho_get_resource_from_id (zak_autho, "page"), FALSE) ? "is" : "isn't")); g_message ("writer-child %s allowed to page.", - (autoz_is_allowed (autoz, autoz_get_role_from_id (autoz, "writer-child"), autoz_get_resource_from_id (autoz, "page"), FALSE) ? "is" : "isn't")); + (zak_autho_is_allowed (zak_autho, zak_autho_get_role_from_id (zak_autho, "writer-child"), zak_autho_get_resource_from_id (zak_autho, "page"), FALSE) ? "is" : "isn't")); g_message ("writer %s allowed to paragraph.", - (autoz_is_allowed (autoz, autoz_get_role_from_id (autoz, "writer"), autoz_get_resource_from_id (autoz, "paragraph"), FALSE) ? "is" : "isn't")); + (zak_autho_is_allowed (zak_autho, zak_autho_get_role_from_id (zak_autho, "writer"), zak_autho_get_resource_from_id (zak_autho, "paragraph"), FALSE) ? "is" : "isn't")); g_message ("writer-child %s allowed to paragraph.", - (autoz_is_allowed (autoz, autoz_get_role_from_id (autoz, "writer-child"), autoz_get_resource_from_id (autoz, "paragraph"), FALSE) ? "is" : "isn't")); + (zak_autho_is_allowed (zak_autho, zak_autho_get_role_from_id (zak_autho, "writer-child"), zak_autho_get_resource_from_id (zak_autho, "paragraph"), FALSE) ? "is" : "isn't")); g_message ("read-only %s allowed to page.", - (autoz_is_allowed (autoz, autoz_get_role_from_id (autoz, "read-only"), autoz_get_resource_from_id (autoz, "page"), FALSE) ? "is" : "isn't")); + (zak_autho_is_allowed (zak_autho, zak_autho_get_role_from_id (zak_autho, "read-only"), zak_autho_get_resource_from_id (zak_autho, "page"), FALSE) ? "is" : "isn't")); g_message ("read-only %s allowed to paragraph.", - (autoz_is_allowed (autoz, autoz_get_role_from_id (autoz, "read-only"), autoz_get_resource_from_id (autoz, "paragraph"), FALSE) ? "is" : "isn't")); + (zak_autho_is_allowed (zak_autho, zak_autho_get_role_from_id (zak_autho, "read-only"), zak_autho_get_resource_from_id (zak_autho, "paragraph"), FALSE) ? "is" : "isn't")); g_message ("writer-child %s child of writer", - (autoz_role_is_child (autoz, autoz_get_role_from_id (autoz, "writer-child"), autoz_get_role_from_id (autoz, "writer")) ? "is" : "isn't")); + (zak_autho_role_is_child (zak_autho, zak_autho_get_role_from_id (zak_autho, "writer-child"), zak_autho_get_role_from_id (zak_autho, "writer")) ? "is" : "isn't")); g_message ("read-only %s child of super-admin", - (autoz_role_is_child (autoz, autoz_get_role_from_id (autoz, "read-only"), autoz_get_role_from_id (autoz, "super-admin")) ? "is" : "isn't")); + (zak_autho_role_is_child (zak_autho, zak_autho_get_role_from_id (zak_autho, "read-only"), zak_autho_get_role_from_id (zak_autho, "super-admin")) ? "is" : "isn't")); g_message ("page %s child of paragraph", - (autoz_resource_is_child (autoz, autoz_get_resource_from_id (autoz, "page"), autoz_get_resource_from_id (autoz, "paragraph")) ? "is" : "isn't")); + (zak_autho_resource_is_child (zak_autho, zak_autho_get_resource_from_id (zak_autho, "page"), zak_autho_get_resource_from_id (zak_autho, "paragraph")) ? "is" : "isn't")); g_message ("paragraph %s child of page", - (autoz_resource_is_child (autoz, autoz_get_resource_from_id (autoz, "paragraph"), autoz_get_resource_from_id (autoz, "page")) ? "is" : "isn't")); + (zak_autho_resource_is_child (zak_autho, zak_autho_get_resource_from_id (zak_autho, "paragraph"), zak_autho_get_resource_from_id (zak_autho, "page")) ? "is" : "isn't")); return 0; } diff --git a/tests/test_from_xml_to_db.c b/tests/test_from_xml_to_db.c index 210f672..342f6dc 100644 --- a/tests/test_from_xml_to_db.c +++ b/tests/test_from_xml_to_db.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2013 Andrea Zagli + * Copyright (C) 2010-2015 Andrea Zagli * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,6 +16,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include + #include #include @@ -25,7 +27,7 @@ int main (int argc, char **argv) { - Autoz *autoz; + ZakAutho *zak_autho; xmlDocPtr xdoc; xmlNodePtr xnode; @@ -35,7 +37,7 @@ main (int argc, char **argv) gda_init (); - autoz = autoz_new (); + zak_autho = zak_autho_new (); if (argc < 2) { @@ -50,7 +52,7 @@ main (int argc, char **argv) return 0; } - autoz_load_from_xml (autoz, xmlDocGetRootElement (xdoc), TRUE); + zak_autho_load_from_xml (zak_autho, xmlDocGetRootElement (xdoc), TRUE); error = NULL; gdacon = gda_connection_open_from_string (NULL, argv[2], NULL, 0, &error); @@ -61,17 +63,17 @@ main (int argc, char **argv) } /* save to db */ - autoz_save_to_db (autoz, gdacon, NULL, TRUE); + zak_autho_save_to_db (zak_autho, gdacon, NULL, TRUE); - g_object_unref (autoz); - autoz = NULL; + g_object_unref (zak_autho); + zak_autho = NULL; /* reload from db */ - autoz = autoz_new (); - autoz_load_from_db (autoz, gdacon, NULL, TRUE); + zak_autho = zak_autho_new (); + zak_autho_load_from_db (zak_autho, gdacon, NULL, TRUE); /* get xml */ - xnode = autoz_get_xml (autoz); + xnode = zak_autho_get_xml (zak_autho); if (xnode != NULL) { xdoc = xmlNewDoc ("1.0"); @@ -82,21 +84,21 @@ main (int argc, char **argv) } g_message ("super-admin %s allowed to page.", - (autoz_is_allowed (autoz, autoz_get_role_from_id (autoz, "super-admin"), autoz_get_resource_from_id (autoz, "page"), FALSE) ? "is" : "isn't")); + (zak_autho_is_allowed (zak_autho, zak_autho_get_role_from_id (zak_autho, "super-admin"), zak_autho_get_resource_from_id (zak_autho, "page"), FALSE) ? "is" : "isn't")); g_message ("super-admin %s allowed to paragraph.", - (autoz_is_allowed (autoz, autoz_get_role_from_id (autoz, "super-admin"), autoz_get_resource_from_id (autoz, "paragraph"), FALSE) ? "is" : "isn't")); + (zak_autho_is_allowed (zak_autho, zak_autho_get_role_from_id (zak_autho, "super-admin"), zak_autho_get_resource_from_id (zak_autho, "paragraph"), FALSE) ? "is" : "isn't")); g_message ("writer %s allowed to page.", - (autoz_is_allowed (autoz, autoz_get_role_from_id (autoz, "writer"), autoz_get_resource_from_id (autoz, "page"), FALSE) ? "is" : "isn't")); + (zak_autho_is_allowed (zak_autho, zak_autho_get_role_from_id (zak_autho, "writer"), zak_autho_get_resource_from_id (zak_autho, "page"), FALSE) ? "is" : "isn't")); g_message ("writer-child %s allowed to page.", - (autoz_is_allowed (autoz, autoz_get_role_from_id (autoz, "writer-child"), autoz_get_resource_from_id (autoz, "page"), FALSE) ? "is" : "isn't")); + (zak_autho_is_allowed (zak_autho, zak_autho_get_role_from_id (zak_autho, "writer-child"), zak_autho_get_resource_from_id (zak_autho, "page"), FALSE) ? "is" : "isn't")); g_message ("writer %s allowed to paragraph.", - (autoz_is_allowed (autoz, autoz_get_role_from_id (autoz, "writer"), autoz_get_resource_from_id (autoz, "paragraph"), FALSE) ? "is" : "isn't")); + (zak_autho_is_allowed (zak_autho, zak_autho_get_role_from_id (zak_autho, "writer"), zak_autho_get_resource_from_id (zak_autho, "paragraph"), FALSE) ? "is" : "isn't")); g_message ("writer-child %s allowed to paragraph.", - (autoz_is_allowed (autoz, autoz_get_role_from_id (autoz, "writer-child"), autoz_get_resource_from_id (autoz, "paragraph"), FALSE) ? "is" : "isn't")); + (zak_autho_is_allowed (zak_autho, zak_autho_get_role_from_id (zak_autho, "writer-child"), zak_autho_get_resource_from_id (zak_autho, "paragraph"), FALSE) ? "is" : "isn't")); g_message ("read-only %s allowed to page.", - (autoz_is_allowed (autoz, autoz_get_role_from_id (autoz, "read-only"), autoz_get_resource_from_id (autoz, "page"), FALSE) ? "is" : "isn't")); + (zak_autho_is_allowed (zak_autho, zak_autho_get_role_from_id (zak_autho, "read-only"), zak_autho_get_resource_from_id (zak_autho, "page"), FALSE) ? "is" : "isn't")); g_message ("read-only %s allowed to paragraph.", - (autoz_is_allowed (autoz, autoz_get_role_from_id (autoz, "read-only"), autoz_get_resource_from_id (autoz, "paragraph"), FALSE) ? "is" : "isn't")); + (zak_autho_is_allowed (zak_autho, zak_autho_get_role_from_id (zak_autho, "read-only"), zak_autho_get_resource_from_id (zak_autho, "paragraph"), FALSE) ? "is" : "isn't")); return 0; } -- 2.49.0