summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2008-07-23 16:20:07 +1000
committerAndrew Bartlett <abartlet@samba.org>2008-07-23 16:20:17 +1000
commitea7f2fedeac470dba02ef318440a4817106c427a (patch)
tree4c00ff971ac3087dddaa23f7a9123626f112f7ed
parent768515f4ad13785729fcd4df7cecaede39b7409a (diff)
parent9549ebc2ac25320d5a3dfd2aca66ecc39bbf7ae8 (diff)
downloadsamba-ea7f2fedeac470dba02ef318440a4817106c427a.tar.gz
samba-ea7f2fedeac470dba02ef318440a4817106c427a.tar.bz2
samba-ea7f2fedeac470dba02ef318440a4817106c427a.zip
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
(This used to be commit ae311d89d2d477b235a6a9294a8bb463ed0a8c05)
-rw-r--r--source4/rpc_server/dcerpc_server.c11
-rw-r--r--source4/setup/schema_samba4.ldif6
2 files changed, 17 insertions, 0 deletions
diff --git a/source4/rpc_server/dcerpc_server.c b/source4/rpc_server/dcerpc_server.c
index fb487dfdcf..a2ca897981 100644
--- a/source4/rpc_server/dcerpc_server.c
+++ b/source4/rpc_server/dcerpc_server.c
@@ -543,9 +543,20 @@ static NTSTATUS dcesrv_bind(struct dcesrv_call_state *call)
uint32_t context_id;
const struct dcesrv_interface *iface;
+#if 0
+ /* It is not safe to enable this check - windows clients
+ * (WinXP in particular) will use it for NETLOGON calls, for
+ * the subsequent SCHANNEL bind. It turns out that NETLOGON
+ * calls include no policy handles, so it is safe there. Let
+ * the failure occour on the attempt to reuse a poilcy handle,
+ * rather than here */
+
+ /* Association groups allow policy handles to be shared across
+ * multiple client connections. We don't implement this yet. */
if (call->pkt.u.bind.assoc_group_id != 0) {
return dcesrv_bind_nak(call, 0);
}
+#endif
if (call->pkt.u.bind.num_contexts < 1 ||
call->pkt.u.bind.ctx_list[0].num_transfer_syntaxes < 1) {
diff --git a/source4/setup/schema_samba4.ldif b/source4/setup/schema_samba4.ldif
index 21d17c5caa..3e129e4f6b 100644
--- a/source4/setup/schema_samba4.ldif
+++ b/source4/setup/schema_samba4.ldif
@@ -3,9 +3,15 @@
#
## Samba4 OID allocation from Samba3's examples/LDAP/samba.schema
## 1.3.6.1.4.1.7165.4.1.x - attributetypes
+
## 1.3.6.1.4.1.7165.4.2.x - objectclasses
+
## 1.3.6.1.4.1.7165.4.3.x - LDB/LDAP Controls
+### see dsdb/samdb/samdb.h
+
## 1.3.6.1.4.1.7165.4.4.x - LDB/LDAP Extended Operations
+### see dsdb/samdb/samdb.h
+
## 1.3.6.1.4.1.7165.4.255.x - mapped OIDs due to conflicts between AD and standards-track
#
#