From 2ea1cb233941b3f9ce94094869b5846c389210ce Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Tue, 22 Jun 2004 06:39:43 +0000 Subject: [PATCH] cc_mslsa.c: Comment out calls to FormatMessage and do not terminate the program on a failure to generate a message. The existing code fails on non-English systems. We do not need this code in a library unless we are logging to the Event Log which is currently not done. Ignore this for the time being until such time as we decide Event Log entries are important to us. ticket: new git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16503 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/krb5/ccache/ChangeLog | 9 +++++++++ src/lib/krb5/ccache/cc_mslsa.c | 8 ++++++++ 2 files changed, 17 insertions(+) diff --git a/src/lib/krb5/ccache/ChangeLog b/src/lib/krb5/ccache/ChangeLog index 39a31fd52..4feb072d9 100644 --- a/src/lib/krb5/ccache/ChangeLog +++ b/src/lib/krb5/ccache/ChangeLog @@ -1,3 +1,12 @@ +2004-06-21 Jeffrey Altman + + * 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 * 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 07e560644..f57b397e6 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 -- 2.26.2