X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=meta-starlingx%2Fmeta-stx-integ%2Frecipes-support%2Fopenldap%2Ffiles%2F0005-openldap-smbk5pwd-overlay.patch;fp=meta-starlingx%2Fmeta-stx-integ%2Frecipes-support%2Fopenldap%2Ffiles%2F0005-openldap-smbk5pwd-overlay.patch;h=0000000000000000000000000000000000000000;hb=6fc6934434f70595536a387ece31bc30141cafb5;hp=4c6b6f5a82462d2998190122c51a9bf16f52fe8f;hpb=eb1e26510491ba49de693ab3b0498edcb06be6c5;p=pti%2Frtp.git

diff --git a/meta-starlingx/meta-stx-integ/recipes-support/openldap/files/0005-openldap-smbk5pwd-overlay.patch b/meta-starlingx/meta-stx-integ/recipes-support/openldap/files/0005-openldap-smbk5pwd-overlay.patch
deleted file mode 100644
index 4c6b6f5..0000000
--- a/meta-starlingx/meta-stx-integ/recipes-support/openldap/files/0005-openldap-smbk5pwd-overlay.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 75e89e30c2ef819169b5f77b0ac8d450271f516b Mon Sep 17 00:00:00 2001
-From: babak sarashki <babak.sarashki@windriver.com>
-Date: Sun, 3 Nov 2019 14:35:23 -0800
-Subject: [PATCH 05/20] openldap smbk5pwd overlay
-
-Compile smbk5pwd together with other overlays.
-
-From STX: openldap-smbk5pwd-overlay.patch
----
- contrib/slapd-modules/smbk5pwd/README |  5 +++++
- servers/slapd/overlays/Makefile.in    | 11 +++++++++--
- 2 files changed, 14 insertions(+), 2 deletions(-)
-
-diff --git a/contrib/slapd-modules/smbk5pwd/README b/contrib/slapd-modules/smbk5pwd/README
-index a7ef2ce..6780f9e 100644
---- a/contrib/slapd-modules/smbk5pwd/README
-+++ b/contrib/slapd-modules/smbk5pwd/README
-@@ -1,3 +1,8 @@
-+******************************************************************************
-+Red Hat note: We do not provide Heimdal Kerberos but MIT. Therefore the module
-+is compiled only with Samba features in Fedora and Red Hat Enterprise Linux.
-+******************************************************************************
-+
- This directory contains a slapd overlay, smbk5pwd, that extends the
- PasswordModify Extended Operation to update Kerberos keys and Samba
- password hashes for an LDAP user.
-diff --git a/servers/slapd/overlays/Makefile.in b/servers/slapd/overlays/Makefile.in
-index 40b6fa5..e3f415a 100644
---- a/servers/slapd/overlays/Makefile.in
-+++ b/servers/slapd/overlays/Makefile.in
-@@ -33,7 +33,8 @@ SRCS = overlays.c \
- 	syncprov.c \
- 	translucent.c \
- 	unique.c \
--	valsort.c
-+	valsort.c \
-+	smbk5pwd.c
- OBJS = statover.o \
- 	@SLAPD_STATIC_OVERLAYS@ \
- 	overlays.o
-@@ -53,7 +54,7 @@ NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
- UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
- 
- LIBRARY = ../liboverlays.a
--PROGRAMS = @SLAPD_DYNAMIC_OVERLAYS@
-+PROGRAMS = @SLAPD_DYNAMIC_OVERLAYS@ smbk5pwd.la
- 
- XINCPATH = -I.. -I$(srcdir)/..
- XDEFS = $(MODULES_CPPFLAGS)
-@@ -125,6 +126,12 @@ unique.la : unique.lo
- valsort.la : valsort.lo
- 	$(LTLINK_MOD) -module -o $@ valsort.lo version.lo $(LINK_LIBS)
- 
-+smbk5pwd.lo : smbk5pwd.c
-+	$(LTCOMPILE_MOD) -DDO_SAMBA -UHAVE_MOZNSS -DHAVE_OPENSSL $(shell pkg-config openssl --cflags) $<
-+
-+smbk5pwd.la : smbk5pwd.lo
-+	$(LTLINK_MOD) -module -o $@ smbk5pwd.lo version.lo $(LINK_LIBS) $(shell pkg-config openssl --libs)
-+
- install-local:	$(PROGRAMS)
- 	@if test -n "$?" ; then \
- 		$(MKDIR) $(DESTDIR)$(moduledir); \
--- 
-2.17.1
-