[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  440db5a... Revert "s3-kerberos: add smb_krb5_parse_name_flags()."
      from  9e48dc2... s3-kerberos: support S4U2SELF impersionation through cli_krb5_get_ticket().

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 440db5a94e0ade69c9c258a54fa4d66b808d965c
Author: Günther Deschner <gd at samba.org>
Date:   Fri Nov 6 13:48:23 2009 +0100

    Revert "s3-kerberos: add smb_krb5_parse_name_flags()."
    
    This reverts commit 17ef153b68795fec681f9ce17c198236aba2b1c2.

-----------------------------------------------------------------------

Summary of changes:
 source3/include/includes.h |    5 +----
 source3/libsmb/clikrb5.c   |   18 ------------------
 2 files changed, 1 insertions(+), 22 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 4ffad61..8bd27b9 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 75abf1c..d5a910b 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.


-- 
Samba Shared Repository