sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-12-02 00:23:50 +03:00
Code Activity

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

Browse Source
This commit is contained in:
Andrew Bartlett
2009-08-10 21:46:20 +10:00
parent f0decfe5c2
commit 6dc41bf27c
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
howto-ol-backend-s4.txt
View File

@@ -34,7 +34,7 @@ Simple provision-backend Example:
--domain=LDAP --ldap-admin-pass="linux" \ --domain=LDAP --ldap-admin-pass="linux" \
--ldap-backend-type=openldap \ --ldap-backend-type=openldap \
--server-role='domain controller' \ --server-role='domain controller' \
--ol-slapd="/usr/local/libexec" --ol-slapd="/usr/local/libexec/slapd"
After that, you should get a similar output: After that, you should get a similar output:

3
source4/scripting/python/samba/provision.py
View File

@@ -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 openldap-backend was chosen, check if path to slapd was given and exists
if ldap_backend_type == "openldap" and ol_slapd is None: 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: if ldap_backend_type == "openldap" and ol_slapd is not None:
ol_slapd = ol_slapd + "/slapd"
if not os.path.exists(ol_slapd): if not os.path.exists(ol_slapd):
message (ol_slapd) message (ol_slapd)
sys.exit("Warning: Given Path to slapd (OpenLDAP-Daemon) does not exist!") sys.exit("Warning: Given Path to slapd (OpenLDAP-Daemon) does not exist!")

2
source4/setup/provision-backend
View File

@@ -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'.", help="To setup OpenLDAP-Backend with Online-Configuration [slapd.d] choose 'yes'.",
choices=["yes", "no"]) choices=["yes", "no"])
parser.add_option("--ol-slapd", type="string", metavar="SLAPD-PATH", 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] opts = parser.parse_args()[0]