sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-04 17:47:26 +03:00
Code

krb5_wrap: Remove obsolete smb_krb5_get_principal_from_service_hostname()

Browse Source 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12554

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
This commit is contained in:
Andreas Schneider 2017-03-09 09:10:12 +01:00 committed by Andreas Schneider
parent a3d95ed903
commit 804e828d52
2 changed files with 0 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
lib/krb5_wrap/krb5_samba.c
View File

@ -2628,61 +2628,6 @@ krb5_error_code smb_krb5_principal_set_realm(krb5_context context,
}
/************************************************************************
Routine to get the default realm from the kerberos credentials cache.
Caller must free if the return value is not NULL.
************************************************************************/
static char *smb_krb5_get_default_realm_from_ccache(TALLOC_CTX *mem_ctx)
{
char *realm = NULL;
krb5_context ctx = NULL;
krb5_ccache cc = NULL;
krb5_principal princ = NULL;
initialize_krb5_error_table();
if (krb5_init_context(&ctx)) {
return NULL;
}
DEBUG(5,("kerberos_get_default_realm_from_ccache: "
"Trying to read krb5 cache: %s\n",
krb5_cc_default_name(ctx)));
if (krb5_cc_default(ctx, &cc)) {
DEBUG(5,("kerberos_get_default_realm_from_ccache: "
"failed to read default cache\n"));
goto out;
}
if (krb5_cc_get_principal(ctx, cc, &princ)) {
DEBUG(5,("kerberos_get_default_realm_from_ccache: "
"failed to get default principal\n"));
goto out;
}
#if defined(HAVE_KRB5_PRINCIPAL_GET_REALM)
realm = talloc_strdup(mem_ctx, krb5_principal_get_realm(ctx, princ));
#elif defined(HAVE_KRB5_PRINC_REALM)
{
krb5_data *realm_data = krb5_princ_realm(ctx, princ);
realm = talloc_strndup(mem_ctx, realm_data->data, realm_data->length);
}
#endif
out:
if (ctx) {
if (princ) {
krb5_free_principal(ctx, princ);
}
if (cc) {
krb5_cc_close(ctx, cc);
}
krb5_free_context(ctx);
}
return realm;
}
/**
* @brief Get the realm from the service hostname.
*
@ -2772,62 +2717,6 @@ char *smb_krb5_get_realm_from_hostname(TALLOC_CTX *mem_ctx,
return realm;
}
/**
* @brief Get the principal as a string from the service hostname.
*
* @param[in] mem_ctx The talloc context
*
* @param[in] service The service name
*
* @param[in] remote_name The remote name
*
* @param[in] default_realm The default_realm if we cannot get it from the
* hostname or netbios name.
*
* @return A talloc'ed principal string or NULL if an error occurred.
*
* The caller needs to free the principal with talloc_free() if it isn't needed
* anymore.
*/
char *smb_krb5_get_principal_from_service_hostname(TALLOC_CTX *mem_ctx,
const char *service,
const char *remote_name,
const char *default_realm)
{
char *realm = NULL;
char *host = NULL;
char *principal;
host = strchr_m(remote_name, '.');
if (host) {
/* DNS name. */
realm = smb_krb5_get_realm_from_hostname(talloc_tos(),
remote_name,
default_realm);
} else {
/* NetBIOS name - use our realm. */
realm = smb_krb5_get_default_realm_from_ccache(talloc_tos());
}
if (realm == NULL || *realm == '\0') {
realm = talloc_strdup(talloc_tos(), default_realm);
if (!realm) {
return NULL;
}
DEBUG(3,("Cannot get realm from, "
"desthost %s or default ccache. Using default "
"smb.conf realm %s\n",
remote_name,
realm));
}
principal = talloc_asprintf(mem_ctx,
"%s/%s@%s",
service, remote_name,
realm);
TALLOC_FREE(realm);
return principal;
}
/**
* @brief Get an error string from a Kerberos error code.
*

5
lib/krb5_wrap/krb5_samba.h
View File

@ -318,11 +318,6 @@ char *smb_krb5_get_realm_from_hostname(TALLOC_CTX *mem_ctx,
const char *hostname,
const char *client_realm);
char *smb_krb5_get_principal_from_service_hostname(TALLOC_CTX *mem_ctx,
const char *service,
const char *remote_name,
const char *default_realm);
char *smb_get_krb5_error_message(krb5_context context,
krb5_error_code code,
TALLOC_CTX *mem_ctx);