Sophie

Sophie

distrib > Fedora > 15 > i386 > by-pkgid > 8ee6fe7bee37f41fd00b5179f82e5d6d > files > 3

globus-gss-assist-8.5-1.fc15.src.rpm

diff -ur globus_gss_assist-8.1.orig/gridmap.c globus_gss_assist-8.1/gridmap.c
--- globus_gss_assist-8.1.orig/gridmap.c	2011-04-22 20:37:02.000000000 +0200
+++ globus_gss_assist-8.1/gridmap.c	2012-02-06 14:40:09.714304158 +0100
@@ -118,6 +118,7 @@
 #endif
 
 
+#ifndef WIN32
 
 /******************************************************************************
                        Start of gridmapdir functions
@@ -509,6 +510,8 @@
                      End of gridmapdir functions
 ******************************************************************************/
 
+#endif
+
 /**
  * @brief Look up the default mapping for a Grid identity in a gridmap file
  * @ingroup globus_gsi_gss_assist
@@ -549,8 +552,10 @@
     globus_result_t                     result = GLOBUS_SUCCESS;
     globus_i_gss_assist_gridmap_line_t *
                                         gline = NULL;
+#ifndef WIN32
     char                               *usernameprefix;
     int                                 ret;
+#endif
 
     static char *                       _function_name_ =
     "globus_gss_assist_gridmap";
@@ -609,6 +614,7 @@
 	    goto exit;
 	}
 
+#ifndef WIN32
 	if ((*useridp)[0] == '.') /* need to use gridmapdir */
 	{             
 	    usernameprefix = strdup(&((*useridp)[1]));
@@ -617,6 +623,7 @@
 	    free(usernameprefix);
 	    return ret;
         }
+#endif
 
     }
     else
@@ -737,12 +744,14 @@
         goto exit;
     }
 
+#ifndef WIN32
     if (*((gline->user_ids)[0]) == '.') /* try using gridmapdir */ 
     {
         globus_i_gss_assist_gridmap_line_free(gline);
         return gridmapdir_userok(globusid, userid);
     }
     else
+#endif
     for (useridp = gline->user_ids; *useridp != NULL; useridp++)
     {
 	if (strcmp(*useridp, userid) == 0)
@@ -914,8 +923,12 @@
         error_obj = globus_error_get(result);
         globus_object_free(error_obj);
 
+#ifndef WIN32
         /* try with gridmapdir before giving up completely */
         return gridmapdir_globusid(local_user, globusidp);
+#else
+        return 1;
+#endif
     }
 } 
 /* globus_gss_assist_map_local_user() */