From: Daniel Kouřil <kouril@ics.muni.cz>
Date: Mon, 6 Aug 2007 17:02:23 +0000 (+0000)
Subject: removed direct dependency on gssapi
X-Git-Tag: glite-yaim-lb_R_4_0_0_2~13
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=a8dc677d88d236f06e68d94b47b53ace6fa5cbc3;p=jra1mw.git

removed direct dependency on gssapi
- edg_wll_gss_get_client_conn() used instead of gss_inquire_context() to get information about the client
- s/gss_release_cred/edg_wll_gss_release_cred
---

diff --git a/org.glite.jp.index/src/bones_server.c b/org.glite.jp.index/src/bones_server.c
index 57e645e..c798f29 100644
--- a/org.glite.jp.index/src/bones_server.c
+++ b/org.glite.jp.index/src/bones_server.c
@@ -60,7 +60,7 @@ static struct glite_srvbones_service stab = {
 
 static time_t 		cert_mtime;
 static char 		*server_cert, *server_key, *cadir;
-static gss_cred_id_t 	mycred = GSS_C_NO_CREDENTIAL;
+static edg_wll_GssCred 	mycred = NULL;
 static char 		*mysubj;
 
 static char 		*port = GLITE_JPIS_DEFAULT_PORT_STR;
@@ -393,12 +393,10 @@ int newconn(int conn,struct timeval *to,void *data)
 	glite_jp_context_t	ctx = private->ctx->jpctx;
 	glite_gsplugin_Context	plugin_ctx;
 
-	gss_cred_id_t		newcred = GSS_C_NO_CREDENTIAL;
+	edg_wll_GssCred		newcred = NULL;
 	edg_wll_GssStatus	gss_code;
-	gss_name_t		client_name = GSS_C_NO_NAME;
-	gss_buffer_desc		token = GSS_C_EMPTY_BUFFER;
-	OM_uint32		maj_stat,min_stat;
 	int			ret = 0;
+	edg_wll_GssPrincipal	client = NULL;
 	edg_wll_GssConnection	connection;
 
 
@@ -415,7 +413,7 @@ int newconn(int conn,struct timeval *to,void *data)
 			{
 
 				printf("[%d] reloading credentials\n",getpid()); /* XXX: log */
-				gss_release_cred(&min_stat,&mycred);
+				edg_wll_gss_release_cred(&mycred, NULL);
 				mycred = newcred;
 			}
 			break;
@@ -437,26 +435,19 @@ int newconn(int conn,struct timeval *to,void *data)
 		goto cleanup;
 	}
 
-	maj_stat = gss_inquire_context(&min_stat,connection.context,
-			&client_name, NULL, NULL, NULL, NULL, NULL, NULL);
-
-	if (!GSS_ERROR(maj_stat))
-		maj_stat = gss_display_name(&min_stat,client_name,&token,NULL);
+        ret = edg_wll_gss_get_client_conn(&connection, &client, NULL);
 
 	if (ctx->peer) free(ctx->peer);
-	if (!GSS_ERROR(maj_stat)) {
-		printf("[%d] client DN: %s\n",getpid(),(char *) token.value); /* XXX: log */
-
-		ctx->peer = strdup(token.value);
-		memset(&token, 0, sizeof(token));
-	}
-	else {
+	if (ret || client->flags & EDG_WLL_GSS_FLAG_ANON) {
 		printf("[%d] annonymous client\n",getpid());
 		ctx->peer = NULL;
 	}
+	else {
+		printf("[%d] client DN: %s\n",getpid(),client->name); /* XXX: log */
 
-	if (client_name != GSS_C_NO_NAME) gss_release_name(&min_stat, &client_name);
-	if (token.value) gss_release_buffer(&min_stat, &token);
+		ctx->peer = strdup(client->name);
+		edg_wll_gss_free_princ(client);
+	}
 
 	glite_gsplugin_init_context(&plugin_ctx);
 	glite_gsplugin_set_connection(plugin_ctx, &connection);
diff --git a/org.glite.jp.index/src/soap_ps_calls.c b/org.glite.jp.index/src/soap_ps_calls.c
index 47e5db4..7fc1305 100644
--- a/org.glite.jp.index/src/soap_ps_calls.c
+++ b/org.glite.jp.index/src/soap_ps_calls.c
@@ -49,7 +49,7 @@ static int find_dest_index(glite_jp_is_conf *conf, long int uniqueid)
 
 
 static int refresh_gsoap(glite_jpis_context_t ctx, struct soap *soap) {
-	gss_cred_id_t		cred;
+	edg_wll_GssCred		cred;
 	edg_wll_GssStatus	gss_code;
 	char			*et;
 	// preventive very long timeout