summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2007-04-22 10:10:29 +0000
committerGerald Carter <jerry@samba.org>2007-04-22 10:10:29 +0000
commit72b4c8d3127f232434d985543e6f9d812cc9adea (patch)
tree2923aa2ea33ae4ac4459301be7ad2a0c2853c476
parent9a1e2badd9901adba8028cdcc943ed2deb8d115a (diff)
downloadsamba-72b4c8d3127f232434d985543e6f9d812cc9adea.tar.gz
samba-72b4c8d3127f232434d985543e6f9d812cc9adea.tar.xz
samba-72b4c8d3127f232434d985543e6f9d812cc9adea.zip
r22448: grab idmap compat patch from 3.0.25 (will recur 3.0.25rc2 for this)samba-3.0.25rc2
-rw-r--r--WHATSNEW.txt5
-rw-r--r--source/nsswitch/idmap.c8
2 files changed, 13 insertions, 0 deletions
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 406d26cb85b..dfbff6be5a7 100644
--- 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 530e03089d0..7a74f744b46 100644
--- 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;
}