[src/netbsd-1-5]: src/crypto/dist/heimdal/lib/krb5 Pull up rev. 1.2:

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

details:   https://anonhg.NetBSD.org/src/rev/6c3a4227cba7
branches:  netbsd-1-5
changeset: 488544:6c3a4227cba7
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Sun Jul 16 20:07:06 2000 +0000

description:
Pull up rev. 1.2:
Return failure if there is no Kerberos 5 configuration file.

diffstat:

 crypto/dist/heimdal/lib/krb5/context.c |  7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diffs (28 lines):

diff -r 10b9ce398b65 -r 6c3a4227cba7 crypto/dist/heimdal/lib/krb5/context.c
--- a/crypto/dist/heimdal/lib/krb5/context.c    Sun Jul 16 19:18:06 2000 +0000
+++ b/crypto/dist/heimdal/lib/krb5/context.c    Sun Jul 16 20:07:06 2000 +0000
@@ -33,7 +33,7 @@
 
 #include "krb5_locl.h"
 
-RCSID("$Id: context.c,v 1.1.1.1 2000/06/16 18:32:56 thorpej Exp $");
+RCSID("$Id: context.c,v 1.1.1.1.2.1 2000/07/16 20:07:06 thorpej Exp $");
 
 #define INIT_FIELD(C, T, E, D, F)                                      \
     (C)->E = krb5_config_get_ ## T ## _default ((C), NULL, (D),        \
@@ -179,11 +179,14 @@
 
     if (ret == 0)
        p->cf = tmp_cf;
+    else {
 #if 0
-    else
        krb5_warnx (p, "Unable to parse config file %s.  Ignoring.",
                    config_file); /* XXX */
 #endif
+       free(p);
+       return ENXIO;   /* XXX close enough for "not configured"? */
+    }
 
     ret = init_context_from_config_file(p);
     if(ret)