sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-09 09:57:48 +03:00
Code
106,763 Commits 62 Branches 1,150 Tags
Commit Graph

106763 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Günther Deschner
1714d0cfa2 vfs_fruit: add fruit:model = <modelname> parametric option 
fruit:model = iMac
fruit:model = MacBook
fruit:model = MacPro
fruit:model = Xserve

will all display a different icon inside Finder.

Formerly, we used "Samba" which resulted in a "?" icon in Finder, with
the new default "MacSamba" we appear with a computer box icon at least.

Guenther

Bug: https://bugzilla.samba.org/show_bug.cgi?id=12840

Signed-off-by: Guenther Deschner <gd@samba.org>
Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>

Autobuild-User(master): Günther Deschner <gd@samba.org>
Autobuild-Date(master): Wed Jul 12 03:17:57 CEST 2017 on sn-devel-144

(cherry picked from commit 259e1706e3206b215e136ea9d5beef4c9e3fcdee)
 2017-07-23 22:25:23 +02:00
Dustin L. Howett via samba-technical
1ec8c4ab07 idmap_ad: Retry query_user exactly once if we get TLDAP_SERVER_DOWN 
All other ldap-querying methods in idmap_ad make a single retry attempt if they get
TLDAP_SERVER_DOWN. This patch brings idmap_ad_query_user in line with that design.

This fixes the symptom described in 12720 at the cost of an additional reconnect per
failed lookup.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12720

Signed-off-by: Dustin L. Howett <dustin@howett.net>
Reviewed-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

(cherry picked from commit fe7020b0d1b6fe1ca9add4815e20c2e2262cb6c9)
 2017-07-23 22:25:23 +02:00
Bob Campbell
73550d1e30 selftest: Do not force run of kcc at start of selftest 
This should help to avoid clashes between periodic and manual runs of
the KCC during autobuild.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12869

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>

Signed-off-by: Bob Campbell <bobcampbell@catalyst.net.nz>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
(cherry picked from commit c0a7d2bacdacc7a43e04f3b450ea069c000b3d8d)

Autobuild-User(v4-6-test): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(v4-6-test): Thu Jul 20 01:54:41 CEST 2017 on sn-devel-144
 2017-07-20 01:54:41 +02:00
Stefan Metzmacher
9251372348 selftest:Samba3: call "net primarytrust dumpinfo" setup_nt4_member() after the join 
Here we check that we get 'REDACTED SECRET VALUES' printed, in order
to avoid regression on the non '-f' behavior.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12782

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit 9530284383f252efd64bfdf138579964c6500eba)

Autobuild-User(v4-6-test): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(v4-6-test): Fri Jul 14 00:00:12 CEST 2017 on sn-devel-144
 2017-07-14 00:00:12 +02:00
Stefan Metzmacher
dd573c0b2e s3:secrets: remove unused secrets_store_[prev_]machine_password() 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12782

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit f513c20ee04fe896900c99ae804753d445414d7d)
 2017-07-13 20:01:29 +02:00
Stefan Metzmacher
d71aa30b0e s3:libads: make use of secrets_*_password_change() in ads_change_trust_account_password() 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12782

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit b874dc90c91dd41c35e99bf7c4fe04220465edca)
 2017-07-13 20:01:29 +02:00
Stefan Metzmacher
15a7a36f9f net: make use of secrets_*_password_change() for "net changesecretpw" 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12782

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit 4ae6a3ffb233c9b9576a3b5bb15a51ee56e4dbc3)
 2017-07-13 20:01:29 +02:00
Stefan Metzmacher
13a2325722 s3:trusts_util: make use the workstation password change more robust 
We use secrets_{prepare,failed,defer,finish}_password_change() to make
the process more robust.

Even if we just just verified the current password with the DC
it can still happen that the remote password change will fail.

If a server has the RefusePasswordChange=1 under
HKLM\SYSTEM\CurrentControlSet\Services\Netlogon\Parameters,
it will reject NetrServerPasswordSet2() with NT_STATUS_WRONG_PASSWORD.

This results in a successful local change, but a failing remote change,
which means the domain membership is broken (as we don't fallback to
the previous password for ntlmssp nor kerberos yet).

An (at least Samba) RODC will also reject a password change,
see https://bugzilla.samba.org/show_bug.cgi?id=12773.

Even with this change we still have open problems, e.g. if the password was
changed, but we didn't get the servers response. In order to fix that we need
to use only netlogon and lsa over unprotected transports, just using schannel
authentication (which supports the fallback to the old password).

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12782

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit 40c42af11fda062fef9df96a9b5ae3e02709f07c)
 2017-07-13 20:01:29 +02:00
