1
0
mirror of https://github.com/samba-team/samba.git synced 2025-04-29 14:50:26 +03:00

1435 Commits

Author SHA1 Message Date
Amitay Isaacs
e9f155f52d samba-tool: max() with key option is available in python >= 2.6
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-09-09 15:24:04 +10:00
Giampaolo Lauria
abd7368e76 samba-tool: Fixed "ldapcmp" command synopsis
Fixed "ldapcmp" command syntax

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-09-09 15:24:04 +10:00
Giampaolo Lauria
342146e0b4 samba-tool: Fixed "dbcheck" subcommand syntax
Fixed syntax for "dbcheck" subcommand

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-09-09 15:24:04 +10:00
Giampaolo Lauria
69a2e4b360 samba-tool: Moved _get_user_realm_domain fcn to common
_get_user_realm_domain is used by both delegation and spn commands

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-09-09 15:24:04 +10:00
Giampaolo Lauria
f4f77bb954 samba-tool: Fixed "testparm" syntax
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-09-09 15:24:04 +10:00
Giampaolo Lauria
dd3ebbffe8 samba-tool: Fixed "user" command syntax
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-09-09 15:24:04 +10:00
Giampaolo Lauria
59caf70824 samba-tool: Fixed "rodc" syntax
Remove options from syntax to be consistent w/ the rest of commands

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-09-09 15:24:03 +10:00
Giampaolo Lauria
4f26c52614 samba-tool: Fixed "ntacl" subcommands syntax
Removed options from syntax

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-09-09 15:24:03 +10:00
Giampaolo Lauria
87a6102c62 samba-tool: Fixed "group" subcommands syntax
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-09-09 15:24:03 +10:00
Giampaolo Lauria
4bf1bcfaeb samba-tool: Fixed "dsacl" command syntax
Removed option from syntax to be consistent w/ the rest of commands

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-09-09 15:24:03 +10:00
Giampaolo Lauria
54aa286b9a samba-tool: Fixed "drs" subcommands syntax
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-09-09 15:24:03 +10:00
Giampaolo Lauria
6a7679cdd4 samba-tool: Fixed "domain" subcommands syntax
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-09-09 15:24:03 +10:00
Giampaolo Lauria
de8e47a4e3 samba-tool: Fixed "spn" command syntax
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-09-09 15:24:02 +10:00
Giampaolo Lauria
8a6f3fc3b4 samba-tool: Fixed "delegation" command syntax
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-09-09 15:24:02 +10:00
Giampaolo Lauria
1081251516 samba-tool: Fixed "time" command synopsis
"server_name" is an optional parameter
added "options" parameter

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-09-09 15:24:02 +10:00
Giampaolo Lauria
62379dde23 samba-tool: Removed "acl" command
Removed "acl" command as it has been changed to:
"dsacl" and "ntacl"

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-09-09 15:24:02 +10:00
Giampaolo Lauria
6484e142dc samba-tool: Added "ntacl" command
Added "ntacl" command to substitute "acl nt" command

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-09-09 15:24:02 +10:00
Giampaolo Lauria
7a609d827e samba-tool: Added "dsacl" command
Added "dsacl" command to substitute "acl ds"

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-09-09 15:24:02 +10:00
Giampaolo Lauria
1a6a626a45 samba-tool: Changed fsmo implementation
Changed fsmo code to fit the object <action> model

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-09-09 15:24:01 +10:00
Giampaolo Lauria
ca30b9ff3e samba-tool: Expanded acronym descriptions
Expanded command acronym descriptions
Added footnote for "server connection needed"

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-09-09 15:24:01 +10:00
Giampaolo Lauria
ef01932fdb samba-tool: Formatted subcommand list output
Formatted output of subcommand list to be a function of the
max number of chars in the longest string

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-09-09 15:24:01 +10:00
Giampaolo Lauria
fb5e27e4c8 samba-tool: Moved command definition to sambatool command
Moved subcommand definition from __init__.py to cmd_sambatool class

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-09-09 15:24:01 +10:00
Giampaolo Lauria
e309c782ba samba-tool: Add long_description and epilog to Command class
long_description and epilog should now be defined for each command.
Their string value will be printed whenever the user invokes the
command w/ the -h or --help
long_desciption will be printed after the usage statement.
epilog will be printed after the options are defined

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-09-09 15:24:01 +10:00
Giampaolo Lauria
f5e173284a samba-tool: Redefined samba-tool as a SuperCommand
Removed MainCommand class as samba-tool is a SuperCommand
Redefined samba-tool as a SuperCommand
Fixed error handling in SuperCommand _run

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-09-09 15:24:01 +10:00
Giampaolo Lauria
02650acac3 samba-tool: Removed SuperCommand usage method
Removed usage method as it is not being used anywhere

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-09-09 15:24:00 +10:00
Giampaolo Lauria
0f580c0705 samba-tool: Removed attribute name from Command class
Removed name as it is not used anywhere
Moved all the attributes on top of the class declaration

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-09-09 15:24:00 +10:00
Amitay Isaacs
4688b3ca60 s4-test: name attribute remove from Command class, so test not required
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-09-09 15:24:00 +10:00
Andrew Bartlett
b8aa4e513c s4-s3-upgrade do not convert min password length as a time
Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Fri Sep  9 01:53:55 CEST 2011 on sn-devel-104
2011-09-09 01:53:55 +02:00
Amitay Isaacs
7800a501cd s4-provision: Fill msDS-NC-Replica-Locations attribute in DNS provisioning
This attribute is required by the hosting requirement.
[MS_ADTS].pdf 7.1.2.3.1 DC and Application NC Replica

