View | Details | Raw Unified | Return to bug 28373
Collapse All | Expand All

(-)src/samba4-4.0.0~beta4/source4/scripting/python/samba/join.py (+9 lines)
 Lines 141-146   class dc_join(object): Link Here 
141
        ctx.managedby = None
141
        ctx.managedby = None
142
        ctx.subdomain = False
142
        ctx.subdomain = False
143
143
144
        ctx.next_rid = None
145
        if ctx.keep_existing:
146
            res = ctx.samdb.search(base=ctx.promote_from_dn,
147
                                   expression='(&(CN=RID Set)(rIDNextRID=*))',
148
                                   attrs=["rIDNextRID"])
149
	    if res:
150
                ctx.next_rid = res[0]["rIDNextRID"][0]
151
144
    def del_noerror(ctx, dn, recursive=False):
152
    def del_noerror(ctx, dn, recursive=False):
145
        if recursive:
153
        if recursive:
146
            try:
154
            try:
 Lines 648-653   class dc_join(object): Link Here 
648
                schemadn=ctx.schema_dn, configdn=ctx.config_dn,
656
                schemadn=ctx.schema_dn, configdn=ctx.config_dn,
649
                serverdn=ctx.server_dn, domain=ctx.domain_name,
657
                serverdn=ctx.server_dn, domain=ctx.domain_name,
650
                hostname=ctx.myname, domainsid=ctx.domsid,
658
                hostname=ctx.myname, domainsid=ctx.domsid,
659
                next_rid=ctx.next_rid,
651
                machinepass=ctx.acct_pass, serverrole="domain controller",
660
                machinepass=ctx.acct_pass, serverrole="domain controller",
652
                sitename=ctx.site, lp=ctx.lp, ntdsguid=ctx.ntds_guid,
661
                sitename=ctx.site, lp=ctx.lp, ntdsguid=ctx.ntds_guid,
653
                use_ntvfs=ctx.use_ntvfs, dns_backend=ctx.dns_backend)
662
                use_ntvfs=ctx.use_ntvfs, dns_backend=ctx.dns_backend)

Return to bug 28373