From 6dc41bf27c6157f981b9b45b026da41e9a3df184 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 10 Aug 2009 21:46:20 +1000
Subject: s4:provision Make the --ol-slapd paramter take the full path to slapd

---
 source4/scripting/python/samba/provision.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'source4/scripting/python/samba/provision.py')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index e099184923..634904441a 100644
--- 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!")
-- 
cgit