tstellar / rpms / openldap

Forked from rpms/openldap 3 years ago
Clone
cvsdist 19aca62
Don't read the user's configuration file if we're running in a setuid
cvsdist 19aca62
or setgid application.
cvsdist 19aca62
--- openldap-2.2.13/libraries/libldap/init.c	2004-06-15 11:51:32.000000000 -0400
cvsdist 19aca62
+++ openldap-2.2.13/libraries/libldap/init.c	2004-06-15 13:42:35.000000000 -0400
cvsdist 19aca62
@@ -551,10 +551,11 @@
cvsdist 19aca62
 		if( user != NULL ) {
cvsdist 19aca62
 			gopts->ldo_def_sasl_authcid = user;
cvsdist 19aca62
 		}
cvsdist 19aca62
-    }
cvsdist 19aca62
+	}
cvsdist 19aca62
 #endif
cvsdist 19aca62
 
cvsdist 19aca62
 	openldap_ldap_init_w_sysconf(LDAP_CONF_FILE);
cvsdist 19aca62
+	if( ( getuid() == geteuid() ) && ( getgid() == getegid() ) ) {
cvsdist 19aca62
 	openldap_ldap_init_w_userconf(LDAP_USERRC_FILE);
cvsdist 19aca62
 
cvsdist 19aca62
 	{
cvsdist 19aca62
@@ -608,4 +609,5 @@
cvsdist 19aca62
 	}
cvsdist 19aca62
 
cvsdist 19aca62
 	openldap_ldap_init_w_env(gopts, NULL);
cvsdist 19aca62
+	}
cvsdist 19aca62
 }