Eliminate separate build tree for sss_client

42 files changed, 69 insertions, 7 deletions

diff --git a/Makefile.am b/Makefile.am
index 45275dce2..f20fc5600 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = common server sss_client
+SUBDIRS = common server
 
 DISTCHECK_CONFIGURE_FLAGS = --with-ldb-lib-dir="$$dc_install_base"/lib/ldb
 
diff --git a/configure.ac b/configure.ac
index a48c583b5..030ebc92a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,7 +8,7 @@ AM_INIT_AUTOMAKE([-Wall -Werror foreign])
 AC_CONFIG_MACRO_DIR([m4])
 AC_PROG_INSTALL
 
-AC_CONFIG_SUBDIRS([common server sss_client])
+AC_CONFIG_SUBDIRS([common server])
 
 AC_SUBST([PRERELEASE_VERSION],
          PRERELEASE_VERSION_NUMBER)
diff --git a/server/Makefile.am b/server/Makefile.am
index 21ae79ae3..eeb8cfef6 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -17,6 +17,8 @@ sssdapiplugindir = $(sssdconfdir)/sssd.api.d
 dbusintrospectdir = $(datarootdir)/sssd/introspect
 dbuspolicydir = $(sysconfdir)/dbus-1/system.d
 localedir = @localedir@
+nsslibdir = @nsslibdir@
+pamlibdir = $(nsslibdir)/security
 
 dbpath = @dbpath@
 pluginpath = @pluginpath@
@@ -179,6 +181,7 @@ AM_CPPFLAGS = -Wall \
     -Iinclude \
     -I.. \
     -I$(srcdir)/include \
+    -I$(srcdir)/sss_client \
     -Iinclude \
     -I. \
     $(POPT_CFLAGS) \
@@ -619,6 +622,42 @@ stress_tests_SOURCES = \
 stress_tests_LDADD = \
     $(SSSD_LIBS)
 
+noinst_PROGRAMS = pam_test_client
+pam_test_client_SOURCES = sss_client/pam_test_client.c
+pam_test_client_LDFLAGS = -lpam -lpam_misc
+
+####################
+# Client Libraries #
+####################
+
+nsslib_LTLIBRARIES = libnss_sss.la
+libnss_sss_la_SOURCES = \
+    sss_client/common.c \
+    sss_client/passwd.c \
+    sss_client/group.c \
+    sss_client/sss_cli.h
+libnss_sss_la_LDFLAGS = \
+    -module \
+    -version-info 2:0:0 \
+    -Wl,--version-script,$(srcdir)/sss_client/sss_nss.exports
+
+pamlib_LTLIBRARIES = pam_sss.la
+pam_sss_la_SOURCES = \
+    sss_client/pam_sss.c \
+    sss_client/common.c \
+    sss_client/sss_cli.h \
+    sss_client/sss_pam_macros.h
+
+pam_sss_la_LDFLAGS = \
+    -lpam \
+    -module \
+    -avoid-version \
+    -Wl,--version-script,$(srcdir)/sss_client/sss_pam.exports
+
+dist_noinst_DATA += \
+    sss_client/sss_nss.exports \
+    sss_client/sss_pam.exports
+
 ####################
 # Plugin Libraries #
 ####################
@@ -799,7 +838,7 @@ dist_man_MANS = man/sss_useradd.8 man/sss_userdel.8 man/sss_usermod.8 \
 		man/sss_groupadd.8 man/sss_groupdel.8 man/sss_groupmod.8 \
 		man/sssd.8 man/sssd.conf.5 man/sssd-ldap.5 man/sssd-krb5.5 \
 		man/sssd-ipa.5 man/sssd_krb5_locator_plugin.8 \
-		man/sss_groupshow.8
+		man/sss_groupshow.8 sss_client/man/pam_sss.8
 
 SUFFIXES = .1.xml .1 .3.xml .3 .5.xml .5 .8.xml .8
 .1.xml.1:
