0.3c fixes

[Daniel Kouril <kouril@ics.muni.cz>]

configure.patch: (not usable)
rokenlib directory contains a few header files which can be incompatible with  
header files provided by system. For example glob.h defines struct glob_t
differently then irix's glob.h does (they do not differ in names of fields but 
in order of the fields). During compiling is used roken's glob.h but system
library is then used for linking. This can produce a severe failure (hard to   
find). 
I think necessary *.h should be copied into $(build_dir)/include during
configuration or making libroken.

kadmin.patch : fixes parsing of commands load, merge, del_enctypes
kf.patch     : self explaining (VERSION is defined to be heimdal version)
mcache.patch : mcc_destroy() should only destroy the ccache contents but
               nothing else (mclose() fails then)
klist.patch  : I think krb4 should be disabled by default

--
Dan
--- heimdal-0.3c/configure.orig	Wed Oct 18 19:30:45 2000
+++ heimdal-0.3c/configure	Wed Oct 18 19:31:15 2000
@@ -4337,7 +4337,7 @@
 
 DIR_roken=roken
 LIB_roken='$(top_builddir)/lib/roken/libroken.la'
-CPPFLAGS_roken='-I$(top_builddir)/lib/roken -I$(top_srcdir)/lib/roken'
+CPPFLAGS_roken='-I$(top_builddir)/lib/roken'
 
 WFLAGS_NOUNUSED=""
 WFLAGS_NOIMPLICITINT=""
--- heimdal-0.3c/kadmin/load.c.orig	Wed Oct 25 12:11:11 2000
+++ heimdal-0.3c/kadmin/load.c	Wed Oct 25 12:29:10 2000
@@ -496,7 +496,7 @@
 	usage ("load");
 	return 0;
     }
-    if(argc - optind < 2 || help_flag) {
+    if(argc == optind || help_flag) {
 	usage ("load");
 	return 0;
     }
@@ -517,7 +517,7 @@
 	usage ("merge");
 	return 0;
     }
-    if(argc - optind < 2 || help_flag) {
+    if(argc == optind || help_flag) {
 	usage ("merge");
 	return 0;
     }
--- heimdal-0.3c/kadmin/del_enctype.c.orig	Wed Oct 25 12:06:28 2000
+++ heimdal-0.3c/kadmin/del_enctype.c	Wed Oct 25 12:08:42 2000
@@ -73,7 +73,7 @@
 	usage ();
 	return 0;
     }
-    if(argc - optind < 3 || help_flag) {
+    if(argc - optind < 2 || help_flag) {
 	usage ();
 	return 0;
     }
--- heimdal-0.3c/appl/kf/kf.c.orig	Fri Oct 20 11:53:14 2000
+++ heimdal-0.3c/appl/kf/kf.c	Fri Oct 20 11:48:27 2000
@@ -166,7 +166,7 @@
     status = krb5_sendauth (context,
 			    &auth_context,
 			    &sock,
-			    VERSION,
+			    KF_VERSION,
 			    NULL,
 			    server,
 			    AP_OPTS_MUTUAL_REQUIRED,
--- heimdal-0.3c/appl/kf/kfd.c.orig	Fri Oct 20 11:53:21 2000
+++ heimdal-0.3c/appl/kf/kfd.c	Fri Oct 20 11:48:39 2000
@@ -170,7 +170,7 @@
     status = krb5_recvauth (context,
 			    &auth_context,
 			    &sock,
-			    VERSION,
+			    KF_VERSION,
 			    server,
 			    0,
 			    NULL,
--- heimdal-0.3c/appl/kf/kf_locl.h.orig	Fri Oct 20 11:55:01 2000
+++ heimdal-0.3c/appl/kf/kf_locl.h	Tue Oct 24 09:55:12 2000
@@ -75,6 +75,7 @@
 #include <krb5.h>
 
 #define SERVICE "host"
+#define KF_VERSION "KF v1.0"
 
 #define PORT "kf"
 #define PORT_NUM 2110
--- heimdal-0.3c/lib/krb5/mcache.c.orig	Tue Oct 24 09:49:55 2000
+++ heimdal-0.3c/lib/krb5/mcache.c	Tue Oct 24 09:50:00 2000
@@ -190,7 +190,6 @@
 	return 0;
 
     free (m->name);
-    krb5_data_free(&id->data);
 
     return 0;
 }
--- heimdal-0.3c/kuser/klist.c.orig	Wed Oct 25 15:00:25 2000
+++ heimdal-0.3c/kuser/klist.c	Thu Oct 26 15:19:26 2000
@@ -567,7 +567,7 @@
 static int do_verbose	= 0;
 static int do_test	= 0;
 #ifdef KRB4
-static int do_v4	= 1;
+static int do_v4	= 0;
 static int do_tokens	= 0;
 #endif
 static int do_v5	= 1;