Replace HOST_NAME_MAX+1-1 with HOST_NAME_MAX. OK deraad@

2 files changed, 8 insertions, 8 deletions

diff --git a/src/lib/libc/net/getnetent.c b/src/lib/libc/net/getnetent.c
index 7cda141fc0..fc98044a37 100644
--- a/src/lib/libc/net/getnetent.c
+++ b/src/lib/libc/net/getnetent.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: getnetent.c,v 1.15 2015/01/16 16:48:51 deraadt Exp $ */
+/*      $OpenBSD: getnetent.c,v 1.16 2015/01/16 18:18:58 millert Exp $ */
 /*
  * Copyright (c) 1983, 1993
  *      The Regents of the University of California.  All rights reserved.
@@ -86,8 +86,8 @@ again:
         if ((cp = strchr(p, '#')) != NULL)
                 *cp = '\0';
         net.n_name = p;
-        if (strlen(net.n_name) >= HOST_NAME_MAX+1-1)
-                net.n_name[HOST_NAME_MAX+1-1] = '\0';
+        if (strlen(net.n_name) >= HOST_NAME_MAX)
+                net.n_name[HOST_NAME_MAX] = '\0';
         cp = strpbrk(p, " \t");
         if (cp == NULL)
                 goto again;
@@ -108,8 +108,8 @@ again:
                 }
                 if (q < &net_aliases[MAXALIASES - 1]) {
                         *q++ = cp;
-                        if (strlen(cp) >= HOST_NAME_MAX+1-1)
-                                cp[HOST_NAME_MAX+1-1] = '\0';
+                        if (strlen(cp) >= HOST_NAME_MAX)
+                                cp[HOST_NAME_MAX] = '\0';
                 }
                 cp = strpbrk(cp, " \t");
                 if (cp != NULL)
diff --git a/src/lib/libc/net/res_comp.c b/src/lib/libc/net/res_comp.c
index 37c8f23dc2..a1467c3dbb 100644
--- a/src/lib/libc/net/res_comp.c
+++ b/src/lib/libc/net/res_comp.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: res_comp.c,v 1.15 2015/01/16 16:48:51 deraadt Exp $   */
+/*      $OpenBSD: res_comp.c,v 1.16 2015/01/16 18:18:58 millert Exp $   */
 
 /*
  * ++Copyright++ 1985, 1993
@@ -84,8 +84,8 @@ dn_expand(const u_char *msg, const u_char *eomorig, const u_char *comp_dn,
 
         dn = exp_dn;
         cp = comp_dn;
-        if (length > HOST_NAME_MAX+1-1)
-                length = HOST_NAME_MAX+1-1;
+        if (length > HOST_NAME_MAX)
+                length = HOST_NAME_MAX;
         eom = exp_dn + length;
         /*
          * fetch next label in domain name