[src/trunk]: src Merge changes between Heimdal 0.6.1 and 0.6.2

[lha <lha%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7a6c7f95ab23
branches:  trunk
changeset: 566405:7a6c7f95ab23
user:      lha <lha%NetBSD.org@localhost>
date:      Sat May 08 13:27:58 2004 +0000

description:
Merge changes between Heimdal 0.6.1 and 0.6.2

diffstat:

 crypto/dist/heimdal/configure.in      |  6 +++---
 crypto/dist/heimdal/kadmin/kadmind.c  |  8 ++++----
 crypto/dist/heimdal/kadmin/version4.c |  6 ++++--
 doc/3RDPARTY                          |  6 +++---
 doc/CHANGES                           |  3 ++-
 include/heimdal/version.h             |  6 +++---
 6 files changed, 19 insertions(+), 16 deletions(-)

diffs (127 lines):

diff -r 24ff75abc34e -r 7a6c7f95ab23 crypto/dist/heimdal/configure.in
--- a/crypto/dist/heimdal/configure.in  Sat May 08 13:15:02 2004 +0000
+++ b/crypto/dist/heimdal/configure.in  Sat May 08 13:27:58 2004 +0000
@@ -1,8 +1,8 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_REVISION($Revision: 1.4 $)
+AC_REVISION($Revision: 1.5 $)
 AC_PREREQ(2.53)
-#test -z "$CFLAGS" && CFLAGS="-g"
-AC_INIT([Heimdal], [0.6.1], [heimdal-bugs%pdc.kth.se@localhost])
+##test -z "$CFLAGS" && CFLAGS="-g"
+AC_INIT([Heimdal], [0.6.2], [heimdal-bugs%pdc.kth.se@localhost])
 AC_CONFIG_SRCDIR([kuser/kinit.c])
 AM_CONFIG_HEADER(include/config.h)
 
diff -r 24ff75abc34e -r 7a6c7f95ab23 crypto/dist/heimdal/kadmin/kadmind.c
--- a/crypto/dist/heimdal/kadmin/kadmind.c      Sat May 08 13:15:02 2004 +0000
+++ b/crypto/dist/heimdal/kadmin/kadmind.c      Sat May 08 13:27:58 2004 +0000
@@ -33,8 +33,8 @@
 
 #include "kadmin_locl.h"
 
-__RCSID("$Heimdal: kadmind.c,v 1.28 2002/10/21 13:21:24 joda Exp $"
-        "$NetBSD: kadmind.c,v 1.9 2003/05/15 21:36:34 lha Exp $");
+__RCSID("$Heimdal: kadmind.c,v 1.28.2.1 2004/04/29 12:30:32 lha Exp $"
+         "$NetBSD: kadmind.c,v 1.10 2004/05/08 13:27:58 lha Exp $");
 
 static char *check_library  = NULL;
 static char *check_function = NULL;
@@ -47,7 +47,7 @@
 static char *port_str;
 char *realm;
 #ifdef KRB4
-int do_kerberos4 = 1;
+int do_kerberos4 = 0;
 #endif
 
 static struct getargs args[] = {
@@ -76,7 +76,7 @@
        "enable debugging" 
     },
 #ifdef KRB4
-    {  "kerberos4", 0, arg_negative_flag, &do_kerberos4,
+    {  "kerberos4", 0,         arg_flag,   &do_kerberos4,
        "don't respond to kerberos 4 requests"
     },
 #endif
diff -r 24ff75abc34e -r 7a6c7f95ab23 crypto/dist/heimdal/kadmin/version4.c
--- a/crypto/dist/heimdal/kadmin/version4.c     Sat May 08 13:15:02 2004 +0000
+++ b/crypto/dist/heimdal/kadmin/version4.c     Sat May 08 13:27:58 2004 +0000
@@ -41,8 +41,8 @@
 #include <krb_err.h>
 #include <kadm_err.h>
 
-__RCSID("$Heimdal: version4.c,v 1.29 2002/10/29 10:33:23 joda Exp $"
-        "$NetBSD: version4.c,v 1.4 2003/05/15 21:36:34 lha Exp $");
+__RCSID("$Heimdal: version4.c,v 1.29.2.1 2004/04/29 12:29:23 lha Exp $"
+       "$NetBSD: version4.c,v 1.5 2004/05/08 13:27:58 lha Exp $");
 
 #define KADM_NO_OPCODE -1
 #define KADM_NO_ENCRYPT -2
@@ -966,6 +966,8 @@
        if(term_flag)
            exit(0);
        if(first) {
+           if (len < 2)
+               krb5_errx(context, 1, "received too short len (%d < 2)", len);
            /* first time around, we have already read len, and two
                bytes of the version string */
            krb5_data_alloc(&message, len);
diff -r 24ff75abc34e -r 7a6c7f95ab23 doc/3RDPARTY
--- a/doc/3RDPARTY      Sat May 08 13:15:02 2004 +0000
+++ b/doc/3RDPARTY      Sat May 08 13:27:58 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: 3RDPARTY,v 1.214 2004/05/04 02:45:47 taca Exp $
+#      $NetBSD: 3RDPARTY,v 1.215 2004/05/08 13:27:59 lha Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -293,8 +293,8 @@
 for import.
 
 Package:       heimdal
-Version:       0.6.1
-Current Vers:  0.6.1
+Version:       0.6.2
+Current Vers:  0.6.2
 Maintainer:    Heimdal <heimdal%pdc.kth.se@localhost>
 Archive Site:  ftp://ftp.pdc.kth.se/pub/heimdal/src/
 Mailing List:  heimdal-discuss%pdc.kth.se@localhost
diff -r 24ff75abc34e -r 7a6c7f95ab23 doc/CHANGES
--- a/doc/CHANGES       Sat May 08 13:15:02 2004 +0000
+++ b/doc/CHANGES       Sat May 08 13:27:58 2004 +0000
@@ -1,4 +1,4 @@
-LIST OF CHANGES FROM LAST RELEASE:                     <$Revision: 1.308 $>
+LIST OF CHANGES FROM LAST RELEASE:                     <$Revision: 1.309 $>
 
 
 [Note: This file does not mention every change made to the NetBSD source tree.
@@ -8,6 +8,7 @@
 
 
 Changes from NetBSD 2.0 to NetBSD 2.1:
+       heimdal: import version 0.6.2.  [lha 20040508]
        which(1): Replaced by a C program that only checks the path.
                [christos 20040401]
        heimdal: import version 0.6.1.  [lha 20040402]
diff -r 24ff75abc34e -r 7a6c7f95ab23 include/heimdal/version.h
--- a/include/heimdal/version.h Sat May 08 13:15:02 2004 +0000
+++ b/include/heimdal/version.h Sat May 08 13:27:58 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: version.h,v 1.15 2004/04/02 14:59:48 lha Exp $ */
+/*     $NetBSD: version.h,v 1.16 2004/05/08 13:27:58 lha Exp $ */
 
 #if defined(__KRB5_VERSION) && !defined(__NO_KRB4_VERSION)
 #define        heimdal_long_version    __heimdal_long_version
@@ -13,8 +13,8 @@
 #endif
 
 #ifndef __NO_KRB5_VERSION
-const char *heimdal_long_version = "@(#)$Version: Heimdal 0.6.1 (NetBSD) $";
-const char *heimdal_version = "Heimdal 0.6.1";
+const char *heimdal_long_version = "@(#)$Version: Heimdal 0.6.2 (NetBSD) $";
+const char *heimdal_version = "Heimdal 0.6.2";
 #endif
 
 #ifndef __NO_KRB4_VERSION