summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvorlon <vorlon@alioth.debian.org>2004-11-19 00:53:29 +0000
committervorlon <vorlon@alioth.debian.org>2004-11-19 00:53:29 +0000
commit64cee6fa4439293c4b6499e8a66299d5182e41f2 (patch)
tree1b29522dae15f21a5e1243cbea2050e85a1c1c40
parentc3f7ddba8dc89a28b725c3078366a0bdd256ae39 (diff)
downloadsamba-64cee6fa4439293c4b6499e8a66299d5182e41f2.tar.gz
make ldapsam_compat work again
git-svn-id: svn://svn.debian.org/svn/pkg-samba/trunk@672 fc4039ab-9d04-0410-8cac-899223bdd6b0
-rw-r--r--changelog2
-rw-r--r--patches/ldapsam_compat.patch14
2 files changed, 16 insertions, 0 deletions
diff --git a/changelog b/changelog
index 062b1f30ea..a2eb2583b9 100644
--- a/changelog
+++ b/changelog
@@ -6,6 +6,8 @@ samba (3.0.8-2) unstable; urgency=low
* Fix missing symbols in libsmbclient (and libnss_wins), and add
-Wl,-z,defs to the libsmbclient link options to prevent future
instances of undefined symbols (closes: #281181).
+ * Fix for the legacy ldapsam_compat backend; thanks to Fabien
+ Chevalier for the patch (closes: #274155).
-- Steve Langasek <vorlon@debian.org> Mon, 15 Nov 2004 06:54:13 -0800
diff --git a/patches/ldapsam_compat.patch b/patches/ldapsam_compat.patch
new file mode 100644
index 0000000000..d7acaa9b6f
--- /dev/null
+++ b/patches/ldapsam_compat.patch
@@ -0,0 +1,14 @@
+--- samba-3.0.7/source/passdb/pdb_ldap.c.orig 2004-09-29
+22:57:47.000000000 +0100
++++ samba-3.0.7/source/passdb/pdb_ldap.c 2004-09-29
+22:58:18.000000000 +0100
+@@ -1253,7 +1253,8 @@
+ int rc;
+
+ attr_list = get_userattr_list( ldap_state->schema_ver );
+- append_attr(&attr_list, get_userattr_key2string(ldap_state->schema_ver,LDAP_ATTR_MOD_TIMESTAMP));
++ if( ldap_state->schema_ver == SCHEMAVER_SAMBASAMACCOUNT )
++ append_attr(&attr_list, get_userattr_key2string(ldap_state->schema_ver,LDAP_ATTR_MOD_TIMESTAMP));
+ rc = ldapsam_search_suffix_by_name(ldap_state, sname, &result, attr_list);
+ free_attr_list( attr_list );
+