4 files changed, 3 insertions, 29 deletions
diff --git a/sys/rpc/auth.h b/sys/rpc/auth.h
index 33c33ffd594d..3d58fb19536b 100644
--- a/sys/rpc/auth.h
+++ b/sys/rpc/auth.h
@@ -246,19 +246,6 @@ extern AUTH *authunix_create_default(void);	/* takes no parameters */
 extern AUTH *authnone_create(void);		/* takes no parameters */
 extern AUTH *authtls_create(void);		/* takes no parameters */
 __END_DECLS
-/*
- * DES style authentication
- * AUTH *authsecdes_create(servername, window, timehost, ckey)
- * 	char *servername;		- network name of server
- *	u_int window;			- time to live
- * 	const char *timehost;			- optional hostname to sync with
- * 	des_block *ckey;		- optional conversation key to use
- */
-__BEGIN_DECLS
-extern AUTH *authdes_create (char *, u_int, struct sockaddr *, des_block *);
-extern AUTH *authdes_seccreate (const char *, const u_int, const  char *,
-    const  des_block *);
-__END_DECLS
 
 __BEGIN_DECLS
 extern bool_t xdr_opaque_auth		(XDR *, struct opaque_auth *);
@@ -280,19 +267,6 @@ extern void passwd2des ( char *, char * );
 __END_DECLS
 
 /*
- *
- * These routines interface to the keyserv daemon
- *
- */
-__BEGIN_DECLS
-extern int key_decryptsession(const char *, des_block *);
-extern int key_encryptsession(const char *, des_block *);
-extern int key_gendes(des_block *);
-extern int key_setsecret(const char *);
-extern int key_secretkey_is_set(void);
-__END_DECLS
-
-/*
  * Publickey routines.
  */
 __BEGIN_DECLS
diff --git a/sys/rpc/rpcsec_gss/rpcsec_gss.c b/sys/rpc/rpcsec_gss/rpcsec_gss.c
index 53770d139c61..89d1c56f7cc2 100644
--- a/sys/rpc/rpcsec_gss/rpcsec_gss.c
+++ b/sys/rpc/rpcsec_gss/rpcsec_gss.c
@@ -858,7 +858,7 @@ rpc_gss_init(AUTH *auth, rpc_gss_options_ret_t *options_ret)
 		if (maj_stat == GSS_S_COMPLETE)
 			my_krb_imp = KRBIMP_MIT;
 		else
-			my_krb_imp = KRBIMP_HESIOD1;
+			my_krb_imp = KRBIMP_HEIMDALV1;
 	}
 
 	/* GSS context establishment loop. */
diff --git a/sys/rpc/rpcsec_gss/rpcsec_gss_int.h b/sys/rpc/rpcsec_gss/rpcsec_gss_int.h
index 02a7767220de..ba200ee3aeb7 100644
--- a/sys/rpc/rpcsec_gss/rpcsec_gss_int.h
+++ b/sys/rpc/rpcsec_gss/rpcsec_gss_int.h
@@ -75,7 +75,7 @@ struct rpc_gss_init_res {
 
 enum krb_imp {
 	KRBIMP_UNKNOWN,
-	KRBIMP_HESIOD1,
+	KRBIMP_HEIMDALV1,
 	KRBIMP_MIT
 };
 
diff --git a/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c b/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c
index e047c557c712..35c904560836 100644
--- a/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c
+++ b/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c
@@ -937,7 +937,7 @@ svc_rpc_gss_accept_sec_context(struct svc_rpc_gss_client *client,
 		if (maj_stat == GSS_S_COMPLETE)
 			my_krb_imp = KRBIMP_MIT;
 		else
-			my_krb_imp = KRBIMP_HESIOD1;
+			my_krb_imp = KRBIMP_HEIMDALV1;
 		min_stat = 0;
 	}