* test.c (print_key): Pass in des_cblock* instead of char *.

	(krb5_print_keyblock): Cast argument to C_Block_print to des_cblock *.
	(krb4_print_ticket): For printf formats expecting a long, cast
	arguments as such.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13278 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/krb524/ChangeLog b/src/krb524/ChangeLog
index ffd569fd33cfc5a59ce960b324295aa97a3c357b..9389020038f85ca77a61b910c41671d4f8db9a1a 100644 (file)
--- a/src/krb524/ChangeLog
+++ b/src/krb524/ChangeLog
@@ -1,3 +1,10 @@
+2001-06-06  Ezra Peisach  <epeisach@mit.edu>
+
+       * test.c (print_key): Pass in des_cblock* instead of char *.
+       (krb5_print_keyblock): Cast argument to C_Block_print to des_cblock *. 
+       (krb4_print_ticket): For printf formats expecting a long, cast
+       arguments as such.
+
 2001-06-05  Ken Raeburn  <raeburn@mit.edu>
 
        * configure.in: Check for unistd.h.

diff --git a/src/krb524/test.c b/src/krb524/test.c
index b243a14782ba995030714e1294b669d6603dd4e0..13189e8cfc18fb526d29fa4745ce266492add911 100644 (file)
--- a/src/krb524/test.c
+++ b/src/krb524/test.c
@@ -46,7 +46,7 @@ void do_local (krb5_creds *, krb5_keyblock *),
 static 
 void print_key(msg, key)
      char *msg;
-     char *key;
+     des_cblock *key;
 {
      printf("%s: ", msg);
      C_Block_print(key);
@@ -84,7 +84,7 @@ void krb5_print_keyblock(msg, key)
      printf("%s: Keytype: %d\n", msg, key->enctype);
      printf("%s: Length: %d\n", msg, key->length);
      printf("%s: Key: ", msg);
-     C_Block_print(key->contents);
+     C_Block_print((des_cblock *) key->contents);
      printf("\n");
 }
 
@@ -142,7 +142,9 @@ void krb5_print_creds(context, creds, secret_key)
      krb5_print_times("Times", &creds->times);
      printf("is_skey: %s\n", creds->is_skey ? "True" : "False");
      printf("Flags: 0x%08x\n", creds->ticket_flags);
+#if 0
      krb5_print_addrs(creds->addresses);
+#endif
      krb5_print_ticket(context, &creds->ticket, secret_key);
      /* krb5_print_ticket(context, &creds->second_ticket, secret_key); */
 }
@@ -177,11 +179,11 @@ void krb4_print_ticket(ticket, secret_key)
      }
      printf("Ticket: Client: %s.%s@%s\n", pname, pinst, prealm);
      printf("Ticket: Service: %s.%s\n", sname, sinst);
-     printf("Ticket: Address: %08lx\n", addr);
+     printf("Ticket: Address: %08lx\n", (long) addr);
      print_key("Ticket: Session Key", (char *) session_key);
      printf("Ticket: Lifetime: %d\n", life);
-     printf("Ticket: Issue Date: %ld, %s", issue_time, ctime((time_t *)
-                                                            &issue_time));
+     printf("Ticket: Issue Date: %ld, %s", (long) issue_time, 
+           ctime((time_t *) &issue_time));
 }
 
 static