diff options
| author | Andrew Tridgell <tridge@samba.org> | 2001-10-21 03:25:34 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2001-10-21 03:25:34 +0000 |
| commit | bbcd9deb07fe0cfcb2911093e1c99d30b210e7d2 (patch) | |
| tree | 855359f48d003658dba234f3d9a4297a523d8176 /source3/libsmb/clikrb5.c | |
| parent | cbe31055f8deb5844b34e8f1b32e27c830d134ed (diff) | |
| download | samba-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/clikrb5.c')
| -rw-r--r-- | source3/libsmb/clikrb5.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/source3/libsmb/clikrb5.c b/source3/libsmb/clikrb5.c index 5fef97c571..98e27fb9c4 100644 --- a/source3/libsmb/clikrb5.c +++ b/source3/libsmb/clikrb5.c @@ -28,8 +28,7 @@ static krb5_error_code krb5_mk_req2(krb5_context context, krb5_auth_context *auth_context, const krb5_flags ap_req_options, - const char *service, - const char *realm, + const char *principle, krb5_ccache ccache, krb5_data *outbuf) { @@ -39,10 +38,9 @@ static krb5_error_code krb5_mk_req2(krb5_context context, krb5_creds creds; krb5_data in_data; - retval = krb5_build_principal(context, &server, strlen(realm), - realm, service, NULL); + retval = krb5_parse_name(context, principle, &server); if (retval) { - DEBUG(1,("Failed to build principle for %s@%s\n", service, realm)); + DEBUG(1,("Failed to parse principle %s\n", principle)); return retval; } @@ -89,7 +87,7 @@ cleanup_princ: /* get a kerberos5 ticket for the given service */ -DATA_BLOB krb5_get_ticket(char *service, char *realm) +DATA_BLOB krb5_get_ticket(char *principle) { krb5_error_code retval; krb5_data packet; @@ -114,7 +112,7 @@ DATA_BLOB krb5_get_ticket(char *service, char *realm) if ((retval = krb5_mk_req2(context, &auth_context, 0, - service, realm, + principle, ccdef, &packet))) { goto failed; } |