From: Michal Voců <michal@ruk.cuni.cz>
Date: Fri, 10 Aug 2012 10:10:05 +0000 (+0000)
Subject: use generic acquire_cred instead of #ifdef, allows for runtime gss mechanism selection
X-Git-Tag: glite-lbjp-common-gss_R_3_2_4_1~12
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=b64b71da103749deffdb33a6df587f61be5aff1f;p=jra1mw.git

use generic acquire_cred instead of #ifdef, allows for runtime gss mechanism selection
---

diff --git a/org.glite.lb.client/src/producer.c b/org.glite.lb.client/src/producer.c
index 3e62895..2da0dc3 100644
--- a/org.glite.lb.client/src/producer.c
+++ b/org.glite.lb.client/src/producer.c
@@ -716,18 +716,11 @@ static int edg_wll_SetLoggingJobMaster(
 		/* do not overwrite user param if already set */
 		edg_wll_GetParam(ctx, EDG_WLL_PARAM_LBPROXY_USER, &p_user);
 		if(NULL == p_user) {
-#ifndef NO_GLOBUS_GSSAPI		
 			/* acquire  gss credentials */
-			err = edg_wll_gss_acquire_cred_gsi(
+			err = edg_wll_gss_acquire_cred(
 				ctx->p_proxy_filename ? ctx->p_proxy_filename : ctx->p_cert_filename,
 				ctx->p_proxy_filename ? ctx->p_proxy_filename : ctx->p_key_filename,
 				&cred, &gss_stat);
-#else
-			/* acquire krb5 credentials */
-			err = edg_wll_gss_acquire_cred_krb5(
-				ctx->p_proxy_filename ? ctx->p_proxy_filename : ctx->p_cert_filename,
-				&cred, &gss_stat);
-#endif
 			/* give up if unable to acquire prescribed credentials */
 			if (err) {
 				edg_wll_SetErrorGss(ctx, "failed to load GSI credentials", &gss_stat);