Stefan Metzmacher
de1faa7c09 s3:libnet: make use of secrets_store_JoinCtx() 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12782

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit c3ad8be5d5192070c599350d6ab28c064206b6cf)
 2017-07-13 20:01:29 +02:00
Stefan Metzmacher
56403c73c4 net: add "net primarytrust dumpinfo" command that dumps the details of the workstation trust 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12782

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit c7c17d9f503d6037aa8ed0bd7ab7cf52f5f28382)
 2017-07-13 20:01:29 +02:00
Stefan Metzmacher
835cc1271a s3:secrets: add infrastructure to use secrets_domain_infoB to store credentials 
We now store various hashed keys at change time and maintain a lot of details
that will help debugging failed password changes.

We keep storing the legacy values:
 SECRETS/SID/
 SECRETS/DOMGUID/
 SECRETS/MACHINE_LAST_CHANGE_TIME/
 SECRETS/MACHINE_PASSWORD/
 SECRETS/MACHINE_PASSWORD.PREV/
 SECRETS/SALTING_PRINCIPAL/DES/

This allows downgrades to older Samba versions.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12782

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit 5f0038fba612afd7fc15b7ab321df979891170d8)
 2017-07-13 20:01:29 +02:00
Stefan Metzmacher
cc67ccbe74 secrets.idl: add secrets_domain_info that will be used in secrets.tdb for machine account trusts 
This blob will be store in secrets.tdb. It makes it possible to store much
more useful details about the workstation trust.

The key feature that that triggered this change is the ability
to store details for the next password change before doing
the remote change. This will allow us to recover from failures.

While being there I also thought about possible new features,
which we may implement in the near future.

We also store the raw UTF16 like cleartext buffer as well as derived
keys like the NTHASH (arcfour-hmac-md5 key) and other kerberos keys.
This will allow us to avoid recalculating the keys for an in memory
keytab in future.

I also added pointer to an optional lsa_ForestTrustInformation structure,
which might be useful to implement multi-tenancy in future.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12782

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit a59c9cba31a801d90db06b767cfd44776f4ede77)
 2017-07-13 20:01:29 +02:00
Stefan Metzmacher
d80ef0b640 netlogon.idl: use lsa_TrustType and lsa_TrustAttributes in netr_trust_extension 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12782

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit 28ac10503476de3c000b3deee2c1f67e0b305578)
 2017-07-13 20:01:29 +02:00
Stefan Metzmacher
59e23da940 netlogon.idl: make netr_TrustFlags [public] 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12782

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit 60274475332dafdfb829a7c086ea09cd9ed00540)
 2017-07-13 20:01:29 +02:00
Stefan Metzmacher
b7e7ac3b55 lsa.idl: make lsa_DnsDomainInfo [public] 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12782

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit ea0798881a7aaf5897a3a3806149536d3d54fc3b)
 2017-07-13 20:01:29 +02:00
Stefan Metzmacher
fc985740bb s3:trusts_util: also pass the previous_nt_hash to netlogon_creds_cli_auth() 
Even in the case where only the password is known to the server, we should
try to leave a valid authentication behind.

We have better ways to indentify which password worked than only using
the current one.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12782

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit d60404b032eca5384d889352f52b9b129861b4af)
 2017-07-13 20:01:29 +02:00
Stefan Metzmacher
f7c05a3992 libcli/auth: pass the cleartext blob to netlogon_creds_cli_ServerPasswordSet*() 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12782

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit 0f5945a06df4bef501ca5085c621294057007225)
 2017-07-13 20:01:28 +02:00
Stefan Metzmacher
5d566127b5 libcli/auth: add const to set_pw_in_buffer() 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12782

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit 1b48c8515ed8fd29204c82cc47f958f4636cd494)
 2017-07-13 20:01:28 +02:00
Stefan Metzmacher
29fa1791a3 libcli/auth: pass an array of nt_hashes to netlogon_creds_cli_auth*() 
This way the caller can pass more than 2 hashes and can only
know which hash was used for a successful connection.

We allow up to 4 hashes (next, current, old, older).

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12782

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit ddd7ac68ccae8b4df6c6a65b3dad20e21924f538)
 2017-07-13 20:01:28 +02:00
