diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-06 15:57:50 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-06 15:57:50 +0200 |
| commit | faf5bef3ce64c6b15ac9cd4490c74f621cea4b73 (patch) | |
| tree | 1652e4bf6d5d999b3e565b32d2e8c862efa7fc9b /package/openssh/patches/patch-openbsd-compat_port-tun_c | |
| parent | 7c46b5169bb606c3449cbb64f835589161f01166 (diff) | |
| parent | 9cfdb6d7a7e939427b7b6e41e1f2074eff724457 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
target/Config.in
Diffstat (limited to 'package/openssh/patches/patch-openbsd-compat_port-tun_c')
| -rw-r--r-- | package/openssh/patches/patch-openbsd-compat_port-tun_c | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/package/openssh/patches/patch-openbsd-compat_port-tun_c b/package/openssh/patches/patch-openbsd-compat_port-tun_c deleted file mode 100644 index c4eb11c4c..000000000 --- a/package/openssh/patches/patch-openbsd-compat_port-tun_c +++ /dev/null @@ -1,21 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- openssh-5.2p1.orig/openbsd-compat/port-tun.c 2008-05-19 07:28:36.000000000 +0200 -+++ openssh-5.2p1/openbsd-compat/port-tun.c 2009-09-18 12:25:49.000000000 +0200 -@@ -67,7 +67,7 @@ sys_tun_open(int tun, int mode) - return (-1); - } - -- bzero(&ifr, sizeof(ifr)); -+ memset(&ifr, 0, sizeof(ifr)); - - if (mode == SSH_TUNMODE_ETHERNET) { - ifr.ifr_flags = IFF_TAP; -@@ -213,7 +213,7 @@ sys_tun_infilter(struct Channel *c, char - if (len <= 0 || len > (int)(sizeof(rbuf) - sizeof(*af))) - return (-1); - ptr = (char *)&rbuf[0]; -- bcopy(buf, ptr + sizeof(u_int32_t), len); -+ memcpy(ptr + sizeof(u_int32_t), buf, len); - len += sizeof(u_int32_t); - af = (u_int32_t *)ptr; - |