diff options
| author | Gerald Carter <jerry@samba.org> | 2007-09-28 18:15:34 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:31:03 -0500 |
| commit | 5221ebb299081da6a806362212c6a8ceb9cc70a8 (patch) | |
| tree | 40822494127c0bebd85a6db2c27115e923e91ae8 /source3/libsmb/clispnego.c | |
| parent | 58a9621904f0334d8f5a1f34e2dfd95409e7c68d (diff) | |
| download | samba-5221ebb299081da6a806362212c6a8ceb9cc70a8.tar.gz samba-5221ebb299081da6a806362212c6a8ceb9cc70a8.tar.xz samba-5221ebb299081da6a806362212c6a8ceb9cc70a8.zip | |
r25407: Revert Longhorn join patch as it is not correct for the 3.2 tree.
The translate_name() used by cli_session_setup_spnego() cann rely
Winbindd since it is needed by the join process (and hence before
Winbind can be run).
(This used to be commit 00a93ed336c5f36643e6e33bd277608eaf05677c)
Diffstat (limited to 'source3/libsmb/clispnego.c')
| -rw-r--r-- | source3/libsmb/clispnego.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/source3/libsmb/clispnego.c b/source3/libsmb/clispnego.c index c45883d8903..9432ce81d3c 100644 --- a/source3/libsmb/clispnego.c +++ b/source3/libsmb/clispnego.c @@ -52,18 +52,7 @@ DATA_BLOB spnego_gen_negTokenInit(char guid[16], asn1_push_tag(&data, ASN1_CONTEXT(3)); asn1_push_tag(&data, ASN1_SEQUENCE(0)); asn1_push_tag(&data, ASN1_CONTEXT(0)); - - /* - * @todo - * Windows 2008 sends a bogus principal, since this - * is not truly supported in the SPNEGO protocol. - * - * We should do the same, but I'm worried this will break things, - * such as DFS. - * todd.stecher@isilon.com - */ asn1_write_GeneralString(&data,principal); - asn1_pop_tag(&data); asn1_pop_tag(&data); asn1_pop_tag(&data); @@ -165,14 +154,6 @@ BOOL spnego_parse_negTokenInit(DATA_BLOB blob, asn1_start_tag(&data, ASN1_SEQUENCE(0)); asn1_start_tag(&data, ASN1_CONTEXT(0)); asn1_read_GeneralString(&data,principal); - /* - * Windows 2008 sends a bogus principal, since this - * is not truly supported in the SPNEGO protocol. - * todd.stecher@isilon.com - */ - if (strcmp(ADS_IGNORE_PRINCIPAL, *principal) == 0) - SAFE_FREE(*principal); - asn1_end_tag(&data); asn1_end_tag(&data); asn1_end_tag(&data); |