Stefan Metzmacher
d41f361e86 s3:trusts_util: pass dcname to trust_pw_change() 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12782

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit 1421abfc733247a6b71eefd819dfeae7151a6d78)
 2017-07-13 20:01:28 +02:00
Stefan Metzmacher
324af7571c s3:secrets: use secrets_delete for all keys in secrets_delete_machine_password_ex() 
We just want all values to be removed at the end, it doesn't matter
if they didn't existed before.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12782

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit bfe35abc1fb15e70a99fa74d064051a1ad541ed0)
 2017-07-13 20:01:28 +02:00
Stefan Metzmacher
748172221a s3:secrets: let secrets_delete_machine_password_ex() also remove the des_salt key 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12782

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit dfaadc81925e313901c9b30cd98a4b4fd2404f9d)
 2017-07-13 20:01:28 +02:00
Stefan Metzmacher
36ae6bcf40 s3:secrets: let secrets_delete_machine_password_ex() remove SID and GUID too 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12782

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit cf8a4646fe71a974b6a5ee13ae7d7751a5a0adc9)
 2017-07-13 20:01:28 +02:00
Stefan Metzmacher
fc8506dcf9 s3:secrets: rewrite secrets_delete_machine_password_ex() using helper variables 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12782

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit 5bc2764fe517748c03a57b61f2f7ef889c92825d)
 2017-07-13 20:01:28 +02:00
Stefan Metzmacher
bce615d2e3 s3:secrets: replace secrets_delete_prev_machine_password() by secrets_delete() 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12782

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit 5b95cb74e7b2838d228f9773c0e20982b81d1e7d)
 2017-07-13 20:01:28 +02:00
Stefan Metzmacher
c54cf09ea1 s3:secrets: let secrets_store_machine_pw_sync() delete the des_salt_key when there's no value 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12782

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit 45eea321a6faa6db1c9c706a27527cc0766dc831)
 2017-07-13 20:01:28 +02:00
Stefan Metzmacher
dd0f49a6d3 s3:secrets: make use of secrets_delete() in secrets_store_machine_pw_sync() 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12782

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit c5ded1123797b2bd152b0989e24eba7cae6a5792)
 2017-07-13 20:01:28 +02:00
Stefan Metzmacher
4e649f7a41 s3:secrets: re-add secrets_delete() helper to simplify deleting optional keys 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12782

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit fde4af1c329655d7ef3f55727632b3f026a3ea73)
 2017-07-13 20:01:28 +02:00
Stefan Metzmacher
45ed7f3393 s3:secrets: rename secrets_delete() to secrets_delete_entry() 
secrets_delete_entry() fails if the key doesn't exist.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12782

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit cd1e888773c4fd3db63ce38a496fc3d54eb8e021)
 2017-07-13 20:01:28 +02:00
Stefan Metzmacher
e67bc70a04 s3:secrets: make use of des_salt_key() in secrets_store_machine_pw_sync() 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12782

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit 4e37d7805b345d80ca6e8a598e39fc81f72a27ce)
 2017-07-13 20:01:28 +02:00
Stefan Metzmacher
f8dc7f36c0 s3:secrets: add some const to secrets_store_domain_guid() 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12782

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit 99013685a1114829579e420df3625ed79eb7ee94)
 2017-07-13 20:01:28 +02:00
Stefan Metzmacher
f29745546d s3:secrets: split out a domain_guid_keystr() function 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12782

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit d37e30cef7906b7b2b14351ad81d0d884811557b)
 2017-07-13 20:01:28 +02:00
Stefan Metzmacher
3341df2252 s3:secrets: rework des_salt_key() to take the realm as argument 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12782

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit 072dd87e639d7dbfc583ede5ddf6559d9d433b8b)
 2017-07-13 20:01:27 +02:00
Stefan Metzmacher
cfba2c40d3 s3:secrets: move kerberos_secrets_*salt related functions to machine_account_secrets.c 
These don't use any krb5_context related functions and they just
work on secrets.tdb, so they really belong to machine_account_secrets.c.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12782

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit 504b446d8dc7410ad63eba9d214e9cf271cf3b2f)
 2017-07-13 20:01:27 +02:00
Stefan Metzmacher
f68f8f6353 s3:libads: remove unused kerberos_fetch_salt_princ_for_host_princ() 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12782

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit 1a26805ad9f19f02a52d9eaa4f2f11ff20ee76ac)
 2017-07-13 20:01:27 +02:00
