Commit f6527c5e authored by Ingo Klöcker's avatar Ingo Klöcker
Browse files

Remove option to add email address to DN

No CA should use this anymore.

GnuPG-bug-id: 5139
parent c9ef9acb
Pipeline #42596 passed with stage
in 18 minutes and 54 seconds
......@@ -72,13 +72,6 @@
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="addEmailToDnCB" >
<property name="text" >
<string>Add email address to DN (only needed for broken CAs)</string>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout" >
<item>
......
......@@ -729,8 +729,6 @@ public:
// The email doesn't necessarily show up in ui.resultLE:
connect(ui.emailLE, &QLineEdit::textChanged,
this, &QWizardPage::completeChanged);
connect(ui.addEmailToDnCB, &QAbstractButton::toggled,
this, &EnterDetailsPage::slotUpdateResultLabel);
registerDialogPropertiesAsFields();
registerField(QStringLiteral("dn"), ui.resultLE);
registerField(QStringLiteral("name"), ui.nameLE);
......@@ -1340,8 +1338,6 @@ void EnterDetailsPage::clearForm()
ui.emailLE->clear();
ui.emailLB->hide();
ui.emailRequiredLB->hide();
ui.addEmailToDnCB->hide();
}
static int row_index_of(QWidget *w, QGridLayout *l)
......@@ -1442,9 +1438,6 @@ void EnterDetailsPage::updateForm()
if (attr == QLatin1String("EMAIL")) {
row = row_index_of(ui.emailLE, ui.gridLayout);
validator = regex.isEmpty() ? Validation::email() : Validation::email(QRegExp(regex));
if (!pgp()) {
ui.addEmailToDnCB->show();
}
} else if (attr == QLatin1String("NAME") || attr == QLatin1String("CN")) {
if ((pgp() && attr == QLatin1String("CN")) || (!pgp() && attr == QLatin1String("NAME"))) {
continue;
......@@ -1481,7 +1474,6 @@ void EnterDetailsPage::updateForm()
std::copy(lines.cbegin(), lines.cend(), std::back_inserter(lineList));
widgets.push_back(ui.resultLE);
widgets.push_back(ui.addEmailToDnCB);
widgets.push_back(ui.advancedPB);
const KEMailSettings e;
......@@ -1504,7 +1496,7 @@ QString EnterDetailsPage::cmsDN() const
continue;
}
QString attr = attributeFromKey(it->attr);
if (attr == QLatin1String("EMAIL") && !ui.addEmailToDnCB->isChecked()) {
if (attr == QLatin1String("EMAIL")) {
continue;
}
if (const char *const oid = oidForAttributeName(attr)) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment