* ser_ktf.c (krb5_ktf_keytab_externalize): Do not violate const char *

        declaration of ktfile_def_name.

        * ktf_util.c (xfwrite): Cast length field to fwrite/fread as unsigned.

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

diff --git a/src/lib/krb5/keytab/file/ChangeLog b/src/lib/krb5/keytab/file/ChangeLog
index 4f6bae1e7f3156717e826969d36814610087841d..2eeab44bb2f9bce62d3c55c4d025ef812af721c3 100644 (file)
--- a/src/lib/krb5/keytab/file/ChangeLog
+++ b/src/lib/krb5/keytab/file/ChangeLog
@@ -1,3 +1,10 @@
+2000-09-25  Ezra Peisach  <epeisach@mit.edu>
+
+       * ser_ktf.c (krb5_ktf_keytab_externalize): Do not violate const char * 
+       declaration of ktfile_def_name.
+
+       * ktf_util.c (xfwrite): Cast length field to fwrite/fread as unsigned. 
+
 1999-10-26  Wilfredo Sanchez  <tritan@mit.edu>
 
        * Makefile.in: Clean up usage of CFLAGS, CPPFLAGS, DEFS, DEFINES,

diff --git a/src/lib/krb5/keytab/file/ktf_util.c b/src/lib/krb5/keytab/file/ktf_util.c
index 4ae73fedbb107ec26d0d844ee3559d0da8178e38..d583581bc5d1c0eb3afa700227df5558a45ffbd5 100644 (file)
--- a/src/lib/krb5/keytab/file/ktf_util.c
+++ b/src/lib/krb5/keytab/file/ktf_util.c
@@ -86,8 +86,8 @@ typedef krb5_int16  krb5_kt_vno;
 
 krb5_kt_vno krb5_kt_default_vno = KRB5_KT_DEFAULT_VNO;
 
-#define xfwrite(a, b, c, d) fwrite((char *)a, b, c, d)
-#define xfread(a, b, c, d) fread((char *)a, b, c, d)
+#define xfwrite(a, b, c, d) fwrite((char *)a, b, (unsigned) c, d)
+#define xfread(a, b, c, d) fread((char *)a, b, (unsigned) c, d)
 
 #ifdef ANSI_STDIO
 static char *fopen_mode_rbplus= "rb+";

diff --git a/src/lib/krb5/keytab/file/ser_ktf.c b/src/lib/krb5/keytab/file/ser_ktf.c
index 69f6d5d862b3e3533ae38b6408e7e0e7977e34a8..af4189617b529a8f8a1ae994d0d7fddc95fb54a7 100644 (file)
--- a/src/lib/krb5/keytab/file/ser_ktf.c
+++ b/src/lib/krb5/keytab/file/ser_ktf.c
@@ -124,7 +124,7 @@ krb5_ktf_keytab_externalize(kcontext, arg, buffer, lenremain)
     krb5_int32         file_pos[2];
     char               *ktname;
     size_t             namelen;
-    char               *fnamep;
+    const char         *fnamep;
 
     required = 0;
     bp = *buffer;
@@ -148,7 +148,7 @@ krb5_ktf_keytab_externalize(kcontext, arg, buffer, lenremain)
            if (ktdata && ktdata->name)
                fnamep = ktdata->name;
            else
-               fnamep = (char *) ktfile_def_name;
+               fnamep = ktfile_def_name;
            namelen += (strlen(fnamep)+1);
 
            if ((ktname = (char *) malloc(namelen))) {