Re: [Freeipa-devel] [PATCH] 0001 six.u function instead of the decode

[Ariel Barria]

2016-07-28 7:10 GMT-05:00 Petr Spacek <pspa...@redhat.com>:
> On 27.7.2016 18:26, Ariel Barria wrote:
>> 2016-07-26 9:39 GMT-05:00 Petr Spacek <pspa...@redhat.com>:
>>> On 26.7.2016 16:28, Jan Cholasta wrote:
>>>> Hi,
>>>>
>>>> On 26.7.2016 16:09, Martin Basti wrote:
>>>>>
>>>>>
>>>>> On 22.07.2016 00:14, Ariel Barria wrote:
>>>>>> Hello everyone.
>>>>>>
>>>>>> I send patch for review.
>>>>
>>>> NACK, six.u() is supposed to be used on string literals *only* [1].
>>>>
>>>> A proper fix would be something like:
>>>>
>>>> value = self.to_text()
>>>> if not isinstance(value, unicode):
>>>> value = value.decode('ascii')
>>>> return value
>>
>> thanks for the guidance and comments
>>
>>>
>>> Most importantly, we should fix/provide this method in python-dns and 
>>> inherit
>>> this method from there.
>>
>> Well, I made a pr, but apparently travis ci test failed with other
>> versions of python, so it is possible that they do not approve, I will
>> be performing other tests to see what the downside.
>>
>> https://github.com/rthalley/dnspython/pull/195
>
> Looking at the PR, there are functions
> dns.name.to_text()
> dns.name.to_unicode()
>
> What is missing in them?
>
> Petr^2 Spacek
>
>
>>>>> I will look on this, for some reason we received your e-mail just today
>>>>> (2016-07-26)
>>
>> welcome.
>> it was my mistake, I sent the patch to the list before being signed to the 
>> list
>>
>>>>
>>>> Honza
>>>>
>>>> [1] <https://pythonhosted.org/six/#six.u>
> --
> Petr^2 Spacek

Hi.
I send the requested changes
thanks for review.
From 4da94aee34d56b7baf0888ca5ef83aaecbc9544b Mon Sep 17 00:00:00 2001
From: "Ariel O. Barria" <ariel.o.bar...@gmail.com>
Date: Thu, 21 Jul 2016 17:06:05 -0500
Subject: [PATCH] freeipa arielb 0001-0002 six.u function instead of the decode
 function

to avoid DNSName.ToASCII broken with python3
replace the decode () function to use the inherited
functions python-dns:
 - from_unicode()
 - to_unicode()
 - to_text()

https://fedorahosted.org/freeipa/ticket/5935
---
 ipapython/dnsutil.py | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ipapython/dnsutil.py b/ipapython/dnsutil.py
index 16549c8f6a4a0782191526856e918d7ac6b94dcc..effdc0a8d198c6a30766fddb7a1865658913b176 100644
--- a/ipapython/dnsutil.py
+++ b/ipapython/dnsutil.py
@@ -71,7 +71,11 @@ class DNSName(dns.name.Name):
 
 def ToASCII(self):
 #method named by RFC 3490 and python standard library
-return self.to_text().decode('ascii')  # must be unicode string
+value = self.to_text()
+if not isinstance(value, unicode):
+n = dns.name.from_unicode(self.to_unicode())
+value = n.to_text(True)
+return value  # must be unicode string
 
 def canonicalize(self):
 return DNSName(super(DNSName, self).canonicalize())
-- 
2.7.4

-- 
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code

[Freeipa-devel] [PATCH] 0002 Add client install option to set ipa_backup_server

[Ariel Barria]

Hello everyone.

I send patch for review.

Regards,
From 3a27ef5bf3001f5f5ad2e71a4fc76a7a5c104e88 Mon Sep 17 00:00:00 2001
From: "Ariel O. Barria" 
Date: Tue, 26 Jul 2016 09:32:26 -0500
Subject: [PATCH] freeipa arielb 0002 Add client install option to set
 ipa_backup_server

Add ipa backup_server on sssd.conf using ipa-client-install

https://fedorahosted.org/freeipa/ticket/4016
---
 client/ipa-client-install | 14 ++
 1 file changed, 14 insertions(+)

diff --git a/client/ipa-client-install b/client/ipa-client-install
index 05b6b6e0da07353750d0dca4e6df9d1f58d69c35..af5d72a5d9e0b89edbb1a5bb974621ae2f02b85a 100755
--- a/client/ipa-client-install
+++ b/client/ipa-client-install
@@ -115,6 +115,10 @@ def parse_options():
 basic_group = OptionGroup(parser, "basic options")
 basic_group.add_option("--domain", dest="domain", help="domain name")
 basic_group.add_option("--server", dest="server", help="IPA server", action="append")
+basic_group.add_option("--ipa-backup-server", dest="ipa_backup_server",
+  default=False,
+  help="Configure sssd to use backup server if no primary"
+   " servers can be reached.")
 basic_group.add_option("--realm", dest="realm_name", help="realm name")
 basic_group.add_option("--fixed-primary", dest="primary", action="store_true",
   default=False, help="Configure sssd to use fixed server as primary IPA server")
@@ -231,6 +235,13 @@ def parse_options():
 if (options.server and not options.domain):
 parser.error("--server cannot be used without providing --domain")
 
+if (options.server and not options.domain):
+parser.error("--server cannot be used without providing --domain")
+
+if (options.ipa_backup_server and not options.primary):
+parser.error("--ipa-backup-server cannot be used without providing "
+ "--fixed-primary")
+
 if options.domain:
 try:
 validate_domain_name(options.domain)
@@ -1273,6 +1284,9 @@ def configure_sssd_conf(fstore, cli_realm, cli_domain, cli_server, options, clie
 if not options.on_master:
 if options.primary:
 domain.set_option('ipa_server', ', '.join(cli_server))
+if options.ipa_backup_server:
+domain.set_option('ipa_backup_server',
+   options.ipa_backup_server)
 else:
 domain.set_option('ipa_server', '_srv_, %s' % ', '.join(cli_server))
 else:
-- 
2.7.4

-- 
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code

[Freeipa-devel] [PATCH] 0001 six.u function instead of the decode

[Ariel Barria]

Hello everyone.

I send patch for review.

Regards,
From 7aaf440617963facf7bd156f1e7295562391a3f2 Mon Sep 17 00:00:00 2001
From: "Ariel O. Barria" 
Date: Thu, 21 Jul 2016 17:06:05 -0500
Subject: [PATCH] freeipa arielb 0001 six.u function instead of the decode
 function

to avoid DNSName.ToASCII broken with python3
In versions 3.3 onwards is not necessary to use the function six.u
based on the following link:
https://pythonhosted.org/six/#six.u

https://fedorahosted.org/freeipa/ticket/5935
---
 ipapython/dnsutil.py | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ipapython/dnsutil.py b/ipapython/dnsutil.py
index 16549c8f6a4a0782191526856e918d7ac6b94dcc..d9c4a88f19a35048e24dc1c95dfaff0cae697ceb 100644
--- a/ipapython/dnsutil.py
+++ b/ipapython/dnsutil.py
@@ -71,7 +71,10 @@ class DNSName(dns.name.Name):
 
 def ToASCII(self):
 #method named by RFC 3490 and python standard library
-return self.to_text().decode('ascii')  # must be unicode string
+if six.PY2:
+return self.to_text().decode('ascii')  # must be unicode string
+else:
+return six.u(self.to_text())  # must be unicode string
 
 def canonicalize(self):
 return DNSName(super(DNSName, self).canonicalize())
-- 
2.7.4

-- 
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code