~ubuntu-branches/ubuntu/trusty/globus-gssapi-gsi/trusty

diff -ur globus_gssapi_gsi-10.2.orig/library/compare_name.c globus_gssapi_gsi-10.2/library/compare_name.c

--- globus_gssapi_gsi-10.2.orig/library/compare_name.c  2008-11-21 16:04:49.000000000 +0100

+++ globus_gssapi_gsi-10.2/library/compare_name.c       2011-12-27 20:58:34.447192918 +0100

@@ -273,10 +273,12 @@

     }

 

     GLOBUS_I_GSI_GSSAPI_DEBUG_PRINT(2, _GGSL("Comparing names:\n"));

-    GLOBUS_I_GSI_GSSAPI_DEBUG_PRINT(2, (_GGSL("Name 1 is of type %s:\n"),

-                                    gss_l_name_types[type1]));

-    GLOBUS_I_GSI_GSSAPI_DEBUG_PRINT(2, (_GGSL("Name 2 is of type %s:\n"),

-                                    gss_l_name_types[type2]));

+    GLOBUS_I_GSI_GSSAPI_DEBUG_FPRINTF(2, (globus_i_gsi_gssapi_debug_fstream,

+                                      _GGSL("Name 1 is of type %s:\n"),

+                                      gss_l_name_types[type1]));

+    GLOBUS_I_GSI_GSSAPI_DEBUG_FPRINTF(2, (globus_i_gsi_gssapi_debug_fstream,

+                                      _GGSL("Name 2 is of type %s:\n"),

+                                      gss_l_name_types[type2]));

 

     /* Normalize order of name1 and name2 so we can have fewer comparisons 

      * below

diff -ur globus_gssapi_gsi-10.2.orig/library/globus_i_gsi_gss_utils.h globus_gssapi_gsi-10.2/library/globus_i_gsi_gss_utils.h

--- globus_gssapi_gsi-10.2.orig/library/globus_i_gsi_gss_utils.h        2011-11-02 14:47:22.000000000 +0100

+++ globus_gssapi_gsi-10.2/library/globus_i_gsi_gss_utils.h     2011-12-27 20:30:31.199300457 +0100

@@ -159,7 +159,7 @@

            char *                       _tmp_str_ = \

                globus_common_create_nstring _MESSAGE_; \

            globus_libc_fprintf(globus_i_gsi_gssapi_debug_fstream, \

-                               _tmp_str_); \

+                               "%s", _tmp_str_); \

            globus_libc_free(_tmp_str_); \

         } \

 }

@@ -170,7 +170,7 @@

     {                                                       \

         globus_libc_fprintf(                                \

             globus_i_gsi_gssapi_debug_fstream,              \

-            _MESSAGE_);                                     \

+            "%s", _MESSAGE_);                               \

     }                                                       \

 }