diff options
| author |   stevesk <stevesk@openbsd.org> | 2001-12-06 18:09:23 +0000 |
|---|---|---|
| committer | stevesk <stevesk@openbsd.org> | 2001-12-06 18:09:23 +0000 |
| commit | 09ccb9fa314b9db3fe1f7a2464faaf841dc3878d (patch) | |
| tree | a92d21ccbf7d74c63b330b118da9c27c1fc54b94 /usr.bin/ssh/channels.c | |
| parent | shutdown(sock, SHUT_RDWR) not needed here; ok markus@ (diff) | |
| download | wireguard-openbsd-09ccb9fa314b9db3fe1f7a2464faaf841dc3878d.tar.xz wireguard-openbsd-09ccb9fa314b9db3fe1f7a2464faaf841dc3878d.zip | |
strncpy->strlcpy. remaining strncpy's are necessary. ok markus@
Diffstat (limited to 'usr.bin/ssh/channels.c')
| -rw-r--r-- | usr.bin/ssh/channels.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/usr.bin/ssh/channels.c b/usr.bin/ssh/channels.c index ca840743c9c..6d8abb47203 100644 --- a/usr.bin/ssh/channels.c +++ b/usr.bin/ssh/channels.c @@ -39,7 +39,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: channels.c,v 1.144 2001/12/06 18:02:32 stevesk Exp $"); +RCSID("$OpenBSD: channels.c,v 1.145 2001/12/06 18:09:23 stevesk Exp $"); #include "ssh.h" #include "ssh1.h" @@ -2544,8 +2544,7 @@ x11_connect_display(void) * Connect to an inet socket. The DISPLAY value is supposedly * hostname:d[.s], where hostname may also be numeric IP address. */ - strncpy(buf, display, sizeof(buf)); - buf[sizeof(buf) - 1] = 0; + strlcpy(buf, display, sizeof(buf)); cp = strchr(buf, ':'); if (!cp) { error("Could not find ':' in DISPLAY: %.100s", display); @@ -2828,8 +2827,7 @@ auth_input_request_forwarding(struct passwd * pw) /* Bind it to the name. */ memset(&sunaddr, 0, sizeof(sunaddr)); sunaddr.sun_family = AF_UNIX; - strncpy(sunaddr.sun_path, auth_sock_name, - sizeof(sunaddr.sun_path)); + strlcpy(sunaddr.sun_path, auth_sock_name, sizeof(sunaddr.sun_path)); if (bind(sock, (struct sockaddr *) & sunaddr, sizeof(sunaddr)) < 0) packet_disconnect("bind: %.100s", strerror(errno)); |