r22448: grab idmap compat patch from 3.0.25 (will recur 3.0.25rc2 for this)

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 406d26cb85b4b6252e0dd1da2dc7b9f28a8c5736..dfbff6be5a729c5d1e41069fd64fdae26fa4ab41 100644 (file)
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -163,6 +163,11 @@ o   Herb Lewis <herb@samba.org>
     * Allow profiling level to be set on startup.
 
 
+o   Ying Li <ying.li2@hp.com>
+    * Use the default tdb idmap plugin when neither idmap domains
+      nor idmap backend have been defined.
+
+
 o   Jason Mader <jason@ncac.gwu.edu>
     * Various compile warning fixes. 
     * Initial patch set for strptime() in libreplace.

diff --git a/source/nsswitch/idmap.c b/source/nsswitch/idmap.c
index 530e03089d0d364b43066ebe6047dfc576dd4da2..7a74f744b46fccd21d05c377c3d552addcf0d3c1 100644 (file)
--- a/source/nsswitch/idmap.c
+++ b/source/nsswitch/idmap.c
@@ -322,8 +322,16 @@ NTSTATUS idmap_init(void)
                        *p = '\0';                      
                        compat_params = p + 1;
                }
+       } else {
+               /* Back compatible: without idmap domains and explicit
+                  idmap backend.  Taking default idmap backend: tdb */
+               
+               compat = 1;
+               compat_backend = talloc_strdup( idmap_ctx, "tdb");
+               compat_params = compat_backend;
        }
 
+
        if ( ! dom_list) {
                dom_list = idmap_default_domain;
        }