Use PATH_MAX, NAME_MAX and LOGIN_NAME_MAX not MAXPATHNAMELEN,

MAXNAMLEN or MAXLOGNAME where possible.  OK deraadt@

2 files changed, 12 insertions, 12 deletions

diff --git a/src/lib/libc/net/ruserok.c b/src/lib/libc/net/ruserok.c
index 5ef078ac95..46fba4beb2 100644
--- a/src/lib/libc/net/ruserok.c
+++ b/src/lib/libc/net/ruserok.c
@@ -28,25 +28,25 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
 
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include <signal.h>
+#include <ctype.h>
+#include <errno.h>
 #include <fcntl.h>
+#include <limits.h>
 #include <netdb.h>
-#include <unistd.h>
+#include <netgroup.h>
 #include <pwd.h>
-#include <errno.h>
+#include <signal.h>
 #include <stdio.h>
-#include <ctype.h>
+#include <stdlib.h>
 #include <string.h>
 #include <syslog.h>
-#include <stdlib.h>
-#include <netgroup.h>
+#include <unistd.h>
 
 int     __ivaliduser(FILE *, in_addr_t, const char *, const char *);
 int     __ivaliduser_sa(FILE *, struct sockaddr *, socklen_t,
@@ -114,7 +114,7 @@ iruserok_sa(const void *raddr, int rlen, int superuser, const char *ruser,
         FILE *hostf;
         uid_t uid;
         int first;
-        char pbuf[MAXPATHLEN];
+        char pbuf[PATH_MAX];
 
         sa = (struct sockaddr *)raddr;
         first = 1;
diff --git a/src/lib/libc/string/strlcpy.3 b/src/lib/libc/string/strlcpy.3
index a7cd269819..044c959c0c 100644
--- a/src/lib/libc/string/strlcpy.3
+++ b/src/lib/libc/string/strlcpy.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: strlcpy.3,v 1.25 2013/09/25 21:49:31 millert Exp $
+.\"     $OpenBSD: strlcpy.3,v 1.26 2013/09/30 12:02:35 millert Exp $
 .\"
 .\" Copyright (c) 1998, 2000 Todd C. Miller <Todd.Miller@courtesan.com>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: September 25 2013 $
+.Dd $Mdocdate: September 30 2013 $
 .Dt STRLCPY 3
 .Os
 .Sh NAME
@@ -138,7 +138,7 @@ char *s, *p, buf[BUFSIZ];
 To detect truncation, perhaps while building a pathname, something
 like the following might be used:
 .Bd -literal -offset indent
-char *dir, *file, pname[MAXPATHLEN];
+char *dir, *file, pname[PATH_MAX];
 
 \&...
 
@@ -151,7 +151,7 @@ if (strlcat(pname, file, sizeof(pname)) >= sizeof(pname))
 Since it is known how many characters were copied the first time, things
 can be sped up a bit by using a copy instead of an append:
 .Bd -literal -offset indent
-char *dir, *file, pname[MAXPATHLEN];
+char *dir, *file, pname[PATH_MAX];
 size_t n;
 
 \&...