@@ -881,6 +920,11 @@ install-exec-hook: installsssddirs
 	fi
 	mkdir -p doc $(DESTDIR)/$(docdir); cp -a doc $(DESTDIR)/$(docdir)/
 
+install-data-hook:
+	rm $(DESTDIR)/$(nsslibdir)/libnss_sss.so.2 \
+       $(DESTDIR)/$(nsslibdir)/libnss_sss.so
+	mv $(DESTDIR)/$(nsslibdir)/libnss_sss.so.2.0.0 $(DESTDIR)/$(nsslibdir)/libnss_sss.so.2
+
 uninstall-hook:
 	if [ -f $(abs_builddir)/config/.files ]; then \
 	    cat $(abs_builddir)/config/.files | xargs -iq rm -f $(DESTDIR)/q; \
diff --git a/server/configure.ac b/server/configure.ac
index f24debb69..4198ee952 100644
--- a/server/configure.ac
+++ b/server/configure.ac
@@ -43,6 +43,19 @@ AC_CHECK_TYPES([errno_t], [], [], [[#include <errno.h>]])
 m4_include([build_macros.m4])
 BUILD_WITH_SHARED_BUILD_DIR
 
+#Check for PAM headers
+AC_CHECK_HEADERS([security/pam_appl.h security/pam_misc.h security/pam_modules.h],
+    [AC_CHECK_LIB(pam, pam_get_item, [ PAM_LIBS="-lpam" ], [AC_MSG_ERROR([PAM must support pam_get_item])])],
+    [AC_MSG_ERROR([PAM development libraries not installed])]
+)
+
+#Set the NSS library install path
+AC_ARG_ENABLE([nsslibdir], [AS_HELP_STRING([--enable-nsslibdir],
+                                        [Where to install nss libraries ($libdir)])],
+              [nsslibdir=$enableval],
+              [nsslibdir=$libdir])
+AC_SUBST(nsslibdir)
+
 m4_include(conf_macros.m4)
 WITH_DB_PATH
 WITH_PLUGIN_PATH
diff --git a/server/po/POTFILES.in b/server/po/POTFILES.in
index 2dacfe8bb..e317161f0 100644
--- a/server/po/POTFILES.in
+++ b/server/po/POTFILES.in
@@ -9,3 +9,8 @@ tools/tools_util.h
 tools/sss_useradd.c
 tools/sss_groupadd.c
 tools/sss_usermod.c
+sss_client/common.c
+sss_client/group.c
+sss_client/pam_sss.c
+sss_client/pam_test_client.c
+sss_client/passwd.c
diff --git a/server/providers/data_provider.h b/server/providers/data_provider.h
index c52466238..76ba4cffb 100644
--- a/server/providers/data_provider.h
+++ b/server/providers/data_provider.h
@@ -34,7 +34,7 @@
 #include "dbus/dbus.h"
 #include "sbus/sssd_dbus.h"
 #include "sbus/sbus_client.h"
-#include "../sss_client/sss_cli.h"
+#include "sss_client/sss_cli.h"
 
 #define DATA_PROVIDER_VERSION 0x0001
 #define DATA_PROVIDER_SERVICE_NAME "dp"
diff --git a/server/responder/common/responder.h b/server/responder/common/responder.h
index 9294f4022..ea6ba5831 100644
--- a/server/responder/common/responder.h
+++ b/server/responder/common/responder.h
@@ -31,7 +31,7 @@
 #include "ldb.h"
 #include "dhash.h"
 #include "sbus/sssd_dbus.h"
-#include "../sss_client/sss_cli.h"
+#include "sss_client/sss_cli.h"
 
 extern hash_table_t *dp_requests;
 
diff --git a/server/responder/common/responder_packet.h b/server/responder/common/responder_packet.h
index e98707a63..2bfdc8a32 100644
--- a/server/responder/common/responder_packet.h
+++ b/server/responder/common/responder_packet.h
@@ -22,7 +22,7 @@
 #ifndef __SSSSRV_PACKET_H__
 #define __SSSSRV_PACKET_H__
 
-#include "../sss_client/sss_cli.h"
+#include "sss_client/sss_cli.h"
 
 #define SSS_PACKET_MAX_RECV_SIZE 1024
 
diff --git a/sss_client/Makefile.am b/server/sss_client/Makefile.am
index b430af6b7..b430af6b7 100644
--- a/sss_client/Makefile.am
+++ b/server/sss_client/Makefile.am
diff --git a/sss_client/autogen.sh b/server/sss_client/autogen.sh
index bf84eeee1..bf84eeee1 100755
--- a/sss_client/autogen.sh
+++ b/server/sss_client/autogen.sh
diff --git a/sss_client/common.c b/server/sss_client/common.c
index 6732c24fc..6732c24fc 100644
--- a/sss_client/common.c
+++ b/server/sss_client/common.c
diff --git a/sss_client/conf_macros.m4 b/server/sss_client/conf_macros.m4
index cff961bc8..cff961bc8 100644
--- a/sss_client/conf_macros.m4
+++ b/server/sss_client/conf_macros.m4
diff --git a/sss_client/config.guess b/server/sss_client/config.guess
index 354dbe175..354dbe175 100755
--- a/sss_client/config.guess
+++ b/server/sss_client/config.guess
diff --git a/sss_client/config.sub b/server/sss_client/config.sub
index 23cd6fd75..23cd6fd75 100755
--- a/sss_client/config.sub
+++ b/server/sss_client/config.sub
diff --git a/sss_client/configure.ac b/server/sss_client/configure.ac
index c32bb6fd6..c32bb6fd6 100644
--- a/sss_client/configure.ac
+++ b/server/sss_client/configure.ac
diff --git a/sss_client/external/docbook.m4 b/server/sss_client/external/docbook.m4
index cae89feb1..cae89feb1 100644
--- a/sss_client/external/docbook.m4
+++ b/server/sss_client/external/docbook.m4
diff --git a/sss_client/group.c b/server/sss_client/group.c
index 675b8b71e..675b8b71e 100644
--- a/sss_client/group.c
+++ b/server/sss_client/group.c
diff --git a/sss_client/install-sh b/server/sss_client/install-sh
index 58719246f..58719246f 100755
--- a/sss_client/install-sh
+++ b/server/sss_client/install-sh
diff --git a/sss_client/m4/.dir b/server/sss_client/m4/.dir
index e69de29bb..e69de29bb 100644
--- a/sss_client/m4/.dir
+++ b/server/sss_client/m4/.dir
diff --git a/sss_client/man/pam_sss.8.xml b/server/sss_client/man/pam_sss.8.xml
index f6ac9f477..f6ac9f477 100644
--- a/sss_client/man/pam_sss.8.xml
+++ b/server/sss_client/man/pam_sss.8.xml
diff --git a/sss_client/pam_sss.c b/server/sss_client/pam_sss.c
index 8a1e3129a..8a1e3129a 100644
--- a/sss_client/pam_sss.c
+++ b/server/sss_client/pam_sss.c
diff --git a/sss_client/pam_test_client.c b/server/sss_client/pam_test_client.c
index a088981bc..a088981bc 100644
--- a/sss_client/pam_test_client.c
+++ b/server/sss_client/pam_test_client.c
diff --git a/sss_client/passwd.c b/server/sss_client/passwd.c
index 0d70b6843..0d70b6843 100644
--- a/sss_client/passwd.c
+++ b/server/sss_client/passwd.c
diff --git a/sss_client/po/LINGUAS b/server/sss_client/po/LINGUAS
index 123c64cac..123c64cac 100644
--- a/sss_client/po/LINGUAS
+++ b/server/sss_client/po/LINGUAS
diff --git a/sss_client/po/Makevars b/server/sss_client/po/Makevars
index 1c2ad2ba3..1c2ad2ba3 100644
--- a/sss_client/po/Makevars
+++ b/server/sss_client/po/Makevars
diff --git a/sss_client/po/POTFILES.in b/server/sss_client/po/POTFILES.in
index feeb0049c..feeb0049c 100644
--- a/sss_client/po/POTFILES.in
+++ b/server/sss_client/po/POTFILES.in
diff --git a/sss_client/po/de.po b/server/sss_client/po/de.po
index 68f344266..68f344266 100644
--- a/sss_client/po/de.po
+++ b/server/sss_client/po/de.po
diff --git a/sss_client/po/es.po b/server/sss_client/po/es.po
index be67efe3b..be67efe3b 100644
--- a/sss_client/po/es.po
+++ b/server/sss_client/po/es.po
diff --git a/sss_client/po/fr.po b/server/sss_client/po/fr.po
index 657e3f403..657e3f403 100644
--- a/sss_client/po/fr.po
+++ b/server/sss_client/po/fr.po
diff --git a/sss_client/po/it.po b/server/sss_client/po/it.po
index a78bb2435..a78bb2435 100644
--- a/sss_client/po/it.po
+++ b/server/sss_client/po/it.po
diff --git a/sss_client/po/ja.po b/server/sss_client/po/ja.po
index 527815b96..527815b96 100644
--- a/sss_client/po/ja.po
+++ b/server/sss_client/po/ja.po
diff --git a/sss_client/po/nl.po b/server/sss_client/po/nl.po
index 5c2d39719..5c2d39719 100644
--- a/sss_client/po/nl.po
+++ b/server/sss_client/po/nl.po
diff --git a/sss_client/po/pl.po b/server/sss_client/po/pl.po
index c8b1b479c..c8b1b479c 100644
--- a/sss_client/po/pl.po
+++ b/server/sss_client/po/pl.po
diff --git a/sss_client/po/pt.po b/server/sss_client/po/pt.po
index 9fd869020..9fd869020 100644
--- a/sss_client/po/pt.po
+++ b/server/sss_client/po/pt.po
diff --git a/sss_client/po/sss_client.pot b/server/sss_client/po/sss_client.pot
index 6d8e2a67c..6d8e2a67c 100644
--- a/sss_client/po/sss_client.pot
+++ b/server/sss_client/po/sss_client.pot
diff --git a/sss_client/po/sv.po b/server/sss_client/po/sv.po
index 32c45e1aa..32c45e1aa 100644
--- a/sss_client/po/sv.po
+++ b/server/sss_client/po/sv.po
diff --git a/sss_client/protos.h b/server/sss_client/protos.h
index adb0b7bb7..adb0b7bb7 100644
--- a/sss_client/protos.h
+++ b/server/sss_client/protos.h
diff --git a/sss_client/sss_cli.h b/server/sss_client/sss_cli.h
index 7e9a81ff3..7e9a81ff3 100644
--- a/sss_client/sss_cli.h
+++ b/server/sss_client/sss_cli.h
diff --git a/sss_client/sss_nss.exports b/server/sss_client/sss_nss.exports
index bcc6b10e1..bcc6b10e1 100644
--- a/sss_client/sss_nss.exports
+++ b/server/sss_client/sss_nss.exports
diff --git a/sss_client/sss_pam.exports b/server/sss_client/sss_pam.exports
index 9afa106be..9afa106be 100644
--- a/sss_client/sss_pam.exports
+++ b/server/sss_client/sss_pam.exports
diff --git a/sss_client/sss_pam_macros.h b/server/sss_client/sss_pam_macros.h
index 5277acd0f..5277acd0f 100644
--- a/sss_client/sss_pam_macros.h
+++ b/server/sss_client/sss_pam_macros.h
diff --git a/server/util/user_info_msg.c b/server/util/user_info_msg.c
index 1886537a4..547e3bb74 100644
--- a/server/util/user_info_msg.c
+++ b/server/util/user_info_msg.c
@@ -23,7 +23,7 @@
 */
 
 #include "util/util.h"
-#include "../sss_client/sss_cli.h"
+#include "sss_client/sss_cli.h"
 
 errno_t pack_user_info_chpass_error(TALLOC_CTX *mem_ctx,
                                     const char *user_error_message,