Stefan Metzmacher
0ce8cd86b8 s3:libads: make use of kerberos_secrets_fetch_salt_princ() in ads_keytab_add_entry() 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12782

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit b0928a2687a9ffe92ebdce7b5252781d62e7e02d)
 2017-07-13 20:01:27 +02:00
Stefan Metzmacher
bf90563935 s3:libnet: make use of kerberos_secrets_fetch_salt_princ() 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12782

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit 51ae7b42d4d52016b39b79447a3e28d473e676cb)
 2017-07-13 20:01:27 +02:00
Stefan Metzmacher
14add2cc7b s3:gse_krb5: simplify fill_keytab_from_password() by using kerberos_fetch_salt_princ() 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12782

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit 1d1cf9792f9227e65857c85ff66a961331e3c16e)
 2017-07-13 20:01:27 +02:00
Stefan Metzmacher
6e1f7e2f00 s3:libads: provide a simpler kerberos_fetch_salt_princ() function 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12782

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit 5fe939e32cdaf7bb5b6dac67e7b0118ce65846be)
 2017-07-13 20:01:27 +02:00
Stefan Metzmacher
bfccba416e s3:libads: remove kerberos_secrets_fetch_salting_principal() fallback 
The handling for per encryption type salts was removed in
Samba 3.0.23a (Jul 21, 2006). It's very unlikely that someone
has such an installation that got constantly upgraded over 10 years
with an automatic password change nor rejoin. It also means
that the KDC only has salt-less arcfour-hmac-md5 key together
with the salted des keys. So there would only be a problem
if the client whould try to use a des key to contact the smb server.

Having this legacy code adds quite some complexity for no
good reason.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12782

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit 487b4717b58a6f1ba913708ce8419145b7f4fac8)
 2017-07-13 20:01:27 +02:00
Stefan Metzmacher
beb5f2bbb9 s3:libnet_join: move kerberos_secrets_store_des_salt() to libnet_join_joindomain_store_secrets() 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12782

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit 7d2eea39112fd69d2b710181b23301562efea387)
 2017-07-13 20:01:27 +02:00
Stefan Metzmacher
4e5c9b5e12 s3:libnet_join: move libnet_join_joindomain_store_secrets() to libnet_join_post_processing() 
We should not store the secrets before we did all remote changes
(except the optional dns updates).

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12782

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit a922e01baeccedc3ffc8a893f1d6072bb203220f)
 2017-07-13 20:01:27 +02:00
Stefan Metzmacher
cb36b6175f s3:libnet_join: call do_JoinConfig() after we did remote changes on the server 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12782

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit 559de1e7236fd4a38f2a1f9980216db95d0430ce)
 2017-07-13 20:01:27 +02:00
Stefan Metzmacher
1b648aac14 s3:libnet_join: split libnet_join_post_processing_ads() into modify/sync 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12782

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit 0ab7944a2b00df4aa155a239c86f97e4e731b864)
 2017-07-13 20:01:27 +02:00
Stefan Metzmacher
b098b48f66 s3:libnet_join: move kerberos_secrets_store_des_salt() out of libnet_join_derive_salting_principal() 
We should separate the calculation and the storing steps.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12782

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit 0c65d5f41023076fd201c3a179df77dd615cdb01)
 2017-07-13 20:01:27 +02:00
Stefan Metzmacher
e7099728c0 s3:libnet_join: remember r->out.krb5_salt in libnet_join_derive_salting_principal() 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12782

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit 549c9d9a07d3002442cbbb7a90d0a7fef4a92bff)
 2017-07-13 20:01:27 +02:00
Stefan Metzmacher
15cefb9081 s3:libnet_join.idl: add krb5_salt to libnet_JoinCtx 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12782

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit 3b13e4d2d0f73c6374ffdae57528cd1a7f333792)
 2017-07-13 20:01:27 +02:00
Stefan Metzmacher
d353c40d3c s3:libnet_join: remember the domain_guid for AD domains 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12782

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit fc2bad0cf34fca5e65fba7e036acf1d8c61f05c0)
 2017-07-13 20:01:26 +02:00
Stefan Metzmacher
0c9f0d5ed6 s3:libnet_join.idl: return the domain_guid in libnet_JoinCtx 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12782

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit 03e455f5a815ce2134e216dc28929646a964384f)
 2017-07-13 20:01:26 +02:00
Stefan Metzmacher
43cce73b97 s3:libnet_join: calculate r->out.account_name in libnet_join_pre_processing() 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12782

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit 826223cc8d36871c2bcb37fe23241f1dbe99a0db)
 2017-07-13 20:01:26 +02:00