diff options
author | Andrew Tridgell <tridge@samba.org> | 2008-10-03 12:23:00 -0700 |
---|---|---|
committer | Andrew Tridgell <tridge@samba.org> | 2008-10-03 12:23:00 -0700 |
commit | 23ec448f83ab00105b214388df287f0a934cdb7a (patch) | |
tree | de94cbd50e47eb7592e5bdf9e42643fb5aa4f239 /source4/libnet/libnet_unbecome_dc.c | |
parent | 163fa1d25ae2104b634ba37ed97d51fe033cbc1f (diff) | |
parent | c7625979ceb350d90d87d2add6ed7156440072c3 (diff) | |
download | samba-23ec448f83ab00105b214388df287f0a934cdb7a.tar.gz samba-23ec448f83ab00105b214388df287f0a934cdb7a.tar.bz2 samba-23ec448f83ab00105b214388df287f0a934cdb7a.zip |
Merge commit 'master/master'
Diffstat (limited to 'source4/libnet/libnet_unbecome_dc.c')
-rw-r--r-- | source4/libnet/libnet_unbecome_dc.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/source4/libnet/libnet_unbecome_dc.c b/source4/libnet/libnet_unbecome_dc.c index 4eeaf1b80c..2ee3c641b2 100644 --- a/source4/libnet/libnet_unbecome_dc.c +++ b/source4/libnet/libnet_unbecome_dc.c @@ -289,7 +289,7 @@ static void unbecomeDC_recv_cldap(struct cldap_request *req) c->status = cldap_netlogon_recv(req, s, &s->cldap.io); if (!composite_is_ok(c)) return; - s->cldap.netlogon = s->cldap.io.out.netlogon.nt5_ex; + s->cldap.netlogon = s->cldap.io.out.netlogon.data.nt5_ex; s->domain.dns_name = s->cldap.netlogon.dns_domain; s->domain.netbios_name = s->cldap.netlogon.domain; @@ -641,7 +641,7 @@ static void unbecomeDC_drsuapi_remove_ds_server_send(struct libnet_UnbecomeDC_st r->in.level = 1; r->in.req.req1.server_dn= s->dest_dsa.server_dn_str; r->in.req.req1.domain_dn= s->domain.dn_str; - r->in.req.req1.unknown = 0x00000001; + r->in.req.req1.commit = true; req = dcerpc_drsuapi_DsRemoveDSServer_send(s->drsuapi.pipe, s, r); composite_continue_rpc(c, req, unbecomeDC_drsuapi_remove_ds_server_recv, s); @@ -666,11 +666,6 @@ static void unbecomeDC_drsuapi_remove_ds_server_recv(struct rpc_request *req) composite_error(c, NT_STATUS_INVALID_NETWORK_RESPONSE); return; } - - if (!W_ERROR_IS_OK(r->out.res.res1.status)) { - composite_error(c, werror_to_ntstatus(r->out.res.res1.status)); - return; - } composite_done(c); } |