Committer: Rene Hummen <rene.hummen@xxxxxxxxxxxxxxxxx> Date: 26/05/2010 at 13:29:03 Revision: 3785 [merge] Revision-id: rene.hummen@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx Branch nick: tiny Log: Synchronized to trunk revision 4590 Modified: D release.version M Makefile.am M configure.ac M doc/HACKING M firewall/cache.c M firewall/cache.h M firewall/cache_port.c M firewall/cache_port.h M firewall/common_hipd_msg.c M firewall/common_hipd_msg.h M firewall/conntrack.c M firewall/conntrack.h M firewall/datapkt.c M firewall/datapkt.h M firewall/dlist.c M firewall/dlist.h M firewall/esp_prot_api.c M firewall/esp_prot_api.h M firewall/esp_prot_config.c M firewall/esp_prot_conntrack.c M firewall/esp_prot_conntrack.h M firewall/esp_prot_defines.h M firewall/esp_prot_fw_msg.c M firewall/esp_prot_fw_msg.h M firewall/firewall.c M firewall/firewall_control.c M firewall/firewall_control.h M firewall/firewall_defines.h M firewall/firewalldb.c M firewall/firewalldb.h M firewall/helpers.c M firewall/helpers.h M firewall/hslist.c M firewall/hslist.h M firewall/lsi.c M firewall/lsi.h M firewall/midauth.c M firewall/midauth.h M firewall/pisa.c M firewall/pisa_cert.c M firewall/pisa_cert.h M firewall/rule_management.c M firewall/rule_management.h M firewall/sysopp.c M firewall/sysopp.h M firewall/user_ipsec_api.c M firewall/user_ipsec_api.h M firewall/user_ipsec_esp.c M firewall/user_ipsec_esp.h M firewall/user_ipsec_fw_msg.c M firewall/user_ipsec_sadb.c M firewall/user_ipsec_sadb.h M hipd/cert.c M hipd/cookie.c M hipd/dh.c M hipd/esp_prot_hipd_msg.c M hipd/hadb.c M hipd/hadb_legacy.c M hipd/hidb.c M hipd/hipd.c M hipd/hiprelay.c M hipd/hit_to_ip.c M hipd/init.c M hipd/input.c M hipd/input.h M hipd/keymat.c M hipd/maintenance.c M hipd/nat.c M hipd/netdev.c M hipd/netdev.h M hipd/nsupdate.c M hipd/oppdb.c M hipd/oppipdb.c M hipd/output.c M hipd/registration.c M hipd/user.c M lib/core/builder.c M lib/core/capability.c M lib/core/certtools.c M lib/core/conf.c M lib/core/conf.h M lib/core/crypto.c M lib/core/crypto.h M lib/core/debug.c M lib/core/debug.h M lib/core/filemanip.h M lib/core/hashchain.c M lib/core/hashtree.c M lib/core/hostid.c M lib/core/hostsfiles.c M lib/core/linkedlist.c M lib/core/message.c M lib/core/message.h M lib/core/performance.c M lib/core/prefix.c M lib/core/solve.c M lib/core/solve.h M lib/core/straddr.c M lib/tool/checksum.c M lib/tool/checksum.h M lib/tool/lutil.c M lib/tool/lutil.h M lib/tool/nlink.c M lib/tool/nlink.h M lib/tool/pk.c M lib/tool/pk.h M lib/tool/xfrmapi.c M lib/tool/xfrmapi.h M modules/heartbeat/hipd/heartbeat.c M modules/update/hipd/update.c M packaging/create-package.sh M packaging/hipl-deb.spec M packaging/hipl-rpm.spec M test/certteststub.c M test/dh_performance.c Merge from following parent revisions and branches: - tiny (parent-id: rene.hummen@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx) - trunk (parent-id: miika@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx)