diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2009-08-10 21:46:20 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2009-08-12 10:01:48 +1000 |
| commit | 6dc41bf27c6157f981b9b45b026da41e9a3df184 (patch) | |
| tree | c439dc4e716179d7b43bab91ef135ac9165c6a84 | |
| parent | f0decfe5c2395173fb632e9bfdea3edf43b1b434 (diff) | |
| download | samba-6dc41bf27c6157f981b9b45b026da41e9a3df184.tar.gz samba-6dc41bf27c6157f981b9b45b026da41e9a3df184.tar.bz2 samba-6dc41bf27c6157f981b9b45b026da41e9a3df184.zip | |
s4:provision Make the --ol-slapd paramter take the full path to slapd
| -rw-r--r-- | howto-ol-backend-s4.txt | 2 | ||||
| -rw-r--r-- | source4/scripting/python/samba/provision.py | 3 | ||||
| -rwxr-xr-x | source4/setup/provision-backend | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/howto-ol-backend-s4.txt b/howto-ol-backend-s4.txt index d7d1edaf10..c96ce55d11 100644 --- 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 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!") diff --git a/source4/setup/provision-backend b/source4/setup/provision-backend index 5cf0f8bf6d..fb7f56b881 100755 --- 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] |