diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-09-30 12:44:39 -0700 | 
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-09-30 14:36:12 -0700 | 
| commit | 67a04613e9106f9ab6c014c57a971d75854908f7 (patch) | |
| tree | 100ee1d7e8f5cf77c1c7a23fa6e1377865518654 | |
| parent | 75a542a1d93f6f015d866a01d25d5978e9b32583 (diff) | |
| download | samba-67a04613e9106f9ab6c014c57a971d75854908f7.tar.gz samba-67a04613e9106f9ab6c014c57a971d75854908f7.tar.bz2 samba-67a04613e9106f9ab6c014c57a971d75854908f7.zip  | |
s4-rodc: fixed the keyVersionNumber on the RODC account in secrets.keytab
we need to fetch the msDS-keyVersionNumber from the writeable DC
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
| -rw-r--r-- | source4/scripting/python/samba/join.py | 7 | 
1 files changed, 5 insertions, 2 deletions
diff --git a/source4/scripting/python/samba/join.py b/source4/scripting/python/samba/join.py index 34f3ebbf53..6cd18b4ec1 100644 --- a/source4/scripting/python/samba/join.py +++ b/source4/scripting/python/samba/join.py @@ -119,7 +119,7 @@ def join_rodc(server=None, creds=None, lp=None, site=None, netbios_name=None,              "useraccountcontrol" : str(samba.dsdb.UF_NORMAL_ACCOUNT |                                         samba.dsdb.UF_ACCOUNTDISABLE),              "showinadvancedviewonly" : "TRUE", -            "description" : "tricky account"} +            "description" : "krbtgt for %s" % ctx.samname}          ctx.samdb.add(rec, ["rodc_join:1:1"])          # now we need to search for the samAccountName attribute on the krbtgt DN, @@ -210,6 +210,8 @@ def join_rodc(server=None, creds=None, lp=None, site=None, netbios_name=None,                                ctx.acct_pass,                                force_change_at_next_login=False,                                username=ctx.samname) +        res = ctx.samdb.search(base=ctx.acct_dn, scope=ldb.SCOPE_BASE, attrs=["msDS-keyVersionNumber"]) +        ctx.key_version_number = res[0]["msDS-keyVersionNumber"]      def join_provision(ctx): @@ -281,7 +283,8 @@ def join_rodc(server=None, creds=None, lp=None, site=None, netbios_name=None,                              netbiosname=ctx.myname,                              domainsid=security.dom_sid(ctx.domsid),                              machinepass=ctx.acct_pass, -                            secure_channel_type=misc.SEC_CHAN_RODC) +                            secure_channel_type=misc.SEC_CHAN_RODC, +                            key_version_number=ctx.key_version_number)  | 
