lib:krb5_wrap: Remove Heimdal‐only krb5_princ_component() implementation

This implementation is no longer called: using a variable of static
storage duration as a conduit for return values is only asking for
trouble.

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/lib/krb5_wrap/krb5_samba.c b/lib/krb5_wrap/krb5_samba.c
index 6f9ae4d822b18adaa66f9317f7073237b522e625..a1884853c61c5dbd028da97b858cb4b14e81f5c6 100644 (file)
--- a/lib/krb5_wrap/krb5_samba.c
+++ b/lib/krb5_wrap/krb5_samba.c
@@ -126,21 +126,6 @@ void krb5_free_string(krb5_context context, 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);
-
-const krb5_data *krb5_princ_component(krb5_context context,
-                                     krb5_principal principal, int i)
-{
-       static krb5_data kdata;
-
-       kdata.data = discard_const_p(char, krb5_principal_get_comp_string(context, principal, i));
-       kdata.length = strlen((const char *)kdata.data);
-       return &kdata;
-}
-#endif
-
 krb5_error_code smb_krb5_princ_component(krb5_context context,
                                         krb5_const_principal principal,
                                         int i,

diff --git a/source4/auth/kerberos/kerberos.h b/source4/auth/kerberos/kerberos.h
index 41c9b048aaf3cddb710d69e7fd75add377d86a5a..5b13f567a008f41f687598bf1e6a9c1fd1f6e80c 100644 (file)
--- a/source4/auth/kerberos/kerberos.h
+++ b/source4/auth/kerberos/kerberos.h
@@ -61,10 +61,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
 
-#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
-
 krb5_error_code smb_krb5_princ_component(krb5_context context,
                                         krb5_const_principal principal,
                                         int i,