d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAXHOSTNAME includes space for a NUL

Browse Source
This commit is contained in:
brian 2001-03-09 20:31:02 +00:00
parent 580f325734
commit 38e76e0a72
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
usr.sbin/ppp/ip.c
View File

@ -465,19 +465,19 @@ ip_LogDNS(const struct udphdr *uh, const char *direction)
if (header.opcode == OPCODE_QUERY && header.qr == 0) {
/* rfc1035 */
char name[MAXHOSTNAMELEN + 1], *n;
char namewithdot[MAXHOSTNAMELEN + 1], *n;
const char *qtype, *qclass;
const u_char *end;
n = name;
n = namewithdot;
end = ptr + len - 4;
if (end - ptr >= sizeof name)
end = ptr + sizeof name - 1;
if (end - ptr >= sizeof namewithdot)
end = ptr + sizeof namewithdot - 1;
while (ptr < end) {
len = *ptr++;
if (len > end - ptr)
len = end - ptr;
if (n != name)
if (n != namewithdot)
*n++ = '.';
memcpy(n, ptr, len);
ptr += len;
@ -488,7 +488,7 @@ ip_LogDNS(const struct udphdr *uh, const char *direction)
qclass = dns_Qclass2Txt(ntohs(*(const u_short *)(end + 2)));
log_Printf(LogDNS, "%sbound query %s %s %s\n",
direction, qclass, qtype, name);
direction, qclass, qtype, namewithdot);
}
}

2
usr.sbin/ppp/ipcp.c
View File

@ -541,7 +541,7 @@ ipcp_Init(struct ipcp *ipcp, struct bundle *bundle, struct link *l,
const struct fsm_parent *parent)
{
struct hostent *hp;
char name[MAXHOSTNAMELEN + 1];
char name[MAXHOSTNAMELEN];
static const char * const timer_names[] =
{"IPCP restart", "IPCP openmode", "IPCP stopped"};

2
usr.sbin/ppp/prompt.c
View File

@ -79,7 +79,7 @@ static void
prompt_Display(struct prompt *p)
{
/* XXX: See Index2Nam() - should we only figure this out once ? */
static char shostname[MAXHOSTNAMELEN + 1];
static char shostname[MAXHOSTNAMELEN];
const char *pconnect, *pauth;
if (p->TermMode || !p->needprompt)

4
usr.sbin/ppp/radius.c
View File

@ -373,7 +373,7 @@ radius_Authenticate(struct radius *r, struct authinfo *authp, const char *name,
struct ttyent *ttyp;
struct timeval tv;
int got, slot;
char hostname[MAXHOSTNAMELEN + 1];
char hostname[MAXHOSTNAMELEN];
struct hostent *hp;
struct in_addr hostaddr;
@ -493,7 +493,7 @@ radius_Account(struct radius *r, struct radacct *ac, struct datalink *dl,
struct ttyent *ttyp;
struct timeval tv;
int got, slot;
char hostname[MAXHOSTNAMELEN + 1];
char hostname[MAXHOSTNAMELEN];
struct hostent *hp;
struct in_addr hostaddr;