r9751: Remove C version of samba3dump (the EJS version works nicely as well).

Fix a couple of bugs in ldb_map.
(This used to be commit 66df76a63433aea4081eab8b20bf3ba86e0a606d)

3 files changed, 44 insertions, 347 deletions

diff --git a/source4/lib/ldb/ldb_map/ldb_map.c b/source4/lib/ldb/ldb_map/ldb_map.c
index 79d3c26f90..f68ba3d545 100644
--- a/source4/lib/ldb/ldb_map/ldb_map.c
+++ b/source4/lib/ldb/ldb_map/ldb_map.c
@@ -62,10 +62,35 @@ static struct ldb_map_context *map_get_privdat(struct ldb_module *module)
 	return &((struct map_private *)module->private_data)->context;
 }
 
+static const struct ldb_map_objectclass *map_find_objectclass_local(struct ldb_map_context *privdat, const char *name)
+{
+	int i;
+	for (i = 0; privdat->objectclass_maps[i].local_name; i++) {
+		if (!ldb_attr_cmp(privdat->objectclass_maps[i].local_name, name))
+			return &privdat->objectclass_maps[i];
+	}
+
+	return NULL;
+}
+
+/* Decide whether a add/modify should be pushed to the 
+ * remote LDAP server. We currently only do this if we see an objectClass we know */
 static BOOL map_is_mappable(struct ldb_map_context *privdat, const struct ldb_message *msg)
 {
-	/* FIXME */
-	return True;
+	int i;
+	struct ldb_message_element *el = ldb_msg_find_element(msg, "objectClass");
+
+	/* No objectClass... */
+	if (el == NULL) {
+		return False;
+	}
+
+	for (i = 0; i < el->num_values; i++) {
+		if (map_find_objectclass_local(privdat, (char *)el->values[i].data))
+			return True;
+	}
+
+	return False;
 }
 
 /* find an attribute by the local name */
