File NetworkManager-novellvpn-dismiss_warn_debug.patch of Package NetworkManager-novellvpn

Overview Repositories Revisions Requests Users Attributes Meta

File NetworkManager-novellvpn-dismiss_warn_debug.patch of Package NetworkManager-novellvpn (Revision 9f80fbafdb04914b867deb93c68239d7)

Currently displaying revision 9f80fbafdb04914b867deb93c68239d7 , Show latest

Index: NetworkManager-novellvpn-0.7.1/src/nm-novellvpn-service-novellvpn-helper.c
===================================================================
--- NetworkManager-novellvpn-0.7.1.orig/src/nm-novellvpn-service-novellvpn-helper.c
+++ NetworkManager-novellvpn-0.7.1/src/nm-novellvpn-service-novellvpn-helper.c
@@ -78,179 +78,6 @@ helper_failed (DBusGConnection *connecti
     exit (1);
 }
 
-/*
- * send_config_error
- *
- * Notify nm-novellvpn-service of a config error from 'novellvpn'.
- *
- */
-static void send_config_error (DBusConnection *con, const char *item)
-{
-  DBusMessage		*message;
-
-  g_return_if_fail (con != NULL);
-  g_return_if_fail (item != NULL);
-
-  if (!(message = dbus_message_new_method_call (NM_DBUS_SERVICE_NOVELLVPN, NM_DBUS_PATH_NOVELLVPN, NM_DBUS_INTERFACE_NOVELLVPN, "signalConfigError")))
-    {
-      nm_warning ("send_config_error(): Couldn't allocate the dbus message");
-      return;
-    }
-
-  dbus_message_append_args (message, DBUS_TYPE_STRING, &item, DBUS_TYPE_INVALID);
-  if (!dbus_connection_send (con, message, NULL))
-    nm_warning ("send_config_error(): could not send dbus message");
-  
-  dbus_message_unref (message);
-}
-
-
-/*
- * gpa_to_uint32arr
- *
- * Convert GPtrArray of uint32 to a uint32* array
- *
- */
-static void
-gpa_to_uint32arr (const GPtrArray *gpa,
-		  guint32 **uia,
-		  guint32  *uia_len)
-{
-  
-  guint32		num_valid = 0, i = 0;
-  struct in_addr	temp_addr;
-
-  *uia = NULL;
-
-  if ( gpa->len > 0 ) {
-    /* Pass over the array first to determine how many valid entries there are */
-    num_valid = 0;
-    for (i = 0; i < gpa->len; ++i) {
-      if (inet_aton ((char *)gpa->pdata[i], &temp_addr)) {
-	num_valid++;
-      }
-    }
-    
-    /* Do the actual string->int conversion and assign to the array. */
-    if (num_valid > 0) {
-      *uia = g_new0 (guint32, num_valid);
-      for (i = 0; i < gpa->len; ++i) {
-	if (inet_aton ((char *)gpa->pdata[i], &temp_addr)) {
-	  (*uia)[i] = temp_addr.s_addr;
-	}
-      }
-    }
-      
-    *uia_len = num_valid;
-  }
-  if (*uia == NULL) {
-    *uia     = g_malloc0 (sizeof (guint32));
-    *uia_len = 1;
-  }
-}
-
-static gboolean
-ipstr_to_uint32 (const char *ip_str, guint32 *ip)
-{
-  struct in_addr	temp_addr;
-
-  /* Convert IPv4 address arguments from strings into numbers */
-  if (!inet_aton (ip_str, &temp_addr))
-    return FALSE;
-  *ip = temp_addr.s_addr;
-  return TRUE;
-}
-
-
-/*
- * send_config_info
- *
- * Send IP config info to nm-novellvpn-service
- *
- */
-static gboolean
-send_config_info (DBusConnection *con,
-		  const char *str_vpn_gateway,
-		  const char *str_tundev,
-		  const char *str_ip4_address,
-		  const char *str_ip4_ptpaddr,
-		  const char *str_ip4_netmask,
-		  const GPtrArray *gpa_ip4_dns,
-		  const GPtrArray *gpa_ip4_nbns,
-		  const char *domain_names
-		  )
-{
-  DBusMessage *	message;
-  guint32		uint_vpn_gateway = 0;
-  guint32		uint_ip4_address = 0;
-  guint32		uint_ip4_ptpaddr = 0;
-  guint32		uint_ip4_netmask = 0xFFFFFFFF; /* Default mask of 255.255.255.255 */
-  guint32 *	        uint_ip4_dns = NULL;
-  guint32		uint_ip4_dns_len = 0;
-  guint32 *	        uint_ip4_nbns = NULL;
-  guint32		uint_ip4_nbns_len = 0;
-  guint32		mtu = 0;
-  gboolean        success = FALSE;
-
-  g_return_val_if_fail (con != NULL, FALSE);
-
-  mtu = get_mtu(str_vpn_gateway);
-
-  if (!(message = dbus_message_new_method_call (NM_DBUS_SERVICE_NOVELLVPN, NM_DBUS_PATH_NOVELLVPN, NM_DBUS_INTERFACE_NOVELLVPN, "signalIP4Config")))
-    {
-      nm_warning ("send_config_error(): Couldn't allocate the dbus message");
-      return FALSE;
-    }
-
-  if (! ipstr_to_uint32 (str_vpn_gateway, &uint_vpn_gateway) ) {
-    nm_warning ("nm-novellvpn-service-novellvpn-helper didn't receive a valid VPN Gateway from novellvpn.");
-    send_config_error (con, "VPN Gateway");
-    goto out;
-  }
-
-  if (! ipstr_to_uint32 (str_ip4_address, &uint_ip4_address) ) {
-    nm_warning ("nm-novellvpn-service-novellvpn-helper didn't receive a valid Internal IP4 Address from novellvpn.");
-    send_config_error (con, "IP4 Address");
-    goto out;
-  }
-
-  if (! ipstr_to_uint32 (str_ip4_ptpaddr, &uint_ip4_ptpaddr) ) {
-    nm_warning ("nm-novellvpn-service-novellvpn-helper didn't receive a valid PtP IP4 Address from novellvpn.");
-    send_config_error (con, "IP4 PtP Address");
-    goto out;
-  }
-
-  if (strlen (str_ip4_netmask) > 0) {
-    ipstr_to_uint32 (str_ip4_netmask, &uint_ip4_netmask);
-  }
-
-  gpa_to_uint32arr (gpa_ip4_dns, &uint_ip4_dns, &uint_ip4_dns_len);
-  gpa_to_uint32arr (gpa_ip4_nbns, &uint_ip4_nbns, &uint_ip4_nbns_len);
-
-  dbus_message_append_args (message, DBUS_TYPE_UINT32, &uint_vpn_gateway,
-			    DBUS_TYPE_STRING, &str_tundev,
-			    DBUS_TYPE_UINT32, &uint_ip4_address,
-			    DBUS_TYPE_UINT32, &uint_ip4_ptpaddr,
-			    DBUS_TYPE_UINT32, &uint_ip4_netmask,
-			    DBUS_TYPE_ARRAY, DBUS_TYPE_UINT32, &uint_ip4_dns, uint_ip4_dns_len,
-			    DBUS_TYPE_ARRAY, DBUS_TYPE_UINT32, &uint_ip4_nbns, uint_ip4_nbns_len,
-			    DBUS_TYPE_UINT32, &mtu,
-			    DBUS_TYPE_STRING, &domain_names,
-			    DBUS_TYPE_INVALID);
-  if (dbus_connection_send (con, message, NULL))
-    success = TRUE;
-  else
-    nm_warning ("send_config_error(): could not send dbus message");
-  
-  dbus_message_unref (message);
-  
-  g_free (uint_ip4_dns);
-  g_free (uint_ip4_nbns);
-
- out:
-  return success;
-}
-
 static GValue *
 addr_to_gvalue (const char *str)
 {
@@ -336,7 +163,7 @@ parse_addr_list (GValue *value_array, co
  *
  */
 
-
+#if 0
 /** Prints all environment variables to /tmp/environ
  */
 
@@ -350,6 +177,7 @@ print_env(char **env)
   }
   fclose(f);
 }
