|
 |
483b06 |
From dd004f9393f0543c556d417d27b9f652b6fe4c99 Mon Sep 17 00:00:00 2001
|
|
|
483b06 |
From: Martin Basti <mbasti@redhat.com>
|
|
|
483b06 |
Date: Wed, 14 Jun 2017 15:02:21 +0200
|
|
|
483b06 |
Subject: [PATCH] Remove ip_netmask from option parser
|
|
|
483b06 |
|
|
|
483b06 |
ipa-dns-install uses ip_netmask=False --> parse_netmask=False, other installers uses default (parse_netmask=True).
|
|
|
483b06 |
Use this consistent accross all installers.
|
|
|
483b06 |
|
|
|
483b06 |
Also this option is unused (and shouldn't be used).
|
|
|
483b06 |
|
|
|
483b06 |
https://pagure.io/freeipa/issue/4317
|
|
|
483b06 |
|
|
|
483b06 |
Reviewed-By: David Kupka <dkupka@redhat.com>
|
|
|
483b06 |
---
|
|
|
483b06 |
ipapython/config.py | 5 ++---
|
|
|
483b06 |
1 file changed, 2 insertions(+), 3 deletions(-)
|
|
|
483b06 |
|
|
|
483b06 |
diff --git a/ipapython/config.py b/ipapython/config.py
|
|
|
483b06 |
index 6349892fe88757629129f464401efce64e30f058..19abfc51ee354d2971be836fa6bad70eea3a6720 100644
|
|
|
483b06 |
--- a/ipapython/config.py
|
|
|
483b06 |
+++ b/ipapython/config.py
|
|
|
483b06 |
@@ -68,9 +68,8 @@ class IPAFormatter(IndentedHelpFormatter):
|
|
|
483b06 |
def check_ip_option(option, opt, value):
|
|
|
483b06 |
from ipapython.ipautil import CheckedIPAddress
|
|
|
483b06 |
|
|
|
483b06 |
- ip_netmask = option.ip_netmask is True
|
|
|
483b06 |
try:
|
|
|
483b06 |
- return CheckedIPAddress(value, parse_netmask=ip_netmask)
|
|
|
483b06 |
+ return CheckedIPAddress(value)
|
|
|
483b06 |
except Exception as e:
|
|
|
483b06 |
raise OptionValueError("option %s: invalid IP address %s: %s" % (opt, value, e))
|
|
|
483b06 |
|
|
|
483b06 |
@@ -85,7 +84,7 @@ class IPAOption(Option):
|
|
|
483b06 |
optparse.Option subclass with support of options labeled as
|
|
|
483b06 |
security-sensitive such as passwords.
|
|
|
483b06 |
"""
|
|
|
483b06 |
- ATTRS = Option.ATTRS + ["sensitive", "ip_netmask"]
|
|
|
483b06 |
+ ATTRS = Option.ATTRS + ["sensitive"]
|
|
|
483b06 |
TYPES = Option.TYPES + ("ip", "dn")
|
|
|
483b06 |
TYPE_CHECKER = copy(Option.TYPE_CHECKER)
|
|
|
483b06 |
TYPE_CHECKER["ip"] = check_ip_option
|
|
|
483b06 |
--
|
|
|
483b06 |
2.9.4
|
|
|
483b06 |
|