diff options
| -rw-r--r-- | src/lib/libc/net/ruserok.c | 16 | ||||
| -rw-r--r-- | src/lib/libc/string/strlcpy.3 | 8 |
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 @@ | |||
| 28 | * SUCH DAMAGE. | 28 | * SUCH DAMAGE. |
| 29 | */ | 29 | */ |
| 30 | 30 | ||
| 31 | #include <sys/param.h> | ||
| 32 | #include <sys/socket.h> | 31 | #include <sys/socket.h> |
| 33 | #include <sys/stat.h> | 32 | #include <sys/stat.h> |
| 34 | 33 | ||
| 35 | #include <netinet/in.h> | 34 | #include <netinet/in.h> |
| 36 | #include <arpa/inet.h> | 35 | #include <arpa/inet.h> |
| 37 | 36 | ||
| 38 | #include <signal.h> | 37 | #include <ctype.h> |
| 38 | #include <errno.h> | ||
| 39 | #include <fcntl.h> | 39 | #include <fcntl.h> |
| 40 | #include <limits.h> | ||
| 40 | #include <netdb.h> | 41 | #include <netdb.h> |
| 41 | #include <unistd.h> | 42 | #include <netgroup.h> |
| 42 | #include <pwd.h> | 43 | #include <pwd.h> |
| 43 | #include <errno.h> | 44 | #include <signal.h> |
| 44 | #include <stdio.h> | 45 | #include <stdio.h> |
| 45 | #include <ctype.h> | 46 | #include <stdlib.h> |
| 46 | #include <string.h> | 47 | #include <string.h> |
| 47 | #include <syslog.h> | 48 | #include <syslog.h> |
| 48 | #include <stdlib.h> | 49 | #include <unistd.h> |
| 49 | #include <netgroup.h> | ||
| 50 | 50 | ||
| 51 | int __ivaliduser(FILE *, in_addr_t, const char *, const char *); | 51 | int __ivaliduser(FILE *, in_addr_t, const char *, const char *); |
| 52 | int __ivaliduser_sa(FILE *, struct sockaddr *, socklen_t, | 52 | int __ivaliduser_sa(FILE *, struct sockaddr *, socklen_t, |
| @@ -114,7 +114,7 @@ iruserok_sa(const void *raddr, int rlen, int superuser, const char *ruser, | |||
| 114 | FILE *hostf; | 114 | FILE *hostf; |
| 115 | uid_t uid; | 115 | uid_t uid; |
| 116 | int first; | 116 | int first; |
| 117 | char pbuf[MAXPATHLEN]; | 117 | char pbuf[PATH_MAX]; |
| 118 | 118 | ||
| 119 | sa = (struct sockaddr *)raddr; | 119 | sa = (struct sockaddr *)raddr; |
| 120 | first = 1; | 120 | 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 @@ | |||
| 1 | .\" $OpenBSD: strlcpy.3,v 1.25 2013/09/25 21:49:31 millert Exp $ | 1 | .\" $OpenBSD: strlcpy.3,v 1.26 2013/09/30 12:02:35 millert Exp $ |
| 2 | .\" | 2 | .\" |
| 3 | .\" Copyright (c) 1998, 2000 Todd C. Miller <Todd.Miller@courtesan.com> | 3 | .\" Copyright (c) 1998, 2000 Todd C. Miller <Todd.Miller@courtesan.com> |
| 4 | .\" | 4 | .\" |
| @@ -14,7 +14,7 @@ | |||
| 14 | .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF | 14 | .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
| 15 | .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | 15 | .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
| 16 | .\" | 16 | .\" |
| 17 | .Dd $Mdocdate: September 25 2013 $ | 17 | .Dd $Mdocdate: September 30 2013 $ |
| 18 | .Dt STRLCPY 3 | 18 | .Dt STRLCPY 3 |
| 19 | .Os | 19 | .Os |
| 20 | .Sh NAME | 20 | .Sh NAME |
| @@ -138,7 +138,7 @@ char *s, *p, buf[BUFSIZ]; | |||
| 138 | To detect truncation, perhaps while building a pathname, something | 138 | To detect truncation, perhaps while building a pathname, something |
| 139 | like the following might be used: | 139 | like the following might be used: |
| 140 | .Bd -literal -offset indent | 140 | .Bd -literal -offset indent |
| 141 | char *dir, *file, pname[MAXPATHLEN]; | 141 | char *dir, *file, pname[PATH_MAX]; |
| 142 | 142 | ||
| 143 | \&... | 143 | \&... |
| 144 | 144 | ||
| @@ -151,7 +151,7 @@ if (strlcat(pname, file, sizeof(pname)) >= sizeof(pname)) | |||
| 151 | Since it is known how many characters were copied the first time, things | 151 | Since it is known how many characters were copied the first time, things |
| 152 | can be sped up a bit by using a copy instead of an append: | 152 | can be sped up a bit by using a copy instead of an append: |
| 153 | .Bd -literal -offset indent | 153 | .Bd -literal -offset indent |
| 154 | char *dir, *file, pname[MAXPATHLEN]; | 154 | char *dir, *file, pname[PATH_MAX]; |
| 155 | size_t n; | 155 | size_t n; |
| 156 | 156 | ||
| 157 | \&... | 157 | \&... |
