commit d7fb3adf3c23cf6ea337ad5083c76fd80ae096c2
author Iliyan Malchev <malchev@google.com> Tue Apr 23 15:01:26 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Apr 23 15:01:26 2013 -0700
tree 98dea241307f72e8a61925564b997e429d6f3857
parent 87a386c97c8629bbf8d28af121c9e1972a3d4fc0
parent 97d980693a6550ea7a66d85cf1f453b1246436b2

am 97d98069: Revert "wpa_supplicant: fix -I option handling"

* commit '97d980693a6550ea7a66d85cf1f453b1246436b2':
  Revert "wpa_supplicant: fix -I option handling"

wpa_supplicant/config_file.c

diff --git a/wpa_supplicant/config_file.c b/wpa_supplicant/config_file.c
index e32bf5a..8604ae8 100644
--- a/wpa_supplicant/config_file.c
+++ b/wpa_supplicant/config_file.c
@@ -435,11 +435,9 @@
 
 	fclose(f);
 
-	if (head)
-		config->ssid = head;
+	config->ssid = head;
 	wpa_config_debug_dump_networks(config);
-	if (cred_head)
-		config->cred = cred_head;
+	config->cred = cred_head;
 
 #ifndef WPA_IGNORE_CONFIG_ERRORS
 	if (errors) {