summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2009-11-06 13:48:23 +0100
committerGünther Deschner <gd@samba.org>2009-11-06 13:48:23 +0100
commit440db5a94e0ade69c9c258a54fa4d66b808d965c (patch)
treec161ebfbfb9418a2d6f3482ad5a351c22be86911
parent9e48dc2b78226bdacb8988509eaa93e5c9d92787 (diff)
downloadsamba-440db5a94e0ade69c9c258a54fa4d66b808d965c.tar.gz
samba-440db5a94e0ade69c9c258a54fa4d66b808d965c.tar.bz2
samba-440db5a94e0ade69c9c258a54fa4d66b808d965c.zip
Revert "s3-kerberos: add smb_krb5_parse_name_flags()."
This reverts commit 17ef153b68795fec681f9ce17c198236aba2b1c2.
-rw-r--r--source3/include/includes.h5
-rw-r--r--source3/libsmb/clikrb5.c18
2 files changed, 1 insertions, 22 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 4ffad61c07..8bd27b99e3 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -952,10 +952,7 @@ char *talloc_asprintf_strupper_m(TALLOC_CTX *t, const char *fmt, ...) PRINTF_ATT
krb5_error_code smb_krb5_parse_name(krb5_context context,
const char *name, /* in unix charset */
krb5_principal *principal);
-krb5_error_code smb_krb5_parse_name_flags(krb5_context context,
- const char *name, /* in unix charset */
- int flags,
- krb5_principal *principal);
+
krb5_error_code smb_krb5_unparse_name(TALLOC_CTX *mem_ctx,
krb5_context context,
krb5_const_principal principal,
diff --git a/source3/libsmb/clikrb5.c b/source3/libsmb/clikrb5.c
index 75abf1cbfd..d5a910bfbd 100644
--- a/source3/libsmb/clikrb5.c
+++ b/source3/libsmb/clikrb5.c
@@ -65,24 +65,6 @@ static krb5_error_code ads_krb5_get_fwd_ticket( krb5_context context,
return ret;
}
-krb5_error_code smb_krb5_parse_name_flags(krb5_context context,
- const char *name, /* in unix charset */
- int flags,
- krb5_principal *principal)
-{
- krb5_error_code ret;
- char *utf8_name;
- size_t converted_size;
-
- if (!push_utf8_talloc(talloc_tos(), &utf8_name, name, &converted_size)) {
- return ENOMEM;
- }
-
- ret = krb5_parse_name_flags(context, utf8_name, flags, principal);
- TALLOC_FREE(utf8_name);
- return ret;
-}
-
#ifdef HAVE_KRB5_PARSE_NAME_NOREALM
/**************************************************************
krb5_parse_name_norealm that takes a UNIX charset.