diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/dbus-proto.c | 16 | ||||
| -rw-r--r-- | src/resource.h | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 1577265..98c9774 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -4,11 +4,11 @@ lib_LTLIBRARIES = libresource.la libresource-glib.la libresource_la_SOURCES = res-msg.c res-conn.c res-proto.c res-set.c \ dbus-proto.c dbus-msg.c \ internal-proto.c internal-msg.c -libresource_la_CFLAGS = @DBUS_CFLAGS@ -I$(top_srcdir) -fvisibility=hidden +libresource_la_CFLAGS = @DBUS_CFLAGS@ @AEGIS_CFLAGS@ -I$(top_srcdir) -fvisibility=hidden if DEBUG libresource_la_CFLAGS += -D__DEBUG__ endif -libresource_la_LDFLAGS = /usr/lib -version-info $(subst .,:,$(VERSION)) -lcreds +libresource_la_LDFLAGS = /usr/lib -version-info $(subst .,:,$(VERSION)) @AEGIS_LIBS@ libresource_la_LIBADD = @DBUS_LIBS@ libresource_glib_la_SOURCES = resource.c resource-glib-glue.c diff --git a/src/dbus-proto.c b/src/dbus-proto.c index 511b8df..42283b8 100644 --- a/src/dbus-proto.c +++ b/src/dbus-proto.c @@ -8,8 +8,9 @@ #include "dbus-proto.h" #include "dbus-msg.h" +#ifdef LIBRESOURCE_AEGIS #include <sys/creds.h> - +#endif /* * local function prototypes @@ -581,16 +582,17 @@ static DBusHandlerResult manager_method(DBusConnection *dcon, resset_t *rset; char *method; - char creds_buf[200]; int has_creds = 1; + resmsg_t reply; + int success; +#ifdef LIBRESOURCE_AEGIS + char creds_buf[200]; int pid; creds_t creds; int res; const char *security_token = "Cellular"; const char *name; - resmsg_t reply; - int success; - +#endif if (!strcmp(interface, RESPROTO_DBUS_MANAGER_INTERFACE) && type == DBUS_MESSAGE_TYPE_METHOD_CALL && @@ -626,7 +628,7 @@ static DBusHandlerResult manager_method(DBusConnection *dcon, resmsg.record.rset.share, resmsg.record.rset.mask); - +#ifdef LIBRESOURCE_AEGIS printf("resmsg.record.klass: %s\n", resmsg.record.klass); if (!strcmp(resmsg.record.klass, "call")) { @@ -676,7 +678,7 @@ static DBusHandlerResult manager_method(DBusConnection *dcon, creds_free(creds); } - +#endif if (rset != NULL && watch_client(&rcon->dbus, sender, TRUE)) { diff --git a/src/resource.h b/src/resource.h index c177023..4c1395f 100644 --- a/src/resource.h +++ b/src/resource.h @@ -22,8 +22,6 @@ typedef void (*error_callback_function_t)(resource_set_t *resource_set, const char *errmsg, void *userdata); -int resource_set_use_dbus(DBusConnection *conn); - resource_set_t *resource_set_create(const char *klass, uint32_t mandatory, uint32_t optional, |