From 9012a501533126c4c0ac25a16fd6439a45df3d9a Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sat, 4 Dec 2004 10:14:03 +0000
Subject: r4059: moved the ldb -o option parsing to a common routine (This used
 to be commit ee52c1e38c9bac852458196ffbd677cca62a3965)

---
 source4/lib/ldb/tools/ldbsearch.c | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

(limited to 'source4/lib/ldb/tools/ldbsearch.c')

diff --git a/source4/lib/ldb/tools/ldbsearch.c b/source4/lib/ldb/tools/ldbsearch.c
index 9f6b2f617a..fced589572 100644
--- a/source4/lib/ldb/tools/ldbsearch.c
+++ b/source4/lib/ldb/tools/ldbsearch.c
@@ -34,6 +34,7 @@
 
 #include "includes.h"
 #include "ldb/include/ldb.h"
+#include "ldb/include/ldb_private.h"
 
 static void usage(void)
 {
@@ -125,18 +126,7 @@ static int do_search(struct ldb_context *ldb,
 			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;
+			options = ldb_options_parse(options, &ldbopts, optarg);
 			break;
 
 		case 'h':
-- 
cgit