head	1.7;
access;
symbols;
locks; strict;
comment	@# @;


1.7
date	2008.07.30.17.42.58;	author rse;	state Exp;
branches;
next	1.6;
commitid	ZiLg5kWuswkHYQct;

1.6
date	2007.12.14.16.06.41;	author cs;	state dead;
branches;
next	1.5;
commitid	oeRv0LR1mlc3OpJs;

1.5
date	2007.10.19.06.33.03;	author rse;	state Exp;
branches;
next	1.4;
commitid	UwAz1JGg6sLPqaCs;

1.4
date	2007.10.05.10.33.58;	author rse;	state Exp;
branches;
next	1.3;
commitid	18llcYRWofepdoAs;

1.3
date	2007.04.24.08.04.30;	author cs;	state dead;
branches;
next	1.2;
commitid	SlEzjA5TMXdXEifs;

1.2
date	2007.04.13.15.07.38;	author cs;	state Exp;
branches;
next	1.1;
commitid	jCCQfTaPEoo2mVds;

1.1
date	2007.01.13.21.18.16;	author rse;	state Exp;
branches;
next	;
commitid	6bfuMYtYUPfyio2s;


desc
@@


1.7
log
@upgrading package: heimdal 1.2 -> 1.2.1
@
text
@Index: lib/sqlite/sqlite3.c
--- lib/sqlite/sqlite3.c.orig	2008-07-28 14:04:41 +0200
+++ lib/sqlite/sqlite3.c	2008-07-28 17:26:31 +0200
@@@@ -383,7 +383,7 @@@@
 #if defined(THREADSAFE)
 # define SQLITE_THREADSAFE THREADSAFE
 #else
-# define SQLITE_THREADSAFE 1
+# define SQLITE_THREADSAFE 0
 #endif
 #endif
 
@


1.6
log
@upgrading package: heimdal 1.0.1 -> 1.0.2
@
text
@d1 11
a11 9
Bugfixes from upstream SVN between 1.0.1 and 1.0.2.
Can be removed once Heimdal 1.0.2 is released.

Index: lib/krb5/rd_req.c
--- lib/krb5/rd_req.c	(revision 21873)
+++ lib/krb5/rd_req.c	(working copy)
@@@@ -826,14 +826,15 @@@@
 	    goto out;
     }
a12 76
-    ret = krb5_verify_ap_req(context,
-			     auth_context,
-			     &ap_req,
-			     server,
-			     o->keyblock,
-			     0,
-			     &o->ap_req_options,
-			     &o->ticket);
+    ret = krb5_verify_ap_req2(context,
+			      auth_context,
+			      &ap_req,
+			      server,
+			      o->keyblock,
+			      0,
+			      &o->ap_req_options,
+			      &o->ticket,
+			      KRB5_KU_AP_REQ_AUTH);
 
     if (ret)
 	goto out;
Index: lib/krb5/init_creds_pw.c
--- lib/krb5/init_creds_pw.c	(revision 21873)
+++ lib/krb5/init_creds_pw.c	(working copy)
@@@@ -1547,9 +1547,15 @@@@
     char buf[BUFSIZ];
     krb5_error_code ret;
 
-    if (in_options == NULL)
+    if (in_options == NULL) {
+	const char *realm = krb5_principal_get_realm(context, client);
 	ret = krb5_get_init_creds_opt_alloc(context, &options);
-    else
+	if (ret == 0)
+	    krb5_get_init_creds_opt_set_default_flags(context, 
+						      NULL, 
+						      realm, 
+						      options);
+    } else
 	ret = _krb5_get_init_creds_opt_copy(context, in_options, &options);
     if (ret)
 	return ret;
Index: lib/krb5/crypto.c
--- lib/krb5/crypto.c	(revision 21873)
+++ lib/krb5/crypto.c	(working copy)
@@@@ -2751,6 +2751,7 @@@@
     if(e == NULL) {
 	krb5_set_error_string (context, "encryption type %d not supported",
 			       etype);
+	*string = NULL;
 	return KRB5_PROG_ETYPE_NOSUPP;
     }
     *string = strdup(e->name);
Index: lib/krb5/context.c
--- lib/krb5/context.c	(revision 21873)
+++ lib/krb5/context.c	(working copy)
@@@@ -251,6 +251,8 @@@@
 {
     if (context->default_cc_name)
 	free(context->default_cc_name);
+    if (context->default_cc_name_env)
+	free(context->default_cc_name_env);
     free(context->etypes);
     free(context->etypes_des);
     krb5_free_host_realm (context, context->default_realms);
Index: lib/kadm5/init_c.c
--- lib/kadm5/init_c.c.orig	2007-08-09 09:47:06 +0200
+++ lib/kadm5/init_c.c	2007-10-18 22:05:53 +0200
@@@@ -354,7 +354,7 @@@@
 		krb5_set_error_string(context, "Unable to find local user name");
 		return KADM5_FAILURE;
 	    }
-	    ret = krb5_make_principal(context, &client, 
+	    ret = krb5_make_principal(context, &default_client, 
 				      NULL, user, "admin", NULL);
 	    if(ret)
 		return ret;
@


1.5
log
@include an upstream bugfix for the kadmin tool
@
text
@@


1.4
log
@align, bugfix and extend the Heimdal Kerberos packaging with the MIT Kerberos packaging
@
text
@d75 12
@


1.3
log
@upgrading package: heimdal 0.8 -> 0.8.1
@
text
@d1 74
a74 21
Index: Makefile.in
--- Makefile.in.orig	2007-04-12 19:37:57 +0200
+++ Makefile.in	2007-04-13 16:43:46 +0200
@@@@ -107,7 +107,7 @@@@
 	uninstall-recursive
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = include lib kuser kdc admin kadmin kpasswd kcm appl doc \
+DIST_SUBDIRS = include lib kuser kdc admin kadmin kpasswd kcm doc \
 	tools tests
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
@@@@ -388,7 +388,7 @@@@
 @@KRB5_TRUE@@LIB_tsasl = $(top_builddir)/lib/tsasl/libtsasl.la
 @@DCE_TRUE@@LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la
 @@KCM_TRUE@@kcm_dir = kcm
-SUBDIRS = include lib kuser kdc admin kadmin kpasswd $(kcm_dir) appl \
+SUBDIRS = include lib kuser kdc admin kadmin kpasswd $(kcm_dir) \
 	doc tools tests
 ACLOCAL_AMFLAGS = -I cf
 EXTRA_DIST = \
@


1.2
log
@upgrading package: heimdal 0.7.2 -> 0.8
@
text
@@


1.1
log
@new package: heimdal 0.7.2 (Kerberos Network Authentication System)
@
text
@d2 3
a4 3
--- Makefile.in.orig	2006-02-06 14:31:14 +0100
+++ Makefile.in	2007-01-13 18:02:32 +0100
@@@@ -105,7 +105,7 @@@@
d10 1
a10 1
 	tools
d13 1
a13 1
@@@@ -367,7 +367,7 @@@@
d17 3
a19 2
-SUBDIRS = include lib kuser kdc admin kadmin kpasswd $(kcm_dir) appl doc tools
+SUBDIRS = include lib kuser kdc admin kadmin kpasswd $(kcm_dir) doc tools
d21 1
a21 2
 EXTRA_DIST = Makefile.am.common krb5.conf
 all: all-recursive
@