krb5_wrap: remove duplicate declaration and dead ifdef

Signed-off-by: Andreas Schneider <asn@samba.org>

diff --git a/libcli/auth/krb5_wrap.c b/libcli/auth/krb5_wrap.c
index f528822b1984896b432c2e5032cbf85eda7c1ea7..c16b35dceea9f83300f6a9c91338615bcea38b60 100644 (file)
--- a/libcli/auth/krb5_wrap.c
+++ b/libcli/auth/krb5_wrap.c
@@ -171,10 +171,6 @@ krb5_error_code smb_krb5_unparse_name(TALLOC_CTX *mem_ctx,
                                            const char *name, 
                                            krb5_principal *principal)
 {
-#ifdef HAVE_KRB5_PARSE_NAME_NOREALM
-       return smb_krb5_parse_name_norealm_conv(context, name, principal);
-#endif
-
        /* we are cheating here because parse_name will in fact set the realm.
         * We don't care as the only caller of smb_krb5_parse_name_norealm
         * ignores the realm anyway when calling

diff --git a/source4/auth/kerberos/kerberos.h b/source4/auth/kerberos/kerberos.h
index 5aff56d8335334faeff8a5b3f29d37b944097243..8235dec70f2c7312d9a747e67f2c069349d76f10 100644 (file)
--- a/source4/auth/kerberos/kerberos.h
+++ b/source4/auth/kerberos/kerberos.h
@@ -68,10 +68,6 @@ krb5_error_code krb5_set_default_tgs_ktypes(krb5_context ctx, const krb5_enctype
 krb5_error_code krb5_auth_con_setuseruserkey(krb5_context context, krb5_auth_context auth_context, krb5_keyblock *keyblock);
 #endif
 
-#ifndef HAVE_KRB5_FREE_UNPARSED_NAME
-void krb5_free_unparsed_name(krb5_context ctx, char *val);
-#endif
-
 #if defined(HAVE_KRB5_PRINCIPAL_GET_COMP_STRING) && !defined(HAVE_KRB5_PRINC_COMPONENT)
 const krb5_data *krb5_princ_component(krb5_context context, krb5_principal principal, int i );
 #endif