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

1474 Commits

Author SHA1 Message Date
Andrew Tridgell
f79d6ee929 s4-provision: use get_config_basedn() in DNS setup
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
2011-09-19 10:57:03 +10:00
Andrew Tridgell
579fd43057 samba-tool: use get_config_basedn() to get configuration NC DN
this allows these commands to work for subdomains

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
2011-09-19 10:57:03 +10:00
Andrew Bartlett
aa960d8fa7 s4-provision Add initial support for joining as a new subdomain
To do this we need to reorganise a lot of the provision code, so that
we can create the framework for the inbound replicaton of the config
and schema partitions and then add in the new subdomain locally.

Andrew Bartlett
2011-09-19 10:57:02 +10:00
Matthias Dieter Wallnöfer
4117c29138 s4:upgrade_from_s3 - old s3 versions < 3.4.x don't have a "state directory" param
Hence the "lock directory" path has to be used instead.

Autobuild-User: Matthias Dieter Wallnöfer <mdw@samba.org>
Autobuild-Date: Fri Sep 16 00:07:30 CEST 2011 on sn-devel-104
2011-09-16 00:07:30 +02:00
Andrew Bartlett
c6cf070df0 s4-s3-upgrade Improve samba-tool domain samba3upgrade behaviour
The --realm argument is again optional (the previous code would take the default
from the default smb.conf, not the one specified) and --targetdir is now a
named argument much like it is to provision.

We now test the --testparm option to ensure it behaves the way we expect.

Andrew Bartlett

Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Tue Sep 13 16:30:31 CEST 2011 on sn-devel-104
2011-09-13 16:30:31 +02:00
Matthias Dieter Wallnöfer
4e87a8419c s4:upgrade_from_s3 - restore "get_testparm_var" method
This has accidentally been removed by commit 8268c2d4e231b05b439bc70331b75342b35daa4e.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-09-13 14:53:24 +02:00
Andrew Tridgell
94886797bc s4-subdomain: match windows form for trustAuthInOutBlob
Windows does not put a version element in the array

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
2011-09-13 15:38:35 +10:00
Andrew Tridgell
588c50f11e s4-subdomain: fixed domain guid choice for subdomain join
We need to use the domain GUID that the server choose in the ncName
link

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
2011-09-13 15:38:35 +10:00
Andrew Tridgell
877e48cac8 s4-subdomain: don't delete account DN not created in subdomain join
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
2011-09-13 15:38:35 +10:00
Andrew Tridgell
b8c6e36b09 s4-subdomain: use a password length of 128
windows seems to use a fixed size for this password. It is possible
that windows servers can only handle one size, given we have observed
some strange behaviour from the windows kdc when we setup trusts

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
2011-09-13 15:38:35 +10:00
Andrew Tridgell
4ff99264cb s4-join: fixed non-subdomain join
these two vars need to be initialised for general join

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
2011-09-13 15:38:34 +10:00
Andrew Tridgell
eb0060766f s4-subdomain: fixed invocationID and hostIPs in subdomain join
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
2011-09-13 15:38:34 +10:00
Andrew Bartlett
8c33036a37 s4-subdomain more work on sub-domain join
we can now create a subdomain of an existing windows domain using:

  samba-tool domain join sub.domain.dns.name subdomain

The ordering of the creation of the key records is quite tricky,
especially for the NTDSDSA object

Pair-Programmed-With: Andrew Tridgell <tridge@samba.org>
2011-09-13 15:38:02 +10:00
Andrew Bartlett
dd9138d9c6 s4-join Add a partitions DN when we join a subdomain 2011-09-13 15:37:12 +10:00
Andrew Bartlett
c271b71420 s4-provision Perform 'modify' operations as system
We need this so that we can modify the cn=configuration partition when
we are setting up a new subdomain.

The serverReference on our ${SERVERDN} is in that partition, and
without this change creating a new subdomain fails due to ACLs.

Andrew Bartlett
2011-09-13 15:37:12 +10:00
Andrew Bartlett
840448eae8 s4-join supply the NTDS GUID to the provision
Unlike other join operations, the creation of a subdomain makes local
changes to the DB, so we need to pass in the NTDS GUID to ensure the
one set on the object created in the parent domain is the one that is
used.

Andrew Bartlett
2011-09-13 15:37:12 +10:00
Andrew Bartlett
846e342648 s4-provision Split addition of users and well known principals
If we are provisioning a subdomain, then these are already in
cn=configuration.

