getdomainname() isn't guaranteed to null terminate the string if it was

truncated for length.  SVN 14135 made sure that the truncated version would
always be null terminated.  SVN 14144 broke this for no readily apparent
reason, and I have no idea what it was even trying to accomplish.  Reverted.
This commit is contained in:
Rob Landley 2006-02-20 16:31:44 +00:00
parent b4ec339ac2
commit 081d6d4380

View File

@ -37,7 +37,7 @@ void print_login_issue(const char *issue_file, const char *tty)
{
FILE *fd;
int c;
char buf[256+2];
char buf[256];
const char *outbuf;
time_t t;
struct utsname uts;
@ -82,8 +82,8 @@ void print_login_issue(const char *issue_file, const char *tty)
case 'D':
case 'o':
buf[0] = '\0';
getdomainname(buf, sizeof(buf) - 1);
getdomainname(buf, sizeof(buf));
buf[sizeof(buf) - 1] = '\0';
break;
case 'd':
@ -95,8 +95,8 @@ void print_login_issue(const char *issue_file, const char *tty)
break;
case 'h':
buf[0] = '\0';
gethostname(buf, sizeof(buf) - 1);
buf[sizeof(buf) - 1] = '\0';
break;
case 'l':
@ -120,7 +120,7 @@ void print_login_prompt(void)
{
char buf[MAXHOSTNAMELEN+1];
if(gethostname(buf, MAXHOSTNAMELEN) == 0)
gethostname(buf, MAXHOSTNAMELEN);
fputs(buf, stdout);
fputs(LOGIN, stdout);