diff options
Diffstat (limited to 'source4/scripting/python')
| -rw-r--r-- | source4/scripting/python/samba/getopt.py | 10 | 
1 files changed, 6 insertions, 4 deletions
diff --git a/source4/scripting/python/samba/getopt.py b/source4/scripting/python/samba/getopt.py index 82cb004b62..7ec684a9d6 100644 --- a/source4/scripting/python/samba/getopt.py +++ b/source4/scripting/python/samba/getopt.py @@ -35,12 +35,14 @@ class SambaOptions(optparse.OptionGroup):          self._configfile = arg      def get_loadparm(self): -        import param +        import os, param          lp = param.LoadParm() -        if self._configfile is None: -            lp.load_default() -        else: +        if self._configfile is not None:              lp.load(self._configfile) +        elif os.getenv("SMB_CONF_PATH") is not None: +            lp.load(os.getenv("SMB_CONF_PATH")) +        else: +            lp.load_default()          return lp  class VersionOptions(optparse.OptionGroup):  | 
