* vpn-daemons/openvpn/intltool-extract.in
vpn-daemons/openvpn/intltool-merge.in
vpn-daemons/openvpn/intltool-update.in
vpn-daemons/pptp/intltool-extract.in
vpn-daemons/pptp/intltool-merge.in
vpn-daemons/pptp/intltool-update.in
- Remove from CVS, they should get created by intltoolize,
shouldn't they?
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1465 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
* vpn-daemons/pptp/src/pppd/patchlevel.h
* vpn-daemons/pptp/src/nm-pptp-service-pppd-plugin.c
- Rename VERSION -> PPPD_VERSION to avoid conflict with the
Makefile-defined VERSION
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1464 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
Patch from: Vinay A R <rvinay@novell.com>
* src/vpn-manager/nm-vpn-act-request.[ch]
- Added 'routes' and 'routes_count' to struct NMVPNActRequest since
IPSec VPNs require them for std gateway.
- (nm_vpn_act_request_new): takes arguments for 'user_routes'
and 'user_routes_count'
- (nm_vpn_act_request_get_user_routes): new function; gets user
defined routes from NMVPNActRequest object, returns the string
array of routes.
* src/vpn-manager/nm-vpn-manager.[ch]
- (nm_vpn_manager_activate_vpn_connection): take additional arguments
for 'user_routes' and 'user_routes_count'
* src/vpn-manager/nm-dbus-vpn.c
- (nm_dbus_vpn_activate_connection): gets 'user_routes' from
nm_dbus_vpn_get_routes() to pass to nm_vpn_manager_activate_vpn_connection()
* src/vpn-manager/nm-vpn-service.c
- (nm_vpn_service_stage3_connect): pass user routes over dbus to
the vpn daemon
Modifications by Dan:
* src/vpn-manager/nm-vpn-service.c
- (nm_vpn_service_stage3_connect): ensure that we don't pass NULL string
arrays into dbus
* vpn-daemons/vpnc/src/nm-vpnc-service.c
* vpn-daemons/pptp/src/nm-pptp-service.c
* vpn-daemons/openvpn/src/nm-openvpn-service.c
- Grab user routes from dbus message
- Free all string arrays we got from dbus
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1463 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
Apply the PtP Address bits of a patch from Tim Niemueller
* src/nm-ip4-config.[ch]
- Add ip4_ptp_address member to object
- (nm_ip4_config_copy): copy ptp address too
- (nm_ip4_config_get_ptp_address, nm_ip4_config_set_ptp_address):
new functions
- (nm_ip4_config_to_rtnl_addr): use ptp address when asked to,
rather than local tunnel ip address
* src/vpn-manager/nm-vpn-service.c
- (print_vpn_config): update for PtP address
- (nm_vpn_service_stage4_ip_config_get): switch parsing to
DBusMessageIters in preparation for getting routes from the VPN
service daemons too
* vpn-daemons/openvpn/src/nm-openvpn-service-openvpn-helper.c
- (send_config_info): update for PtP address, clean up code
- (main): update for PtP address, clean up code, fix typo
* vpn-daemons/openvpn/src/nm-openvpn-service.c
- (nm_openvpn_dbus_process_helper_ip4_config): update for PtP address
* vpn-daemons/pptp/src/nm-pptp-service-pppd-plugin.c
- (pptp_ip_up): update for PtP address
* vpn-daemons/pptp/src/nm-pptp-service.c
- (nm_pptp_dbus_process_helper_ip4_config): update for PtP address
* vpn-daemons/vpnc/src/nm-vpnc-service.c
- (print_vpn_config): update for PtP address
- (nm_vpnc_dbus_process_helper_ip4_config): update for PtP address
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1346 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
* configure.in: Explicitly set AUX_DIR to . to prevent autoconf from
searching (and finding) install-sh in ../.., which lead to
problems.
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1268 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
