summaryrefslogtreecommitdiff
path: root/source3/libsmb/clispnego.c
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2001-10-21 03:25:34 +0000
committerAndrew Tridgell <tridge@samba.org>2001-10-21 03:25:34 +0000
commitbbcd9deb07fe0cfcb2911093e1c99d30b210e7d2 (patch)
tree855359f48d003658dba234f3d9a4297a523d8176 /source3/libsmb/clispnego.c
parentcbe31055f8deb5844b34e8f1b32e27c830d134ed (diff)
downloadsamba-bbcd9deb07fe0cfcb2911093e1c99d30b210e7d2.tar.gz
samba-bbcd9deb07fe0cfcb2911093e1c99d30b210e7d2.tar.bz2
samba-bbcd9deb07fe0cfcb2911093e1c99d30b210e7d2.zip
made smbclient cope better with arbitrary principle forms
(This used to be commit d1341d74b7aa5f6b3f72e5409b245f87f1ad670b)
Diffstat (limited to 'source3/libsmb/clispnego.c')
-rw-r--r--source3/libsmb/clispnego.c15
1 files changed, 1 insertions, 14 deletions
diff --git a/source3/libsmb/clispnego.c b/source3/libsmb/clispnego.c
index c421d75913..bcce0f6173 100644
--- a/source3/libsmb/clispnego.c
+++ b/source3/libsmb/clispnego.c
@@ -271,24 +271,11 @@ BOOL spnego_parse_krb5_wrap(DATA_BLOB blob, DATA_BLOB *ticket)
*/
DATA_BLOB spnego_gen_negTokenTarg(struct cli_state *cli, char *principle)
{
- char *p;
- fstring service;
- char *realm;
DATA_BLOB tkt, tkt_wrapped, targ;
const char *krb_mechs[] = {OID_KERBEROS5_OLD, OID_NTLMSSP, NULL};
- fstrcpy(service, principle);
- p = strchr_m(service, '@');
- if (!p) {
- DEBUG(1,("Malformed principle [%s] in spnego_gen_negTokenTarg\n",
- principle));
- return data_blob(NULL, 0);
- }
- *p = 0;
- realm = p+1;
-
/* get a kerberos ticket for the service */
- tkt = krb5_get_ticket(service, realm);
+ tkt = krb5_get_ticket(principle);
/* wrap that up in a nice GSS-API wrapping */
tkt_wrapped = spnego_gen_krb5_wrap(tkt);