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

(pop_init): use getnameinfo_verified

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@7633 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1999-12-20 05:42:48 +00:00
parent c8a35e1432
commit 3c75c49ae6
1 changed files with 12 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
appl/popper/pop_init.c
View File

@@ -125,22 +125,23 @@ krb5_authenticate (POP *p, int s, u_char *buf, struct sockaddr *addr)
NULL, NULL,
&ticket); &ticket);
if (ret == 0) { if (ret == 0) {
char *s; char *server;
ret = krb5_unparse_name(p->context, ticket->server, &s);
ret = krb5_unparse_name(p->context, ticket->server, &server);
if(ret) { if(ret) {
pop_log(p, POP_FAILURE, "krb5_unparse_name: %s", pop_log(p, POP_FAILURE, "krb5_unparse_name: %s",
krb5_get_err_text(p->context, ret)); krb5_get_err_text(p->context, ret));
exit(1); exit(1);
} }
/* does this make sense? */ /* does this make sense? */
if(strncmp(s, "pop/", 4) != 0) { if(strncmp(server, "pop/", 4) != 0) {
pop_log(p, POP_FAILURE, pop_log(p, POP_FAILURE,
"Got ticket for service `%s'", s); "Got ticket for service `%s'", server);
exit(1); exit(1);
} else if(p->debug) } else if(p->debug)
pop_log(p, POP_DEBUG, pop_log(p, POP_DEBUG,
"Accepted ticket for service `%s'", s); "Accepted ticket for service `%s'", server);
free(s); free(server);
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);
@@ -237,7 +238,6 @@ pop_init(POP *p,int argcount,char **argmessage)
{ {
struct sockaddr_storage cs_ss; struct sockaddr_storage cs_ss;
struct sockaddr *cs = (struct sockaddr *)&cs_ss; struct sockaddr *cs = (struct sockaddr *)&cs_ss;
struct hostent * ch; /* Client host information */
int len; int len;
char * trace_file_name = "/tmp/popper-trace"; char * trace_file_name = "/tmp/popper-trace";
int portnum = 0; int portnum = 0;
@@ -345,59 +345,13 @@ pop_init(POP *p,int argcount,char **argmessage)
p->ipport = ntohs(socket_get_port (cs)); p->ipport = ntohs(socket_get_port (cs));
/* Get the canonical name of the host to whom I am speaking */ /* Get the canonical name of the host to whom I am speaking */
ch = getipnodebyaddr (socket_get_address (cs), error = getnameinfo_verified (cs, len, p->client, sizeof(p->client),
socket_addr_size (cs), NULL, 0, 0);
cs->sa_family, if (error) {
&error); pop_log (p, POP_PRIORITY,
if (ch == NULL){ "getnameinfo: %s", gai_strerror (error));
pop_log(p,POP_PRIORITY,
"Unable to get canonical name of client, err = %d",error);
strlcpy (p->client, p->ipaddr, sizeof(p->client)); strlcpy (p->client, p->ipaddr, sizeof(p->client));
} }
/* Save the cannonical name of the client host in
the POP parameter block */
else {
/* Distrust distant nameservers */
struct hostent * ch_again;
char * * addrp;
/* See if the name obtained for the client's IP
address returns an address */
ch_again = getipnodebyname (ch->h_name,
cs->sa_family,
0,
&error);
if (ch_again == NULL) {
pop_log(p,POP_PRIORITY,
"Client at \"%s\" resolves to an unknown host name \"%s\"",
p->ipaddr,ch->h_name);
strlcpy (p->client, p->ipaddr, sizeof(p->client));
}
else {
/* Save the host name (the previous value was
destroyed by gethostbyname) */
strlcpy (p->client, ch->h_name, sizeof(p->client));
/* Look for the client's IP address in the list returned
for its name */
for (addrp=ch_again->h_addr_list; *addrp; ++addrp)
if (memcmp(*addrp,
socket_get_address (cs),
socket_addr_size (cs)) == 0)
break;
if (!*addrp) {
pop_log (p,POP_PRIORITY,
"Client address \"%s\" not listed for its host name \"%s\"",
p->ipaddr,ch->h_name);
strlcpy (p->client, p->ipaddr, sizeof(p->client));
}
}
freehostent (ch_again);
}
if(ch != NULL)
freehostent (ch);
/* Create input file stream for TCP/IP communication */ /* Create input file stream for TCP/IP communication */
if ((p->input = fdopen(STDIN_FILENO,"r")) == NULL){ if ((p->input = fdopen(STDIN_FILENO,"r")) == NULL){