[SCM] Samba Shared Repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
       via  1cb99fc idmap_hash: Add a deprecation message
       via  5ced307 docs: Improve the idmap_hash manpage
      from  845bf7f s4:selftest: run samba4.sam.python also against fl2008r2dc

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 1cb99fc6af388843d313e0de48fee17103df806a
Author: Andreas Schneider <asn at samba.org>
Date:   Tue Feb 21 14:51:08 2017 +0100

    idmap_hash: Add a deprecation message
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=12582
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>
    
    Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date(master): Fri Mar  3 16:54:34 CET 2017 on sn-devel-144

commit 5ced307a46674f0d484db0d3201d64e70b44787d
Author: Andreas Schneider <asn at samba.org>
Date:   Wed Feb 15 08:55:24 2017 +0100

    docs: Improve the idmap_hash manpage
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=12582
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Michael Adam <obnox at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 docs-xml/manpages/idmap_hash.8.xml       | 24 +++++++++++++++++++++---
 source3/winbindd/idmap_hash/idmap_hash.c |  4 ++++
 2 files changed, 25 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/manpages/idmap_hash.8.xml b/docs-xml/manpages/idmap_hash.8.xml
index 9f4f1d1..311319d 100644
--- a/docs-xml/manpages/idmap_hash.8.xml
+++ b/docs-xml/manpages/idmap_hash.8.xml
@@ -13,17 +13,35 @@
 
 <refnamediv>
 	<refname>idmap_hash</refname>
-	<refpurpose>Samba's idmap_hash Backend for Winbind</refpurpose>
+	<refpurpose>DO NOT USE THIS BACKEND</refpurpose>
 </refnamediv>
 
 <refsynopsisdiv>
 	<title>DESCRIPTION</title>
-	<para>The idmap_hash plugin implements a hashing algorithm used to map
+	<para>DO NOT USE THIS PLUGIN
+
+	  The idmap_hash plugin implements a hashing algorithm used to map
 	  SIDs for domain users and groups to 31-bit uids and gids, respectively.
 	  This plugin also implements the nss_info API and can be used
 	  to support a local name mapping files if enabled via the
 	  "winbind normalize names" and "winbind nss info"
 	  parameters in smb.conf.
+	  The module divides the range into subranges for each domain that is being
+	  handled by the idmap config.
+
+	  The module needs the complete UID and GID range to be able to map all
+	  SIDs.  The lowest value for the range should be the smallest ID
+	  available in the system. This is normally 1000. The highest ID should
+	  be set to 2147483647.
+
+	  A smaller range will lead to issues because of the hashing algorithm
+	  used. The overall range to map all SIDs is 0 - 2147483647. Any range
+	  smaller than 0 - 2147483647 will filter some SIDs. As we can normally
+	  only start with 1000, we are not able to map 1000 SIDs. This already
+	  can lead to issues. The smaller the range the less SIDs can be mapped.
+
+	  We do not recommend to use this plugin. It will be removed in a future
+	  release of Samba.
 	</para>
 </refsynopsisdiv>
 
@@ -53,7 +71,7 @@
 	<programlisting>
 	[global]
 	idmap config * : backend = hash
-	idmap config * : range = 1000-4000000000
+	idmap config * : range = 1000-2147483647
 
 	winbind nss info = hash
 	winbind normalize names = yes
diff --git a/source3/winbindd/idmap_hash/idmap_hash.c b/source3/winbindd/idmap_hash/idmap_hash.c
index 743b0ec..36cc0f1 100644
--- a/source3/winbindd/idmap_hash/idmap_hash.c
+++ b/source3/winbindd/idmap_hash/idmap_hash.c
@@ -112,6 +112,10 @@ static NTSTATUS idmap_hash_initialize(struct idmap_domain *dom)
 	size_t num_domains = 0;
 	int i;
 
+	DBG_ERR("The idmap_hash module is deprecated and should not be used. "
+		"Please migrate to a different plugin. This module will be "
+		"removed in a future version of Samba\n");
+
 	if (!strequal(dom->name, "*")) {
 		DBG_ERR("Error: idmap_hash configured for domain '%s'. "
 			"But the hash module can only be used for the default "


-- 
Samba Shared Repository