From dd380a420e5ea23f4ce38d91315d724b139f7f86 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Milo=C5=A1=20Mula=C4=8D?= Date: Fri, 26 Oct 2007 09:17:11 +0000 Subject: [PATCH] aftermerge cleanup, now it builds --- org.glite.security.gss/interface/glite_gss.h | 9 +++++++++ org.glite.security.gss/src/glite_gss.c | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/org.glite.security.gss/interface/glite_gss.h b/org.glite.security.gss/interface/glite_gss.h index e0d83a9..a6d306e 100644 --- a/org.glite.security.gss/interface/glite_gss.h +++ b/org.glite.security.gss/interface/glite_gss.h @@ -138,6 +138,15 @@ edg_wll_gss_free_princ(edg_wll_GssPrincipal principal); int edg_wll_gss_gethostname(char *name, int len); +char * +edg_wll_gss_normalize_subj(char *in, + int replace_in); + +int +edg_wll_gss_equal_subj(const char *a, + const char *b); + + #ifdef __cplusplus } #endif diff --git a/org.glite.security.gss/src/glite_gss.c b/org.glite.security.gss/src/glite_gss.c index e28e70a..017f126 100644 --- a/org.glite.security.gss/src/glite_gss.c +++ b/org.glite.security.gss/src/glite_gss.c @@ -843,7 +843,7 @@ int edg_wll_gss_write(edg_wll_GssConnection *connection, const void *buf, size_t bufsize, struct timeval *timeout, edg_wll_GssStatus* gss_code) { - OM_uint32 maj_stat, min_stat, min_stat2; + OM_uint32 maj_stat, min_stat; gss_buffer_desc input_token; gss_buffer_desc output_token; int ret; @@ -874,7 +874,7 @@ int edg_wll_gss_read(edg_wll_GssConnection *connection, void *buf, size_t bufsize, struct timeval *timeout, edg_wll_GssStatus* gss_code) { - OM_uint32 maj_stat, min_stat; + OM_uint32 maj_stat, min_stat, min_stat2; gss_buffer_desc input_token; gss_buffer_desc output_token; size_t i, len; -- 1.8.2.3