[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [networkmanagement] libs/ui/security: Allow empty string in 'Subject Match' and 'Alternative Subject
From:       Lamarque V. Souza <lamarque () kde ! org>
Date:       2012-10-01 0:17:32
Message-ID: 20121001001732.BF942A605D () git ! kde ! org
[Download RAW message or body]

Git commit 8815f26e37afc28c1e92cd0adf0973899fc8d64c by Lamarque V. Souza.
Committed on 01/10/2012 at 02:13.
Pushed by lvsouza into branch 'master'.

Allow empty string in 'Subject Match' and 'Alternative Subject Matches'
fields in wifi WPA2 enterprise dialog.

CCBUG: 307496

M  +1    -1    libs/ui/security/peapwidget.cpp
M  +1    -1    libs/ui/security/tlswidget.cpp
M  +1    -1    libs/ui/security/ttlswidget.cpp

http://commits.kde.org/networkmanagement/8815f26e37afc28c1e92cd0adf0973899fc8d64c

diff --git a/libs/ui/security/peapwidget.cpp b/libs/ui/security/peapwidget.cpp
index b28a1b4..053a232 100644
--- a/libs/ui/security/peapwidget.cpp
+++ b/libs/ui/security/peapwidget.cpp
@@ -46,7 +46,7 @@ PeapWidget::PeapWidget(Knm::Connection* connection, QWidget * \
parent)  Q_D(PeapWidget);
     setupUi(this);
 
-    d->altSubjectValidator = new \
QRegExpValidator(QRegExp(QLatin1String("^(DNS:[a-zA-Z0-9_-]+\\.[a-zA-Z0-9_.-]+|EMAIL:[a-zA-Z0-9._-]+@[a-zA-Z0-9_-]+\\.[a-zA-Z0-9_.-]+|URI:[a-zA-Z0-9._-]+:.+)$")), \
this); +    d->altSubjectValidator = new \
QRegExpValidator(QRegExp(QLatin1String("^(DNS:[a-zA-Z0-9_-]+\\.[a-zA-Z0-9_.-]+|EMAIL:[a-zA-Z0-9._-]+@[a-zA-Z0-9_-]+\\.[a-zA-Z0-9_.-]+|URI:[a-zA-Z0-9._-]+:.+|)$")), \
                this);
     d->serversValidator = new \
QRegExpValidator(QRegExp(QLatin1String("^[a-zA-Z0-9_-]+\\.[a-zA-Z0-9_.-]+$")), this); \
  ListValidator *altSubjectValidator = new ListValidator(this);
diff --git a/libs/ui/security/tlswidget.cpp b/libs/ui/security/tlswidget.cpp
index c2321af..77300cc 100644
--- a/libs/ui/security/tlswidget.cpp
+++ b/libs/ui/security/tlswidget.cpp
@@ -50,7 +50,7 @@ TlsWidget::TlsWidget(bool isInnerMethod, Knm::Connection* \
connection, QWidget *  {
     Q_D(TlsWidget);
     setupUi(this);
-    d->altSubjectValidator = new \
QRegExpValidator(QRegExp(QLatin1String("^(DNS:[a-zA-Z0-9_-]+\\.[a-zA-Z0-9_.-]+|EMAIL:[a-zA-Z0-9._-]+@[a-zA-Z0-9_-]+\\.[a-zA-Z0-9_.-]+|URI:[a-zA-Z0-9._-]+:.+)$")), \
this); +    d->altSubjectValidator = new \
QRegExpValidator(QRegExp(QLatin1String("^(DNS:[a-zA-Z0-9_-]+\\.[a-zA-Z0-9_.-]+|EMAIL:[a-zA-Z0-9._-]+@[a-zA-Z0-9_-]+\\.[a-zA-Z0-9_.-]+|URI:[a-zA-Z0-9._-]+:.+|)$")), \
                this);
     d->serversValidator = new \
QRegExpValidator(QRegExp(QLatin1String("^[a-zA-Z0-9_-]+\\.[a-zA-Z0-9_.-]+$")), this); \
  ListValidator *altSubjectValidator = new ListValidator(this);
diff --git a/libs/ui/security/ttlswidget.cpp b/libs/ui/security/ttlswidget.cpp
index 0ce137b..d7599d2 100644
--- a/libs/ui/security/ttlswidget.cpp
+++ b/libs/ui/security/ttlswidget.cpp
@@ -46,7 +46,7 @@ TtlsWidget::TtlsWidget(Knm::Connection* connection, QWidget * \
parent)  Q_D(TtlsWidget);
     setupUi(this);
 
-    d->altSubjectValidator = new \
QRegExpValidator(QRegExp(QLatin1String("^(DNS:[a-zA-Z0-9_-]+\\.[a-zA-Z0-9_.-]+|EMAIL:[a-zA-Z0-9._-]+@[a-zA-Z0-9_-]+\\.[a-zA-Z0-9_.-]+|URI:[a-zA-Z0-9._-]+:.+)$")), \
this); +    d->altSubjectValidator = new \
QRegExpValidator(QRegExp(QLatin1String("^(DNS:[a-zA-Z0-9_-]+\\.[a-zA-Z0-9_.-]+|EMAIL:[a-zA-Z0-9._-]+@[a-zA-Z0-9_-]+\\.[a-zA-Z0-9_.-]+|URI:[a-zA-Z0-9._-]+:.+|)$")), \
                this);
     d->serversValidator = new \
QRegExpValidator(QRegExp(QLatin1String("^[a-zA-Z0-9_-]+\\.[a-zA-Z0-9_.-]+$")), this); \
  ListValidator *altSubjectValidator = new ListValidator(this);


[prev in list] [next in list] [prev in thread] [next in thread]