kerberos gssapi related changes

diff --git a/org.glite.lb.client/src/prod_proto.c b/org.glite.lb.client/src/prod_proto.c
index 3d1a2ff..e111ffc 100644 (file)
--- a/org.glite.lb.client/src/prod_proto.c
+++ b/org.glite.lb.client/src/prod_proto.c
@@ -272,7 +272,6 @@ int edg_wll_log_connect(edg_wll_Context ctx, int *conn)
        edg_wll_connectionTryLock(ctx, index);
        edg_wll_poolUnlock();
 
-#if 0
        /* acquire gss credentials */
        ret = edg_wll_gss_acquire_cred_gsi(
              ctx->p_proxy_filename ? ctx->p_proxy_filename : ctx->p_cert_filename,
@@ -293,7 +292,7 @@ int edg_wll_log_connect(edg_wll_Context ctx, int *conn)
                fprintf(stderr,"edg_wll_log_connect: going on anonymously!\n");
        }
 #endif
-#endif
+
 #ifdef EDG_WLL_LOG_STUB
        fprintf(stderr,"edg_wll_log_connect: opening connection to local-logger %s:%d\n",
                        ctx->connections->connPool[index].peerName,
@@ -308,6 +307,7 @@ int edg_wll_log_connect(edg_wll_Context ctx, int *conn)
              ctx->p_proxy_filename ? ctx->p_proxy_filename : ctx->p_cert_filename,
              ctx->p_proxy_filename ? ctx->p_proxy_filename : ctx->p_key_filename,
              &ctx->connections->connPool[index].gsiCred, &gss_stat);
+
        /* give up if unable to acquire prescribed credentials, otherwise go on anonymously */
        if (ret && ctx->p_proxy_filename) {
                answer = edg_wll_SetErrorGss(ctx, "edg_wll_gss_acquire_cred_gsi(): failed to load GSI credentials", &gss_stat);

diff --git a/org.glite.lb.client/src/producer.c b/org.glite.lb.client/src/producer.c
index 1f09a71..b8a62e2 100644 (file)
--- a/org.glite.lb.client/src/producer.c
+++ b/org.glite.lb.client/src/producer.c
@@ -728,7 +728,6 @@ static int edg_wll_SetLoggingJobMaster(
                } else {
                        edg_wll_SetParamString(ctx, EDG_WLL_PARAM_LBPROXY_USER, cred->name);
                }
-
                if (cred != NULL)
                        edg_wll_gss_release_cred(&cred, NULL);
        }