summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Schneider <asn@samba.org>2014-04-17 12:02:45 +0200
committerStefan Metzmacher <metze@samba.org>2014-04-24 11:21:05 +0200
commit8729d990a32aa2bd59ef176e33ce3966c0f98f9f (patch)
tree0571f0548d044e8a779ca0527fb6e70f99f85eca
parent788f72f8ebf8e300237cae3c4863586e38301a62 (diff)
downloadsamba-8729d990a32aa2bd59ef176e33ce3966c0f98f9f.tar.gz
samba-8729d990a32aa2bd59ef176e33ce3966c0f98f9f.tar.xz
samba-8729d990a32aa2bd59ef176e33ce3966c0f98f9f.zip
s3-auth: Register ncalrpc_as_system gensec module.
Signed-off-by: Andreas Schneider <asn@samba.org> Signed-off-by: Stefan Metzmacher <metze@samba.org>
-rw-r--r--source3/auth/auth_generic.c4
-rw-r--r--source3/libsmb/auth_generic.c3
2 files changed, 5 insertions, 2 deletions
diff --git a/source3/auth/auth_generic.c b/source3/auth/auth_generic.c
index e07d3b7a9e9..e1c6475ecab 100644
--- a/source3/auth/auth_generic.c
+++ b/source3/auth/auth_generic.c
@@ -262,7 +262,7 @@ NTSTATUS auth_generic_prepare(TALLOC_CTX *mem_ctx,
}
backends = talloc_zero_array(gensec_settings,
- const struct gensec_security_ops *, 5);
+ const struct gensec_security_ops *, 6);
if (backends == NULL) {
TALLOC_FREE(tmp_ctx);
return NT_STATUS_NO_MEMORY;
@@ -282,6 +282,8 @@ NTSTATUS auth_generic_prepare(TALLOC_CTX *mem_ctx,
backends[idx++] = gensec_security_by_auth_type(NULL, DCERPC_AUTH_TYPE_SCHANNEL);
+ backends[idx++] = gensec_security_by_auth_type(NULL, DCERPC_AUTH_TYPE_NCALRPC_AS_SYSTEM);
+
/*
* This is anonymous for now, because we just use it
* to set the kerberos state at the moment
diff --git a/source3/libsmb/auth_generic.c b/source3/libsmb/auth_generic.c
index 3130decb0eb..1f6c681a6e5 100644
--- a/source3/libsmb/auth_generic.c
+++ b/source3/libsmb/auth_generic.c
@@ -78,7 +78,7 @@ NTSTATUS auth_generic_client_prepare(TALLOC_CTX *mem_ctx, struct auth_generic_st
}
backends = talloc_zero_array(gensec_settings,
- const struct gensec_security_ops *, 5);
+ const struct gensec_security_ops *, 6);
if (backends == NULL) {
TALLOC_FREE(ans);
return NT_STATUS_NO_MEMORY;
@@ -96,6 +96,7 @@ NTSTATUS auth_generic_client_prepare(TALLOC_CTX *mem_ctx, struct auth_generic_st
backends[idx++] = gensec_security_by_oid(NULL, GENSEC_OID_SPNEGO);
backends[idx++] = gensec_security_by_auth_type(NULL, DCERPC_AUTH_TYPE_SCHANNEL);
+ backends[idx++] = gensec_security_by_auth_type(NULL, DCERPC_AUTH_TYPE_NCALRPC_AS_SYSTEM);
nt_status = gensec_client_start(ans, &ans->gensec_security, gensec_settings);