diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/knock/patches/patch-src_knockd_c | |
parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/knock/patches/patch-src_knockd_c')
-rw-r--r-- | package/knock/patches/patch-src_knockd_c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/package/knock/patches/patch-src_knockd_c b/package/knock/patches/patch-src_knockd_c new file mode 100644 index 000000000..d9f399bd6 --- /dev/null +++ b/package/knock/patches/patch-src_knockd_c @@ -0,0 +1,12 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- knock-0.5.orig/src/knockd.c 2005-06-27 07:11:34.000000000 +0200 ++++ knock-0.5/src/knockd.c 2009-05-29 17:03:55.776378324 +0200 +@@ -1064,7 +1064,7 @@ char* get_ip(const char* iface, char *bu + return(NULL); + } + +- bzero((void*)(&ifr.ifr_name), sizeof(ifr.ifr_name)); ++ memset((void*)(&ifr.ifr_name), 0, sizeof(ifr.ifr_name)); + strncpy(ifr.ifr_name, iface, sizeof(ifr.ifr_name)-1); + ifr.ifr_name[sizeof(ifr.ifr_name)-1] = '\0'; + if(ioctl(s, SIOCGIFADDR, &ifr)) { |