sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

s4-dbcheck: Allow forcing an override of an old @MODULES record

Browse Source 
Reviewed-by: Stefan Metzmacher <metze@samba.org>
This commit is contained in:
Andrew Bartlett 2012-08-23 15:18:13 +10:00 committed by Stefan Metzmacher
parent 213e7260a8
commit 99d872ee92
3 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source4/scripting/python/samba/dbchecker.py
View File

@ -749,3 +749,12 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base)))
m['add'] = ldb.MessageElement('NONE', ldb.FLAG_MOD_ADD, 'force_reindex')
m['delete'] = ldb.MessageElement('NONE', ldb.FLAG_MOD_DELETE, 'force_reindex')
return self.do_modify(m, [], 're-indexed database', validate=False)
###############################################
# reset @MODULES
def reset_modules(self):
'''reset @MODULES to that needed for current sam.ldb (to read a very old database)'''
m = ldb.Message()
m.dn = ldb.Dn(self.samdb, "@MODULES")
m['@LIST'] = ldb.MessageElement('samba_dsdb', ldb.FLAG_MOD_REPLACE, '@LIST')
return self.do_modify(m, [], 'reset @MODULES on database', validate=False)

24
source4/scripting/python/samba/netcmd/dbcheck.py
View File

@ -55,6 +55,7 @@ class cmd_dbcheck(Command):
help="don't print details of checking"),
Option("--attrs", dest="attrs", default=None, help="list of attributes to check (space separated)"),
Option("--reindex", dest="reindex", default=False, action="store_true", help="force database re-index"),
Option("--force-modules", dest="force_modules", default=False, action="store_true", help="force loading of Samba modules and ignore the @MODULES record (for very old databases)"),
Option("-H", "--URL", help="LDB URL for database or target server (defaults to local SAM database)",
type=str, metavar="URL", dest="H"),
]
@ -62,7 +63,7 @@ class cmd_dbcheck(Command):
def run(self, DN=None, H=None, verbose=False, fix=False, yes=False,
cross_ncs=False, quiet=False,
scope="SUB", credopts=None, sambaopts=None, versionopts=None,
attrs=None, reindex=False):
attrs=None, reindex=False, force_modules=False):
lp = sambaopts.get_loadparm()
@ -73,8 +74,16 @@ class cmd_dbcheck(Command):
else:
creds = None
samdb = SamDB(session_info=system_session(), url=H,
credentials=creds, lp=lp)
if force_modules:
samdb = SamDB(session_info=system_session(), url=H,
credentials=creds, lp=lp, options=["modules=samba_dsdb"])
else:
try:
samdb = SamDB(session_info=system_session(), url=H,
credentials=creds, lp=lp)
except:
raise CommandError("Failed to connect to DB at %s. If this is a really old sam.ldb (before alpha9), then try again with --force-modules" % H)
if H is None or not over_ldap:
samdb_schema = samdb
@ -105,13 +114,20 @@ class cmd_dbcheck(Command):
started_transaction = True
try:
chk = dbcheck(samdb, samdb_schema=samdb_schema, verbose=verbose,
fix=fix, yes=yes, quiet=quiet, in_transaction=started_transaction)
fix=fix, yes=yes, quiet=quiet, in_transaction=started_transaction)
if reindex:
self.outf.write("Re-indexing...\n")
error_count = 0
if chk.reindex_database():
self.outf.write("completed re-index OK\n")
elif force_modules:
self.outf.write("Resetting @MODULES...\n")
error_count = 0
if chk.reset_modules():
self.outf.write("completed @MODULES reset OK\n")
else:
error_count = chk.check_database(DN=DN, scope=search_scope,
controls=controls, attrs=attrs)

5
testprogs/blackbox/dbcheck.sh
View File

@ -20,7 +20,12 @@ reindex() {
$BINDIR/samba-tool dbcheck --reindex
}
force_modules() {
$BINDIR/samba-tool dbcheck --force-modules
}
testit "dbcheck" dbcheck
testit "reindex" reindex
testit "force_modules" force_modules
exit $failed