Committer: Rene Hummen <rene.hummen@xxxxxxxxxxxxxxxxx> Date: 18/03/2010 at 16:08:05 Revision: 1669 [merge] Revision-id: rene.hummen@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx Branch nick: midauth Log: sychronized with trunk revision 4007 Modified: D hipd/init.c.doxyme D hipd/keymat.c.doxyme D hipd/maintenance.c.doxyme D hipd/oppdb.c.doxyme D hipd/oppipdb.c.doxyme A lib/tool/pfkeysadb.c A lib/tool/pfkeysadb.h M Makefile.am M agent/connhipd.c M doc/HACKING M doc/verbose-header-files.txt M firewall/cache.c M firewall/common_hipd_msg.c M firewall/datapkt.c M firewall/esp_prot_fw_msg.c M firewall/firewall.c M firewall/firewall_control.c M firewall/firewalldb.c M firewall/lsi.c M firewall/opptcp.c M firewall/proxy.c M firewall/sysopp.c M firewall/user_ipsec_fw_msg.c M hipd/accessor.c M hipd/bos.c M hipd/cert.c M hipd/close.c M hipd/dht.c M hipd/hipd.c M hipd/init.c M hipd/input.c M hipd/keymat.c M hipd/maintenance.c M hipd/nat.c M hipd/netdev.c M hipd/oppdb.c M hipd/oppdb.h M hipd/oppipdb.c M hipd/output.c M hipd/pfkeyapi.c M hipd/registration.c M hipd/update.c M hipd/user.c M hipd/user.h M hipd/user_ipsec_hipd_msg.c M lib/conf/hipconf.c M lib/core/builder.c M lib/core/certtools.c M lib/core/hostid.c M lib/core/icomm.h M lib/core/state.h M lib/dht/libhipdht.c M lib/opphip/wrap.c M tools/hipl_autobuild M tools/pisacert.c M verbose-headers.txt Merge from following parent revisions and branches: - midauth (parent-id: rene.hummen@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx) - trunk (parent-id: miika@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx)