1
0
mirror of https://github.com/samba-team/samba.git synced 2025-04-30 18:53:31 +03:00

71 Commits

Author SHA1 Message Date
Matthias Dieter Wallnöfer
05f9495ff3 s4:join python code - "msDS-KeyVersionNumber" does not exist on Win2k
No problem since "secretsdb_self_join()" then chooses 1 as a default
value.
Fix case sensitivity for "msDS-KeyVersionNumber".

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2012-02-13 09:49:20 +11:00
Matthias Dieter Wallnöfer
fa1c71382d s4:join python code - perform a fallback password set operation over libnet
Windows 2000 DCs allow LDAP password set operations only with the help of SSL.
Given the fact that this technique is hard to setup it is easier to use SAMR
over "libnet".

Reviewed-By: Andrew Bartlett <abartlet@samba.org>
2012-02-09 00:27:08 +01:00
Matthias Dieter Wallnöfer
36e5526685 s4:join python code - write the SAM account name correctly
It is easier for the comprehension

Reviewed-By: Andrew Bartlett <abartlet@samba.org>
2012-02-09 00:27:08 +01:00
Amitay Isaacs
1f0298dd1b python: Change except: statement to except Exception:
This way we only catch true exceptions and keyboard interrupts
are not caught here.

Autobuild-User: Amitay Isaacs <amitay@samba.org>
Autobuild-Date: Tue Jan 24 03:32:40 CET 2012 on sn-devel-104
2012-01-24 03:32:40 +01:00
Matthieu Patou
f6435b734a s4-join: replicate first with DRS_CRITICAL_ONLY and DRS_GET_ANC objects for the base dn partition
Windows dcpromo do the same: getncchanges with DRS_GET_ANC and
DRS_CRITICAL_ONLY, then it does a getncchanges without those flags for
the rest.

Signed-off-by: Andrew Tridgell <tridge@samba.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
2011-12-19 11:49:18 +01:00
Stefan Metzmacher
162975a6f3 s4:python/samba/join: set msDS-Behavior-Version to '4' 2008_R2 on the nTDSA object
This matches the values we set in provision.

metze

Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Mon Dec 12 19:16:13 CET 2011 on sn-devel-104
2011-12-12 19:16:13 +01:00
Matthieu Patou
fc42b0ab41 s4-python: factorize the definition of get_dsServiceName 2011-12-05 18:23:07 +01:00
Stefan Metzmacher
4edbc719e5 s4:python/samba/join.py: add optional 'machinepass' parameter to join_*()
metze
2011-11-29 09:21:25 +01:00
Stefan Metzmacher
948f091a22 s4:python/samba/join.py: add optional 'machinepass' parameter to class dc_join
metze
2011-11-29 09:21:25 +01:00
Amitay Isaacs
1e935d1bdc s4-provision: Make BIND9_DLZ as the default backend for DNS 2011-11-29 16:00:36 +11:00
Matthias Dieter Wallnöfer
179bf9b51c s4:libnet/py_net.c: "py_net_finddc" - add an "address" parameter
This is useful for a new "samba-tool domain info" command.

Patch inspired by Matthieu Patou.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
2011-11-26 10:34:58 +01:00
Matthias Dieter Wallnöfer
0e5f8634fc s4:join.py - fix typo 2011-11-15 21:01:36 +01:00
Matthias Dieter Wallnöfer
f4a07f0b81 s4:join.py - fix up "DsAddEntry" against Windows Server 2000
It is important to consider the result level regarding error
information. Windows 2000 seems to send us back v2, all other
implementations v3. Consider post "Joining W2k AD domain"

Reviewed-by: abartlet

Autobuild-User: Matthias Dieter Wallnöfer <mdw@samba.org>
Autobuild-Date: Wed Nov  9 23:37:08 CET 2011 on sn-devel-104
2011-11-09 23:37:08 +01:00
Jelmer Vernooij
1ad05d8c09 Some formatting fixes, remove unused imports.
Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Sun Nov  6 06:22:33 CET 2011 on sn-devel-104
2011-11-06 06:22:33 +01:00
Matthieu Patou
d95826c218 s4-join: Send ReplicaUpdateRefs at the end of the join 2011-11-01 17:26:51 +01:00
Matthieu Patou
3cdfcb9394 s4-domain-join: do not add DFSR entries when joining, this should be done in the code handling DFSR replication 2011-11-01 17:26:51 +01:00
Kai Blin
8c076862ad s4 provision: DNS backend should be set by caller
Autobuild-User: Kai Blin <kai@samba.org>
Autobuild-Date: Mon Oct 17 09:51:12 CEST 2011 on sn-devel-104
2011-10-17 09:51:12 +02:00
Andrew Tridgell
6b5d8e02f7 s4-subdomain: create trust record with forest root DC
when we create a sub-subdomain we need to use the forest naming master
to setup the partition changes for the new subdomain. We also need to
setup the trust with the forest root, as that allows us to create the
needed _msdcs DNS entries in the forest

