diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-01-23 23:33:36 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-01-23 23:38:57 +0100 |
| commit | decdf5954d5e1ae84318d6767317965f544a897f (patch) | |
| tree | b2d0d55116726fae8a086511100c341b769e199c /source4/setup/vampire.py | |
| parent | 00cb710fbc872cffa2d4d5c54c5ea65ba993da0c (diff) | |
| download | samba-decdf5954d5e1ae84318d6767317965f544a897f.tar.gz samba-decdf5954d5e1ae84318d6767317965f544a897f.tar.bz2 samba-decdf5954d5e1ae84318d6767317965f544a897f.zip | |
python: Add convenience function for getting command line loadparm context
and default to using system smb.conf.
(This used to be commit b3afde0f00ab5093b577b139a062c233d4db2524)
Diffstat (limited to 'source4/setup/vampire.py')
| -rwxr-xr-x | source4/setup/vampire.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source4/setup/vampire.py b/source4/setup/vampire.py index 392cd2d4fb..728c53146a 100755 --- a/source4/setup/vampire.py +++ b/source4/setup/vampire.py @@ -26,7 +26,8 @@ from auth import system_session import sys parser = optparse.OptionParser("vampire [options] <domain>") -parser.add_option_group(options.SambaOptions(parser)) +sambaopts = options.SambaOptions(parser) +parser.add_option_group(sambaopts) parser.add_option_group(options.VersionOptions(parser)) credopts = options.CredentialsOptions(parser) parser.add_option_group(credopts) @@ -47,8 +48,6 @@ def vampire(domain, session_info, credentials, lp): ctx.samsync_ldb(vampire_ctx, machine_creds=machine_creds, session_info=session_info) -lp = param.LoadParm() -if opts.configfile: - lp.load(opts.configfile) +lp = sambaopts.get_loadparm() vampire(args[0], session_info=system_session(), credentials=credopts.get_credentials(), lp=lp) |