summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2011-12-23 15:26:07 +0100
committerAndreas Schneider <asn@samba.org>2012-07-17 10:58:38 +0200
commit342a2e6181a07737e2f9cb7476fa86c39b0731ec (patch)
treed110c96ecb01ad97a3091f51df406c31814ddd7b
parente7c7a911302fa6c3df70303a529e0ba362f9e838 (diff)
downloadsamba-342a2e6181a07737e2f9cb7476fa86c39b0731ec.tar.gz
samba-342a2e6181a07737e2f9cb7476fa86c39b0731ec.tar.bz2
samba-342a2e6181a07737e2f9cb7476fa86c39b0731ec.zip
s4:librpc/rpc/dcerpc_schannel: just append NETLOGON_NEG_RODC_PASSTHROUGH as rodc
The RODC stuff doesn't depend on the schannel algorithm. metze Signed-off-by: Günther Deschner <gd@samba.org>
-rw-r--r--libcli/auth/credentials.h2
-rw-r--r--source4/librpc/rpc/dcerpc_schannel.c9
2 files changed, 5 insertions, 6 deletions
diff --git a/libcli/auth/credentials.h b/libcli/auth/credentials.h
index 47582ef73a..7b8fac6715 100644
--- a/libcli/auth/credentials.h
+++ b/libcli/auth/credentials.h
@@ -68,5 +68,3 @@
#define NETLOGON_NEG_AUTH2_ADS_FLAGS (0x200fbffb | NETLOGON_NEG_ARCFOUR | NETLOGON_NEG_128BIT | NETLOGON_NEG_SCHANNEL)
-#define NETLOGON_NEG_AUTH2_RODC_FLAGS (NETLOGON_NEG_AUTH2_ADS_FLAGS | NETLOGON_NEG_RODC_PASSTHROUGH)
-
diff --git a/source4/librpc/rpc/dcerpc_schannel.c b/source4/librpc/rpc/dcerpc_schannel.c
index 1655e6bad0..3a3dec068b 100644
--- a/source4/librpc/rpc/dcerpc_schannel.c
+++ b/source4/librpc/rpc/dcerpc_schannel.c
@@ -321,10 +321,6 @@ struct composite_context *dcerpc_schannel_key_send(TALLOC_CTX *mem_ctx,
s->local_negotiate_flags = NETLOGON_NEG_AUTH2_FLAGS;
/* allocate credentials */
- /* type of authentication depends on schannel type */
- if (schannel_type == SEC_CHAN_RODC) {
- s->local_negotiate_flags = NETLOGON_NEG_AUTH2_RODC_FLAGS;
- }
if (s->pipe->conn->flags & DCERPC_SCHANNEL_128) {
s->local_negotiate_flags = NETLOGON_NEG_AUTH2_ADS_FLAGS;
}
@@ -333,6 +329,11 @@ struct composite_context *dcerpc_schannel_key_send(TALLOC_CTX *mem_ctx,
s->dcerpc_schannel_auto = true;
}
+ /* type of authentication depends on schannel type */
+ if (schannel_type == SEC_CHAN_RODC) {
+ s->local_negotiate_flags |= NETLOGON_NEG_RODC_PASSTHROUGH;
+ }
+
/* allocate binding structure */
s->binding = talloc_zero(c, struct dcerpc_binding);
if (composite_nomem(s->binding, c)) return c;