From 9fed7ed00eb74a82e822dca2c9f267fe0c47069f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCnther=20Deschner?= Date: Thu, 8 May 2014 14:59:00 +0200 Subject: lib/krb5_wrap: add krb5_copy_data_contents. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reuses krb5_data_copy() if available, choosed not to call it krb5_data_copy as that is easily mixed up with krb5_copy_data (which allocs the krb5_data pointer). Thanks Simo for proposing the better name. Guenther Signed-off-by: Günther Deschner Reviewed-by: Andrew Bartlett --- lib/krb5_wrap/krb5_samba.c | 33 +++++++++++++++++++++++++++++++++ lib/krb5_wrap/krb5_samba.h | 4 ++++ 2 files changed, 37 insertions(+) (limited to 'lib') diff --git a/lib/krb5_wrap/krb5_samba.c b/lib/krb5_wrap/krb5_samba.c index ec44f9ade26..76e7ab53a82 100644 --- a/lib/krb5_wrap/krb5_samba.c +++ b/lib/krb5_wrap/krb5_samba.c @@ -734,6 +734,39 @@ void kerberos_free_data_contents(krb5_context context, krb5_data *pdata) #endif } +/* + * @brief copy a buffer into a krb5_data struct + * + * @param[in] p The krb5_data + * @param[in] data The data to copy + * @param[in] length The length of the data to copy + * @return krb5_error_code + * + * Caller has to free krb5_data with kerberos_free_data_contents(). + */ + +krb5_error_code krb5_copy_data_contents(krb5_data *p, + const void *data, + size_t len) +{ +#if defined(HAVE_KRB5_DATA_COPY) + return krb5_data_copy(p, data, len); +#else + if (len) { + p->data = malloc(len); + if (p->data == NULL) { + return ENOMEM; + } + memmove(p->data, data, len); + } else { + p->data = NULL; + } + p->length = len; + p->magic = KV5M_DATA; + return 0; +#endif +} + /* get a kerberos5 ticket for the given service */ diff --git a/lib/krb5_wrap/krb5_samba.h b/lib/krb5_wrap/krb5_samba.h index 5a3d20e1b8e..7835a3128fd 100644 --- a/lib/krb5_wrap/krb5_samba.h +++ b/lib/krb5_wrap/krb5_samba.h @@ -321,6 +321,10 @@ char *smb_krb5_principal_get_comp_string(TALLOC_CTX *mem_ctx, krb5_const_principal principal, unsigned int component); +krb5_error_code krb5_copy_data_contents(krb5_data *p, + const void *data, + size_t len); + #endif /* HAVE_KRB5 */ int cli_krb5_get_ticket(TALLOC_CTX *mem_ctx, -- cgit v1.2.1