make SSSD client support configurable

4 files changed, 25 insertions, 29 deletions

diff --git a/worker/Makefile.am b/worker/Makefile.am
index 55f5607..8e81725 100644
--- a/worker/Makefile.am
+++ b/worker/Makefile.am
@@ -1,20 +1,8 @@
-#SSSD_PATH=../../freeipa/sssd/server
-#SSSD_INCLUDE=-I$(SSSD_PATH) -I$(SSSD_PATH)/../replace
-#SSSD_LIBS=-ltalloc -ltdb -ltevent -lldb
-#UTIL_OBJ = \
-#    $(SSSD_PATH)/util/debug.o \
-#    $(SSSD_PATH)/util/signal.o \
-#    $(SSSD_PATH)/util/server.o \
-#    $(SSSD_PATH)/util/memory.o \
-#    $(SSSD_PATH)/util/btreemap.o \
-#    $(SSSD_PATH)/util/service_helpers.o \
-#    $(SSSD_PATH)/confdb/confdb.o \
-#    $(SSSD_PATH)/sbus/sssd_dbus_common.o \
-#    $(SSSD_PATH)/sbus/sssd_dbus_connection.o \
-#    $(SSSD_PATH)/sbus/sssd_dbus_server.o
-
 
 bin_PROGRAMS = worker
-worker_SOURCES = worker.c debug.c helpers.c ipaaction.c xml_helper.c output_handler.c sbus_client.c
+worker_SOURCES = worker.c debug.c helpers.c ipaaction.c xml_helper.c output_handler.c
+if WITH_SSSD
+    worker_SOURCES += sbus_client.c
+endif
 worker_CFLAGS = @XML_CPPFLAGS@ @XSLT_CFLAGS@ @LIBCURL_CPPFLAGS@  @DBUS_CFLAGS@ @POPT_CFLAGS@ @SSSD_CFLAGS@
 worker_LDFLAGS = @XML_LIBS@ @XSLT_LIBS@ @LIBCURL@ @DBUS_LIBS@ @POPT_LIBS@  @SSSD_LIBS@
diff --git a/worker/build_macros.m4 b/worker/build_macros.m4
index 793968e..309bc7a 100644
--- a/worker/build_macros.m4
+++ b/worker/build_macros.m4
@@ -24,18 +24,19 @@ AC_DEFUN([BUILD_WITH_SSSD_DIR],
         sssddir=$with_sssd_dir
         SSSD_CFLAGS="-I$with_sssd_dir/server -I$with_sssd_dir/replace"
         SSSD_LIBS="\
-   $with_sssd_dir/server/util/debug.o \
-   $with_sssd_dir/server/util/signal.o \
-   $with_sssd_dir/server/util/server.o \
-   $with_sssd_dir/server/util/memory.o \
-   $with_sssd_dir/server/util/btreemap.o \
-   $with_sssd_dir/server/util/service_helpers.o \
-   $with_sssd_dir/server/confdb/confdb.o \
-   $with_sssd_dir/server/sbus/sssd_dbus_common.o \
-   $with_sssd_dir/server/sbus/sssd_dbus_connection.o \
-   $with_sssd_dir/server/sbus/sssd_dbus_server.o \
-   -ltalloc -lldb -ltevent -ltdb"
+                   $with_sssd_dir/server/util/signal.o \
+                   $with_sssd_dir/server/util/server.o \
+                   $with_sssd_dir/server/util/memory.o \
+                   $with_sssd_dir/server/util/btreemap.o \
+                   $with_sssd_dir/server/util/service_helpers.o \
+                   $with_sssd_dir/server/confdb/confdb.o \
+                   $with_sssd_dir/server/sbus/sssd_dbus_common.o \
+                   $with_sssd_dir/server/sbus/sssd_dbus_connection.o \
+                   $with_sssd_dir/server/sbus/sssd_dbus_server.o \
+                   -ltalloc -lldb -ltevent -ltdb"
+        AC_DEFINE(WITH_SSSD,1)
     fi
     AC_SUBST(sssddir)
   ])
+AM_CONDITIONAL([WITH_SSSD], [test x"$with_sssd_dir" != x])
 
diff --git a/worker/debug.c b/worker/debug.c
index 5a9a46c..b64307e 100644
--- a/worker/debug.c
+++ b/worker/debug.c
@@ -4,9 +4,10 @@
 #include <stdarg.h>
 #include <stdlib.h>
 
-int my_debug_level = 5;
+const char *debug_prg_name = "PolicyProcessor";
+int debug_level = 5;
 
-void my_debug_fn(const char *format, ...)
+void debug_fn(const char *format, ...)
 {
     va_list ap;
     char *s = NULL;
diff --git a/worker/worker.c b/worker/worker.c
index b350e6e..33b3afb 100644
--- a/worker/worker.c
+++ b/worker/worker.c
@@ -24,7 +24,9 @@
 #include "helpers.h"
 #include "util.h"
 #include "xml_helper.h"
+#ifdef WITH_SSSD
 #include "sbus_client.h"
+#endif
 
 
 int main(int argc, const char *argv[])
@@ -102,7 +104,11 @@ int main(int argc, const char *argv[])
     }
 
     if (opt_daemon!=0) {
+#ifdef WITH_SSSD
         ret = setup_sbus_and_server_loop();
+#else
+        DEBUG(0,("This binary was not compiled with sssd support.\n"));
+#endif
     }
 
 cleanup: