svn rev #22052: tools/gssmonger/trunk/ gssmaggot/ gssmaster/

[raeburn@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=22052
Commit By: raeburn
Log Message:
Fix some bugs in %hs use cases, including one that caused a crash for
me in testing.



Changed Files:
U   tools/gssmonger/trunk/gssmaggot/handlers.c
U   tools/gssmonger/trunk/gssmaster/interfere.c
U   tools/gssmonger/trunk/gssmaster/mangle.c
Modified: tools/gssmonger/trunk/gssmaggot/handlers.c
===================================================================
--- tools/gssmonger/trunk/gssmaggot/handlers.c	2009-02-24 00:00:02 UTC (rev 22051)
+++ tools/gssmonger/trunk/gssmaggot/handlers.c	2009-02-24 00:12:35 UTC (rev 22052)
@@ -642,8 +642,8 @@
                       Major,
                       Minor
 #if USE_GSSAPI
-                      , msg.value,
-                      msg2.value
+                      , (char *) msg.value,
+                      (char *) msg2.value
 #endif
                       );
 

Modified: tools/gssmonger/trunk/gssmaster/interfere.c
===================================================================
--- tools/gssmonger/trunk/gssmaster/interfere.c	2009-02-24 00:00:02 UTC (rev 22051)
+++ tools/gssmonger/trunk/gssmaster/interfere.c	2009-02-24 00:12:35 UTC (rev 22052)
@@ -373,7 +373,7 @@
           ezLogMsgA( EZLOG_BLOCK,
                      EZ_DEFAULT,
                      "Failed to encode \"%hs\"",
-                     Messages[ iEncode ] );
+                     (char *) Messages[ iEncode ].pvMessage );
 
           ret = FALSE;
 
@@ -385,8 +385,8 @@
                      EZ_DEFAULT,
                      "Successful %hs of \"%.*hs\"",
                      pArgs->Glue.EncodeDescription,
-                     pData[ iEncode ].OriginalMessage->cbMessage,
-                     pData[ iEncode ].OriginalMessage->pvMessage );
+                     (int) pData[ iEncode ].OriginalMessage->cbMessage,
+                     (char *) pData[ iEncode ].OriginalMessage->pvMessage );
 
           DumpToken( pArgs->Glue.EncodeDescription,
                      LOGLEVEL_DIAGNOSEDATA,
@@ -449,8 +449,8 @@
         ezLogMsgA( AnyMessageFailsLog,
                    EZ_DEFAULT,
                    "Failed to decode encoded version of \"%.*hs\"",
-                   pData[ iDecode ].OriginalMessage->cbMessage,
-                   pData[ iDecode ].OriginalMessage->pvMessage );
+                   (int) pData[ iDecode ].OriginalMessage->cbMessage,
+                   (char *) pData[ iDecode ].OriginalMessage->pvMessage );
 
         ret = FALSE;
 
@@ -482,8 +482,8 @@
                      pArgs->hLog,
                      FILE_AND_LINE,
                      "Message encoded/decoded as \"%.*hs\".",
-                     pData[ iDecode ].OriginalMessage->cbMessage,
-                     pData[ iDecode ].OriginalMessage->pvMessage );
+                     (int) pData[ iDecode ].OriginalMessage->cbMessage,
+                     (char *) pData[ iDecode ].OriginalMessage->pvMessage );
             
         } else {
             
@@ -496,10 +496,10 @@
                      FILE_AND_LINE,
                      "Message decoded as \"%.*hs\" -- different"
                      " than what we encoded (\"%.*hs\")!",
-                     pData[ iDecode ].cbPlain,
-                     pData[ iDecode ].pvPlain,
-                     pData[ iDecode ].OriginalMessage->cbMessage,
-                     pData[ iDecode ].OriginalMessage->pvMessage );
+                     (int) pData[ iDecode ].cbPlain,
+                     (char *) pData[ iDecode ].pvPlain,
+                     (int) pData[ iDecode ].OriginalMessage->cbMessage,
+                     (char *) pData[ iDecode ].OriginalMessage->pvMessage );
 
             
         }
@@ -510,8 +510,8 @@
                    pArgs->hLog,
                    FILE_AND_LINE,
                    "\"%.*hs\" validated successfully.",
-                   pData[ iDecode ].OriginalMessage->cbMessage,
-                   pData[ iDecode ].OriginalMessage->pvMessage );
+                   (int) pData[ iDecode ].OriginalMessage->cbMessage,
+                   (char *) pData[ iDecode ].OriginalMessage->pvMessage );
 
 
       }

Modified: tools/gssmonger/trunk/gssmaster/mangle.c
===================================================================
--- tools/gssmonger/trunk/gssmaster/mangle.c	2009-02-24 00:00:02 UTC (rev 22051)
+++ tools/gssmonger/trunk/gssmaster/mangle.c	2009-02-24 00:12:35 UTC (rev 22052)
@@ -450,8 +450,8 @@
                        "Error reading char %ld (after '%hc') from %hs:"
                        " '%hc' (0x%02x) is not a hex digit.",
                        iFile,
+                       ch[0],
                        FileName,
-                       ch[0],
                        ch[1],
                        ch[1] );
             ret = GSMERR_TEST_ISSUE;