s4:provision Make the --ol-slapd paramter take the full path to slapd

diff --git a/howto-ol-backend-s4.txt b/howto-ol-backend-s4.txt
index d7d1edaf10f1652e9be4604d694dc03623c5d9da..c96ce55d115e2ed50e8231822257592e3e5347d0 100644 (file)
--- a/howto-ol-backend-s4.txt
+++ b/howto-ol-backend-s4.txt
@@ -34,7 +34,7 @@ Simple provision-backend Example:
   --domain=LDAP --ldap-admin-pass="linux" \
   --ldap-backend-type=openldap \
   --server-role='domain controller' \
-  --ol-slapd="/usr/local/libexec"
+  --ol-slapd="/usr/local/libexec/slapd"
 
 After that, you should get a similar output:
 

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index e099184923ec188544b81c88779518282efc7e9d..634904441a34f88e7912ed7bed78549f9b7fbc22 100644 (file)
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -1304,9 +1304,8 @@ def provision_backend(setup_dir=None, message=None,
 
     # if openldap-backend was chosen, check if path to slapd was given and exists
     if ldap_backend_type == "openldap" and ol_slapd is None:
-        sys.exit("Warning: OpenLDAP-Backend must be setup with path to slapd (OpenLDAP-Daemon), e.g. --ol-slapd=\"/usr/local/libexec\"!")
+        sys.exit("Warning: OpenLDAP-Backend must be setup with path to slapd (OpenLDAP-Daemon), e.g. --ol-slapd=\"/usr/local/libexec/slapd\"!")
     if ldap_backend_type == "openldap" and ol_slapd is not None:
-       ol_slapd = ol_slapd + "/slapd"
        if not os.path.exists(ol_slapd):
             message (ol_slapd)
             sys.exit("Warning: Given Path to slapd (OpenLDAP-Daemon) does not exist!")

diff --git a/source4/setup/provision-backend b/source4/setup/provision-backend
index 5cf0f8bf6d95a46ea79e8b9d7f6e9e50435f4e53..fb7f56b8819b1c89d6d4626dee53a35aafb6009f 100755 (executable)
--- a/source4/setup/provision-backend
+++ b/source4/setup/provision-backend
@@ -72,7 +72,7 @@ parser.add_option("--ol-olc", type="choice", metavar="OPENLDAP-OLC",
                help="To setup OpenLDAP-Backend with Online-Configuration [slapd.d] choose 'yes'.",
                choices=["yes", "no"])
 parser.add_option("--ol-slapd", type="string", metavar="SLAPD-PATH", 
-               help="Path to OpenLDAP-Daemon (slapd) [e.g.:'/usr/local/libexec']. Recommended for Setup with OpenLDAP-Backend. OpenLDAP Version >= 2.4.17 should be used.") 
+               help="Path to OpenLDAP-Daemon (slapd) [e.g.:'/usr/local/libexec/slapd']. Required for Setup with OpenLDAP-Backend. OpenLDAP Version >= 2.4.17 should be used.") 
 
 opts = parser.parse_args()[0]