Merge branch 'master' into ubuntu

debian/freeipa-client.dirs

@@ -1 +1,2 @@
+etc/ipa
 var/lib/ipa-client/sysrestore

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,44 @@
+@@ -0,0 +1,33 @@
 +from ipapython import ipautil
 +from ipapython.platform import base
 +
@@ -71,27 +71,16 @@ Date:   Fri Mar 1 12:21:00 2013 +0200
 +    """
 +
 +    def __build_args(self):
-+        args = ['--force']
++        args = ['--force',  '--package']
 +        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"]:
-+                 continue
-+            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))
++            if type(value) is bool and not value:
++               if not any("remove" in s for s in args):
++                    args.append("--remove")
++               args.append("%s" % (option))
 +        return args
 +
-+
 +    def execute(self):
 +        env = {"DEBCONF_FRONTEND" : "noninteractive"}
 +        args = self.__build_args()

debian/patches/fix-pykerberos-api.diff

@@ -1,5 +1,3 @@
-diff --git a/ipalib/rpc.py b/ipalib/rpc.py
-index 81e7aa3..ce5f2a0 100644
 --- a/ipalib/rpc.py
 +++ b/ipalib/rpc.py
 @@ -380,7 +380,7 @@ class KerbTransport(SSLTransport):
@@ -10,3 +8,4 @@ index 81e7aa3..ce5f2a0 100644
 +            (rc, vc) = kerberos.authGSSClientInit(service, gssflags=self.flags)
          except kerberos.GSSError, e:
              self._handle_exception(e)
+ 

debian/patches/use-new-nssdb.diff

@@ -36,3 +36,14 @@
      except CalledProcessError, e:
          root_logger.info("Failed to add CA to the default NSS database.")
          return CLIENT_INSTALL_ERROR
+--- a/ipalib/rpc.py
++++ b/ipalib/rpc.py
+@@ -322,7 +322,7 @@ class SSLTransport(LanguageAwareTranspor
+             if self._connection and host == self._connection[0]:
+                 return self._connection[1]
+ 
+-        dbdir = '/etc/pki/nssdb'
++        dbdir = 'sql:/etc/pki/nssdb'
+         no_init = self.__nss_initialized(dbdir)
+         if sys.version_info < (2, 7):
+             conn = NSSHTTPS(host, 443, dbdir=dbdir, no_init=no_init)