projects / NetworkManager.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: bfb7243) | patch
2008-10-30 Dan Williams <dcbw@redhat.com>
authorDan Williams <dcbw@redhat.com>
Thu, 30 Oct 2008 04:31:29 +0000 (04:31 +0000)
committerDan Williams <dcbw@redhat.com>
Thu, 30 Oct 2008 04:31:29 +0000 (04:31 +0000)
commitb955a8197e07b71f10942c3f1a197f5f1b3b0f90
tree134707b4b9f7a2639c31274b1b6e46556830ce11tree | snapshot
parentbfb72436631fcfc07478d7474b88959471b17e9acommit | diff
2008-10-30  Dan Williams  <dcbw@redhat.com>

Patch from Alexander Sack <asac@canonical.com>

Fix "ppp connections don't honour ip4 connection settings"

* src/nm-device-ethernet.c
- (real_act_stage4_get_ip4_config): merge ip4config settings
with results from ppp manager

* src/nm-serial-device.c
- (real_act_stage4_get_ip4_config): merge ip4config settings
with results from ppp manager

git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@4234 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
ChangeLog diff | blob | history
src/nm-device-ethernet.c diff | blob | history
src/nm-serial-device.c diff | blob | history
Network connection manager and user applications