[SCM] Samba Shared Repository - branch master updated

Noel Power npower at samba.org
Mon Jan 21 15:35:02 UTC 2019

The branch, master has been updated
       via  10e54a095f0 netcmd: Try to improve domain backup error message
      from  0628ca2a558 tdb: Fix compatibility of wscript with older python


- Log -----------------------------------------------------------------
commit 10e54a095f005c0988a7e5e8a35cea6200197854
Author: Tim Beale <timbeale at catalyst.net.nz>
Date:   Thu Jan 17 09:41:21 2019 +1300

    netcmd: Try to improve domain backup error message
    I ran this command as non-root by mistake and didn't find the error
    message particularly helpful. Tweak the error message so it reminds the
    user that they should be root. Also display the path we're looking for
    the sam.ldb file in, to give them more clues.
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=13676
    Signed-off-by: Tim Beale <timbeale at catalyst.net.nz>
    Reviewed-by: Noel Power <npower at samba.org>
    Autobuild-User(master): Noel Power <npower at samba.org>
    Autobuild-Date(master): Mon Jan 21 16:34:06 CET 2019 on sn-devel-144


Summary of changes:
 python/samba/netcmd/domain_backup.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Changeset truncated at 500 lines:

diff --git a/python/samba/netcmd/domain_backup.py b/python/samba/netcmd/domain_backup.py
index 4cacf571f3d..4e32b4b9b1c 100644
--- a/python/samba/netcmd/domain_backup.py
+++ b/python/samba/netcmd/domain_backup.py
@@ -1009,8 +1009,9 @@ class cmd_domain_backup_offline(samba.netcmd.Command):
         paths = samba.provision.provision_paths_from_lp(lp, lp.get('realm'))
         if not (paths.samdb and os.path.exists(paths.samdb)):
-            raise CommandError('No sam.db found.  This backup ' +
-                               'tool is only for AD DCs')
+            logger.error("No database found at {0}".format(paths.samdb))
+            raise CommandError('Please check you are root, and ' +
+                               'are running this command on an AD DC')
         check_targetdir(logger, targetdir)

Samba Shared Repository

More information about the samba-cvs mailing list