mirror of
https://github.com/samba-team/samba.git
synced 2025-07-27 07:42:04 +03:00
s4-s3-upgrade Improve samba-tool domain samba3upgrade behaviour
The --realm argument is again optional (the previous code would take the default from the default smb.conf, not the one specified) and --targetdir is now a named argument much like it is to provision. We now test the --testparm option to ensure it behaves the way we expect. Andrew Bartlett Autobuild-User: Andrew Bartlett <abartlet@samba.org> Autobuild-Date: Tue Sep 13 16:30:31 CEST 2011 on sn-devel-104
This commit is contained in:
@ -53,6 +53,7 @@ class SambaOptions(optparse.OptionGroup):
|
||||
callback=self._set_realm)
|
||||
self._configfile = None
|
||||
self._lp = LoadParm()
|
||||
self.realm = None
|
||||
|
||||
def get_loadparm_path(self):
|
||||
"""Return path to the smb.conf file specified on the command line."""
|
||||
@ -66,6 +67,7 @@ class SambaOptions(optparse.OptionGroup):
|
||||
|
||||
def _set_realm(self, option, opt_str, arg, parser):
|
||||
self._lp.set('realm', arg)
|
||||
self.realm = arg
|
||||
|
||||
def _set_option(self, option, opt_str, arg, parser):
|
||||
if arg.find('=') == -1:
|
||||
|
Reference in New Issue
Block a user