--- /usr/share/samba/setup/provision 2012-03-08 19:33:26.000000000 +0100 +++ provision 2012-02-13 14:30:09.000000000 +0100 @@ -41,6 +41,7 @@ FILL_NT4SYNC, FILL_DRS, ProvisioningError, + DEFAULTSITE, ) from samba.dsdb import ( DS_DOMAIN_FUNCTION_2000, @@ -126,6 +127,8 @@ help="Path to setup-ds.pl script for Fedora DS LDAP backend [e.g.:'/usr/sbin/setup-ds.pl']. Required for Setup with Fedora DS backend.") parser.add_option("--use-xattrs", type="choice", choices=["yes", "no", "auto"], help="Define if we should use the native fs capabilities or a tdb file for storing attributes likes ntacl, auto tries to make an inteligent guess based on the user rights and system capabilities", default="auto") parser.add_option("--ldap-dryrun-mode", help="Configure LDAP backend, but do not run any binaries and exit early. Used only for the test environment. DO NOT USE", action="store_true") +parser.add_option("--sitename", type="string", metavar="SITENAME", default=DEFAULTSITE, + help="specific sitename") opts = parser.parse_args()[0] @@ -267,6 +270,7 @@ ldapadminpass=opts.ldapadminpass, ol_mmr_urls=opts.ol_mmr_urls, slapd_path=opts.slapd_path, setup_ds_path=opts.setup_ds_path, nosync=opts.ldap_backend_nosync, ldap_dryrun_mode=opts.ldap_dryrun_mode, + sitename=opts.sitename, useeadb=eadb, next_rid=opts.next_rid, lp=lp) except ProvisioningError, e: print str(e)