View | Details | Raw Unified | Return to bug 26504 | Differences between
and this patch

Collapse All | Expand All

(-)/usr/share/samba/setup/provision (+4 lines)
 Lines 41-46    Link Here 
41
    FILL_NT4SYNC,
41
    FILL_NT4SYNC,
42
    FILL_DRS,
42
    FILL_DRS,
43
    ProvisioningError,
43
    ProvisioningError,
44
    DEFAULTSITE,
44
    )
45
    )
45
from samba.dsdb import (
46
from samba.dsdb import (
46
    DS_DOMAIN_FUNCTION_2000,
47
    DS_DOMAIN_FUNCTION_2000,
 Lines 126-131    Link Here 
126
        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.")
127
        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.")
127
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")
128
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")
128
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")
129
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")
130
parser.add_option("--sitename", type="string", metavar="SITENAME", default=DEFAULTSITE,
131
        help="specific sitename")
129
132
130
opts = parser.parse_args()[0]
133
opts = parser.parse_args()[0]
131
134
 Lines 267-272    Link Here 
267
          ldapadminpass=opts.ldapadminpass, ol_mmr_urls=opts.ol_mmr_urls,
270
          ldapadminpass=opts.ldapadminpass, ol_mmr_urls=opts.ol_mmr_urls,
268
          slapd_path=opts.slapd_path, setup_ds_path=opts.setup_ds_path,
271
          slapd_path=opts.slapd_path, setup_ds_path=opts.setup_ds_path,
269
          nosync=opts.ldap_backend_nosync, ldap_dryrun_mode=opts.ldap_dryrun_mode,
272
          nosync=opts.ldap_backend_nosync, ldap_dryrun_mode=opts.ldap_dryrun_mode,
273
          sitename=opts.sitename,
270
          useeadb=eadb, next_rid=opts.next_rid, lp=lp)
274
          useeadb=eadb, next_rid=opts.next_rid, lp=lp)
271
except ProvisioningError, e:
275
except ProvisioningError, e:
272
    print str(e)
276
    print str(e)

Return to bug 26504