fix include files

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

6 files changed, 7 insertions, 21 deletions

diff --git a/src/kdc/dispatch.c b/src/kdc/dispatch.c
index c4fa67277..b1bd65b80 100644
--- a/src/kdc/dispatch.c
+++ b/src/kdc/dispatch.c
@@ -18,8 +18,6 @@ static char rcsid_dispatch_c[] =
 #include <krb5/copyright.h>
 #include <krb5/krb5.h>
 #include <krb5/asn1.h>
-#include <krb5/krb5_err.h>
-#include <krb5/isode_err.h>
 #include <krb5/kdb.h>
 #include "kdc_util.h"
 
diff --git a/src/kdc/do_as_req.c b/src/kdc/do_as_req.c
index 8329711b7..91a2a89d8 100644
--- a/src/kdc/do_as_req.c
+++ b/src/kdc/do_as_req.c
@@ -18,20 +18,17 @@ static char rcsid_do_as_req_c[] =
 #include <krb5/copyright.h>
 
 #include <krb5/krb5.h>
-#include <krb5/krb5_err.h>
 #include <krb5/kdb.h>
-#include <stdio.h>
 #include <krb5/libos-proto.h>
 #include <krb5/asn1.h>
 #include <krb5/osconf.h>
-#include <errno.h>
 #include <com_err.h>
 
-#include <sys/types.h>
 #include <krb5/ext-proto.h>
 
 #include <syslog.h>
 #ifdef KRB5_USE_INET
+#include <sys/types.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #endif
@@ -233,6 +230,7 @@ krb5_data **response;			/* filled in with a response packet */
 	cleanup();
 	return retval;
     }
+    enc_tkt_reply.confounder = krb5_random_confounder();
     retval = krb5_encrypt_tkt_part(&encrypting_key, &ticket_reply);
     bzero((char *)encrypting_key.contents, encrypting_key.length);
     free((char *)encrypting_key.contents);
diff --git a/src/kdc/do_tgs_req.c b/src/kdc/do_tgs_req.c
index eeff5d07b..9ea76d801 100644
--- a/src/kdc/do_tgs_req.c
+++ b/src/kdc/do_tgs_req.c
@@ -18,20 +18,16 @@ static char rcsid_do_tgs_req_c[] =
 #include <krb5/copyright.h>
 
 #include <krb5/krb5.h>
-#include <krb5/krb5_err.h>
 #include <krb5/kdb.h>
-#include <stdio.h>
 #include <krb5/libos-proto.h>
 #include <krb5/asn1.h>
 #include <krb5/osconf.h>
-#include <errno.h>
-#include <com_err.h>
-
-#include <sys/types.h>
 #include <krb5/ext-proto.h>
+#include <com_err.h>
 
 #include <syslog.h>
 #ifdef KRB5_USE_INET
+#include <sys/types.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #endif
@@ -373,6 +369,8 @@ krb5_data **response;			/* filled in with a response packet */
 		   if (newtransited) free(enc_tkt_reply.transited.data);}
 
     ticket_reply.enc_part2 = &enc_tkt_reply;
+    enc_tkt_reply.confounder = krb5_random_confounder();
+
     if (isflagset(realreq->kdc_options, KDC_OPT_ENC_TKT_IN_SKEY)) {
 	if (!second_ticket) {
 	    if (!realreq->enc_part2) {
diff --git a/src/kdc/kdc_util.c b/src/kdc/kdc_util.c
index 9a660c99f..1c6adcdb6 100644
--- a/src/kdc/kdc_util.c
+++ b/src/kdc/kdc_util.c
@@ -18,14 +18,11 @@ static char rcsid_kdc_util_c[] =
 #include <krb5/copyright.h>
 #include <krb5/krb5.h>
 #include <krb5/kdb.h>
-#include <krb5/krb5_err.h>
-#include <krb5/kdb5_err.h>
 #include <krb5/asn1.h>
 
 #include "kdc_util.h"
 #include "extern.h"
 
-#include <errno.h>
 #include <krb5/ext-proto.h>
 #include <stdio.h>
 
diff --git a/src/kdc/main.c b/src/kdc/main.c
index 6052c6a1e..978d9ee43 100644
--- a/src/kdc/main.c
+++ b/src/kdc/main.c
@@ -33,9 +33,6 @@ static char rcsid_main_c[] =
 #include <krb5/osconf.h>
 #include <krb5/kdb.h>
 #include <krb5/kdb_dbm.h>
-#include <krb5/krb5_err.h>
-#include <krb5/isode_err.h>
-#include <krb5/kdb5_err.h>
 #include <krb5/libos-proto.h>
 #include <krb5/ext-proto.h>
 
diff --git a/src/kdc/network.c b/src/kdc/network.c
index 16d48d6bd..2d18ef3c2 100644
--- a/src/kdc/network.c
+++ b/src/kdc/network.c
@@ -19,11 +19,9 @@ static char rcsid_network_c[] =
 #include <krb5/osconf.h>
 #include <krb5/krb5.h>
 #include <krb5/ext-proto.h>
-#include <stdio.h>
 #include <krb5/libos-proto.h>
-#include <errno.h>
-#include <com_err.h>
 #include <krb5/kdb.h>
+#include <com_err.h>
 #include "kdc_util.h"
 #include "extern.h"
 #include "kdc5_err.h"