[src/netbsd-1-5]: src Pull up revisions 1.3-1.4 (requested by assar):

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

details:   https://anonhg.NetBSD.org/src/rev/b3cbb515c883
branches:  netbsd-1-5
changeset: 491148:b3cbb515c883
user:      he <he%NetBSD.org@localhost>
date:      Thu Apr 05 23:24:59 2001 +0000

description:
Pull up revisions 1.3-1.4 (requested by assar):
  Upgrade Heimdal to version 0.3e.

diffstat:

 crypto/dist/heimdal/kdc/main.c |  6 ++++--
 lib/libkadm/Makefile           |  9 ++++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diffs (53 lines):

diff -r 76b8aa4d12b7 -r b3cbb515c883 crypto/dist/heimdal/kdc/main.c
--- a/crypto/dist/heimdal/kdc/main.c    Thu Apr 05 23:24:56 2001 +0000
+++ b/crypto/dist/heimdal/kdc/main.c    Thu Apr 05 23:24:59 2001 +0000
@@ -35,7 +35,7 @@
 
 #include <util.h>
 
-RCSID("$Id: main.c,v 1.1.1.1.2.1 2000/08/06 21:11:07 thorpej Exp $");
+RCSID("$Id: main.c,v 1.1.1.1.2.2 2001/04/05 23:24:59 he Exp $");
 
 sig_atomic_t exit_flag = 0;
 krb5_context context;
@@ -52,7 +52,9 @@
     krb5_error_code ret;
     set_progname(argv[0]);
     
-    krb5_init_context(&context);
+    ret = krb5_init_context(&context);
+    if (ret)
+       errx (1, "krb5_init_context failed: %d", ret);
 
     configure(argc, argv);
 
diff -r 76b8aa4d12b7 -r b3cbb515c883 lib/libkadm/Makefile
--- a/lib/libkadm/Makefile      Thu Apr 05 23:24:56 2001 +0000
+++ b/lib/libkadm/Makefile      Thu Apr 05 23:24:59 2001 +0000
@@ -1,4 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2000/06/16 23:22:58 thorpej Exp $
+# $NetBSD: Makefile,v 1.2.2.1 2001/04/05 23:24:59 he Exp $
+
+.include <bsd.own.mk>
+
 DIST=          ${.CURDIR}/../../crypto/dist
 .PATH: ${DIST}/krb4/lib/kadm
 
@@ -7,7 +10,7 @@
 
 LIB=   kadm
 
-COMPILEET!=    cd ${.CURDIR}/../libcom_err/compile_et && make print-objdir
+COMPILEET!=    cd ${.CURDIR}/../libcom_err/compile_et && ${PRINTOBJDIR}
 
 kadm_err.c kadm_err.h: kadm_err.et
        ${COMPILEET}/compile_et ${DIST}/krb4/lib/kadm/kadm_err.et
@@ -28,7 +31,7 @@
 INCS=  kadm.h                                  \
        kadm_err.h
 
-LIBKRBINC!=    cd ${.CURDIR}/../libkrb && make print-objdir
+LIBKRBINC!=    cd ${.CURDIR}/../libkrb && ${PRINTOBJDIR}
 
 CPPFLAGS+= -I.                                 \
        -I${DIST}/krb4/lib/kadm                 \