[Pkg-freeipa-devel] freeipa: Changes to 'debian-unstable'

[Timo Aaltonen]

 debian/patches/add-debian-platform.diff |   38 +++++++++++++++++++++++++++++---
 1 file changed, 35 insertions(+), 3 deletions(-)

New commits:
commit 30e7d4a91bb9673687bcce27ea2cd726ad0f3271
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Mon Sep 2 16:38:37 2013 +0300

    add auth support to debian platform

diff --git a/debian/patches/add-debian-platform.diff b/debian/patches/add-debian-platform.diff
index da3603a..7d0d04a 100644
--- a/debian/patches/add-debian-platform.diff
+++ b/debian/patches/add-debian-platform.diff
@@ -52,7 +52,7 @@ Date:   Fri Mar 1 12:21:00 2013 +0200
 +check_selinux_status = redhat.check_selinux_status
 --- /dev/null
 +++ b/ipapython/platform/debian/auth.py
-@@ -0,0 +1,18 @@
+@@ -0,0 +1,42 @@
 +from ipapython.platform import base
 +
 +class DebianAuthConfig(base.AuthConfig):
@@ -69,8 +69,32 @@ Date:   Fri Mar 1 12:21:00 2013 +0200
 +    and making the best out of the rest of them.
 +    """
 +
++    def __build_args(self):
++        args = ['--force']
++        for (option, value) in self.parameters.items():
++            if option == "sssdauth":
++                option = "sss"
++            # only sssd supported, filter the dupe
++            elif option in ["sssd", "krb5", "ldap", "update"]:
++                 option = ""
++            if type(value) is bool:
++                if value:
++                    if not "package" in args:
++                        args.append("--package %s" % (option))
++                    else:
++                        args.append("%s" % (option))
++                else:
++                    if not any("remove" in s for s in args):
++                        args.append("--remove %s" % (option))
++                    else:
++                        args.append("%s" % (option))
++
++
 +    def execute(self):
-+        raise NotImplementedError
++        env = "DEBCONF_FRONTEND=noninteractive"
++        args = self.__build_args()
++        ipautil.run(["/usr/sbin/pam-auth-update"]+args,env)
++
 --- /dev/null
 +++ b/ipapython/platform/debian/service.py
 @@ -0,0 +1,107 @@

commit 9292da3d7a1a242ad66ca290acf878a3cbed7b03
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Tue Jun 18 11:35:28 2013 +0300

    update debian platform to not try to update the services list on client

diff --git a/debian/patches/add-debian-platform.diff b/debian/patches/add-debian-platform.diff
index 0075e2c..da3603a 100644
--- a/debian/patches/add-debian-platform.diff
+++ b/debian/patches/add-debian-platform.diff
@@ -73,7 +73,7 @@ Date:   Fri Mar 1 12:21:00 2013 +0200
 +        raise NotImplementedError
 --- /dev/null
 +++ b/ipapython/platform/debian/service.py
-@@ -0,0 +1,99 @@
+@@ -0,0 +1,107 @@
 +import time
 +
 +from ipapython import ipautil
@@ -97,11 +97,19 @@ Date:   Fri Mar 1 12:21:00 2013 +0200
 +    def stop(self, instance_name='', capture_output=True):
 +        ipautil.run(["/usr/sbin/service", self.service_name, "stop",
 +                     instance_name], capture_output=capture_output)
++        if 'context' in api.env and api.env.context in ['ipactl', 'installer']:
++            update_service_list = True
++        else:
++            update_service_list = False
 +        super(DebianService, self).stop(instance_name)
 +
 +    def start(self, instance_name='', capture_output=True, wait=True):
 +        ipautil.run(["/usr/sbin/service", self.service_name, "start",
 +                     instance_name], capture_output=capture_output)
++        if 'context' in api.env and api.env.context in ['ipactl', 'installer']:
++            update_service_list = True
++        else:
++            update_service_list = False
 +        if wait and self.is_running(instance_name):
 +            self.__wait_for_open_ports(instance_name)
 +        super(DebianService, self).start(instance_name)