diff options
| author | Simo Sorce <idra@samba.org> | 2012-03-31 00:11:02 -0400 |
|---|---|---|
| committer | Andreas Schneider <asn@samba.org> | 2012-04-12 12:06:41 +0200 |
| commit | 6ab0dfe0d9fdea81599ae022c73f5c282ab6aadf (patch) | |
| tree | 39d32fc8fcdc8e2e02e867d62ce08c14bf615f87 | |
| parent | c761654b925d2cb556768bcd121ad9bf8f0c3bf9 (diff) | |
| download | samba-6ab0dfe0d9fdea81599ae022c73f5c282ab6aadf.tar.gz samba-6ab0dfe0d9fdea81599ae022c73f5c282ab6aadf.tar.bz2 samba-6ab0dfe0d9fdea81599ae022c73f5c282ab6aadf.zip | |
krb5_wrap: remove duplicate declaration and dead ifdef
Signed-off-by: Andreas Schneider <asn@samba.org>
| -rw-r--r-- | libcli/auth/krb5_wrap.c | 4 | ||||
| -rw-r--r-- | source4/auth/kerberos/kerberos.h | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/libcli/auth/krb5_wrap.c b/libcli/auth/krb5_wrap.c index f528822b19..c16b35dcee 100644 --- 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 5aff56d833..8235dec70f 100644 --- 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 |