return parser, optiongroups
def message(self, text):
- print text
+ self.outf.write(text+"\n")
def _run(self, *argv):
parser, optiongroups = self._create_parser()
usage = "samba-tool <subcommand>"
else:
usage = "samba-tool %s <subcommand>" % myname
- print "Usage: %s [options]" %usage
- print "Available subcommands:"
+ self.outf.write("Usage: %s [options]\n" % usage)
+ self.outf.write("Available subcommands:\n")
subcmds = self.subcommands.keys()
subcmds.sort()
- max_length = max(map(lambda c: len(c), subcmds))
+ max_length = max([len(c) for c in subcmds])
for cmd in subcmds:
- print " %*s - %s" % (-max_length, cmd, self.subcommands[cmd].description)
+ self.outf.write(" %*s - %s\n" % (-max_length, cmd, self.subcommands[cmd].description))
if subcommand in [None]:
raise CommandError("You must specify a subcommand")
if subcommand in ['help', '-h', '--help']:
- print "For more help on a specific subcommand, please type: %s (-h|--help)" % usage
+ self.outf.write("For more help on a specific subcommand, please type: %s (-h|--help)\n" % usage)
return 0
raise CommandError("No such subcommand '%s'" % subcommand)
type=str, metavar="URL", dest="H"),
]
- 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):
+ 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):
lp = sambaopts.get_loadparm()
samdb_schema = SamDB(session_info=system_session(), url=None,
credentials=creds, lp=lp)
- scope_map = { "SUB": ldb.SCOPE_SUBTREE, "BASE":ldb.SCOPE_BASE, "ONE":ldb.SCOPE_ONELEVEL }
+ scope_map = { "SUB": ldb.SCOPE_SUBTREE, "BASE": ldb.SCOPE_BASE, "ONE":ldb.SCOPE_ONELEVEL }
scope = scope.upper()
if not scope in scope_map:
raise CommandError("Unknown scope %s" % scope)
attrs = attrs.split()
started_transaction = False
-
if yes and fix:
samdb.transaction_start()
started_transaction = True
fix=fix, yes=yes, quiet=quiet)
if reindex:
- print("Re-indexing...")
+ self.outf.write("Re-indexing...\n")
error_count = 0
if chk.reindex_database():
- print("completed re-index OK")
+ self.outf.write("completed re-index OK\n")
else:
error_count = chk.check_database(DN=DN, scope=search_scope,
controls=controls, attrs=attrs)
def print_new_acl(self, samdb, object_dn):
desc = self.read_descriptor(samdb, object_dn)
desc_sddl = desc.as_sddl(self.get_domain_sid(samdb))
- print "new descriptor for %s:" % object_dn
- print desc_sddl
+ self.outf.write("new descriptor for %s:\n" % object_dn)
+ self.outf.write(desc_sddl + "\n")
def run(self, car, action, objectdn, trusteedn, sddl,
H=None, credopts=None, sambaopts=None, versionopts=None):
samdb.modify(m)
except LdbError, (num, msg):
raise CommandError("Failed to initiate role seize of '%s' role: %s" % (role, msg))
- print("FSMO transfer of '%s' role successful" % role)
+ self.outf.write("FSMO transfer of '%s' role successful\n" % role)
def run(self, force=None, H=None, role=None,
credopts=None, sambaopts=None, versionopts=None):
samdb.modify(m)
except LdbError, (num, msg):
raise CommandError("Failed to initiate transfer of '%s' role: %s" % (role, msg))
- print("FSMO transfer of '%s' role successful" % role)
+ self.outf.write("FSMO transfer of '%s' role successful\n" % role)
def run(self, force=None, H=None, role=None,
credopts=None, sambaopts=None, versionopts=None):
msg = get_gpo_info(self.samdb, None)
for m in msg:
- print("GPO : %s" % m['name'][0])
- print("display name : %s" % m['displayName'][0])
- print("path : %s" % m['gPCFileSysPath'][0])
- print("dn : %s" % m.dn)
- print("version : %s" % attr_default(m, 'versionNumber', '0'))
- print("flags : %s" % gpo_flags_string(int(attr_default(m, 'flags', 0))))
- print("")
+ self.outf.write("GPO : %s\n" % m['name'][0])
+ self.outf.write("display name : %s\n" % m['displayName'][0])
+ self.outf.write("path : %s\n" % m['gPCFileSysPath'][0])
+ self.outf.write("dn : %s\n" % m.dn)
+ self.outf.write("version : %s\n" % attr_default(m, 'versionNumber', '0'))
+ self.outf.write("flags : %s\n" % gpo_flags_string(int(attr_default(m, 'flags', 0))))
+ self.outf.write("\n")
class cmd_list(Command):
attrs=['name', 'displayName', 'flags',
'ntSecurityDescriptor'])
except Exception:
- print("Failed to fetch gpo object %s" % g['dn'])
+ self.outf.write("Failed to fetch gpo object %s\n" %
+ g['dn'])
continue
secdesc_ndr = gmsg[0]['ntSecurityDescriptor'][0]
dcerpc.security.SEC_ADS_LIST |
dcerpc.security.SEC_ADS_READ_PROP)
except RuntimeError:
- print("Failed access check on %s" % msg.dn)
+ self.outf.write("Failed access check on %s\n" % msg.dn)
continue
# check the flags on the GPO
else:
msg_str = 'user'
- print("GPOs for %s %s" % (msg_str, username))
+ self.outf.write("GPOs for %s %s\n" % (msg_str, username))
for g in gpos:
- print(" %s %s" % (g[0], g[1]))
+ self.outf.write(" %s %s\n" % (g[0], g[1]))
class cmd_show(Command):
secdesc_ndr = msg['ntSecurityDescriptor'][0]
secdesc = ndr_unpack(dcerpc.security.descriptor, secdesc_ndr)
- print("GPO : %s" % msg['name'][0])
- print("display name : %s" % msg['displayName'][0])
- print("path : %s" % msg['gPCFileSysPath'][0])
- print("dn : %s" % msg.dn)
- print("version : %s" % attr_default(msg, 'versionNumber', '0'))
- print("flags : %s" % gpo_flags_string(int(attr_default(msg, 'flags', 0))))
- print("ACL : %s" % secdesc.as_sddl())
- print("")
+ self.outf.write("GPO : %s\n" % msg['name'][0])
+ self.outf.write("display name : %s\n" % msg['displayName'][0])
+ self.outf.write("path : %s\n" % msg['gPCFileSysPath'][0])
+ self.outf.write("dn : %s\n" % msg.dn)
+ self.outf.write("version : %s\n" % attr_default(msg, 'versionNumber', '0'))
+ self.outf.write("flags : %s\n" % gpo_flags_string(int(attr_default(msg, 'flags', 0))))
+ self.outf.write("ACL : %s\n" % secdesc.as_sddl())
+ self.outf.write("\n")
class cmd_getlink(Command):
raise CommandError("Could not find Container DN %s (%s)" % container_dn, e)
if 'gPLink' in msg:
- print("GPO(s) linked to DN %s" % container_dn)
+ self.outf.write("GPO(s) linked to DN %s\n" % container_dn)
gplist = parse_gplink(msg['gPLink'][0])
for g in gplist:
msg = get_gpo_info(self.samdb, dn=g['dn'])
- print(" GPO : %s" % msg[0]['name'][0])
- print(" Name : %s" % msg[0]['displayName'][0])
- print(" Options : %s" % gplink_options_string(g['options']))
- print("")
+ self.outf.write(" GPO : %s\n" % msg[0]['name'][0])
+ self.outf.write(" Name : %s\n" % msg[0]['displayName'][0])
+ self.outf.write(" Options : %s\n" % gplink_options_string(g['options']))
+ self.outf.write("\n")
else:
- print("No GPO(s) linked to DN=%s" % container_dn)
+ self.outf.write("No GPO(s) linked to DN=%s\n" % container_dn)
class cmd_setlink(Command):
except Exception, e:
raise CommandError("Error adding GPO Link", e)
- print("Added/Updated GPO link")
+ self.outf.write("Added/Updated GPO link\n")
cmd_getlink().run(container_dn, H, sambaopts, credopts, versionopts)
except Exception, e:
raise CommandError("Error Removing GPO Link (%s)" % e)
- print("Deleted GPO link.")
+ self.outf.write("Deleted GPO link.\n")
cmd_getlink().run(container_dn, H, sambaopts, credopts, versionopts)
inheritance = int(msg['gPOptions'][0])
if inheritance == dsdb.GPO_BLOCK_INHERITANCE:
- print("Container has GPO_BLOCK_INHERITANCE")
+ self.outf.write("Container has GPO_BLOCK_INHERITANCE\n")
else:
- print("Container has GPO_INHERIT")
+ self.outf.write("Container has GPO_INHERIT\n")
class cmd_setinheritance(Command):
os.mkdir(gpodir)
copy_directory_remote_to_local(conn, sharepath, gpodir)
except Exception, e:
+ # FIXME: Catch more specific exception
raise CommandError("Error copying GPO from DC", e)
- print('GPO copied to %s' % gpodir)
+ self.outf.write('GPO copied to %s\n' % gpodir)
class cmd_create(Command):
except Exception, e:
raise CommandError("Error setting ACL on GPT", e)
- print "GPO '%s' created as %s" % (displayname, gpo)
+ self.outf.write("GPO '%s' created as %s\n" % (displayname, gpo))
class cmd_gpo(SuperCommand):
samdb.newgroup(groupname, groupou=groupou, grouptype = gtype,
description=description, mailaddress=mail_address, notes=notes)
except Exception, e:
+ # FIXME: catch more specific exception
raise CommandError('Failed to create group "%s"' % groupname, e)
- print("Added group %s" % groupname)
+ self.outf.write("Added group %s\n" % groupname)
class cmd_group_delete(Command):
credentials=creds, lp=lp)
samdb.deletegroup(groupname)
except Exception, e:
+ # FIXME: catch more specific exception
raise CommandError('Failed to remove group "%s"' % groupname, e)
- print("Deleted group %s" % groupname)
+ self.outf.write("Deleted group %s\n" % groupname)
class cmd_group_add_members(Command):
credentials=creds, lp=lp)
samdb.add_remove_group_members(groupname, listofmembers, add_members_operation=True)
except Exception, e:
- raise CommandError('Failed to add members "%s" to group "%s"' % (listofmembers, groupname), e)
- print("Added members to group %s" % groupname)
+ # FIXME: catch more specific exception
+ raise CommandError('Failed to add members "%s" to group "%s"' % (
+ listofmembers, groupname), e)
+ self.outf.write("Added members to group %s\n" % groupname)
class cmd_group_remove_members(Command):
credentials=creds, lp=lp)
samdb.add_remove_group_members(groupname, listofmembers, add_members_operation=False)
except Exception, e:
+ # FIXME: Catch more specific exception
raise CommandError('Failed to remove members "%s" from group "%s"' % (listofmembers, groupname), e)
- print("Removed members from group %s" % groupname)
+ self.outf.write("Removed members from group %s\n" % groupname)
class cmd_group(SuperCommand):
# Log some domain controller specific place-holers that are being used
# when compare content of two DCs. Uncomment for DEBUG purposes.
if self.two_domains and not self.quiet:
- print "\n* Place-holders for %s:" % self.host
- print 4*" " + "${DOMAIN_DN} => %s" % self.base_dn
- print 4*" " + "${DOMAIN_NETBIOS} => %s" % self.domain_netbios
- print 4*" " + "${SERVER_NAME} => %s" % self.server_names
- print 4*" " + "${DOMAIN_NAME} => %s" % self.domain_name
+ self.outf.write("\n* Place-holders for %s:\n" % self.host)
+ self.outf.write(4*" " + "${DOMAIN_DN} => %s\n" %
+ self.base_dn)
+ self.outf.write(4*" " + "${DOMAIN_NETBIOS} => %s\n" %
+ self.domain_netbios)
+ self.outf.write(4*" " + "${SERVER_NAME} => %s\n" %
+ self.server_names)
+ self.outf.write(4*" " + "${DOMAIN_NAME} => %s\n" %
+ self.domain_name)
def find_domain_sid(self):
res = self.ldb.search(base=self.base_dn, expression="(objectClass=*)", scope=SCOPE_BASE)
Log on the screen if there is no --quiet oprion set
"""
if not self.quiet:
- print msg
+ self.outf.write(msg+"\n")
def fix_dn(self, s):
res = "%s" % s
class LDAPBundel(object):
+
def __init__(self, connection, context, dn_list=None, filter_list=None):
self.con = connection
self.two_domains = self.con.two_domains
Log on the screen if there is no --quiet oprion set
"""
if not self.quiet:
- print msg
+ self.outf.write(msg+"\n")
def update_size(self):
self.size = len(self.dn_list)
try:
res = self.con.ldb.search(base=self.search_base, scope=self.search_scope, attrs=["dn"])
except LdbError, (enum, estr):
- print("Failed search of base=%s" % self.search_base)
+ self.outf.write("Failed search of base=%s\n" % self.search_base)
raise
for x in res:
dn_list.append(x["dn"].get_linearized())
self.log( "".join([str("\n" + 4*" " + x) for x in self.summary["df_value_attrs"]]) )
self.summary["df_value_attrs"] = []
+
class cmd_ldapcmp(Command):
"""compare two ldap databases"""
synopsis = "%prog ldapcmp <URL1> <URL2> (domain|configuration|schema) [options]"
status = 0
for context in contexts:
if not quiet:
- print "\n* Comparing [%s] context..." % context
+ self.outf.write("\n* Comparing [%s] context...\n" % context)
b1 = LDAPBundel(con1, context=context, filter_list=filter_list)
b2 = LDAPBundel(con2, context=context, filter_list=filter_list)
if b1 == b2:
if not quiet:
- print "\n* Result for [%s]: SUCCESS" % context
+ self.outf.write("\n* Result for [%s]: SUCCESS\n" %
+ context)
else:
if not quiet:
- print "\n* Result for [%s]: FAILURE" % context
+ self.outf.write("\n* Result for [%s]: FAILURE\n" % context)
if not descriptor:
assert len(b1.summary["df_value_attrs"]) == len(b2.summary["df_value_attrs"])
b2.summary["df_value_attrs"] = []
- print "\nSUMMARY"
- print "---------"
+ self.outf.write("\nSUMMARY\n")
+ self.outf.write("---------\n")
b1.print_summary()
b2.print_summary()
# mark exit status as FAILURE if a least one comparison failed
except Exception, e:
raise CommandError("Unable to read domain SID from configuration files", e)
attrs = ["objectSid"]
- print lp.get("realm")
res = ldb.search(expression="(objectClass=*)",
base="flatname=%s,cn=Primary Domains" % lp.get("workgroup"),
scope=SCOPE_BASE, attrs=attrs)
acl = getntacl(lp, file, xattr_backend, eadb_file)
if as_sddl:
anysid = security.dom_sid(security.SID_NT_SELF)
- print acl.info.as_sddl(anysid)
+ self.outf.write(acl.info.as_sddl(anysid)+"\n")
else:
acl.dump()
-
class cmd_ntacl(SuperCommand):
"""NT ACLs manipulation"""
source_dsa_invocation_id = misc.GUID(local_samdb.schema_format_value("objectGUID", res[0]["invocationId"][0]))
dn = self.get_dn(samdb, account)
- print "Replicating DN %s" % dn
+ self.outf.write("Replicating DN %s\n" % dn)
destination_dsa_guid = misc.GUID(local_samdb.get_ntds_GUID())
# TODO once I understand how, use the domain info to naildown
# to the correct domain
(cleaneduser, realm, domain) = _get_user_realm_domain(user)
- print cleaneduser
+ self.outf.write(cleaneduser+"\n")
res = sam.search(expression="samaccountname=%s" % ldb.binary_encode(cleaneduser),
scope=ldb.SCOPE_SUBTREE,
attrs=["servicePrincipalName"])
found = False
flag = ldb.FLAG_MOD_ADD
if spns != None:
- print "User %s has the following servicePrincipalName: " % str(res[0].dn)
+ self.outf.write(
+ "User %s has the following servicePrincipalName: \n" %
+ res[0].dn)
for e in spns:
- print "\t %s" % (str(e))
+ self.outf.write("\t %s\n" % e)
else:
- print "User %s has no servicePrincipalName" % str(res[0].dn)
+ self.outf.write("User %s has no servicePrincipalName" %
+ res[0].dn)
else:
raise CommandError("User %s not found" % user)
if parameter_name is None:
lp[section_name].dump(sys.stdout, lp.default_service, verbose)
else:
- print lp.get(parameter_name, section_name)
+ self.outf.write(lp.get(parameter_name, section_name)+"\n")
else:
if not suppress_prompt:
- print "Press enter to see a dump of your service definitions"
+ self.outf.write("Press enter to see a dump of your service definitions\n")
sys.stdin.readline()
lp.dump(sys.stdout, verbose)
if valid:
net = Net(creds, lp, server=credopts.ipaddress)
if server_name is None:
server_name = common.netcmd_dnsname(lp)
- print net.time(server_name)
+ self.outf.write(net.time(server_name)+"\n")
except Exception, e:
raise CommandError("Failed to add user '%s': " % username, e)
- print("User '%s' created successfully" % username)
-
+ self.outf.write("User '%s' created successfully\n" % username)
class cmd_user_delete(Command):
samdb.deleteuser(username)
except Exception, e:
raise CommandError('Failed to remove user "%s"' % username, e)
- print("Deleted user %s" % username)
-
+ self.outf.write("Deleted user %s\n" % username)
class cmd_user_enable(Command):
samdb.enable_account(filter)
except Exception, msg:
raise CommandError("Failed to enable user '%s': %s" % (username or filter, msg))
- print("Enabled user '%s'" % (username or filter))
-
+ self.outf.write("Enabled user '%s'\n" % (username or filter))
class cmd_user_setexpiry(Command):
try:
samdb.setexpiry(filter, days*24*3600, no_expiry_req=noexpiry)
except Exception, msg:
- raise CommandError("Failed to set expiry for user '%s': %s" % (username or filter, msg))
- print("Set expiry for user '%s' to %u days" % (username or filter, days))
-
+ # FIXME: Catch more specific exception
+ raise CommandError("Failed to set expiry for user '%s': %s" % (
+ username or filter, msg))
+ self.outf.write("Set expiry for user '%s' to %u days\n" % (
+ username or filter, days))
class cmd_user_password(Command):
try:
net.change_password(password)
except Exception, msg:
+ # FIXME: catch more specific exception
raise CommandError("Failed to change password : %s" % msg)
- print "Changed password OK"
-
+ self.outf.write("Changed password OK\n")
class cmd_user_setpassword(Command):
force_change_at_next_login=must_change_at_next_login,
username=username)
except Exception, msg:
+ # FIXME: catch more specific exception
raise CommandError("Failed to set password for user '%s': %s" % (username or filter, msg))
- print "Changed password OK"
+ self.outf.write("Changed password OK\n")
git.samba.org / obnox / samba / samba-obnox.git / commitdiff