revert patch that shouldn't have been on a tag..

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

diff --git a/src/lib/krb5/asn.1/ChangeLog b/src/lib/krb5/asn.1/ChangeLog
index d1be656478f71ba6b377e8850dfb1cfcb21ceada..77433fd776efa78fbd7eac834e73fe3f635df26b 100644 (file)
--- a/src/lib/krb5/asn.1/ChangeLog
+++ b/src/lib/krb5/asn.1/ChangeLog
@@ -1,3 +1,8 @@
+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 1852e762f7a397743fea3b0583224a56b69a85b2..22e43fd737cd878ac1dd05cc45fac1affd4ca76f 100644 (file)
--- a/src/lib/krb5/asn.1/asn1_k_decode.h
+++ b/src/lib/krb5/asn.1/asn1_k_decode.h
@@ -141,8 +141,6 @@ 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/ccache/ChangeLog b/src/lib/krb5/ccache/ChangeLog
index c206e31bbff1a7f0ec728af0797811c3841644dc..bc7ca4f6d714e6e9a5b6ecc91fbe439b422f2145 100644 (file)
--- a/src/lib/krb5/ccache/ChangeLog
+++ b/src/lib/krb5/ccache/ChangeLog
@@ -1,10 +1,3 @@
-2005-12-07  Ken Raeburn  <raeburn@mit.edu>
-
-       * ccbase.c: Include ctype.h.
-       (struct krb5_cc_typelist): Field ops now points to const.
-
-       * ccdefault.c (krb5_cc_default): Delete unused variable "retval".
-
 2004-09-01  Jeffrey Altman <jaltman@mit.edu>
 
         * cc_mslsa.c: 

diff --git a/src/lib/krb5/ccache/ccbase.c b/src/lib/krb5/ccache/ccbase.c
index 4a7857bee1d6f763aaf459ea0ec83d6462f4e40f..8bb178e2ab05063089c27951dc3492aa49358f62 100644 (file)
--- a/src/lib/krb5/ccache/ccbase.c
+++ b/src/lib/krb5/ccache/ccbase.c
@@ -27,14 +27,13 @@
  * Registration functions for ccache.
  */
 
-#include <ctype.h>
 #include "k5-int.h"
 
 #include "fcc.h"
 
 struct krb5_cc_typelist
  {
-  const krb5_cc_ops *ops;
+  krb5_cc_ops *ops;
   struct krb5_cc_typelist *next;
  };
 extern const krb5_cc_ops krb5_mcc_ops;

diff --git a/src/lib/krb5/ccache/ccdefault.c b/src/lib/krb5/ccache/ccdefault.c
index 95e83b8514d07016dd22d27527f8984786c8bbef..8a45a243b8df7d5dfdf19db5243c1a9453be894c 100644 (file)
--- a/src/lib/krb5/ccache/ccdefault.c
+++ b/src/lib/krb5/ccache/ccdefault.c
@@ -42,6 +42,7 @@ static HANDLE hLeashDLL = INVALID_HANDLE_VALUE;
 krb5_error_code KRB5_CALLCONV
 krb5_cc_default(krb5_context context, krb5_ccache *ccache)
 {
+       krb5_error_code retval;
        krb5_os_context os_ctx;
 
        if (!context || context->magic != KV5M_CONTEXT)

diff --git a/src/lib/krb5/keytab/ktbase.c b/src/lib/krb5/keytab/ktbase.c
index a03379d58341d5046b707dc4e16e39e4ec190029..d351bfa928ff81536752c3ea5296df5b45e69660 100644 (file)
--- a/src/lib/krb5/keytab/ktbase.c
+++ b/src/lib/krb5/keytab/ktbase.c
@@ -27,6 +27,7 @@
  * 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 a455cc40b8c0c87cddfbf630f3fb4862f8c75453..184bfb508df02fde29b0ac06d6e6f39906a05445 100644 (file)
--- a/src/lib/krb5/krb/chpw.c
+++ b/src/lib/krb5/krb/chpw.c
@@ -249,10 +249,9 @@ 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))
@@ -318,7 +317,6 @@ 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 -