From 9714613ed356c07ab3852e9f6236ea30ff544859 Mon Sep 17 00:00:00 2001 From: ravind Date: Fri, 9 Dec 2016 13:01:03 -0500 Subject: [PATCH] DOCS-9489: Update LDAP tutorial admonition /tutorial/configure-ldap-sasl-activedirectory requires updated admonition to point to new 3.4 LDAP support for Windows LDAP authentication and Authorization --- ...admonition-mongodb-enterprise-windows-ldap.rst | 15 +++++++++++++-- .../configure-ldap-sasl-activedirectory.txt | 3 +-- source/tutorial/configure-ldap-sasl-openldap.txt | 4 +--- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/source/includes/admonition-mongodb-enterprise-windows-ldap.rst b/source/includes/admonition-mongodb-enterprise-windows-ldap.rst index 9554c316907..472f0406f88 100644 --- a/source/includes/admonition-mongodb-enterprise-windows-ldap.rst +++ b/source/includes/admonition-mongodb-enterprise-windows-ldap.rst @@ -1,2 +1,13 @@ -MongoDB Enterprise for Windows does not support binding via -``saslauthd``. +.. important:: + + :abbr:`Windows (Microsoft Windows)` does not support the ``saslauthd`` + daemon. MongoDB servers running version 3.2 or prior cannot connect to an + LDAP server for authentication. You cannot apply this tutorial to a MongoDB + server running on :abbr:`Windows (Microsoft Windows)`. + + MongoDB 3.4 or later supports binding to an LDAP server via system + libraries for :ref:`LDAP authentication ` or :ref:`LDAP + authorization `. To configure a MongoDB 3.4 + deployment running on :abbr:`Windows (Microsoft Windows)` for LDAP proxy + authentication, see + :doc:`/tutorial/authenticate-nativeldap-activedirectory`. diff --git a/source/tutorial/configure-ldap-sasl-activedirectory.txt b/source/tutorial/configure-ldap-sasl-activedirectory.txt index e1ac1390be5..bef009bd3cd 100644 --- a/source/tutorial/configure-ldap-sasl-activedirectory.txt +++ b/source/tutorial/configure-ldap-sasl-activedirectory.txt @@ -18,9 +18,8 @@ Lightweight Directory Access Protocol (LDAP) service. Considerations -------------- -.. warning:: - .. include:: /includes/admonition-mongodb-enterprise-windows-ldap.rst +.. include:: /includes/admonition-mongodb-enterprise-windows-ldap.rst .. include:: /includes/admonition-saslauthd-ldap-considerations.rst diff --git a/source/tutorial/configure-ldap-sasl-openldap.txt b/source/tutorial/configure-ldap-sasl-openldap.txt index 577eafc1d01..dbf9d1d69c6 100644 --- a/source/tutorial/configure-ldap-sasl-openldap.txt +++ b/source/tutorial/configure-ldap-sasl-openldap.txt @@ -18,9 +18,7 @@ Lightweight Directory Access Protocol (LDAP) service. Considerations -------------- -.. warning:: - - .. include:: /includes/admonition-mongodb-enterprise-windows-ldap.rst +.. include:: /includes/admonition-mongodb-enterprise-windows-ldap.rst .. include:: /includes/admonition-saslauthd-ldap-considerations.rst