NetworkManager r4058 - trunk/libnm-util

[dcbw svn gnome org]

Author: dcbw
Date: Thu Sep 11 20:54:02 2008
New Revision: 4058
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=4058&view=rev

Log:
Add compare flag to ignore secrets

Modified:
   trunk/libnm-util/nm-setting.c
   trunk/libnm-util/nm-setting.h

Modified: trunk/libnm-util/nm-setting.c
==============================================================================
--- trunk/libnm-util/nm-setting.c	(original)
+++ trunk/libnm-util/nm-setting.c	Thu Sep 11 20:54:02 2008
@@ -236,6 +236,9 @@
 		    && (prop_spec->flags & (NM_SETTING_PARAM_FUZZY_IGNORE | NM_SETTING_PARAM_SECRET)))
 			continue;
 
+		if ((flags & COMPARE_FLAGS_IGNORE_SECRETS) && (prop_spec->flags & NM_SETTING_PARAM_SECRET))
+			continue;
+
 		if (   (flags & COMPARE_FLAGS_IGNORE_ID)
 		    && !strcmp (setting->name, NM_SETTING_CONNECTION_SETTING_NAME)
 		    && !strcmp (prop_spec->name, NM_SETTING_CONNECTION_ID))

Modified: trunk/libnm-util/nm-setting.h
==============================================================================
--- trunk/libnm-util/nm-setting.h	(original)
+++ trunk/libnm-util/nm-setting.h	Thu Sep 11 20:54:02 2008
@@ -96,7 +96,10 @@
 	COMPARE_FLAGS_FUZZY = 0x00000001,
 
 	/* Ignore the connection ID */
-	COMPARE_FLAGS_IGNORE_ID = 0x00000002
+	COMPARE_FLAGS_IGNORE_ID = 0x00000002,
+
+	/* Ignore secrets */
+	COMPARE_FLAGS_IGNORE_SECRETS = 0x00000004
 } NMSettingCompareFlags;
 
 /* Returns TRUE if the connections are the same */