Autobuild-User: Andrew Tridgell <tridge@samba.org>
Autobuild-Date: Tue Oct  4 07:40:59 CEST 2011 on sn-devel-104
2011-10-04 07:40:59 +02:00
Andrew Tridgell
fb937afbec s4-join: enable cleanup on failed join
if a join fails, then cleanup the old records
2011-10-04 15:08:57 +11: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
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
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
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
Andrew Tridgell
32c5e3b204 s4-join: fixed DNS hostname
we need the local hostname, not the remote name
2011-08-25 07:39:39 +10:00
Andrew Tridgell
68100e5a21 s4-join: setup DNS forest name on join context 2011-08-25 07:39:39 +10:00
Stefan Metzmacher
5d6b848394 s4:py/samba/join: add domain_critical_only=False to join_DC/join_RODC
metze

Signed-off-by: Andrew Tridgell <tridge@samba.org>
2011-08-12 12:39:05 +02:00
Andrew Tridgell
bb6214d634 s4-join: make dsServiceName a GUID in @ROOTDSE on join
when joining another domain as a DC we should setup our dsServiceName
in @ROOTDSE to be a GUID so we can cope with later server renames

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
2011-08-12 04:00:07 +02:00
Andrew Tridgell
03f92508ef samba-tool: use ldb.binary_encode() on search expression elements
this allows us to deal with search elements containing characters that
must be escaped in LDAP

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Pair-Programmed-With: Amitay Isaacs <amitay@gmail.com>
2011-07-29 18:17:44 +10:00
Matthieu Patou
c2ac7473f3 s4-python: raise an error if unable to bind remote ldap while joining 2011-05-17 00:31:09 +02:00
Andrew Tridgell
6d0be9e3d1 s4-test: fixed a problem with very verbose NDR debug
lp.get("log level") returns a string, not an integer. It needs to be
cast to an integer for comparison with a number

Autobuild-User: Andrew Tridgell <tridge@samba.org>
Autobuild-Date: Wed Apr  6 08:58:05 CEST 2011 on sn-devel-104
2011-04-06 08:58:05 +02:00
Andrew Bartlett
d1e5a73806 s4-provision Remove setup_path, setup_dir and find_setup_dir
We now have a reliable way to know the current location of the
templates: dyn_SETUPDIR, which is updated for both the in-build and
installed binaries.

This replaces the function arguments and the distributed resolution of
the setup directory with one 'global' function (imported as required).

This also removes the ability to specify an alternate setup directory
on the command line, as this was rarely if ever used and never tested.

Andrew Bartlett
2011-02-07 13:22:01 +11:00
Jelmer Vernooij
b44fe4e3bb Use new style objects. 2011-01-06 15:21:21 +01:00
Jelmer Vernooij
186c3474c4 join: Properly cancel transaction on exceptions. 2010-12-15 16:40:59 +01:00
Andrew Tridgell
8c59bbd757 s4-join: fixed exception handling in join command 2010-11-29 18:04:42 +11:00
Jelmer Vernooij
eb5a8e29cf s4-python: Some reformatting for the purpose of pydoctor. 2010-11-28 17:23:28 +01:00
Andrew Tridgell
5b3981acb1 s4-rodc: enable the DRS_GET_ALL_GROUP_MEMBERSHIP flag for RODC replication
see the description of this flag in [MS-DRSR]
2010-11-18 23:12:26 +01:00
Andrew Tridgell
96e55cb132 s4-join: initially disable the machine account
enable after a password is set
2010-11-18 23:12:26 +01:00
Andrew Tridgell
5524822a72 s4-join: fixed join to w2k3
w2k3 does need msDS-Behavior-Version
2010-11-17 11:30:07 +11:00
Andrew Tridgell
a82bc073e2 s4-join: show a reasonable error on DsAddEntry() failing
DsAddEntry() gives errors in a reply container
2010-11-17 11:30:07 +11:00
Andrew Tridgell
3f9c97dbc5 s4-join: enable NDR printing at debug levels >= 5
this is handy for debugging joins
2010-11-17 11:30:07 +11:00
Andrew Tridgell
6ff009cacc s4-join: not all versions of w2003 have msDS-SupportedEncryptionTypes
Autobuild-User: Andrew Tridgell <tridge@samba.org>
Autobuild-Date: Mon Nov 15 22:28:16 UTC 2010 on sn-devel-104
2010-11-15 22:28:16 +00:00
Andrew Tridgell
81c9b98ecd s4-join: use the command line loadparm in provision during a join
this allows a join with an empty smb.conf to override locations of
files correctly with --option

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
2010-11-11 02:57:04 +00:00
Andrew Tridgell
13020349e1 s4-join: raise mininum password length to 32 in new join code 2010-11-10 09:53:18 +11:00