update copyright notices

use xfree rather than free((char *))

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

3 files changed, 13 insertions, 16 deletions

diff --git a/src/kdc/do_as_req.c b/src/kdc/do_as_req.c
index 4d4c46e23..7215c3559 100644
--- a/src/kdc/do_as_req.c
+++ b/src/kdc/do_as_req.c
@@ -2,7 +2,8 @@
  * $Source$
  * $Author$
  *
- * Copyright 1990 by the Massachusetts Institute of Technology.
+ * Copyright 1990,1991 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
  * For copying and distribution information, please see the file
  * <krb5/copyright.h>.
@@ -15,8 +16,6 @@ static char rcsid_do_as_req_c[] =
 "$Id$";
 #endif	/* !lint & !SABER */
 
-#include <krb5/copyright.h>
-
 #include <krb5/krb5.h>
 #include <krb5/kdb.h>
 #include <krb5/libos-proto.h>
@@ -156,7 +155,7 @@ krb5_data **response;			/* filled in with a response packet */
 		   krb5_db_free_principal(&server, 1); \
 		   memset((char *)session_key->contents, 0, \
 			  session_key->length); \
-		   free((char *)session_key->contents); \
+		   xfree(session_key->contents); \
 		   session_key->contents = 0; }
 
 
@@ -252,7 +251,7 @@ krb5_data **response;			/* filled in with a response packet */
     }
     retval = krb5_encrypt_tkt_part(&encrypting_key, &ticket_reply);
     memset((char *)encrypting_key.contents, 0, encrypting_key.length);
-    free((char *)encrypting_key.contents);
+    xfree(encrypting_key.contents);
     if (retval) {
 	cleanup();
 	return retval;
@@ -264,7 +263,7 @@ krb5_data **response;			/* filled in with a response packet */
 #define cleanup() {krb5_db_free_principal(&client, 1); \
 		   memset((char *)session_key->contents, 0, \
 			  session_key->length); \
-		   free((char *)session_key->contents); \
+		   xfree(session_key->contents); \
 		   session_key->contents = 0; \
 		   memset(ticket_reply.enc_part.ciphertext.data, 0, \
 			 ticket_reply.enc_part.ciphertext.length); \
@@ -315,7 +314,7 @@ krb5_data **response;			/* filled in with a response packet */
 #define cleanup() {krb5_db_free_principal(&client, 1); \
 		   memset((char *)session_key->contents, 0, \
 			  session_key->length); \
-		   free((char *)session_key->contents); \
+		   xfree(session_key->contents); \
 		   session_key->contents = 0; \
 		   memset(ticket_reply.enc_part.ciphertext.data, 0, \
 			 ticket_reply.enc_part.ciphertext.length); \
@@ -357,7 +356,7 @@ krb5_data **response;			/* filled in with a response packet */
     retval = krb5_encode_kdc_rep(KRB5_AS_REP, &reply_encpart,
 				 &encrypting_key,  &reply, response);
     memset((char *)encrypting_key.contents, 0, encrypting_key.length);
-    free((char *)encrypting_key.contents);
+    xfree(encrypting_key.contents);
     cleanup();
     return retval;
 }
diff --git a/src/kdc/do_tgs_req.c b/src/kdc/do_tgs_req.c
index 83b35e833..57e790903 100644
--- a/src/kdc/do_tgs_req.c
+++ b/src/kdc/do_tgs_req.c
@@ -16,8 +16,6 @@ static char rcsid_do_tgs_req_c[] =
 "$Id$";
 #endif	/* !lint & !SABER */
 
-#include <krb5/copyright.h>
-
 #include <krb5/krb5.h>
 #include <krb5/kdb.h>
 #include <krb5/libos-proto.h>
@@ -186,7 +184,7 @@ tgt_again:
 #define cleanup() { krb5_db_free_principal(&server, 1); \
 		   memset((char *)session_key->contents, 0, \
 			  session_key->length); \
-		   free((char *)session_key->contents); \
+		   xfree(session_key->contents); \
 		   session_key->contents = 0; }
 
     ticket_reply.server = request->server; /* XXX careful for realm... */
@@ -452,7 +450,7 @@ tgt_again:
 #define cleanup() { krb5_db_free_principal(&server, 1); \
 		   memset((char *)session_key->contents, 0, \
 			  session_key->length); \
-		   free((char *)session_key->contents); \
+		   xfree(session_key->contents); \
 		   session_key->contents = 0; \
 		   if (newtransited) free(enc_tkt_reply.transited.tr_contents.data);}
 
@@ -485,7 +483,7 @@ tgt_again:
 	retval = krb5_encrypt_tkt_part(&encrypting_key, &ticket_reply);
 
 	memset((char *)encrypting_key.contents, 0, encrypting_key.length);
-	free((char *)encrypting_key.contents);
+	xfree(encrypting_key.contents);
 
 	if (retval) {
 	    tkt_cleanup();
@@ -527,7 +525,7 @@ tgt_again:
 				 header_ticket->enc_part2->session,
 				 &reply, response);
     memset((char *)session_key->contents, 0, session_key->length);
-    free((char *)session_key->contents);
+    xfree(session_key->contents);
     tkt_cleanup();
     session_key->contents = 0;
     return retval;
diff --git a/src/kdc/kdc_util.c b/src/kdc/kdc_util.c
index 00eecc813..96a3c7006 100644
--- a/src/kdc/kdc_util.c
+++ b/src/kdc/kdc_util.c
@@ -3,6 +3,7 @@
  * $Author$
  *
  * Copyright 1990,1991 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
  *
  * For copying and distribution information, please see the file
  * <krb5/copyright.h>.
@@ -15,7 +16,6 @@ static char rcsid_kdc_util_c[] =
 "$Id$";
 #endif	/* !lint & !SABER */
 
-#include <krb5/copyright.h>
 #include <krb5/krb5.h>
 #include <krb5/kdb.h>
 #include <krb5/asn1.h>
@@ -212,7 +212,7 @@ krb5_ticket **ticket;
     if (freeprinc) {
 	krb5_db_free_principal(&server, nprincs);
 	memset((char *)encrypting_key.contents, 0, encrypting_key.length);
-	free((char *)encrypting_key.contents);
+	xfree(encrypting_key.contents);
     }
     if (retval) {
 	cleanup_apreq();