summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSumit Bose <sbose@redhat.com>2009-03-06 10:13:44 +0100
committerStephen Gallagher <sgallagh@redhat.com>2009-03-06 06:32:55 -0500
commit49271571930ee976aac332f21230b245bbde39d0 (patch)
tree7dfb457197be8daa66e8a9d04c1e3daf86959ad4
parent0ae3745711f4c856cf36f4aca07310586f930e1d (diff)
downloadsssd-49271571930ee976aac332f21230b245bbde39d0.tar.gz
sssd-49271571930ee976aac332f21230b245bbde39d0.tar.bz2
sssd-49271571930ee976aac332f21230b245bbde39d0.zip
minor fixes for the build process
enable --without-tests
-rw-r--r--Makefile2
-rw-r--r--server/configure.ac3
-rw-r--r--server/providers/ldap_be.c7
-rw-r--r--server/server.mk1
-rw-r--r--sssd.spec6
5 files changed, 17 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 8a38214f..d8eb90ac 100644
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,7 @@ TARBALL_PREFIX = $(PACKAGE_NAME)-$(PACKAGE_VERSION)
TARBALL = $(TARBALL_PREFIX).tar.gz
LIBDIR ?= /usr/lib
RPMBUILD ?= $(PWD)/rpmbuild
+DOC = BUILD.txt COPYING
all:
@@ -28,6 +29,7 @@ local-archive: realdistclean
@for subdir in $(SUBDIRS); do \
cp -pr $$subdir dist/$(TARBALL_PREFIX)/.; \
done
+ cp -p $(DOC) dist/$(TARBALL_PREFIX)/.
tarballs: local-archive
-mkdir -p dist/sources
diff --git a/server/configure.ac b/server/configure.ac
index 1a40e2be..0c1036a9 100644
--- a/server/configure.ac
+++ b/server/configure.ac
@@ -43,6 +43,7 @@ WITH_PID_PATH
WITH_PIPE_PATH
WITH_INFOPIPE
WITH_POLICYKIT
+WITH_TESTS
m4_include(pkg.m4)
m4_include(libpopt.m4)
@@ -55,7 +56,7 @@ m4_include(ldap.m4)
m4_include(util/signal.m4)
PKG_CHECK_MODULES([DBUS],[dbus-1])
-if test xHAVE_TESTS != x; then
+if test x$HAVE_TESTS != x; then
PKG_CHECK_MODULES([CHECK],[check])
fi
PKG_CHECK_MODULES([NSS],[nss])
diff --git a/server/providers/ldap_be.c b/server/providers/ldap_be.c
index e5c31730..8967732f 100644
--- a/server/providers/ldap_be.c
+++ b/server/providers/ldap_be.c
@@ -22,6 +22,13 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#ifdef WITH_MOZLDAP
+#define LDAP_OPT_SUCCESS LDAP_SUCCESS
+#define LDAP_TAG_EXOP_MODIFY_PASSWD_ID ((ber_tag_t) 0x80U)
+#define LDAP_TAG_EXOP_MODIFY_PASSWD_OLD ((ber_tag_t) 0x81U)
+#define LDAP_TAG_EXOP_MODIFY_PASSWD_NEW ((ber_tag_t) 0x82U)
+#endif
+
#include <errno.h>
#include <ldap.h>
#include <sys/time.h>
diff --git a/server/server.mk b/server/server.mk
index 0bf82a8b..cd3b19ad 100644
--- a/server/server.mk
+++ b/server/server.mk
@@ -71,6 +71,7 @@ PAMSRV_OBJ = \
PAMSRV_UTIL_OBJ = responder/pam/pamsrv_util.o
+$(LDAP_BE_OBJ): CFLAGS += $(LDAP_CFLAGS)
$(CRYPT_OBJ): CFLAGS += $(NSS_CFLAGS)
diff --git a/sssd.spec b/sssd.spec
index 053a6566..8b1ef6d3 100644
--- a/sssd.spec
+++ b/sssd.spec
@@ -24,8 +24,10 @@ BuildRequires: libtdb-devel
BuildRequires: libldb-devel
BuildRequires: dbus-devel
BuildRequires: dbus-libs
-BuildRequires: mozldap-devel
+BuildRequires: openldap-devel
BuildRequires: pam-devel
+BuildRequires: nss-devel
+BuildRequires: nspr-devel
%description
Provides a set of daemons to manage access to remote directories and
@@ -46,6 +48,7 @@ pushd server
--sysconfdir=%{_sysconfdir} \
--without-tests \
--without-policykit \
+ --with-openldap \
--with-infopipe
make %{?_smp_mflags}
@@ -74,6 +77,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
+%doc COPYING
%{_sbindir}/sssd
%{_libexecdir}/%{name}/
%{_libdir}/%{name}/