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

diff --git a/meta-starlingx/meta-stx-integ/recipes-support/openldap/files/0007-openldap-userconfig-setgid.patch b/meta-starlingx/meta-stx-integ/recipes-support/openldap/files/0007-openldap-userconfig-setgid.patch
deleted file mode 100644
index 4249400..0000000
--- a/meta-starlingx/meta-stx-integ/recipes-support/openldap/files/0007-openldap-userconfig-setgid.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From c4906ff521df3f1c9fc4a302300fc135447ee40a Mon Sep 17 00:00:00 2001
-From: babak sarashki <babak.sarashki@windriver.com>
-Date: Sun, 3 Nov 2019 14:38:21 -0800
-Subject: [PATCH 07/20] openldap userconfig setgid
-
-From Stx 1901: openldap-userconfig-setgid.patch
-
-Normally, skips reading of user configuration file when running with different effective UID.
-This patch adds the same behavior for GID.
-
-Author: Nalin Dahyabhai <nalin@redhat.com>
----
- libraries/libldap/init.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libraries/libldap/init.c b/libraries/libldap/init.c
-index 89235f9..de16b60 100644
---- a/libraries/libldap/init.c
-+++ b/libraries/libldap/init.c
-@@ -684,7 +684,7 @@ void ldap_int_initialize( struct ldapoptions *gopts, int *dbglvl )
- 	openldap_ldap_init_w_sysconf(LDAP_CONF_FILE);
- 
- #ifdef HAVE_GETEUID
--	if ( geteuid() != getuid() )
-+	if ( geteuid() != getuid() || getegid() != getgid() )
- 		return;
- #endif
- 
--- 
-2.17.1
-