oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

(krb5_authenticate): don't use the principal associated with the

Browse Source 
socket for authentication, instead let krb5_rd_req pick the correct
one from the ticket; just check that it actually was a pop-ticket


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@7146 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
1999-10-16 13:12:02 +00:00
parent 4abf3bf24c
commit 19dde914b3
1 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
appl/popper/pop_init.c
View File

@@ -76,7 +76,6 @@ krb5_authenticate (POP *p, int s, u_char *buf, struct sockaddr *addr)
krb5_error_code ret; krb5_error_code ret;
krb5_auth_context auth_context = NULL; krb5_auth_context auth_context = NULL;
u_int32_t len; u_int32_t len;
krb5_principal server;
krb5_ticket *ticket; krb5_ticket *ticket;
if (memcmp (buf, "\x00\x00\x00\x13", 4) != 0) if (memcmp (buf, "\x00\x00\x00\x13", 4) != 0)
@@ -89,28 +88,31 @@ krb5_authenticate (POP *p, int s, u_char *buf, struct sockaddr *addr)
|| memcmp (buf, KRB5_SENDAUTH_VERSION, len) != 0) || memcmp (buf, KRB5_SENDAUTH_VERSION, len) != 0)
return -1; return -1;
ret = krb5_sock_to_principal (p->context,
s,
"pop",
KRB5_NT_SRV_HST,
&server);
if (ret) {
pop_log (p, POP_FAILURE,
"krb5_sock_to_principal: %s",
krb5_get_err_text(p->context, ret));
exit (1);
}
ret = krb5_recvauth (p->context, ret = krb5_recvauth (p->context,
&auth_context, &auth_context,
&s, &s,
"KPOPV1.0", "KPOPV1.0",
server, NULL, /* let rd_req figure out what server to use */
KRB5_RECVAUTH_IGNORE_VERSION, KRB5_RECVAUTH_IGNORE_VERSION,
NULL, NULL,
&ticket); &ticket);
krb5_free_principal (p->context, server);
if (ret == 0) { if (ret == 0) {
char *s;
ret = krb5_unparse_name(p->context, ticket->server, &s);
if(ret) {
pop_log(p, POP_FAILURE, "krb5_unparse_name: %s",
krb5_get_err_text(p->context, ret));
exit(1);
}
/* does this make sense? */
if(strncmp(s, "pop/", 4) != 0) {
pop_log(p, POP_FAILURE,
"Got ticket for service `%s'", s);
exit(1);
} else if(p->debug)
pop_log(p, POP_DEBUG,
"Accepted ticket for service `%s'", s);
free(s);
krb5_auth_con_free (p->context, auth_context); krb5_auth_con_free (p->context, auth_context);
krb5_copy_principal (p->context, ticket->client, &p->principal); krb5_copy_principal (p->context, ticket->client, &p->principal);
krb5_free_ticket (p->context, ticket); krb5_free_ticket (p->context, ticket);