Skip to content

GitLab

P
polkit
Commit 36c1b772 authored by David Zeuthen's avatar David Zeuthen
Browse files
Options

rename libpolkit to polkit 

It's more consistent and, uhm, easier to type.
parent 9e492bfb
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1358 additions and 1091 deletions
Makefile.am
View file @ 36c1b772
## Process this file with automake to produce Makefile.in
SUBDIRS = libpolkit libpolkit-dbus libpolkit-grant modules doc tools policy
pamdir = $(sysconfdir)/pam.d
pam_DATA = polkit
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libpolkit.pc libpolkit-dbus.pc libpolkit-grant.pc
DISTCLEANFILES = libpolkit.pc libpolkit-dbus.pc libpolkit-grant.pc
SUBDIRS = data polkit polkit-dbus polkit-grant modules doc tools policy
# Creating ChangeLog from git log (taken from cairo/Makefile.am):
ChangeLog: $(srcdir)/ChangeLog
......@@ -29,7 +21,7 @@ $(srcdir)/ChangeLog:
.PHONY: ChangeLog $(srcdir)/ChangeLog
EXTRA_DIST = HACKING polkit.in libpolkit.pc.in libpolkit-dbus.pc.in libpolkit-grant.pc.in mkinstalldirs ChangeLog
EXTRA_DIST = HACKING mkinstalldirs ChangeLog
clean-local :
rm -f *~
configure.in
View file @ 36c1b772
......@@ -6,7 +6,7 @@ AM_INIT_AUTOMAKE(PolicyKit, 0.3)
AM_CONFIG_HEADER(config.h)
AM_MAINTAINER_MODE
# libtool versioning - this applies to libpolkit
# libtool versioning - this applies to all libraries in this package
#
# See http://sources.redhat.com/autobook/autobook/autobook_91.html#SEC91 for details
#
......@@ -325,23 +325,24 @@ AC_DEFINE_UNQUOTED(PAM_FILE_INCLUDE_PASSWORD, "$PAM_FILE_INCLUDE_PASSWORD", [pam
AC_DEFINE_UNQUOTED(PAM_FILE_INCLUDE_SESSION, "$PAM_FILE_INCLUDE_SESSION", [pam file session])
AC_OUTPUT([
libpolkit.pc
libpolkit-dbus.pc
libpolkit-grant.pc
Makefile
polkit
libpolkit/Makefile
libpolkit-dbus/Makefile
libpolkit-grant/Makefile
data/Makefile
data/polkit
data/polkit.pc
data/polkit-dbus.pc
data/polkit-grant.pc
polkit/Makefile
polkit-dbus/Makefile
polkit-grant/Makefile
tools/Makefile
doc/Makefile
doc/api/Makefile
doc/api/libpolkit/Makefile
doc/api/libpolkit/version.xml
doc/api/libpolkit-dbus/Makefile
doc/api/libpolkit-dbus/version.xml
doc/api/libpolkit-grant/Makefile
doc/api/libpolkit-grant/version.xml
doc/api/polkit/Makefile
doc/api/polkit/version.xml
doc/api/polkit-dbus/Makefile
doc/api/polkit-dbus/version.xml
doc/api/polkit-grant/Makefile
doc/api/polkit-grant/version.xml
doc/spec/Makefile
doc/spec/polkit-spec.xml.in
doc/man/Makefile
......
data/Makefile.am 0 → 100644
View file @ 36c1b772
## Process this file with automake to produce Makefile.in
pamdir = $(sysconfdir)/pam.d
pam_DATA = polkit
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = polkit.pc polkit-dbus.pc polkit-grant.pc
DISTCLEANFILES = polkit.pc polkit-dbus.pc polkit-grant.pc
EXTRA_DIST = polkit.in polkit.pc.in polkit-dbus.pc.in polkit-grant.pc.in
clean-local :
rm -f *~
doc/api/Makefile.am
View file @ 36c1b772
## Process this file with automake to create Makefile.in.
SUBDIRS = libpolkit libpolkit-dbus libpolkit-grant
SUBDIRS = polkit polkit-dbus polkit-grant
MAINTAINERCLEANFILES = \
*~ \
......
doc/api/libpolkit/Makefile.am → doc/api/polkit-dbus/Makefile.am
View file @ 36c1b772
......@@ -5,20 +5,20 @@ NULL =
AUTOMAKE_OPTIONS = 1.7
# The name of the module.
DOC_MODULE=libpolkit
DOC_MODULE=polkit-dbus
# The top-level SGML file.
DOC_MAIN_SGML_FILE=libpolkit-docs.xml
DOC_MAIN_SGML_FILE=polkit-dbus-docs.xml
# Extra options to supply to gtkdoc-scan
#SCAN_OPTIONS=--deprecated-guards="CAIRO_DISABLE_DEPRECATED"
# The directory containing the source code. Relative to $(srcdir)
DOC_SOURCE_DIR=../../../libpolkit
DOC_SOURCE_DIR=../../../polkit-dbus
# Used for dependencies
HFILE_GLOB=$(top_srcdir)/libpolkit/*.h
CFILE_GLOB=$(top_srcdir)/libpolkit/*.c
HFILE_GLOB=$(top_srcdir)/polkit-dbus/*.h
CFILE_GLOB=$(top_srcdir)/polkit-dbus/*.c
# Headers to ignore
IGNORE_HFILES= \
......@@ -34,7 +34,7 @@ INCLUDES = \
GTKDOC_LIBS = \
$(GLIB_LIBS) \
$(top_builddir)/libpolkit/libpolkit.la \
$(top_builddir)/polkit-dbus/libpolkit-dbus.la \
$(NULL)
# Extra options to supply to gtkdoc-mkdb
......@@ -57,8 +57,8 @@ FIXXREF_OPTIONS=
MAINTAINERCLEANFILES = \
*~ \
Makefile.in \
libpolkit.types \
libpolkit-*.txt \
polkit-dbus.types \
polkit-dbus-*.txt \
$(NULL)
include $(top_srcdir)/gtk-doc.make
......
doc/api/libpolkit-dbus/libpolkit-dbus-docs.xml → doc/api/polkit-dbus/polkit-dbus-docs.xml
View file @ 36c1b772
......@@ -64,7 +64,7 @@
PolicyKit D-Bus helper library.
</para>
</partintro>
<xi:include href="xml/libpolkit-dbus.xml"/>
<xi:include href="xml/polkit-dbus.xml"/>
</reference>
<index>
......
doc/api/libpolkit-grant/Makefile.am → doc/api/polkit-grant/Makefile.am
View file @ 36c1b772
......@@ -5,20 +5,20 @@ NULL =
AUTOMAKE_OPTIONS = 1.7
# The name of the module.
DOC_MODULE=libpolkit-grant
DOC_MODULE=polkit-grant
# The top-level SGML file.
DOC_MAIN_SGML_FILE=libpolkit-grant-docs.xml
DOC_MAIN_SGML_FILE=polkit-grant-docs.xml
# Extra options to supply to gtkdoc-scan
#SCAN_OPTIONS=--deprecated-guards="CAIRO_DISABLE_DEPRECATED"
# The directory containing the source code. Relative to $(srcdir)
DOC_SOURCE_DIR=../../../libpolkit-grant
DOC_SOURCE_DIR=../../../polkit-grant
# Used for dependencies
HFILE_GLOB=$(top_srcdir)/libpolkit-grant/*.h
CFILE_GLOB=$(top_srcdir)/libpolkit-grant/*.c
HFILE_GLOB=$(top_srcdir)/polkit-grant/*.h
CFILE_GLOB=$(top_srcdir)/polkit-grant/*.c
# Headers to ignore
IGNORE_HFILES= \
......@@ -34,7 +34,7 @@ INCLUDES = \
GTKDOC_LIBS = \
$(GLIB_LIBS) \
$(top_builddir)/libpolkit-grant/libpolkit-grant.la \
$(top_builddir)/polkit-grant/libpolkit-grant.la \
$(NULL)
# Extra options to supply to gtkdoc-mkdb
......@@ -57,8 +57,8 @@ FIXXREF_OPTIONS=
MAINTAINERCLEANFILES = \
*~ \
Makefile.in \
libpolkit-grant.types \
libpolkit-grant-*.txt \
polkit-grant.types \
polkit-grant-*.txt \
$(NULL)
include $(top_srcdir)/gtk-doc.make
......
doc/api/libpolkit-grant/libpolkit-grant-docs.xml → doc/api/polkit-grant/polkit-grant-docs.xml
View file @ 36c1b772
......@@ -64,7 +64,7 @@
PolicyKit granting helper library.
</para>
</partintro>
<xi:include href="xml/libpolkit-grant.xml"/>
<xi:include href="xml/polkit-grant.xml"/>
</reference>
<index>
......
doc/api/libpolkit-dbus/Makefile.am → doc/api/polkit/Makefile.am
View file @ 36c1b772
......@@ -5,20 +5,20 @@ NULL =
AUTOMAKE_OPTIONS = 1.7
# The name of the module.
DOC_MODULE=libpolkit-dbus
DOC_MODULE=polkit
# The top-level SGML file.
DOC_MAIN_SGML_FILE=libpolkit-dbus-docs.xml
DOC_MAIN_SGML_FILE=polkit-docs.xml
# Extra options to supply to gtkdoc-scan
#SCAN_OPTIONS=--deprecated-guards="CAIRO_DISABLE_DEPRECATED"
# The directory containing the source code. Relative to $(srcdir)
DOC_SOURCE_DIR=../../../libpolkit-dbus
DOC_SOURCE_DIR=../../../polkit
# Used for dependencies
HFILE_GLOB=$(top_srcdir)/libpolkit-dbus/*.h
CFILE_GLOB=$(top_srcdir)/libpolkit-dbus/*.c
HFILE_GLOB=$(top_srcdir)/polkit/*.h
CFILE_GLOB=$(top_srcdir)/polkit/*.c
# Headers to ignore
IGNORE_HFILES= \
......@@ -34,7 +34,7 @@ INCLUDES = \
GTKDOC_LIBS = \
$(GLIB_LIBS) \
$(top_builddir)/libpolkit-dbus/libpolkit-dbus.la \
$(top_builddir)/polkit/libpolkit.la \
$(NULL)
# Extra options to supply to gtkdoc-mkdb
......@@ -54,11 +54,11 @@ HTML_IMAGES =
# Extra options to supply to gtkdoc-fixref
FIXXREF_OPTIONS=
MAINTAINERCLEANFILES = \
*~ \
Makefile.in \
libpolkit-dbus.types \
libpolkit-dbus-*.txt \
MAINTAINERCLEANFILES = \
*~ \
Makefile.in \
polkit.types \
polkit-*.txt \
$(NULL)
include $(top_srcdir)/gtk-doc.make
......
doc/api/libpolkit/libpolkit-docs.xml → doc/api/polkit/polkit-docs.xml
View file @ 36c1b772
......@@ -64,22 +64,20 @@
PolicyKit library.
</para>
</partintro>
<xi:include href="xml/libpolkit-types.xml"/>
<xi:include href="xml/libpolkit-error.xml"/>
<xi:include href="xml/libpolkit-result.xml"/>
<xi:include href="xml/libpolkit-context.xml"/>
<xi:include href="xml/libpolkit-action.xml"/>
<xi:include href="xml/libpolkit-policy-file.xml"/>
<xi:include href="xml/libpolkit-policy-file-entry.xml"/>
<xi:include href="xml/libpolkit-policy-default.xml"/>
<xi:include href="xml/libpolkit-policy-cache.xml"/>
<xi:include href="xml/libpolkit-resource.xml"/>
<xi:include href="xml/libpolkit-seat.xml"/>
<xi:include href="xml/libpolkit-session.xml"/>
<xi:include href="xml/libpolkit-caller.xml"/>
<xi:include href="xml/libpolkit-module.xml"/>
<xi:include href="xml/libpolkit-debug.xml"/>
<xi:include href="xml/libpolkit-utils.xml"/>
<xi:include href="xml/polkit-types.xml"/>
<xi:include href="xml/polkit-error.xml"/>
<xi:include href="xml/polkit-result.xml"/>
<xi:include href="xml/polkit-context.xml"/>
<xi:include href="xml/polkit-action.xml"/>
<xi:include href="xml/polkit-policy-file.xml"/>
<xi:include href="xml/polkit-policy-file-entry.xml"/>
<xi:include href="xml/polkit-policy-default.xml"/>
<xi:include href="xml/polkit-policy-cache.xml"/>
<xi:include href="xml/polkit-resource.xml"/>
<xi:include href="xml/polkit-seat.xml"/>
<xi:include href="xml/polkit-session.xml"/>
<xi:include href="xml/polkit-caller.xml"/>
<xi:include href="xml/polkit-module.xml"/>
</reference>
<index>
......
modules/allow-all/Makefile.am
View file @ 36c1b772
......@@ -19,7 +19,7 @@ polkitmodule_LTLIBRARIES = \
polkit_module_allow_all_la_SOURCES = polkit-module-allow-all.c
polkit_module_allow_all_la_LDFLAGS = -no-undefined -module -avoid-version
polkit_module_allow_all_la_LIBADD = $(top_builddir)/libpolkit/libpolkit.la
polkit_module_allow_all_la_LIBADD = $(top_builddir)/polkit/libpolkit.la
clean-local :
rm -f *~
modules/allow-all/polkit-module-allow-all.c
View file @ 36c1b772
......@@ -28,10 +28,10 @@
#endif
#include <stddef.h>
#include <libpolkit/libpolkit.h>
#include <polkit/polkit.h>
/* The symbol that libpolkit looks up when loading this module */
polkit_bool_t libpolkit_module_set_functions (PolKitModuleInterface *module_interface);
/* The symbol that polkit looks up when loading this module */
polkit_bool_t polkit_module_set_functions (PolKitModuleInterface *module_interface);
static polkit_bool_t
_module_init (PolKitModuleInterface *module_interface, int argc, char *argv[])
......@@ -51,7 +51,7 @@ _module_can_session_access_resource (PolKitModuleInterface *module_interface,
PolKitResource *resource,
PolKitSession *session)
{
return LIBPOLKIT_RESULT_YES;
return POLKIT_RESULT_YES;
}
static PolKitResult
......@@ -61,11 +61,11 @@ _module_can_caller_access_resource (PolKitModuleInterface *module_interface,
PolKitResource *resource,
PolKitCaller *caller)
{
return LIBPOLKIT_RESULT_YES;
return POLKIT_RESULT_YES;
}
polkit_bool_t
libpolkit_module_set_functions (PolKitModuleInterface *module_interface)
polkit_module_set_functions (PolKitModuleInterface *module_interface)
{
polkit_bool_t ret;
......@@ -73,10 +73,10 @@ libpolkit_module_set_functions (PolKitModuleInterface *module_interface)
if (module_interface == NULL)
goto out;
libpolkit_module_set_func_initialize (module_interface, _module_init);
libpolkit_module_set_func_shutdown (module_interface, _module_shutdown);
libpolkit_module_set_func_can_session_access_resource (module_interface, _module_can_session_access_resource);
libpolkit_module_set_func_can_caller_access_resource (module_interface, _module_can_caller_access_resource);
polkit_module_set_func_initialize (module_interface, _module_init);
polkit_module_set_func_shutdown (module_interface, _module_shutdown);
polkit_module_set_func_can_session_access_resource (module_interface, _module_can_session_access_resource);
polkit_module_set_func_can_caller_access_resource (module_interface, _module_can_caller_access_resource);
ret = TRUE;
out:
......
modules/default/Makefile.am
View file @ 36c1b772
......@@ -19,7 +19,7 @@ polkitmodule_LTLIBRARIES = \
polkit_module_default_la_SOURCES = polkit-module-default.c
polkit_module_default_la_LDFLAGS = -no-undefined -module -avoid-version
polkit_module_default_la_LIBADD = $(top_builddir)/libpolkit/libpolkit.la
polkit_module_default_la_LIBADD = $(top_builddir)/polkit/libpolkit.la
clean-local :
rm -f *~
modules/default/polkit-module-default.c
View file @ 36c1b772
......@@ -28,10 +28,10 @@
#endif
#include <stddef.h>
#include <libpolkit/libpolkit.h>
#include <polkit/polkit.h>
/* The symbol that libpolkit looks up when loading this module */
polkit_bool_t libpolkit_module_set_functions (PolKitModuleInterface *module_interface);
/* The symbol that polkit looks up when loading this module */
polkit_bool_t polkit_module_set_functions (PolKitModuleInterface *module_interface);
static polkit_bool_t
_module_init (PolKitModuleInterface *module_interface,
......@@ -57,11 +57,11 @@ _module_can_session_access_resource (PolKitModuleInterface *module_interface,
PolKitPolicyCache *cache;
PolKitPolicyFileEntry *pfe;
result = LIBPOLKIT_RESULT_NO;
cache = libpolkit_context_get_policy_cache (pk_context);
pfe = libpolkit_policy_cache_get_entry (cache, action);
return libpolkit_policy_default_can_session_access_resource (
libpolkit_policy_file_entry_get_default (pfe),
result = POLKIT_RESULT_NO;
cache = polkit_context_get_policy_cache (pk_context);
pfe = polkit_policy_cache_get_entry (cache, action);
return polkit_policy_default_can_session_access_resource (
polkit_policy_file_entry_get_default (pfe),
action,
resource,
session);
......@@ -78,18 +78,18 @@ _module_can_caller_access_resource (PolKitModuleInterface *module_interface,
PolKitPolicyCache *cache;
PolKitPolicyFileEntry *pfe;
result = LIBPOLKIT_RESULT_NO;
cache = libpolkit_context_get_policy_cache (pk_context);
pfe = libpolkit_policy_cache_get_entry (cache, action);
return libpolkit_policy_default_can_caller_access_resource (
libpolkit_policy_file_entry_get_default (pfe),
result = POLKIT_RESULT_NO;
cache = polkit_context_get_policy_cache (pk_context);
pfe = polkit_policy_cache_get_entry (cache, action);
return polkit_policy_default_can_caller_access_resource (
polkit_policy_file_entry_get_default (pfe),
action,
resource,
caller);
}
polkit_bool_t
libpolkit_module_set_functions (PolKitModuleInterface *module_interface)
polkit_module_set_functions (PolKitModuleInterface *module_interface)
{
polkit_bool_t ret;
......@@ -97,10 +97,10 @@ libpolkit_module_set_functions (PolKitModuleInterface *module_interface)
if (module_interface == NULL)
goto out;
libpolkit_module_set_func_initialize (module_interface, _module_init);
libpolkit_module_set_func_shutdown (module_interface, _module_shutdown);
libpolkit_module_set_func_can_session_access_resource (module_interface, _module_can_session_access_resource);
libpolkit_module_set_func_can_caller_access_resource (module_interface, _module_can_caller_access_resource);
polkit_module_set_func_initialize (module_interface, _module_init);
polkit_module_set_func_shutdown (module_interface, _module_shutdown);
polkit_module_set_func_can_session_access_resource (module_interface, _module_can_session_access_resource);
polkit_module_set_func_can_caller_access_resource (module_interface, _module_can_caller_access_resource);
ret = TRUE;
out:
......
modules/deny-all/Makefile.am
View file @ 36c1b772
......@@ -19,7 +19,7 @@ polkitmodule_LTLIBRARIES = \
polkit_module_deny_all_la_SOURCES = polkit-module-deny-all.c
polkit_module_deny_all_la_LDFLAGS = -no-undefined -module -avoid-version
polkit_module_deny_all_la_LIBADD = $(top_builddir)/libpolkit/libpolkit.la
polkit_module_deny_all_la_LIBADD = $(top_builddir)/polkit/libpolkit.la
clean-local :
rm -f *~
modules/deny-all/polkit-module-deny-all.c
View file @ 36c1b772
......@@ -28,10 +28,10 @@
#endif
#include <stddef.h>
#include <libpolkit/libpolkit.h>
#include <polkit/polkit.h>
/* The symbol that libpolkit looks up when loading this module */
polkit_bool_t libpolkit_module_set_functions (PolKitModuleInterface *module_interface);
/* The symbol that polkit looks up when loading this module */
polkit_bool_t polkit_module_set_functions (PolKitModuleInterface *module_interface);
static polkit_bool_t
_module_init (PolKitModuleInterface *module_interface, int argc, char *argv[])
......@@ -51,7 +51,7 @@ _module_can_session_access_resource (PolKitModuleInterface *module_interface,
PolKitResource *resource,
PolKitSession *session)
{
return LIBPOLKIT_RESULT_NO;
return POLKIT_RESULT_NO;
}
static PolKitResult
......@@ -61,11 +61,11 @@ _module_can_caller_access_resource (PolKitModuleInterface *module_interface,
PolKitResource *resource,
PolKitCaller *caller)
{
return LIBPOLKIT_RESULT_NO;
return POLKIT_RESULT_NO;
}
polkit_bool_t
libpolkit_module_set_functions (PolKitModuleInterface *module_interface)
polkit_module_set_functions (PolKitModuleInterface *module_interface)
{
polkit_bool_t ret;
......@@ -73,10 +73,10 @@ libpolkit_module_set_functions (PolKitModuleInterface *module_interface)
if (module_interface == NULL)
goto out;
libpolkit_module_set_func_initialize (module_interface, _module_init);
libpolkit_module_set_func_shutdown (module_interface, _module_shutdown);
libpolkit_module_set_func_can_session_access_resource (module_interface, _module_can_session_access_resource);
libpolkit_module_set_func_can_caller_access_resource (module_interface, _module_can_caller_access_resource);
polkit_module_set_func_initialize (module_interface, _module_init);
polkit_module_set_func_shutdown (module_interface, _module_shutdown);
polkit_module_set_func_can_session_access_resource (module_interface, _module_can_session_access_resource);
polkit_module_set_func_can_caller_access_resource (module_interface, _module_can_caller_access_resource);
ret = TRUE;
out:
......
modules/grant/Makefile.am
View file @ 36c1b772
......@@ -19,7 +19,7 @@ polkitmodule_LTLIBRARIES = \
polkit_module_grant_la_SOURCES = polkit-module-grant.c
polkit_module_grant_la_LDFLAGS = -no-undefined -module -avoid-version
polkit_module_grant_la_LIBADD = $(top_builddir)/libpolkit/libpolkit.la @GLIB_LIBS@
polkit_module_grant_la_LIBADD = $(top_builddir)/polkit/libpolkit.la @GLIB_LIBS@
clean-local :
rm -f *~
modules/grant/polkit-module-grant.c
View file @ 36c1b772
......@@ -31,11 +31,11 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <libpolkit/libpolkit.h>
#include <polkit/polkit.h>
#include <glib.h>
/* The symbol that libpolkit looks up when loading this module */
polkit_bool_t libpolkit_module_set_functions (PolKitModuleInterface *module_interface);
/* The symbol that polkit looks up when loading this module */
polkit_bool_t polkit_module_set_functions (PolKitModuleInterface *module_interface);
static polkit_bool_t
_module_init (PolKitModuleInterface *module_interface, int argc, char *argv[])
......@@ -57,7 +57,7 @@ _module_can_session_access_resource (PolKitModuleInterface *module_interface,
PolKitResource *resource,
PolKitSession *session)
{
return LIBPOLKIT_RESULT_UNKNOWN_ACTION;
return POLKIT_RESULT_UNKNOWN_ACTION;
}
static PolKitResult
......@@ -71,7 +71,7 @@ _module_can_caller_access_resource (PolKitModuleInterface *module_interface,
PolKitSession *session;
PolKitResult result;
result = LIBPOLKIT_RESULT_UNKNOWN_ACTION;
result = POLKIT_RESULT_UNKNOWN_ACTION;
/* file format:
*
......@@ -101,24 +101,24 @@ _module_can_caller_access_resource (PolKitModuleInterface *module_interface,
char *dbus_name;
guint resource_hash;
if (!libpolkit_action_get_action_id (action, &action_name))
if (!polkit_action_get_action_id (action, &action_name))
goto out;
if (!libpolkit_caller_get_uid (caller, &invoking_user_id))
if (!polkit_caller_get_uid (caller, &invoking_user_id))
goto out;
if (resource == NULL)
goto out;
if (!libpolkit_resource_get_resource_type (resource, &resource_type))
if (!polkit_resource_get_resource_type (resource, &resource_type))
goto out;
if (!libpolkit_resource_get_resource_id (resource, &resource_id))
if (!polkit_resource_get_resource_id (resource, &resource_id))
goto out;
session_name = NULL;
if (!libpolkit_caller_get_ck_session (caller, &session))
if (!polkit_caller_get_ck_session (caller, &session))
goto out;
if (!libpolkit_caller_get_dbus_name (caller, &dbus_name))
if (!polkit_caller_get_dbus_name (caller, &dbus_name))
goto out;
if (!libpolkit_session_get_ck_objref (session, &session_objpath))
if (!polkit_session_get_ck_objref (session, &session_objpath))
goto out;
session_name = g_basename (session_objpath);
......@@ -129,7 +129,7 @@ _module_can_caller_access_resource (PolKitModuleInterface *module_interface,
/* TODO: FIXME: XXX: this format of storing granted privileges needs be redone
*
* this concerns these two files
* - libpolkit-grant/polkit-grant-helper.c
* - polkit-grant/polkit-grant-helper.c
* - modules/grant/polkit-module-grant.c
*/
......@@ -145,7 +145,7 @@ _module_can_caller_access_resource (PolKitModuleInterface *module_interface,
grant_file = g_strdup_printf (PACKAGE_LOCALSTATE_DIR "/run/PolicyKit/dbus_%s_%d_%s_%u.grant",
dbus_name, invoking_user_id, action_name, resource_hash);
if (g_file_test (grant_file, G_FILE_TEST_EXISTS)) {
result = LIBPOLKIT_RESULT_YES;
result = POLKIT_RESULT_YES;
g_free (grant_file);
goto out;
}
......@@ -154,7 +154,7 @@ _module_can_caller_access_resource (PolKitModuleInterface *module_interface,
grant_file = g_strdup_printf (PACKAGE_LOCALSTATE_DIR "/run/PolicyKit/session_%s_%d_%s_%u.grant",
session_name, invoking_user_id, action_name, resource_hash);
if (g_file_test (grant_file, G_FILE_TEST_EXISTS)) {
result = LIBPOLKIT_RESULT_YES;
result = POLKIT_RESULT_YES;
g_free (grant_file);
goto out;
}
......@@ -163,7 +163,7 @@ _module_can_caller_access_resource (PolKitModuleInterface *module_interface,
grant_file = g_strdup_printf (PACKAGE_LOCALSTATE_DIR "/lib/PolicyKit/uid_%d_%s_%u.grant",
invoking_user_id, action_name, resource_hash);
if (g_file_test (grant_file, G_FILE_TEST_EXISTS)) {
result = LIBPOLKIT_RESULT_YES;
result = POLKIT_RESULT_YES;
g_free (grant_file);
goto out;
}
......@@ -175,7 +175,7 @@ out:
}
polkit_bool_t
libpolkit_module_set_functions (PolKitModuleInterface *module_interface)
polkit_module_set_functions (PolKitModuleInterface *module_interface)
{
polkit_bool_t ret;
......@@ -183,10 +183,10 @@ libpolkit_module_set_functions (PolKitModuleInterface *module_interface)
if (module_interface == NULL)
goto out;
libpolkit_module_set_func_initialize (module_interface, _module_init);
libpolkit_module_set_func_shutdown (module_interface, _module_shutdown);
libpolkit_module_set_func_can_session_access_resource (module_interface, _module_can_session_access_resource);
libpolkit_module_set_func_can_caller_access_resource (module_interface, _module_can_caller_access_resource);
polkit_module_set_func_initialize (module_interface, _module_init);
polkit_module_set_func_shutdown (module_interface, _module_shutdown);
polkit_module_set_func_can_session_access_resource (module_interface, _module_can_session_access_resource);
polkit_module_set_func_can_caller_access_resource (module_interface, _module_can_caller_access_resource);
ret = TRUE;
out:
......
modules/run-program/Makefile.am
View file @ 36c1b772
......@@ -19,7 +19,7 @@ polkitmodule_LTLIBRARIES = \
polkit_module_run_program_la_SOURCES = polkit-module-run-program.c
polkit_module_run_program_la_LDFLAGS = -no-undefined -module -avoid-version
polkit_module_run_program_la_LIBADD = $(top_builddir)/libpolkit/libpolkit.la @GLIB_LIBS@
polkit_module_run_program_la_LIBADD = $(top_builddir)/polkit/libpolkit.la @GLIB_LIBS@
clean-local :
rm -f *~
modules/run-program/polkit-module-run-program.c
View file @ 36c1b772
......@@ -27,11 +27,11 @@
# include <config.h>
#endif
#include <libpolkit/libpolkit.h>
#include <polkit/polkit.h>
#include <glib.h>
/* The symbol that libpolkit looks up when loading this module */
polkit_bool_t libpolkit_module_set_functions (PolKitModuleInterface *module_interface);
/* The symbol that polkit looks up when loading this module */
polkit_bool_t polkit_module_set_functions (PolKitModuleInterface *module_interface);
typedef struct {
int program_argc;
......@@ -75,7 +75,7 @@ _module_init (PolKitModuleInterface *module_interface, int argc, char *argv[])
if (user_data->program_argv == NULL)
goto error;
libpolkit_module_set_user_data (module_interface, user_data);
polkit_module_set_user_data (module_interface, user_data);
return TRUE;
error: