pull up r18787 from trunk

 r18787@cathode-dark-space:  coffman | 2006-11-09 10:25:52 -0500
 ticket: new
 subject: Remove obsolete/conflicting prototype for krb524_convert_princs
 Tags: pullup

 After krb524_convert_princs() was made static, the prototype in krb524d.h
 no longer matches the actual function declaration and is no longer needed.

ticket: 4683
version_fixed: 1.6

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-6@18794 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/krb524/krb524d.h b/src/krb524/krb524d.h
index 33be97157aeec0515ed4227ee8cda23aca9ec7ab..b40e3aec5272f9ce30978a3c72db891ab11c9dcb 100644 (file)
--- a/src/krb524/krb524d.h
+++ b/src/krb524/krb524d.h
@@ -43,13 +43,6 @@ int krb524_convert_tkt_skey
                   krb5_keyblock *v5_skey, krb5_keyblock *v4_skey,
                        struct sockaddr_in *saddr);
 
-/* conv_princ.c */
-
-int krb524_convert_princs
-       (krb5_context context, krb5_principal client, krb5_principal server,
-        char *pname, char *pinst, char *prealm,
-        char *sname, char *sinst, char *srealm);
-
 KRB524INT_END_DECLS
 
 #endif /* KRB524INT_H */