okay, now revert the additional patches that were in the tree I tried

to use to revert the previous patches...

git-svn-id: svn://anonsvn.mit.edu/krb5/tags/krb5-1-3-6-final@17553 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/krb5/asn.1/ChangeLog b/src/lib/krb5/asn.1/ChangeLog
index 77433fd776efa78fbd7eac834e73fe3f635df26b..d1be656478f71ba6b377e8850dfb1cfcb21ceada 100644 (file)
--- a/src/lib/krb5/asn.1/ChangeLog
+++ b/src/lib/krb5/asn.1/ChangeLog
@@ -1,8 +1,3 @@
-2005-12-07  Ken Raeburn  <raeburn@mit.edu>
-
-       * asn1_k_decode.h (asn1_decode_etype_info_entry): Delete
-       prototype.
-
 2004-08-31  Tom Yu  <tlyu@mit.edu>
 
        * asn1buf.c: Fix denial-of-service bug.

diff --git a/src/lib/krb5/asn.1/asn1_k_decode.h b/src/lib/krb5/asn.1/asn1_k_decode.h
index 22e43fd737cd878ac1dd05cc45fac1affd4ca76f..1852e762f7a397743fea3b0583224a56b69a85b2 100644 (file)
--- a/src/lib/krb5/asn.1/asn1_k_decode.h
+++ b/src/lib/krb5/asn.1/asn1_k_decode.h
@@ -141,6 +141,8 @@ asn1_error_code asn1_decode_pa_data
        (asn1buf *buf, krb5_pa_data *val);
 asn1_error_code asn1_decode_passwdsequence
        (asn1buf *buf, passwd_phrase_element *val);
+asn1_error_code asn1_decode_etype_info_entry
+       (asn1buf *buf, krb5_etype_info_entry *val);
 asn1_error_code asn1_decode_sam_challenge
        (asn1buf *buf, krb5_sam_challenge *val);
 asn1_error_code asn1_decode_sam_challenge_2

diff --git a/src/lib/krb5/keytab/ktbase.c b/src/lib/krb5/keytab/ktbase.c
index d351bfa928ff81536752c3ea5296df5b45e69660..a03379d58341d5046b707dc4e16e39e4ec190029 100644 (file)
--- a/src/lib/krb5/keytab/ktbase.c
+++ b/src/lib/krb5/keytab/ktbase.c
@@ -27,7 +27,6 @@
  * Registration functions for keytab.
  */
 
-#include <ctype.h>
 #include "k5-int.h"
 
 extern const krb5_kt_ops krb5_ktf_ops;

diff --git a/src/lib/krb5/krb/chpw.c b/src/lib/krb5/krb/chpw.c
index 184bfb508df02fde29b0ac06d6e6f39906a05445..a455cc40b8c0c87cddfbf630f3fb4862f8c75453 100644 (file)
--- a/src/lib/krb5/krb/chpw.c
+++ b/src/lib/krb5/krb/chpw.c
@@ -249,9 +249,10 @@ krb5int_mk_setpw_req(
     krb5_data  *encoded_setpw;
 
     char *ptr;
+     int count = 2;
 
-    cipherpw.data = NULL;
-    cipherpw.length = 0;
+     cipherpw.data = NULL;
+     cipherpw.length = 0;
      
     if (ret = krb5_auth_con_setflags(context, auth_context,
                                     KRB5_AUTH_CONTEXT_DO_SEQUENCE))
@@ -317,6 +318,7 @@ krb5int_rd_setpw_rep( krb5_context context, krb5_auth_context auth_context, krb5
     krb5_error_code ret;
     krb5_data cipherresult;
     krb5_data clearresult;
+    krb5_replay_data replay;
     krb5_keyblock *tmpkey;
 /*
 ** validate the packet length -