svn commit: samba r13730 - in trunk/source/passdb: .

[idra at samba.org]

Author: idra
Date: 2006-02-27 21:29:21 +0000 (Mon, 27 Feb 2006)
New Revision: 13730

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=13730

Log:

editposix is not suited for ldapsam_compat


Modified:
   trunk/source/passdb/pdb_ldap.c


Changeset:
Modified: trunk/source/passdb/pdb_ldap.c
===================================================================
--- trunk/source/passdb/pdb_ldap.c	2006-02-27 21:28:19 UTC (rev 13729)
+++ trunk/source/passdb/pdb_ldap.c	2006-02-27 21:29:21 UTC (rev 13730)
@@ -5357,16 +5357,6 @@
 	(*pdb_method)->rid_algorithm = ldapsam_rid_algorithm;
 	(*pdb_method)->new_rid = ldapsam_new_rid;
 
-	if (lp_parm_bool(-1, "ldapsam", "trusted", False) &&
-	    lp_parm_bool(-1, "ldapsam", "editposix", False)) {
-		(*pdb_method)->create_user = ldapsam_create_user;
-		(*pdb_method)->delete_user = ldapsam_delete_user;
-		(*pdb_method)->create_dom_group = ldapsam_create_dom_group;
-		(*pdb_method)->delete_dom_group = ldapsam_delete_dom_group;
-		(*pdb_method)->add_groupmem = ldapsam_add_groupmem;
-		(*pdb_method)->del_groupmem = ldapsam_del_groupmem;
-		(*pdb_method)->set_unix_primary_group = ldapsam_set_primary_group;
-	}
 	/* TODO: Setup private data and free */
 
 	if ( !(ldap_state = TALLOC_ZERO_P(*pdb_method, struct ldapsam_privates)) ) {
@@ -5475,6 +5465,16 @@
 			ldapsam_enum_group_memberships;
 		(*pdb_method)->lookup_rids = ldapsam_lookup_rids;
 		(*pdb_method)->sid_to_id = ldapsam_sid_to_id;
+		
+		if (lp_parm_bool(-1, "ldapsam", "editposix", False)) {
+			(*pdb_method)->create_user = ldapsam_create_user;
+			(*pdb_method)->delete_user = ldapsam_delete_user;
+			(*pdb_method)->create_dom_group = ldapsam_create_dom_group;
+			(*pdb_method)->delete_dom_group = ldapsam_delete_dom_group;
+			(*pdb_method)->add_groupmem = ldapsam_add_groupmem;
+			(*pdb_method)->del_groupmem = ldapsam_del_groupmem;
+			(*pdb_method)->set_unix_primary_group = ldapsam_set_primary_group;
+		}
 	}
 
 	ldap_state = (*pdb_method)->private_data;