NetworkManager r4281 - in trunk: . libnm-util

[dcbw svn gnome org]

Author: dcbw
Date: Thu Nov 13 21:47:52 2008
New Revision: 4281
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=4281&view=rev

Log:
2008-11-13  Dan Williams  <dcbw redhat com>

	* libnm-util/crypto.c
		- (crypto_get_private_key_data): fix bad initial arg type checking
			from pkcs#12 patch



Modified:
   trunk/ChangeLog
   trunk/libnm-util/crypto.c

Modified: trunk/libnm-util/crypto.c
==============================================================================
--- trunk/libnm-util/crypto.c	(original)
+++ trunk/libnm-util/crypto.c	Thu Nov 13 21:47:52 2008
@@ -480,9 +480,9 @@
 	g_return_val_if_fail (contents != NULL, NULL);
 	g_return_val_if_fail (password != NULL, NULL);
 	g_return_val_if_fail (out_key_type != NULL, NULL);
-	g_return_val_if_fail (out_key_type == NM_CRYPTO_KEY_TYPE_UNKNOWN, NULL);
+	g_return_val_if_fail (*out_key_type == NM_CRYPTO_KEY_TYPE_UNKNOWN, NULL);
 	g_return_val_if_fail (out_file_type != NULL, NULL);
-	g_return_val_if_fail (out_file_type == NM_CRYPTO_FILE_FORMAT_UNKNOWN, NULL);
+	g_return_val_if_fail (*out_file_type == NM_CRYPTO_FILE_FORMAT_UNKNOWN, NULL);
 
 	/* Try PKCS#12 first */
 	if (crypto_verify_pkcs12 (contents, password, NULL)) {