pullup from trunk

ticket: 2608
version_fixed: 1.3.5

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-3@16504 dc483132-0cff-0310-8789-dd5450dbe970

2 files changed, 17 insertions, 0 deletions

diff --git a/src/lib/krb5/ccache/ChangeLog b/src/lib/krb5/ccache/ChangeLog
index 38dcf2c..1f6a3d9 100644
--- a/src/lib/krb5/ccache/ChangeLog
+++ b/src/lib/krb5/ccache/ChangeLog
@@ -1,3 +1,12 @@
+2004-06-21  Jeffrey Altman <jaltman@mit.edu>
+
+    * cc_mslsa.c: Comment out call to FormatMessage() which fails
+      horribly on non-English systems.  We do not need the output
+      or printf statements as part of a library.  Therefore, we 
+      will ignore this for the time being.   When we decide we
+      want to log event to the Event Log then we can properly 
+      implement this function.
+
 2004-06-18  Jeffrey Altman <jaltman@mit.edu>
 
     * cc_mslsa.c: Enforce acceptable enctypes by checking against
diff --git a/src/lib/krb5/ccache/cc_mslsa.c b/src/lib/krb5/ccache/cc_mslsa.c
index 07e5606..f57b397 100644
--- a/src/lib/krb5/ccache/cc_mslsa.c
+++ b/src/lib/krb5/ccache/cc_mslsa.c
@@ -98,6 +98,13 @@ ShowWinError(LPSTR szAPI, DWORD dwError)
     // TODO - Write errors to event log so that scripts that don't
     // check for errors will still get something in the event log
 
+    // This code is completely unsafe for use on non-English systems
+    // Any call to this function will result in the FormatMessage
+    // call failing and the program terminating.  This might have
+    // been acceptable when this code was part of ms2mit.exe as
+    // a standalone executable but it is not appropriate for a library
+
+#ifdef COMMENT
     WCHAR szMsgBuf[MAX_MSG_SIZE];
     DWORD dwRes;
 
@@ -117,6 +124,7 @@ ShowWinError(LPSTR szAPI, DWORD dwError)
     }
 
     printf("%S",szMsgBuf);
+#endif /* COMMENT */
 }
 
 static VOID