Signed-off-by: Andrew Bartlett <abartlet@samba.org>

Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Thu Sep  8 02:04:51 CEST 2011 on sn-devel-104
2011-09-08 02:04:51 +02:00
Amitay Isaacs
c212abe83f s4-provision: Make DNS entries consistent with dns_update script
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-09-08 00:35:37 +02:00
Amitay Isaacs
4b5ebfc5ff s4-provision: Reworked DNS provisioning to support AD DNS schema
This changes configure DNS partitions used by AD DNS and populate
with relevant entries. This has an advantage that Windows can
replicate these partitions and set up dns server using them.

In addition, these partitions are used by bind9_dlz module to query
zone information directly and do not need to create text database
for dynamic zones.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-09-08 00:35:37 +02:00
Amitay Isaacs
595b9c4cc6 s4-provision: Add DNS backend option to provision
This option is introduced temporarily to test bind9 backend with
and without dlz_dlopen module.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-09-08 00:35:37 +02:00
Andrew Bartlett
c640e9235f s4-s3-upgrade: convert password age policies to the negative NTTIME format
This previously caused all accounts to be locked out.

Andrew Bartlett

Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Wed Sep  7 13:44:44 CEST 2011 on sn-devel-104
2011-09-07 13:44:44 +02:00
Amitay Isaacs
47f7e3c525 samba-tool: Add --filter option to ldapcmp to ignore specified attributes 2011-09-07 12:16:40 +02:00
Andrew Bartlett
a9a3a79767 s4-s3-upgrade Handle expected errors, error out on unexpected ones
Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Wed Sep  7 02:22:56 CEST 2011 on sn-devel-104
2011-09-07 02:22:56 +02:00
Andrew Bartlett
02da47d75c s4-s3-upgrade Fix group member addition 2011-09-07 08:44:35 +10:00
Andrew Tridgell
17fa96b64a s4-samdb: added a few function comments for pydoc
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
2011-09-05 11:19:25 +02:00
Andrew Tridgell
957e1ed2a7 s4-provision: these substitutuons are not used any more
we now create partitions dynamically

Pair-Programmed-With: Amitay Isaacs <amitay@gmail.com>
2011-09-05 11:19:25 +02:00
Andrew Bartlett
5422db82e3 s4-s3-upgrade Fix error handling in add_users_to_group 2011-09-05 11:19:25 +02:00
Andrew Bartlett
1316bc4b08 s4-provision handle a number of invalid but real-world upgrade cases
Real world databass have the wrong account flags (U and W at the same time) and have the wrong
group type in group mapping databases.  Cope with these.

Andrew Bartlett

Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Mon Sep  5 04:58:09 CEST 2011 on sn-devel-104
2011-09-05 04:58:09 +02:00
Andrew Bartlett
4a9f5d759f s4-provision Fix type error on existing idmap entries in s3 upgrade
This is already a DN object.

Andrew Bartlett
2011-09-05 11:25:38 +10:00
Andrew Bartlett
3d05a0856f s4-provision Use ProvisioningError and the eadb
The eadb flag tells us to avoid using system extended attributes, typcially if we
are not running as root (ie, in a test environment).

The ProvisioningError class allows us to return failures to the upgrade_from_s3 script
which can then be detected correctly by the selftest framework.

Andrew Bartlett
2011-09-05 11:25:38 +10:00
Andrew Bartlett
389cb93450 s4-provision Allow a missing idmap DB in upgrade.py
Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Sun Sep  4 06:34:16 CEST 2011 on sn-devel-104
2011-09-04 06:34:16 +02:00
Andrew Bartlett
329ec81288 s4-provision cope with SID_NAME_WKN_GRP mappings in upgrade.py
Some incorrect LDAP backends have entries with this group type, but
due to the pdb_ldap code, we cannot read the group members, and we
already skip them in add_group_from_mapping_entry().

Andrew Bartlett
2011-09-04 13:00:10 +10:00
Andrew Tridgell
8ab3c843b1 pyldb: added OID_COMPARATOR constants
This also changes the other constants to remove the LDB_ prefix, which
is redundent

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
2011-09-01 15:23:09 +10:00
Andrew Bartlett
607d7c5cdf s4-provision Use samba.dns_name_to_dn 2011-08-26 14:06:07 +02:00
Amitay Isaacs
099b9db404 py-samba3-test: Copy sample database in tempdir before running test
Samba3 python module using passdb api modifies the database files, to
upgrade them to latest version. So copy the sample database before
running tests on it.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>

Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Fri Aug 26 07:04:15 CEST 2011 on sn-devel-104
2011-08-26 07:04:15 +02:00
Amitay Isaacs
76ff9bffd8 s3_upgrade: Set lock directory to correct directory
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-08-26 10:07:36 +10:00
Amitay Isaacs
eebb37c9b2 py-samba3-test: Set lock directory to the datadir
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-08-26 10:07:28 +10:00
Amitay Isaacs
d8465f2a91 s3_upgrade: Update commandline options and use updated samba3 python module
upgrade_from_s3 script now requires samba3 configuration file and target
directory for samba4 database. In addition, it either uses --libdir option
or --testparm option to correctly guess the paths for samba3 databases
(private dir and state directory).

Usage: upgrade_from_s3 [options] <configuration_file> <targetdir>

Input arguments are:
  <configuration_file> - path to existing smb.conf
  <targetdir>          - directory in which samba4 database will be created

In addition, specify either samba3 database directory (with --libdir) or
samba3 testparm utility (with --testparm).

Before using passdb interface, initialize s3 loadparm context using
correct path settings for private dir and state directory.

Export account policy from s3 to s4.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-08-26 10:06:33 +10:00