summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimo Sorce <idra@samba.org>2008-11-03 10:57:10 -0500
committerSimo Sorce <idra@samba.org>2008-11-03 10:58:03 -0500
commitddbc682f58bcee78ac1dbd24b3c44da67512d888 (patch)
tree05d060f91d58a92a8c7f0e82e5f16e8006b8fb65
parent73f7183c9d244e7cdbe5c7ec91677b64a5f08e8e (diff)
downloadsssd-ddbc682f58bcee78ac1dbd24b3c44da67512d888.tar.gz
sssd-ddbc682f58bcee78ac1dbd24b3c44da67512d888.tar.bz2
sssd-ddbc682f58bcee78ac1dbd24b3c44da67512d888.zip
Use a common interface file for all users of the internal
sbus service.
-rw-r--r--server/monitor.c6
-rw-r--r--server/monitor.h28
-rw-r--r--server/sbus/tests/test_client.c11
-rw-r--r--server/sbus_interfaces.h39
4 files changed, 62 insertions, 22 deletions
diff --git a/server/monitor.c b/server/monitor.c
index 0ca38b56..f7ba8009 100644
--- a/server/monitor.c
+++ b/server/monitor.c
@@ -30,11 +30,7 @@
#include "monitor.h"
#include "dbus/dbus.h"
#include "sbus/sssd_dbus.h"
-
-/* TODO: Get these values from LDB */
-#define SERVICE_PATH "/org/freeipa/sssd/service"
-#define SERVICE_INTERFACE "org.freeipa.sssd.service"
-#define SERVICE_METHOD_IDENTITY "getIdentity"
+#include "sbus_interfaces.h"
/* TODO: get this value from LDB */
#define DBUS_ADDRESS "unix:path=/var/lib/sss/pipes/private/dbus"
diff --git a/server/monitor.h b/server/monitor.h
index 8d9e026d..cb53916f 100644
--- a/server/monitor.h
+++ b/server/monitor.h
@@ -1,12 +1,26 @@
-#ifndef _MONITOR_H_
-#define _MONITOR_H_
+/*
+ SSSD
+
+ Service monitor
+
+ Copyright (C) Simo Sorce 2008
-#define MONITOR_VERSION "0.1"
-#define MONITOR_DBUS_INTERFACE "org.freeipa.sssd.monitor"
-#define MONITOR_DBUS_PATH "/org/freeipa/sssd/monitor"
+ 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
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
-/* D-BUS Methods */
-#define MONITOR_METHOD_VERSION "getVersion"
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef _MONITOR_H_
+#define _MONITOR_H_
int start_monitor(TALLOC_CTX *mem_ctx,
struct event_context *event_ctx,
diff --git a/server/sbus/tests/test_client.c b/server/sbus/tests/test_client.c
index bf1c207e..bd7f42d5 100644
--- a/server/sbus/tests/test_client.c
+++ b/server/sbus/tests/test_client.c
@@ -5,6 +5,7 @@
#include "util/util.h"
#include "dbus/dbus.h"
#include "sbus/sssd_dbus.h"
+#include "sbus_interfaces.h"
/* TODO: get this value from LDB */
#define DBUS_ADDRESS "unix:path=/var/lib/sss/pipes/private/dbus"
@@ -13,16 +14,6 @@
#define TEST_CLIENT_NAME "testclient"
#define TEST_CLIENT_VERSION 1
-/* Monitor Interface */
-#define MONITOR_DBUS_INTERFACE "org.freeipa.sssd.monitor"
-#define MONITOR_DBUS_PATH "/org/freeipa/sssd/monitor"
-#define MONITOR_METHOD_VERSION "getVersion"
-
-/* Service Interface */
-#define SERVICE_PATH "/org/freeipa/sssd/service"
-#define SERVICE_INTERFACE "org.freeipa.sssd.service"
-#define SERVICE_METHOD_IDENTITY "getIdentity"
-
struct test_cli_ctx {
struct sbus_method_ctx *sd_ctx;
/*DBusConnection *conn;*/
diff --git a/server/sbus_interfaces.h b/server/sbus_interfaces.h
new file mode 100644
index 00000000..5c6c52e7
--- /dev/null
+++ b/server/sbus_interfaces.h
@@ -0,0 +1,39 @@
+/*
+ SSSD
+
+ Sbus Interfaces
+
+ Copyright (C) Simo Sorce 2008
+
+ 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
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*** Monitor ***/
+
+#define MONITOR_VERSION "0.1"
+#define MONITOR_DBUS_INTERFACE "org.freeipa.sssd.monitor"
+#define MONITOR_DBUS_PATH "/org/freeipa/sssd/monitor"
+
+/* Monitor Methods */
+#define MONITOR_METHOD_VERSION "getVersion"
+
+
+/*** Services ***/
+
+#define SERVICE_PATH "/org/freeipa/sssd/service"
+#define SERVICE_INTERFACE "org.freeipa.sssd.service"
+
+/* Service Methods */
+#define SERVICE_METHOD_IDENTITY "getIdentity"
+