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/dhcp6/patches/patch-server_reply_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/dhcp6/patches/patch-server_reply_c')
| -rw-r--r-- | package/dhcp6/patches/patch-server_reply_c | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/package/dhcp6/patches/patch-server_reply_c b/package/dhcp6/patches/patch-server_reply_c deleted file mode 100644 index bafca5ae1..000000000 --- a/package/dhcp6/patches/patch-server_reply_c +++ /dev/null @@ -1,21 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- w-dhcp6-1.0-1.orig/server/reply.c 2002-06-28 14:50:04.000000000 +0200 -+++ w-dhcp6-1.0-1/server/reply.c 2008-10-20 15:29:52.000000000 +0200 -@@ -147,7 +147,7 @@ struct DHCP_MESSAGE * create_dummy_reply - opt_ptr -> u_opt_len.opt_len = opt_src_ptr -> u_opt_len.opt_len; - ia_ptr = (struct IA *) malloc (sizeof (struct IA)); - opt_ptr -> opt_data = ia_ptr; -- bzero (ia_ptr, sizeof (struct IA)); -+ memset (ia_ptr, 0, sizeof (struct IA)); - ia_ptr -> u_iaid.iaid = ia_src_ptr -> u_iaid.iaid; - - // set IAADDR option with values set to null -@@ -159,7 +159,7 @@ struct DHCP_MESSAGE * create_dummy_reply - opt_ptr -> u_opt_len.opt_len = opt_src_ptr -> u_opt_len.opt_len; - iaaddr_ptr = (struct IA_ADDRESS *) malloc (sizeof (struct IA_ADDRESS)); - opt_ptr -> opt_data = iaaddr_ptr; -- bzero (iaaddr_ptr, sizeof (struct IA_ADDRESS)); -+ memset (iaaddr_ptr, 0, sizeof (struct IA_ADDRESS)); - - return dhcp_message_ptr; - } |