From 555b144a330f62c00813226d41be5f1ddfd32b03 Mon Sep 17 00:00:00 2001
From: Jan Grulich <jgrulich@redhat.com>
Date: Tue, 28 Jun 2016 14:57:21 +0200
Subject: Do not set peap label based on peap version


diff --git a/src/settings/security8021xsetting.cpp b/src/settings/security8021xsetting.cpp
index 8be37e7..888fc94 100644
--- a/src/settings/security8021xsetting.cpp
+++ b/src/settings/security8021xsetting.cpp
@@ -891,7 +891,19 @@ QVariantMap NetworkManager::Security8021xSetting::toMap() const
 
     if (!version.isEmpty()) {
         setting.insert(QLatin1String(NM_SETTING_802_1X_PHASE1_PEAPVER), version);
-        setting.insert(QLatin1String(NM_SETTING_802_1X_PHASE1_PEAPLABEL), "1");
+    }
+
+    QString peapLabel;
+    switch (phase1PeapLabel()) {
+        case PeapLabelForce:
+            peapLabel = '1';
+            break;
+        case PeapLabelUnknown:
+            break;
+    }
+
+    if (!peapLabel.isEmpty()) {
+        setting.insert(QLatin1String(NM_SETTING_802_1X_PHASE1_PEAPLABEL), peapLabel);
     }
 
     QString provisioning;