Add LDAP upgrade over ldapi support.

This disables all but the ldapi listener in DS so it will be quiet when
we perform our upgrades. It is expected that any other clients that
also use ldapi will be shut down by other already (krb5 and dns).

Add ldapi as an option in ipaldap and add the beginning of pure offline
support (e.g. direct editing of LDIF files).

1 files changed, 12 insertions, 2 deletions

diff --git a/ipaserver/ipaldap.py b/ipaserver/ipaldap.py
index 3d0b321e0..578894ab5 100644
--- a/ipaserver/ipaldap.py
+++ b/ipaserver/ipaldap.py
@@ -217,9 +217,12 @@ class IPAdmin(SimpleLDAPObject):
         if self.cacert is not None:
             SimpleLDAPObject.__init__(self,'ldaps://%s:%d' % (self.host,self.port))
         else:
-            SimpleLDAPObject.__init__(self,'ldap://%s:%d' % (self.host,self.port))
+            if self.ldapi:
+                SimpleLDAPObject.__init__(self,'ldapi://%%2fvar%%2frun%%2fslapd-%s.socket' % "-".join(self.realm.split(".")))
+            else:
+                SimpleLDAPObject.__init__(self,'ldap://%s:%d' % (self.host,self.port))
 
-    def __init__(self,host,port=389,cacert=None,bindcert=None,bindkey=None,proxydn=None,debug=None):
+    def __init__(self,host='',port=389,cacert=None,bindcert=None,bindkey=None,proxydn=None,debug=None,ldapi=False,realm=None):
         """We just set our instance variables and wrap the methods - the real
            work is done in __localinit. This is separated out this way so
            that we can call it from places other than instance creation
@@ -241,6 +244,8 @@ class IPAdmin(SimpleLDAPObject):
         self.bindcert = bindcert
         self.bindkey = bindkey
         self.proxydn = proxydn
+        self.ldapi = ldapi
+        self.realm = realm
         self.suffixes = {}
         self.__localinit()
 
@@ -345,6 +350,11 @@ class IPAdmin(SimpleLDAPObject):
         self.simple_bind_s(binddn, bindpw)
         self.__lateinit()
 
+    def do_external_bind(self, user_name=None):
+        auth_tokens = ldap.sasl.external(user_name)
+        self.sasl_interactive_bind_s("", auth_tokens)
+        self.__lateinit()
+
     def getEntry(self,*args):
         """This wraps the search function.  It is common to just get one entry"""