1 diff -rdup openssh-4.6p1.oorig/openbsd-compat/port-tun.c openssh-4.6p1/openbsd-compat/port-tun.c
2 --- openssh-4.6p1.oorig/openbsd-compat/port-tun.c 2006-09-02 07:32:40.000000000 +0200
3 +++ openssh-4.6p1/openbsd-compat/port-tun.c 2007-06-28 16:08:42.000000000 +0200
4 @@ -66,7 +66,7 @@ sys_tun_open(int tun, int mode)
8 - bzero(&ifr, sizeof(ifr));
9 + memset(&ifr, 0, sizeof(ifr));
11 if (mode == SSH_TUNMODE_ETHERNET) {
12 ifr.ifr_flags = IFF_TAP;
13 @@ -212,7 +212,7 @@ sys_tun_infilter(struct Channel *c, char
14 if (len <= 0 || len > (int)(sizeof(rbuf) - sizeof(*af)))
16 ptr = (char *)&rbuf[0];
17 - bcopy(buf, ptr + sizeof(u_int32_t), len);
18 + memmove(ptr + sizeof(u_int32_t), buf, len);
19 len += sizeof(u_int32_t);
20 af = (u_int32_t *)ptr;