gen/FreeBSD/gethostname.c.patch

   1 --- gethostname.c.orig  2008-04-05 00:47:41.000000000 -0700
   2 +++ gethostname.c       2008-04-05 01:04:59.000000000 -0700
   3 @@ -37,8 +37,10 @@ static char sccsid[] = "@(#)gethostname.
   4  #include <sys/cdefs.h>
   5  __FBSDID("$FreeBSD: src/lib/libc/gen/gethostname.c,v 1.5 2003/08/19 23:01:46 wollman Exp $");
   6
   7 +#include <string.h>
   8  #include <sys/param.h>
   9  #include <sys/sysctl.h>
  10 +#include <limits.h>
  11
  12  #include <errno.h>
  13
  14 @@ -54,10 +56,22 @@ gethostname(name, namelen)
  15
  16         mib[0] = CTL_KERN;
  17         mib[1] = KERN_HOSTNAME;
  18 +       if (namelen < MAXHOSTNAMELEN + 1) {
  19 +               char local_buf[MAXHOSTNAMELEN + 1];
  20 +               size_t local_len = sizeof(local_buf);
  21 +               if (sysctl(mib, 2, local_buf, &local_len, NULL, 0) == -1) {
  22 +                       if (errno == ENOMEM)
  23 +                               errno = ENAMETOOLONG;
  24 +                       return (-1);
  25 +               }
  26 +               strncpy(name, local_buf, namelen);
  27 +               name[namelen - 1] = 0;
  28 +       } else {
  29         if (sysctl(mib, 2, name, &namelen, NULL, 0) == -1) {
  30                 if (errno == ENOMEM)
  31                         errno = ENAMETOOLONG;
  32                 return (-1);
  33 +               }
  34         }
  35         return (0);
  36  }