diff options
author | nectar <nectar@FreeBSD.org> | 2002-11-24 20:59:25 +0000 |
---|---|---|
committer | nectar <nectar@FreeBSD.org> | 2002-11-24 20:59:25 +0000 |
commit | d13cd487f69aa39c9486c32e8c28e08dc9a63c76 (patch) | |
tree | 2708753996e89e20cd6831ff0f1965ac9952a791 /crypto/heimdal/kadmin/server.c | |
parent | 923bcb0860f02fab9cc26fecdbcffc17a9d9a7ec (diff) | |
parent | 1abd325d288bd51f6ca702d7fbf296a6f47f7e74 (diff) | |
download | FreeBSD-src-d13cd487f69aa39c9486c32e8c28e08dc9a63c76.zip FreeBSD-src-d13cd487f69aa39c9486c32e8c28e08dc9a63c76.tar.gz |
This commit was generated by cvs2svn to compensate for changes in r107207,
which included commits to RCS files with non-trunk default branches.
Diffstat (limited to 'crypto/heimdal/kadmin/server.c')
-rw-r--r-- | crypto/heimdal/kadmin/server.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/crypto/heimdal/kadmin/server.c b/crypto/heimdal/kadmin/server.c index 143e95d..82050bb 100644 --- a/crypto/heimdal/kadmin/server.c +++ b/crypto/heimdal/kadmin/server.c @@ -34,7 +34,7 @@ #include "kadmin_locl.h" #include <krb5-private.h> -RCSID("$Id: server.c,v 1.36 2002/09/10 19:23:28 joda Exp $"); +RCSID("$Id: server.c,v 1.36.2.1 2002/10/21 14:53:39 joda Exp $"); static kadm5_ret_t kadmind_dispatch(void *kadm_handle, krb5_boolean initial, @@ -532,6 +532,8 @@ handle_v5(krb5_context context, v5_loop (context, ac, initial, kadm_handle, fd); } +extern int do_kerberos4; + krb5_error_code kadmind_loop(krb5_context context, krb5_auth_context ac, @@ -551,7 +553,10 @@ kadmind_loop(krb5_context context, if(len > 0xffff && (len & 0xffff) == ('K' << 8) + 'A') { len >>= 16; #ifdef KRB4 - handle_v4(context, keytab, len, fd); + if(do_kerberos4) + handle_v4(context, keytab, len, fd); + else + krb5_errx(context, 1, "version 4 kadmin is disabled"); #else krb5_errx(context, 1, "packet appears to be version 4"); #endif |