r3754: merge in ldb modules support from the tmp branch ldbPlugins

(This used to be commit 71323f424b4561af1fdddd2358629049be3dad8c)

1 files changed, 20 insertions, 2 deletions

diff --git a/source4/lib/ldb/tools/ldbadd.c b/source4/lib/ldb/tools/ldbadd.c
index 9383197ed0..6d04800502 100644
--- a/source4/lib/ldb/tools/ldbadd.c
+++ b/source4/lib/ldb/tools/ldbadd.c
@@ -83,16 +83,34 @@ static int process_file(struct ldb_context *ldb, FILE *f)
 	struct ldb_context *ldb;
 	int count=0;
 	const char *ldb_url;
+	const char **options = NULL;
+	int ldbopts;
 	int opt, i;
 
 	ldb_url = getenv("LDB_URL");
 
-	while ((opt = getopt(argc, argv, "hH:")) != EOF) {
+	ldbopts = 0;
+	while ((opt = getopt(argc, argv, "hH:o:")) != EOF) {
 		switch (opt) {
 		case 'H':
 			ldb_url = optarg;
 			break;
 
+		case 'o':
+			ldbopts++;
+			if (options == NULL) {
+				options = (const char **)malloc(sizeof(char *) * (ldbopts + 1));
+			} else {
+				options = (const char **)realloc(options, sizeof(char *) * (ldbopts + 1));
+				if (options == NULL) {
+					fprintf(stderr, "Out of memory!\n");
+					exit(-1);
+				}
+			}
+			options[ldbopts - 1] = optarg;
+			options[ldbopts] = NULL;
+			break;
+
 		case 'h':
 		default:
 			usage();
@@ -108,7 +126,7 @@ static int process_file(struct ldb_context *ldb, FILE *f)
 	argc -= optind;
 	argv += optind;
 
-	ldb = ldb_connect(ldb_url, 0, NULL);
+	ldb = ldb_connect(ldb_url, 0, options);
 
 	if (!ldb) {
 		perror("ldb_connect");