Use MAX_HOST_NAME+1 (limits.h) instead of MAXHOSTNAMELEN (sys/param.h

or netdb.h).

diff --git a/include/missing.h b/include/missing.h
index fda151bf7902d5c23a98485bc3f4f6a87c3fe7d3..1cd16e5b9743fb598a7e1bbf3e874d18fd9ba783 100644 (file)
--- a/include/missing.h
+++ b/include/missing.h
@@ -93,8 +93,16 @@
 # endif
 #endif
 
-#ifndef MAXHOSTNAMELEN
-# define MAXHOSTNAMELEN                64
+#ifndef HOST_NAME_MAX
+# ifdef MAXHOSTNAMELEN
+#  define HOST_NAME_MAX                MAXHOSTNAMELEN
+# else
+#  ifdef _POSIX_HOST_NAME_MAX
+#   define HOST_NAME_MAX       _POSIX_HOST_NAME_MAX
+#  else
+#   define HOST_NAME_MAX       64
+#  endif
+# endif
 #endif
 
 /*

diff --git a/plugins/sudoers/match.c b/plugins/sudoers/match.c
index f7b69689e6cea3e7daa5e4dabb970532c3aca2b0..45c4090c9b309970f96d8734e43fb20f33331912 100644 (file)
--- a/plugins/sudoers/match.c
+++ b/plugins/sudoers/match.c
@@ -788,8 +788,8 @@ netgr_matches(char *netgr, char *lhost, char *shost, char *user)
 #ifdef HAVE_GETDOMAINNAME
     /* get the domain name (if any) */
     if (!initialized) {
-       domain = (char *) emalloc(MAXHOSTNAMELEN + 1);
-       if (getdomainname(domain, MAXHOSTNAMELEN + 1) == -1 || *domain == '\0') {
+       domain = (char *) emalloc(HOST_NAME_MAX + 1);
+       if (getdomainname(domain, HOST_NAME_MAX + 1) == -1 || *domain == '\0') {
            efree(domain);
            domain = NULL;
        }

diff --git a/plugins/sudoers/testsudoers.c b/plugins/sudoers/testsudoers.c
index bf1a16aab1399c5e46867809333056ad66b7a665..f7678de01782fe3bec1d9df8910c96820933493c 100644 (file)
--- a/plugins/sudoers/testsudoers.c
+++ b/plugins/sudoers/testsudoers.c
@@ -128,7 +128,7 @@ main(int argc, char *argv[])
     struct privilege *priv;
     struct userspec *us;
     char *p, *grfile, *pwfile;
-    char hbuf[MAXHOSTNAMELEN + 1];
+    char hbuf[HOST_NAME_MAX + 1];
     int match, host_match, runas_match, cmnd_match;
     int ch, dflag, exitcode = 0;
     debug_decl(main, SUDO_DEBUG_MAIN)

diff --git a/plugins/sudoers/visudo.c b/plugins/sudoers/visudo.c
index 6ed97edd0525e1177d45716705e4d3fef659209c..f9f92bc3ad30e86161db01b703e7f2caafc39673 100644 (file)
--- a/plugins/sudoers/visudo.c
+++ b/plugins/sudoers/visudo.c
@@ -1040,7 +1040,7 @@ get_args(char *cmnd)
 static void
 get_hostname(void)
 {
-    char *p, thost[MAXHOSTNAMELEN + 1];
+    char *p, thost[HOST_NAME_MAX + 1];
     debug_decl(get_hostname, SUDO_DEBUG_UTIL)
 
     if (gethostname(thost, sizeof(thost)) != -1) {

diff --git a/src/sudo.c b/src/sudo.c
index 9d947a84eae634be359f895b42f4be37e434f898..1e28e870ecf362888353e9c3ed2007c516cdd85b 100644 (file)
--- a/src/sudo.c
+++ b/src/sudo.c
@@ -414,7 +414,7 @@ get_user_groups(struct user_details *ud)
 static char **
 get_user_info(struct user_details *ud)
 {
-    char *cp, **user_info, cwd[PATH_MAX], host[MAXHOSTNAMELEN];
+    char *cp, **user_info, cwd[PATH_MAX], host[HOST_NAME_MAX + 1];
     struct passwd *pw;
     int fd, i = 0;
     debug_decl(get_user_info, SUDO_DEBUG_UTIL)