NetworkManager r3911 - in branches/NETWORKMANAGER_0_6_0_RELEASE/vpn-daemons/pptp: . src

[dcbw svn gnome org]

Author: dcbw
Date: Fri Aug  8 03:30:03 2008
New Revision: 3911
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=3911&view=rev

Log:
2008-08-07  Dan Williams  <dcbw redhat com>

	* src/nm-pptp-pppd-plugin.c
		- (nm_ip_up): use correct option index (bgo #517468)



Modified:
   branches/NETWORKMANAGER_0_6_0_RELEASE/vpn-daemons/pptp/ChangeLog
   branches/NETWORKMANAGER_0_6_0_RELEASE/vpn-daemons/pptp/src/nm-pptp-service-pppd-plugin.c

Modified: branches/NETWORKMANAGER_0_6_0_RELEASE/vpn-daemons/pptp/src/nm-pptp-service-pppd-plugin.c
==============================================================================
--- branches/NETWORKMANAGER_0_6_0_RELEASE/vpn-daemons/pptp/src/nm-pptp-service-pppd-plugin.c	(original)
+++ branches/NETWORKMANAGER_0_6_0_RELEASE/vpn-daemons/pptp/src/nm-pptp-service-pppd-plugin.c	Fri Aug  8 03:30:03 2008
@@ -111,12 +111,12 @@
   guint32 i=0;
  
   g_return_if_fail (con != NULL);
-  if (ipcp_gotoptions[ifunit].ouraddr==0) {
+  if (ipcp_gotoptions[0].ouraddr==0) {
     nm_warning ("nm-pptp-service-pptp-helper didn't receive an Internal IP4 Address from pptp.");
     send_config_error (con, "IP4 Address");
     return;
   }
-  uint_ip4_address=ipcp_gotoptions[ifunit].ouraddr;
+  uint_ip4_address=ipcp_gotoptions[0].ouraddr;
   
   if (!(message = dbus_message_new_method_call (NM_DBUS_SERVICE_PPTP, NM_DBUS_PATH_PPTP, NM_DBUS_INTERFACE_PPTP, "signalIP4Config")))
     {
@@ -125,37 +125,37 @@
     }
 
 
-  if (ipcp_gotoptions[ifunit].dnsaddr) {
-    if (ipcp_gotoptions[ifunit].dnsaddr[0]!=0) {
+  if (ipcp_gotoptions[0].dnsaddr) {
+    if (ipcp_gotoptions[0].dnsaddr[0]!=0) {
       uint_ip4_dns_len++; 
-      uint_ip4_dns1=ipcp_gotoptions[ifunit].dnsaddr[0];
-      if (ipcp_gotoptions[ifunit].dnsaddr[1]!=0) {
+      uint_ip4_dns1=ipcp_gotoptions[0].dnsaddr[0];
+      if (ipcp_gotoptions[0].dnsaddr[1]!=0) {
         uint_ip4_dns_len++;
-        uint_ip4_dns2=ipcp_gotoptions[ifunit].dnsaddr[1];
+        uint_ip4_dns2=ipcp_gotoptions[0].dnsaddr[1];
       }  
     }
 //    if (uint_ip4_dns_len > 0)
 //    {
 //      uint_ip4_dns = g_new0(guint32,uint_ip4_dns_len);
 //      for (i = 0; i < uint_ip4_dns_len; ++i)
-//        uint_ip4_dns[i] = ipcp_gotoptions[ifunit].dnsaddr[i];
+//        uint_ip4_dns[i] = ipcp_gotoptions[0].dnsaddr[i];
 //    }
   }
 
-  if (ipcp_gotoptions[ifunit].winsaddr) {
-    if (ipcp_gotoptions[ifunit].winsaddr[0]!=0) {
+  if (ipcp_gotoptions[0].winsaddr) {
+    if (ipcp_gotoptions[0].winsaddr[0]!=0) {
       uint_ip4_wins_len++; 
-      uint_ip4_wins1=ipcp_gotoptions[ifunit].winsaddr[0];
-      if (ipcp_gotoptions[ifunit].winsaddr[1]!=0) {
+      uint_ip4_wins1=ipcp_gotoptions[0].winsaddr[0];
+      if (ipcp_gotoptions[0].winsaddr[1]!=0) {
         uint_ip4_wins_len++;
-        uint_ip4_wins2=ipcp_gotoptions[ifunit].winsaddr[1];
+        uint_ip4_wins2=ipcp_gotoptions[0].winsaddr[1];
       }
     }
 //    if (uint_ip4_wins_len > 0)
 //    {
 //      uint_ip4_wins = g_new0(guint32,uint_ip4_wins_len);
 //      for (i = 0; i < uint_ip4_wins_len; ++i)
-//        uint_ip4_wins[i] = ipcp_gotoptions[ifunit].winsaddr[i];
+//        uint_ip4_wins[i] = ipcp_gotoptions[0].winsaddr[i];
 //    }
   }