diff options
| -rw-r--r-- | server/monitor.c | 2 | ||||
| -rw-r--r-- | server/sbus/sssd_dbus.h (renamed from server/dbus/sssd_dbus.h) | 0 | ||||
| -rw-r--r-- | server/sbus/sssd_dbus_common.c (renamed from server/dbus/sssd_dbus_common.c) | 0 | ||||
| -rw-r--r-- | server/sbus/sssd_dbus_connection.c (renamed from server/dbus/sssd_dbus_connection.c) | 4 | ||||
| -rw-r--r-- | server/sbus/sssd_dbus_private.h (renamed from server/dbus/sssd_dbus_private.h) | 0 | ||||
| -rw-r--r-- | server/sbus/sssd_dbus_server.c (renamed from server/dbus/sssd_dbus_server.c) | 4 | ||||
| -rw-r--r-- | server/sbus/tests/test_client.c (renamed from server/dbus/tests/test_client.c) | 2 | ||||
| -rw-r--r-- | server/server.mk | 12 |
8 files changed, 12 insertions, 12 deletions
diff --git a/server/monitor.c b/server/monitor.c index 12e1b2fb1..0ca38b566 100644 --- a/server/monitor.c +++ b/server/monitor.c @@ -29,7 +29,7 @@ #include "confdb/confdb.h" #include "monitor.h" #include "dbus/dbus.h" -#include "dbus/sssd_dbus.h" +#include "sbus/sssd_dbus.h" /* TODO: Get these values from LDB */ #define SERVICE_PATH "/org/freeipa/sssd/service" diff --git a/server/dbus/sssd_dbus.h b/server/sbus/sssd_dbus.h index 1bd062d42..1bd062d42 100644 --- a/server/dbus/sssd_dbus.h +++ b/server/sbus/sssd_dbus.h diff --git a/server/dbus/sssd_dbus_common.c b/server/sbus/sssd_dbus_common.c index 0ea66ccb3..0ea66ccb3 100644 --- a/server/dbus/sssd_dbus_common.c +++ b/server/sbus/sssd_dbus_common.c diff --git a/server/dbus/sssd_dbus_connection.c b/server/sbus/sssd_dbus_connection.c index 3a169f794..bd95c0abe 100644 --- a/server/dbus/sssd_dbus_connection.c +++ b/server/sbus/sssd_dbus_connection.c @@ -2,8 +2,8 @@ #include "events.h" #include "util/util.h" #include "dbus/dbus.h" -#include "dbus/sssd_dbus.h" -#include "dbus/sssd_dbus_private.h" +#include "sbus/sssd_dbus.h" +#include "sbus/sssd_dbus_private.h" /* Types */ struct dbus_ctx_list; diff --git a/server/dbus/sssd_dbus_private.h b/server/sbus/sssd_dbus_private.h index d102c8c9d..d102c8c9d 100644 --- a/server/dbus/sssd_dbus_private.h +++ b/server/sbus/sssd_dbus_private.h diff --git a/server/dbus/sssd_dbus_server.c b/server/sbus/sssd_dbus_server.c index 633e4b7ec..22dcbf39a 100644 --- a/server/dbus/sssd_dbus_server.c +++ b/server/sbus/sssd_dbus_server.c @@ -22,8 +22,8 @@ #include "events.h" #include "util/util.h" #include "dbus/dbus.h" -#include "dbus/sssd_dbus.h" -#include "dbus/sssd_dbus_private.h" +#include "sbus/sssd_dbus.h" +#include "sbus/sssd_dbus_private.h" /* Types */ struct sbus_srv_ctx { diff --git a/server/dbus/tests/test_client.c b/server/sbus/tests/test_client.c index 34e740185..bf1c207e5 100644 --- a/server/dbus/tests/test_client.c +++ b/server/sbus/tests/test_client.c @@ -4,7 +4,7 @@ #include "events.h" #include "util/util.h" #include "dbus/dbus.h" -#include "dbus/sssd_dbus.h" +#include "sbus/sssd_dbus.h" /* TODO: get this value from LDB */ #define DBUS_ADDRESS "unix:path=/var/lib/sss/pipes/private/dbus" diff --git a/server/server.mk b/server/server.mk index a65dcb582..6339791e0 100644 --- a/server/server.mk +++ b/server/server.mk @@ -13,15 +13,15 @@ SERVER_OBJ = \ nss/nsssrv_packet.o \ nss/nsssrv_cmd.o \ nss/nsssrv_ldb.o \ - dbus/sssd_dbus_common.o \ - dbus/sssd_dbus_connection.o \ - dbus/sssd_dbus_server.o + sbus/sssd_dbus_common.o \ + sbus/sssd_dbus_connection.o \ + sbus/sssd_dbus_server.o CLIENT_OBJ = \ - dbus/sssd_dbus_common.o \ - dbus/sssd_dbus_connection.o \ + sbus/sssd_dbus_common.o \ + sbus/sssd_dbus_connection.o \ util/debug.o \ - dbus/tests/test_client.o + sbus/tests/test_client.o install:: all ${INSTALLCMD} -d $(DESTDIR)$(sbindir) |