@@ -745,22 +770,29 @@ static int map_search_bytree_mp(struct ldb_module *module, const struct ldb_dn *
 		int extraret;
 		
 		/* Merge with additional data from local database */
-		extraret = ldb_next_search(module, merged->dn, LDB_SCOPE_ONELEVEL, "", NULL, &extrares);
+		extraret = ldb_next_search(module, merged->dn, LDB_SCOPE_BASE, "", NULL, &extrares);
 
-		if (extraret > 1) {
+		if (extraret == -1) {
+			ldb_debug(module->ldb, LDB_DEBUG_ERROR, "Error searching for extra data!\n");
+		} else if (extraret > 1) {
 			ldb_debug(module->ldb, LDB_DEBUG_ERROR, "More then one result for extra data!\n");
+			talloc_free(newres);
 			return -1;
-		} else if (extraret == 1) {
+		} else if (extraret == 0) {
+			ldb_debug(module->ldb, LDB_DEBUG_TRACE, "No extra data found for remote DN");
+		}
+		
+		if (extraret == 1) {
 			int j;
 			ldb_debug(module->ldb, LDB_DEBUG_TRACE, "Extra data found for remote DN");
-			for (j = 0; j < merged->num_elements; j++) {
-				ldb_msg_add(module->ldb, merged, &extrares[0]->elements[j], extrares[0]->elements[j].flags);
+			for (j = 0; j < extrares[0]->num_elements; j++) {
+				ldb_msg_add(module->ldb, merged, &(extrares[0]->elements[j]), extrares[0]->elements[j].flags);
 			}
+
+			ldb_msg_add_string(module->ldb, merged, "extraMapped", "TRUE");
 		} else {
-			ldb_debug(module->ldb, LDB_DEBUG_TRACE, "No extra data found for remote DN");
+			ldb_msg_add_string(module->ldb, merged, "extraMapped", "FALSE");
 		}
-
-		talloc_free(extrares);
 		
 		if (ldb_match_msg(module->ldb, merged, tree, base, scope)) {
 			(*res)[ret] = merged;
@@ -768,10 +800,10 @@ static int map_search_bytree_mp(struct ldb_module *module, const struct ldb_dn *
 		} else {
 			ldb_debug(module->ldb, LDB_DEBUG_TRACE, "Discarded merged message because it did not match");
 		}
-		
-		talloc_free(newres[i]);
 	}
 
+	talloc_free(newres);
+
 	return ret;
 }
 
@@ -783,7 +815,6 @@ static int map_search_bytree(struct ldb_module *module, const struct ldb_dn *bas
 			      enum ldb_scope scope, struct ldb_parse_tree *tree,
 			      const char * const *attrs, struct ldb_message ***res)
 {
-	int ret;
 	struct ldb_message **fbres, **mpres;
 	int i;
 	int ret_fb, ret_mp;
@@ -803,8 +834,6 @@ static int map_search_bytree(struct ldb_module *module, const struct ldb_dn *bas
 	for (i = 0; i < ret_mp; i++) (*res)[ret_fb+i] = mpres[i];
 
 	return ret_fb + ret_mp;
-	
-	return ret;
 }
 /*
   search for matching records
diff --git a/source4/lib/samba3/config.mk b/source4/lib/samba3/config.mk
index 06b7e5e256..6a122546a5 100644
--- a/source4/lib/samba3/config.mk
+++ b/source4/lib/samba3/config.mk
@@ -15,13 +15,3 @@ ADD_OBJ_FILES = \
 		lib/samba3/upgrade.o
 # End SUBSYSTEM LIBSAMBA3
 ################################################
-
-################################################
-# Start BINARY samba3dump
-[BINARY::samba3dump]
-INSTALLDIR = BINDIR
-INIT_OBJ_FILES = \
-		lib/samba3/samba3dump.o
-REQUIRED_SUBSYSTEMS = LIBBASIC LIBCMDLINE LIBSAMBA3
-# End BINARY samba3dump
-################################################
diff --git a/source4/lib/samba3/samba3dump.c b/source4/lib/samba3/samba3dump.c
deleted file mode 100644
index 6be91c0db2..0000000000
--- a/source4/lib/samba3/samba3dump.c
+++ /dev/null
@@ -1,322 +0,0 @@
-/* 
-   Unix SMB/CIFS implementation.
-   Samba3 database dump utility
-
-    Copyright (C) Jelmer Vernooij	2005
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#include "includes.h"
-#include "lib/samba3/samba3.h"
-#include "lib/cmdline/popt_common.h"
-#include "lib/ldb/include/ldb.h"
-
-static void print_header(const char *txt)
-{
-	int i;
-	printf("\n%s\n", txt);
-	for (i = 0; txt[i]; i++) putchar('=');
-	putchar('\n');
-}
-
-static NTSTATUS print_samba3_policy(struct samba3_policy *ret)
-{
-	print_header("Account Policies");
-	printf("Min password length: %d\n", ret->min_password_length);
-	printf("Password history length: %d\n", ret->password_history);
-	printf("User must logon to change password: %d\n", ret->user_must_logon_to_change_password);
-	printf("Maximum password age: %d\n", ret->maximum_password_age);
-	printf("Minimum password age: %d\n", ret->minimum_password_age);
-	printf("Lockout duration: %d\n", ret->lockout_duration);
-	printf("Reset Count Minutes: %d\n", ret->reset_count_minutes);
-	printf("Bad Lockout Minutes: %d\n", ret->bad_lockout_minutes);
-	printf("Disconnect Time: %d\n", ret->disconnect_time);
-	printf("Refuse Machine Password Change: %d\n", ret->refuse_machine_password_change);
-
-	return NT_STATUS_OK;
-}
-
-static NTSTATUS print_samba3_sam(struct samba3 *samba3)
-{
-	struct samba3_samaccount *accounts = samba3->samaccounts;
-	uint32_t i;
-	print_header("SAM Database");
-	
-	for (i = 0; i < samba3->samaccount_count; i++) {
-		printf("%d: %s\n", accounts[i].user_rid, accounts[i].username);
-	}
-
-	return NT_STATUS_OK;
-}
-
-static NTSTATUS print_samba3_shares(struct samba3 *samba3)
-{
-	int i, j;
-	print_header("Configured shares");
-	for (i = 0; i < samba3->share_count; i++) {
-		struct samba3_share_info *share = &samba3->shares[i];
-		printf("--- %s ---\n", share->name);
-
-		for (j = 0; j < share->parameter_count; j++) {
-			printf("\t%s = %s\n", share->parameters[j].name, share->parameters[j].value);
-		}
-
-		printf("\n");
-	}
-
-	return NT_STATUS_OK;
-}
-
-static NTSTATUS print_samba3_secrets(struct samba3_secrets *secrets)
-{
-	int i;
-	print_header("Secrets");
-
-	printf("IPC Credentials:\n");
-	if (secrets->ipc_cred->username_obtained) {
-		TALLOC_CTX *mem_ctx = talloc_new(NULL);
-		printf("	User: %s\n", cli_credentials_get_username(secrets->ipc_cred, mem_ctx));
-		talloc_free(mem_ctx);
-	}
-	if (secrets->ipc_cred->password_obtained)
-		printf("	Password: %s\n", cli_credentials_get_password(secrets->ipc_cred));
-
-	if (secrets->ipc_cred->domain_obtained)
-		printf("	Domain: %s\n\n", cli_credentials_get_domain(secrets->ipc_cred));
-
-	printf("LDAP passwords:\n");
-	for (i = 0; i < secrets->ldappw_count; i++) {
-		printf("\t%s -> %s\n", secrets->ldappws[i].dn, secrets->ldappws[i].password);
-	}
-	printf("\n");
-
-	printf("Domains:\n");
-	for (i = 0; i < secrets->domain_count; i++) {
-		printf("\t--- %s ---\n", secrets->domains[i].name);
-		printf("\tSID: %s\n", dom_sid_string(NULL, &secrets->domains[i].sid));
-		printf("\tGUID: %s\n", GUID_string(NULL, &secrets->domains[i].guid));
-		printf("\tPlaintext pwd: %s\n", secrets->domains[i].plaintext_pw);
-		printf("\tLast Changed: %lu\n", secrets->domains[i].last_change_time);
-		printf("\tSecure Channel Type: %d\n\n", secrets->domains[i].sec_channel_type);
-	}
-
-	printf("Trusted domains:\n");
-	for (i = 0; i < secrets->trusted_domain_count; i++) {
-		int j;
-		for (j = 0; j < secrets->trusted_domains[i].uni_name_len; j++) {
-			printf("\t--- %s ---\n", secrets->trusted_domains[i].uni_name[j]);
-		}
-		printf("\tPassword: %s\n", secrets->trusted_domains[i].pass);
-		printf("\tModified: %lu\n", secrets->trusted_domains[i].mod_time);
-		printf("\tSID: %s\n", dom_sid_string(NULL, &secrets->trusted_domains[i].domain_sid));
-	}
-
-	return NT_STATUS_OK;
-}
-
-static NTSTATUS print_samba3_regdb(struct samba3_regdb *regdb)
-{
-	int i;
-	print_header("Registry");
-
-	for (i = 0; i < regdb->key_count; i++) {
-		int j;
-		printf("%s\n", regdb->keys[i].name);
-		for (j = 0; j < regdb->keys[i].value_count; j++) {
-			printf("\t%s: type %d, length %d\n", 
-				   regdb->keys[i].values[j].name,
-				   regdb->keys[i].values[j].type,
-				   regdb->keys[i].values[j].data.length);
-		}
-	}
-
-	return NT_STATUS_OK;
-}
-
-static NTSTATUS print_samba3_winsdb(struct samba3 *samba3)
-{
-	int i;
-	print_header("WINS Database");
-
-	for (i = 0; i < samba3->winsdb_count; i++) {
-		printf("%s, nb_flags: %x, type: %d, ttl: %lu, %d ips\n", samba3->winsdb_entries[i].name, samba3->winsdb_entries[i].nb_flags, samba3->winsdb_entries[i].type, samba3->winsdb_entries[i].ttl, samba3->winsdb_entries[i].ip_count);
-	}
-
-	return NT_STATUS_OK;
-}
-
-static NTSTATUS print_samba3_groupdb(struct samba3_groupdb *db)
-{
-	int i;
-	print_header("Group Mappings");
-	
-	for (i = 0; i < db->groupmap_count; i++) 
-	{
-		printf("\t--- Group: %s ---\n", db->groupmappings[i].nt_name);
-		printf("\tComment: %s\n", db->groupmappings[i].comment);
-		printf("\tGID: %d\n", db->groupmappings[i].gid);
-		printf("\tSID Name Use: %d\n", db->groupmappings[i].sid_name_use);
-		printf("\tSID: %s\n\n", dom_sid_string(NULL, db->groupmappings[i].sid));
-	}
-
-	for (i = 0; i < db->alias_count; i++)
-	{
-		int j;
-		printf("\t--- Alias: %s ---\n", dom_sid_string(NULL, db->aliases[i].sid));
-		for (j = 0; j < db->aliases[i].member_count; j++) {
-			printf("\t%s\n", dom_sid_string(NULL,db->aliases[i].members[j]));
-		}
-	}
-
-	return NT_STATUS_OK;
-}
-
-static NTSTATUS print_samba3_idmapdb(struct samba3_idmapdb *db)
-{
-	int i;
-	print_header("Winbindd SID<->GID/UID mappings");
-
-	printf("User High Water Mark: %d\n", db->user_hwm);
-	printf("Group High Water Mark: %d\n\n", db->group_hwm);
-
-	for (i = 0; i < db->mapping_count; i++) {
-		printf("%s -> %cID %d", 
-			  dom_sid_string(NULL, db->mappings[i].sid),
-			  (db->mappings[i].type == IDMAP_GROUP)?'G':'U',
-			  db->mappings[i].unix_id);
-	}
-
-	return NT_STATUS_OK;
-}
-
-static NTSTATUS print_samba3(struct samba3 *samba3)
-{
-	print_samba3_sam(samba3);
-	print_samba3_policy(&samba3->policy);
-	print_samba3_shares(samba3);
-	print_samba3_winsdb(samba3);
-	print_samba3_regdb(&samba3->registry);
-	print_samba3_secrets(&samba3->secrets);
-	print_samba3_groupdb(&samba3->group);
-	print_samba3_idmapdb(&samba3->idmap);
-
-	return NT_STATUS_OK;
-}
-
-static BOOL write_ldif(const char *fn, struct ldb_message **messages, int count)
-{
-	FILE *f = fopen(fn, "w+");
-	struct ldb_ldif ldif;
-	int i;
-	struct ldb_context *ldb = ldb_init(NULL);
-
-	if (!f) {
-		DEBUG(0, ("Unable to open LDIF file '%s'\n", fn));
-		talloc_free(ldb);
-		return False;
-	}
-
-	for (i = 0; i < count; i++) {
-		ldif.changetype = LDB_CHANGETYPE_ADD;
-		ldif.msg = messages[i];
-
-		ldb_ldif_write_file(ldb, f, &ldif);
-	}
-
-	talloc_free(ldb);
-
-	fclose(f);
-
-	return True;
-}
- 
-int main(int argc, char **argv)
-{
-	int opt;
-	const char *format = "summary";
-	char *libdir = NULL;
-	char *smbconf = NULL;
-	struct samba3 *samba3;
-	poptContext pc;
-	TALLOC_CTX *mem_ctx;
-	struct poptOption long_options[] = {
-		POPT_AUTOHELP
-		{ "format", 0, POPT_ARG_STRING, &format, 'f', "Format to use (one of: summary, text, ldif)" },
-		POPT_COMMON_SAMBA
-		POPT_TABLEEND
-	};
-
-	pc = poptGetContext(argv[0], argc, (const char **) argv, long_options,0);
-
-	poptSetOtherOptionHelp(pc, "<libdir> <smb.conf>");
-
-	while((opt = poptGetNextOpt(pc)) != -1) {
-	}
-
-	samba3dump_init_subsystems;
-
-	mem_ctx = talloc_init("samba3dump_context");
-
-	libdir = talloc_strdup(mem_ctx, poptGetArg(pc));
-	smbconf = talloc_strdup(mem_ctx, poptGetArg(pc));
-
-	printf("Reading from libdir '%s', smb.conf file '%s'\n", libdir, smbconf);
-
-	samba3_read(smbconf, libdir, mem_ctx, &samba3);
-
-	if (!strcmp(format, "summary")) {
-		printf("WINS db entries: %d\n", samba3->winsdb_count);
-		printf("SAM Accounts: %d\n", samba3->samaccount_count);
-		printf("Registry key count: %d\n", samba3->registry.key_count);
-		printf("Shares (including [global]): %d\n", samba3->share_count);
-		printf("Groupmap count: %d\n", samba3->group.groupmap_count);
-		printf("Alias count: %d\n", samba3->group.alias_count);
-		printf("Idmap count: %d\n", samba3->idmap.mapping_count);
-	} else if (!strcmp(format, "text")) {
-		print_samba3(samba3);
-	} else if (!strcmp(format, "ldif")) {
-		struct ldb_message **msgs;
-		struct ldb_context *ldb = ldb_init(mem_ctx);
-		int i, ret;
-		const char *hives[] = { "hklm", "hkcr", "hku", "hkpd", "hkpt", NULL };
-
-		for (i = 0; hives[i]; i++) {
-			char *fn;
-
-			ret = samba3_upgrade_registry(&samba3->registry, hives[i], ldb, &msgs); 
-
-			printf("Writing %s.ldif\n", hives[i]);
-			asprintf(&fn, "%s.ldif", hives[i]);
-			write_ldif(fn, msgs, ret); 
-			SAFE_FREE(fn);
-		}
-
-		ret = samba3_upgrade_sam(samba3, ldb, &msgs);
-		printf("Writing sam.ldif\n");
-		write_ldif("sam.ldif", msgs, ret);
-
-		ret = samba3_upgrade_winsdb(samba3, ldb, &msgs);
-		printf("Writing wins.ldif\n");
-		write_ldif("wins.ldif", msgs, ret);
-
-		ret = samba3_upgrade_winbind(samba3, ldb, &msgs);
-		printf("Writing winbind.ldif\n");
-		write_ldif("winbind.ldif", msgs, ret);
-	}
-	poptFreeContext(pc);
-
-	return 0;
-}