+#endif
 
 static void
 send_ip4_config (DBusGConnection *connection, GHashTable *config)
Index: NetworkManager-novellvpn-0.7.1/auth-dialog/gnome-two-password-dialog.c
===================================================================
--- NetworkManager-novellvpn-0.7.1.orig/auth-dialog/gnome-two-password-dialog.c
+++ NetworkManager-novellvpn-0.7.1/auth-dialog/gnome-two-password-dialog.c
@@ -327,7 +327,7 @@ void get_the_vendor_file_name(char* vend
 	char search_keys[3][100] = { {'\0'}, {'\0'}, {'\0'}};
 	GSList *conf_list = NULL;
 	GSList *iter = NULL;
-	GError *error = NULL;
+	//GError *error = NULL;
 	char *key = NULL;
 	char *val = NULL;
 	char *connection_path = NULL;
@@ -705,7 +705,7 @@ int is_a_certificate_connection()
 	GConfClient *gconf_client = NULL;
 	GSList *conf_list = NULL;
 	GSList *iter = NULL;
-	GError *error = NULL;
+	//GError *error = NULL;
 	char *key = NULL;
 	char *val = NULL;
 	char *connection_path = NULL;
Index: NetworkManager-novellvpn-0.7.1/properties/nm-novellvpn-propertiesui.c
===================================================================
--- NetworkManager-novellvpn-0.7.1.orig/properties/nm-novellvpn-propertiesui.c
+++ NetworkManager-novellvpn-0.7.1/properties/nm-novellvpn-propertiesui.c
@@ -305,7 +305,6 @@ void
 novellvpnui_get_properties (NovellVPNPropertiesUI *self,
 		GHashTable **properties)
 {
-	const char *conn_name = NULL;
 	const char *gwtype = NULL;
 	const char *authtype = NULL;
 	const char *gw = NULL;
@@ -585,8 +584,6 @@ novellvpnui_set_properties (NovellVPNPro
 	   	GSList* routes,
 	   	GHashTable *properties)
 {
-	GSList *i = NULL;
-
 	nm_debug ("Enter novellvpnui_set_properties...");
 
 	if (properties != NULL)
Index: NetworkManager-novellvpn-0.7.1/auth-dialog/main.c
===================================================================
--- NetworkManager-novellvpn-0.7.1.orig/auth-dialog/main.c
+++ NetworkManager-novellvpn-0.7.1/auth-dialog/main.c
@@ -64,7 +64,7 @@ typedef struct {
 
 } PasswordsInfo;
 
-static char *
+/*static char *
 find_one_password (PasswordsInfo *info, gboolean *is_session)
 {   
 	GList *found_list = NULL;
@@ -98,7 +98,7 @@ find_one_password (PasswordsInfo *info, 
 	gnome_keyring_found_list_free (found_list);
 
 	return secret;
-}
+}*/
 
 
 static GSList *
Index: NetworkManager-novellvpn-0.7.1/src/nm-novellvpn-service.c
===================================================================
--- NetworkManager-novellvpn-0.7.1.orig/src/nm-novellvpn-service.c
+++ NetworkManager-novellvpn-0.7.1/src/nm-novellvpn-service.c
@@ -298,7 +298,7 @@ novellvpn_watch_cb (GPid pid, gint statu
 }
 
 
-#define NVPN_DEBUG
+//#define NVPN_DEBUG
 /*
  * write_config_option
  *
@@ -800,7 +800,7 @@ validate_one_property (gpointer key, gpo
 	const gchar *tmp = NULL;
 
 	tmp = g_value_get_string (val);
-	nm_debug ("%s=%s", (char *)key, tmp);
+	//nm_debug ("%s=%s", (char *)key, tmp);
 
 	if (*failed) {
 		nm_debug ("already failed, escaped!");
@@ -812,7 +812,7 @@ validate_one_property (gpointer key, gpo
 
 		if (!strcmp (prop.name, (char *) key) 
 				&& prop.type == G_VALUE_TYPE ((GValue *) val)) {
-			nm_debug ("found it, i=%d", i);
+			//nm_debug ("found it, i=%d", i);
 			/* Property is ok */
 			return;
 		}

Places

File NetworkManager-novellvpn-dismiss_warn_debug.patch of Package NetworkManager-novellvpn (Revision 9f80fbafdb04914b867deb93c68239d7)

Places