Andrew Bartlett
2011-09-13 15:37:12 +10:00
Andrew Bartlett
6635bb70d3 s4-provision Add initial support for joining as a new subdomain
To do this we need to reorganise a lot of the provision code, so that
we can create the framework for the inbound replicaton of the config
and schema partitions and then add in the new subdomain locally.

Andrew Bartlett
2011-09-13 15:37:11 +10:00
Jelmer Vernooij
0ee22a2dec s4-python: Fix some formatting issues.
Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Tue Sep 13 03:51:13 CEST 2011 on sn-devel-104
2011-09-13 03:51:13 +02:00
Jelmer Vernooij
df1d3dc777 s4-python: Consistently use spaces rather than tabs, fix headers in several places. 2011-09-13 02:24:03 +02:00
Jelmer Vernooij
b4c4a2d0f9 Add samba.tests.source, which checks Python files for copyright lines, license headers and invalid characters (dos newlines, tabs). 2011-09-13 02:24:03 +02:00
Jelmer Vernooij
762102f054 testparm.py: Use standard formatting of header. 2011-09-13 02:24:03 +02:00
Jelmer Vernooij
62670d43b8 group.py: Remove tab characters. 2011-09-13 02:24:03 +02:00
Jelmer Vernooij
375a92c302 drs.py: Remove tab characters. 2011-09-13 02:24:03 +02:00
Jelmer Vernooij
4c7acab5fc domain.py: Remove tab characters. 2011-09-13 02:24:03 +02:00
Jelmer Vernooij
dc26067a6f delegation.py: Remove tab characters. 2011-09-13 02:24:03 +02:00
Jelmer Vernooij
1fcce6bd3f drs_utils.py: Remove tab characters. 2011-09-13 02:24:03 +02:00
Amitay Isaacs
e223a65b10 samba-tool: Add "domain samba3upgrade" subcommand
Added new command to upgrade from samba3 to samba4.

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-09-12 20:42:21 +10:00
Amitay Isaacs
c7b1f156bb s4-s3-upgrade: Check for duplicate sids before provisioning
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-09-12 20:42:20 +10:00
Amitay Isaacs
662818b123 s4-provision: Fix the informational message from dns provisioning
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-09-12 20:42:19 +10:00
Amitay Isaacs
c7c29a3523 s4-provision: Create private dir for dns in a separate function
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-09-12 20:42:18 +10:00
Amitay Isaacs
c6a40942b2 s4-s3-upgrade: Check for common user/group names before provisioning
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-09-12 20:42:17 +10:00
Amitay Isaacs
0b089880f0 s4-provision: Generate appropriate named.conf file depending on dns_backend
For --dns_backend=BIND9, generate the dns zone file, and named.conf with
zone information.

For --dns-backend=BIND9_DLZ, generate the named.conf with dlz directive.

If no option is specified, default dns_backend is BIND9.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-09-12 20:42:16 +10:00
Amitay Isaacs
295361c13d s4-provision: Remove dupliate creation of dns/spn_update_list files
dns_update_list and spn_update_list are set up using
create_dns_update_list() function.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-09-12 20:42:15 +10:00
Matthias Dieter Wallnöfer
6f4264a72e s4:samba-tool/domain.py - rename arguments "domain" -> "domain-level", "forest" -> "forest-level"
This should clarify the scope of them.

Reviewed-by: Jelmer

Autobuild-User: Matthias Dieter Wallnöfer <mdw@samba.org>
Autobuild-Date: Sun Sep 11 20:12:52 CEST 2011 on sn-devel-104
2011-09-11 20:12:52 +02:00
Matthias Dieter Wallnöfer
7e460a04f7 s4:samba-tool/domain.py - restore domain raise functionality
The samba-tool command has accidentally been damaged by commit
2d4988c3d79e501003875cd26b7f9aaa72402b31.

Reviewed-by: Jelmer
2011-09-11 17:33:12 +02:00
Andrew Bartlett
47130f97fd s4-s3-upgrade Do not use python 2.6 style exceptions
Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Fri Sep  9 08:54:16 CEST 2011 on sn-devel-104
2011-09-09 08:54:16 +02:00
Amitay Isaacs
46754e9665 samba-tool: epilog option to OptionParser available in python >= 2.6
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-09-09 15:24:05 +10:00
Amitay Isaacs
4d0ead86e1 samba-tool: Provide feedback if synopsis is not defined for a command
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-09-09 15:24:05 +10:00
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