Merge passdb from HEAD -> 3.0

The work here includes:
 - metze' set/changed patch, which avoids making changes to ldap on unmodified
attributes.

 - volker's group mapping in passdb patch

 - volker's samsync stuff
 - volkers SAMR changes.

 - mezte's connection caching patch

 - my recent changes (fix magic root check, ldap ssl)

Andrew Bartlett
(This used to be commit 2044d60bbe0043cdbb9aba931115672bde975d2f)

1 files changed, 6 insertions, 6 deletions

diff --git a/source3/utils/smbgroupedit.c b/source3/utils/smbgroupedit.c
index 589dafc231..b5033e0384 100644
--- a/source3/utils/smbgroupedit.c
+++ b/source3/utils/smbgroupedit.c
@@ -69,7 +69,7 @@ static BOOL get_sid_from_input(DOM_SID *sid, char *input)
 	
 	if (StrnCaseCmp( input, "S-", 2)) {
 		/* Perhaps its the NT group name? */
-		if (!get_group_map_from_ntname(input, &map, MAPPING_WITHOUT_PRIV)) {
+		if (!pdb_getgrnam(&map, input, MAPPING_WITHOUT_PRIV)) {
 			printf("NT Group %s doesn't exist in mapping DB\n", input);
 			return False;
 		} else {
@@ -133,7 +133,7 @@ static int changegroup(char *sid_string, char *group, enum SID_NAME_USE sid_type
 	}
 
 	/* Get the current mapping from the database */
-	if(!get_group_map_from_sid(sid, &map, MAPPING_WITH_PRIV)) {
+	if(!pdb_getgrsid(&map, sid, MAPPING_WITH_PRIV)) {
 		printf("This SID does not exist in the database\n");
 		return -1;
 	}
@@ -177,8 +177,8 @@ static int changegroup(char *sid_string, char *group, enum SID_NAME_USE sid_type
 	if (privilege!=NULL)
 		convert_priv_from_text(&map.priv_set, privilege);
 
-	if (!add_mapping_entry(&map, TDB_REPLACE)) {
-		printf("Count not update group database\n");
+	if (!pdb_update_group_mapping_entry(&map)) {
+		printf("Could not update group database\n");
 		free_privilege(&map.priv_set);
 		return -1;
 	}
@@ -198,7 +198,7 @@ static int deletegroup(char *group)
 		return -1;
 	}
 
-	if(!group_map_remove(sid)) {
+	if(!pdb_delete_group_mapping_entry(sid)) {
 		printf("removing group %s from the mapping db failed!\n", group);
 		return -1;
 	}
@@ -220,7 +220,7 @@ static int listgroup(enum SID_NAME_USE sid_type, BOOL long_list)
 	if (!long_list)
 		printf("NT group (SID) -> Unix group\n");
 		
-	if (!enum_group_mapping(sid_type, &map, &entries, ENUM_ALL_MAPPED, MAPPING_WITH_PRIV))
+	if (!pdb_enum_group_mapping(sid_type, &map, &entries, ENUM_ALL_MAPPED, MAPPING_WITH_PRIV))
 		return -1;
 	
 	for (i=0; i<entries; i++) {