sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-27 07:42:04 +03:00
Code Activity

s4-s3-upgrade Improve samba-tool domain samba3upgrade behaviour

Browse Source 
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:
Andrew Bartlett
2011-09-13 21:02:43 +10:00
parent 4e87a8419c
commit c6cf070df0
3 changed files with 38 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source4/scripting/python/samba/getopt.py
View File

@ -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: