1 files changed, 274 insertions, 61 deletions

diff --git a/source3/utils/dbwrap_tool.c b/source3/utils/dbwrap_tool.c
index 6809a0bc73..eb28902f55 100644
--- a/source3/utils/dbwrap_tool.c
+++ b/source3/utils/dbwrap_tool.c
@@ -4,6 +4,7 @@
    low level TDB/CTDB tool using the dbwrap interface
 
    Copyright (C) 2009 Michael Adam <obnox@samba.org>
+   Copyright (C) 2011 Bjoern Baumbach <bb@sernet.de>
 
    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
@@ -21,20 +22,31 @@
 
 #include "includes.h"
 #include "system/filesys.h"
-#include "dbwrap.h"
+#include "popt_common.h"
+#include "dbwrap/dbwrap.h"
+#include "dbwrap/dbwrap_open.h"
+#include "dbwrap/dbwrap_watch.h"
 #include "messages.h"
+#include "util_tdb.h"
 
-typedef enum { OP_FETCH, OP_STORE, OP_DELETE, OP_ERASE, OP_LISTKEYS } dbwrap_op;
+enum dbwrap_op { OP_FETCH, OP_STORE, OP_DELETE, OP_ERASE, OP_LISTKEYS,
+		 OP_LISTWATCHERS };
 
-typedef enum { TYPE_INT32, TYPE_UINT32 } dbwrap_type;
+enum dbwrap_type { TYPE_INT32, TYPE_UINT32, TYPE_STRING, TYPE_HEX, TYPE_NONE };
 
 static int dbwrap_tool_fetch_int32(struct db_context *db,
 				   const char *keyname,
-				   void *data)
+				   const char *data)
 {
 	int32_t value;
+	NTSTATUS status;
 
-	value = dbwrap_fetch_int32(db, keyname);
+	status = dbwrap_fetch_int32_bystring(db, keyname, &value);
+	if (!NT_STATUS_IS_OK(status)) {
+		d_printf("Error fetching int32 from key '%s': %s\n",
+			 keyname, nt_errstr(status));
+		return -1;
+	}
 	d_printf("%d\n", value);
 
 	return 0;
@@ -42,30 +54,89 @@ static int dbwrap_tool_fetch_int32(struct db_context *db,
 
 static int dbwrap_tool_fetch_uint32(struct db_context *db,
 				    const char *keyname,
-				    void *data)
+				    const char *data)
 {
 	uint32_t value;
-	bool ret;
+	NTSTATUS ret;
 
-	ret = dbwrap_fetch_uint32(db, keyname, &value);
-	if (ret) {
+	ret = dbwrap_fetch_uint32_bystring(db, keyname, &value);
+	if (NT_STATUS_IS_OK(ret)) {
 		d_printf("%u\n", value);
 		return 0;
 	} else {
-		d_fprintf(stderr, "ERROR: could not fetch uint32 key '%s'\n",
-			  keyname);
+		d_fprintf(stderr, "ERROR: could not fetch uint32 key '%s': "
+			  "%s\n", nt_errstr(ret), keyname);
 		return -1;
 	}
 }
 
+static int dbwrap_tool_fetch_string(struct db_context *db,
+				    const char *keyname,
+				    const char *data)
+{
+	TDB_DATA tdbdata;
+	NTSTATUS status;
+	TALLOC_CTX *tmp_ctx = talloc_stackframe();
+	int ret;
+
+	status = dbwrap_fetch_bystring(db, tmp_ctx, keyname, &tdbdata);
+	if (NT_STATUS_IS_OK(status)) {
+		d_printf("%-*.*s\n", (int)tdbdata.dsize, (int)tdbdata.dsize,
+			 tdbdata.dptr);
+		ret = 0;
+	} else {
+		d_fprintf(stderr, "ERROR: could not fetch string key '%s': "
+			  "%s\n", nt_errstr(status), keyname);
+		ret = -1;
+	}
+
+	talloc_free(tmp_ctx);
+	return ret;
+}
+
+static int dbwrap_tool_fetch_hex(struct db_context *db,
+				 const char *keyname,
+				 const char *data)
+{
+	TDB_DATA tdbdata;
+	DATA_BLOB datablob;
+	NTSTATUS status;
+	TALLOC_CTX *tmp_ctx = talloc_stackframe();
+	char *hex_string;
+	int ret;
+
+	status = dbwrap_fetch_bystring(db, tmp_ctx, keyname, &tdbdata);
+	if (NT_STATUS_IS_OK(status)) {
+	        datablob.data = tdbdata.dptr;
+		datablob.length = tdbdata.dsize;
+
+		hex_string = data_blob_hex_string_upper(tmp_ctx, &datablob);
+		if (hex_string == NULL) {
+			d_fprintf(stderr, "ERROR: could not get hex string "
+				  "from data blob\n");
+			ret = -1;
+		} else {
+			d_printf("%s\n", hex_string);
+			ret =  0;
+		}
+	} else {
+		d_fprintf(stderr, "ERROR: could not fetch hex key '%s': "
+			  "%s\n", nt_errstr(status), keyname);
+		ret = -1;
+	}
+
+	talloc_free(tmp_ctx);
+	return ret;
+}
+
 static int dbwrap_tool_store_int32(struct db_context *db,
 				   const char *keyname,
-				   void *data)
+				   const char *data)
 {
 	NTSTATUS status;
-	int32_t value = *((int32_t *)data);
+	int32_t value = (int32_t)strtol(data, NULL, 10);
 
-	status = dbwrap_trans_store_int32(db, keyname, value);
+	status = dbwrap_trans_store_int32_bystring(db, keyname, value);
 
 	if (!NT_STATUS_IS_OK(status)) {
 		d_fprintf(stderr, "ERROR: could not store int32 key '%s': %s\n",
@@ -78,12 +149,12 @@ static int dbwrap_tool_store_int32(struct db_context *db,
 
 static int dbwrap_tool_store_uint32(struct db_context *db,
 				    const char *keyname,
-				    void *data)
+				    const char *data)
 {
 	NTSTATUS status;
-	uint32_t value = *((uint32_t *)data);
+	uint32_t value = (uint32_t)strtol(data, NULL, 10);
 
-	status = dbwrap_trans_store_uint32(db, keyname, value);
+	status = dbwrap_trans_store_uint32_bystring(db, keyname, value);
 
 	if (!NT_STATUS_IS_OK(status)) {
 		d_fprintf(stderr,
@@ -95,9 +166,64 @@ static int dbwrap_tool_store_uint32(struct db_context *db,
 	return 0;
 }
 
+static int dbwrap_tool_store_string(struct db_context *db,
+				    const char *keyname,
+				    const char *data)
+{
+	NTSTATUS status;
+
+	status = dbwrap_trans_store_bystring(db, keyname,
+			   string_term_tdb_data(data), TDB_REPLACE);
+
+	if (!NT_STATUS_IS_OK(status)) {
+		d_fprintf(stderr,
+			  "ERROR: could not store string key '%s': %s\n",
+			  keyname, nt_errstr(status));
+		return -1;
+	}
+
+	return 0;
+}
+
+static int dbwrap_tool_store_hex(struct db_context *db,
+				    const char *keyname,
+				    const char *data)
+{
+	NTSTATUS status;
+	DATA_BLOB datablob;
+	TDB_DATA tdbdata;
+	TALLOC_CTX *tmp_ctx = talloc_stackframe();
+
+	datablob = strhex_to_data_blob(tmp_ctx, data);
+	if(strlen(data) > 0 && datablob.length == 0) {
+		d_fprintf(stderr,
+			  "ERROR: could not convert hex string to data blob\n"
+			  "       Not a valid hex string?\n");
+		talloc_free(tmp_ctx);
+		return -1;
+	}
+
+	tdbdata.dptr = (unsigned char *)datablob.data;
+	tdbdata.dsize = datablob.length;
+
+	status = dbwrap_trans_store_bystring(db, keyname,
+					     tdbdata,
+					     TDB_REPLACE);
+	if (!NT_STATUS_IS_OK(status)) {
+		d_fprintf(stderr,
+			  "ERROR: could not store string key '%s': %s\n",
+			  keyname, nt_errstr(status));
+		talloc_free(tmp_ctx);
+		return -1;
+	}
+
+	talloc_free(tmp_ctx);
+	return 0;
+}
+
 static int dbwrap_tool_delete(struct db_context *db,
 			      const char *keyname,
-			      void *data)
+			      const char *data)
 {
 	NTSTATUS status;
 
@@ -114,7 +240,7 @@ static int dbwrap_tool_delete(struct db_context *db,
 
 static int delete_fn(struct db_record *rec, void *priv)
 {
-	rec->delete_rec(rec);
+	dbwrap_record_delete(rec);
 	return 0;
 }
 
@@ -124,13 +250,13 @@ static int delete_fn(struct db_record *rec, void *priv)
  */
 static int dbwrap_tool_erase(struct db_context *db,
 			     const char *keyname,
-			     void *data)
+			     const char *data)
 {
-	int ret;
+	NTSTATUS status;
 
-	ret = db->traverse(db, delete_fn, NULL);
+	status = dbwrap_traverse(db, delete_fn, NULL, NULL);
 
-	if (ret < 0) {
+	if (!NT_STATUS_IS_OK(status)) {
 		d_fprintf(stderr, "ERROR erasing the database\n");
 		return -1;
 	}
@@ -140,8 +266,8 @@ static int dbwrap_tool_erase(struct db_context *db,
 
 static int listkey_fn(struct db_record *rec, void *private_data)
 {
-	int length = rec->key.dsize;
-	unsigned char *p = (unsigned char *)rec->key.dptr;
+	int length = dbwrap_record_get_key(rec).dsize;
+	unsigned char *p = (unsigned char *)dbwrap_record_get_key(rec).dptr;
 
 	while (length--) {
 		if (isprint(*p) && !strchr("\"\\", *p)) {
@@ -159,13 +285,13 @@ static int listkey_fn(struct db_record *rec, void *private_data)
 
 static int dbwrap_tool_listkeys(struct db_context *db,
 				const char *keyname,
-				void *data)
+				const char *data)
 {
-	int ret;
+	NTSTATUS status;
 
-	ret = db->traverse_read(db, listkey_fn, NULL);
+	status = dbwrap_traverse_read(db, listkey_fn, NULL, NULL);
 
-	if (ret < 0) {
+	if (!NT_STATUS_IS_OK(status)) {
 		d_fprintf(stderr, "ERROR listing db keys\n");
 		return -1;
 	}
@@ -173,22 +299,55 @@ static int dbwrap_tool_listkeys(struct db_context *db,
 	return 0;
 }
 
+static int dbwrap_tool_listwatchers_cb(const uint8_t *db_id, size_t db_id_len,
+				       const TDB_DATA key,
+				       const struct server_id *watchers,
+				       size_t num_watchers,
+				       void *private_data)
+{
+	uint32_t i;
+	dump_data_file(db_id, db_id_len, false, stdout);
+	dump_data_file(key.dptr, key.dsize, false, stdout);
+
+	for (i=0; i<num_watchers; i++) {
+		char *str = server_id_str(talloc_tos(), &watchers[i]);
+		printf("%s\n", str);
+		TALLOC_FREE(str);
+	}
+	printf("\n");
+	return 0;
+}
+
+
+static int dbwrap_tool_listwatchers(struct db_context *db,
+				    const char *keyname,
+				    const char *data)
+{
+	dbwrap_watchers_traverse_read(dbwrap_tool_listwatchers_cb, NULL);
+	return 0;
+}
+
 struct dbwrap_op_dispatch_table {
-	dbwrap_op op;
-	dbwrap_type type;
+	enum dbwrap_op op;
+	enum dbwrap_type type;
 	int (*cmd)(struct db_context *db,
 		   const char *keyname,
-		   void *data);
+		   const char *data);
 };
 
 struct dbwrap_op_dispatch_table dispatch_table[] = {
 	{ OP_FETCH,  TYPE_INT32,  dbwrap_tool_fetch_int32 },
 	{ OP_FETCH,  TYPE_UINT32, dbwrap_tool_fetch_uint32 },
+	{ OP_FETCH,  TYPE_STRING, dbwrap_tool_fetch_string },
+	{ OP_FETCH,  TYPE_HEX,    dbwrap_tool_fetch_hex },
 	{ OP_STORE,  TYPE_INT32,  dbwrap_tool_store_int32 },
 	{ OP_STORE,  TYPE_UINT32, dbwrap_tool_store_uint32 },
+	{ OP_STORE,  TYPE_STRING, dbwrap_tool_store_string },
+	{ OP_STORE,  TYPE_HEX,    dbwrap_tool_store_hex },
 	{ OP_DELETE, TYPE_INT32,  dbwrap_tool_delete },
 	{ OP_ERASE,  TYPE_INT32,  dbwrap_tool_erase },
 	{ OP_LISTKEYS, TYPE_INT32, dbwrap_tool_listkeys },
+	{ OP_LISTWATCHERS, TYPE_NONE, dbwrap_tool_listwatchers },
 	{ 0, 0, NULL },
 };
 
@@ -202,75 +361,112 @@ int main(int argc, const char **argv)
 
 	const char *dbname;
 	const char *opname;
-	dbwrap_op op;
+	enum dbwrap_op op;
 	const char *keyname = "";
 	const char *keytype = "int32";
-	dbwrap_type type;
+	enum dbwrap_type type;
 	const char *valuestr = "0";
-	int32_t value = 0;
 
 	TALLOC_CTX *mem_ctx = talloc_stackframe();
 
 	int ret = 1;
 
+	struct poptOption popt_options[] = {
+		POPT_AUTOHELP
+		POPT_COMMON_SAMBA
+		POPT_TABLEEND
+	};
+	int opt;
+	const char **extra_argv;
+	int extra_argc = 0;
+	poptContext pc;
+
 	load_case_tables();
 	lp_set_cmdline("log level", "0");
 	setup_logging(argv[0], DEBUG_STDERR);
-	lp_load(get_dyn_CONFIGFILE(), true, false, false, true);
 
-	if ((argc < 3) || (argc > 6)) {
+	pc = poptGetContext(argv[0], argc, argv, popt_options, POPT_CONTEXT_KEEP_FIRST);
+
+	while ((opt = poptGetNextOpt(pc)) != -1) {
+		switch (opt) {
+		default:
+			fprintf(stderr, "Invalid option %s: %s\n",
+				poptBadOption(pc, 0), poptStrerror(opt));
+			goto done;
+		}
+	}
+
+	/* setup the remaining options for the main program to use */
+	extra_argv = poptGetArgs(pc);
+	if (extra_argv) {
+		extra_argv++;
+		while (extra_argv[extra_argc]) extra_argc++;
+	}
+
+	lp_load_global(get_dyn_CONFIGFILE());
+
+	if ((extra_argc < 2) || (extra_argc > 5)) {
 		d_fprintf(stderr,
 			  "USAGE: %s <database> <op> [<key> [<type> [<value>]]]\n"
-			  "       ops: fetch, store, delete, erase, listkeys\n"
-			  "       types: int32, uint32\n",
+			  "       ops: fetch, store, delete, erase, listkeys, "
+			  "listwatchers\n"
+			  "       types: int32, uint32, string, hex\n",
 			 argv[0]);
 		goto done;
 	}
 
-	dbname = argv[1];
-	opname = argv[2];
+	dbname = extra_argv[0];
+	opname = extra_argv[1];
 
 	if (strcmp(opname, "store") == 0) {
-		if (argc != 6) {
+		if (extra_argc != 5) {
 			d_fprintf(stderr, "ERROR: operation 'store' requires "
 				  "value argument\n");
 			goto done;
 		}
-		valuestr = argv[5];
-		keytype = argv[4];
-		keyname = argv[3];
+		valuestr = extra_argv[4];
+		keytype = extra_argv[3];
+		keyname = extra_argv[2];
 		op = OP_STORE;
 	} else if (strcmp(opname, "fetch") == 0) {
-		if (argc != 5) {
+		if (extra_argc != 4) {
 			d_fprintf(stderr, "ERROR: operation 'fetch' requires "
 				  "type but not value argument\n");
 			goto done;
 		}
 		op = OP_FETCH;
-		keytype = argv[4];
-		keyname = argv[3];
+		keytype = extra_argv[3];
+		keyname = extra_argv[2];
 	} else if (strcmp(opname, "delete") == 0) {
-		if (argc != 4) {
+		if (extra_argc != 3) {
 			d_fprintf(stderr, "ERROR: operation 'delete' does "
 				  "not allow type nor value argument\n");
 			goto done;
 		}
-		keyname = argv[3];
+		keyname = extra_argv[2];
 		op = OP_DELETE;
 	} else if (strcmp(opname, "erase") == 0) {
-		if (argc != 3) {
+		if (extra_argc != 2) {
 			d_fprintf(stderr, "ERROR: operation 'erase' does "
 				  "not take a key argument\n");
 			goto done;
 		}
 		op = OP_ERASE;
 	} else if (strcmp(opname, "listkeys") == 0) {
-		if (argc != 3) {
+		if (extra_argc != 2) {
 			d_fprintf(stderr, "ERROR: operation 'listkeys' does "
 				  "not take a key argument\n");
 			goto done;
 		}
 		op = OP_LISTKEYS;
+	} else if (strcmp(opname, "listwatchers") == 0) {
+		if (extra_argc != 2) {
+			d_fprintf(stderr, "ERROR: operation 'listwatchers' "
+				  "does not take an argument\n");
+			goto done;
+		}
+		op = OP_LISTWATCHERS;
+		keytype = "none";
 	} else {
 		d_fprintf(stderr,
 			  "ERROR: invalid op '%s' specified\n"
@@ -281,13 +477,18 @@ int main(int argc, const char **argv)
 
 	if (strcmp(keytype, "int32") == 0) {
 		type = TYPE_INT32;
-		value = (int32_t)strtol(valuestr, NULL, 10);
 	} else if (strcmp(keytype, "uint32") == 0) {
 		type = TYPE_UINT32;
-		value = (int32_t)strtoul(valuestr, NULL, 10);
+	} else if (strcmp(keytype, "string") == 0) {
+		type = TYPE_STRING;
+	} else if (strcmp(keytype, "hex") == 0) {
+		type = TYPE_HEX;
+	} else if (strcmp(keytype, "none") == 0) {
+		type = TYPE_NONE;
 	} else {
 		d_fprintf(stderr, "ERROR: invalid type '%s' specified.\n"
-				  "       supported types: int32, uint32\n",
+				  "       supported types: int32, uint32, "
+				  "string, hex, none\n",
 				  keytype);
 		goto done;
 	}
@@ -298,23 +499,35 @@ int main(int argc, const char **argv)
 		goto done;
 	}
 
-	msg_ctx = messaging_init(mem_ctx, procid_self(), evt_ctx);
+	msg_ctx = messaging_init(mem_ctx, evt_ctx);
 	if (msg_ctx == NULL) {
 		d_fprintf(stderr, "ERROR: could not init messaging context\n");
 		goto done;
 	}
 
-	db = db_open(mem_ctx, dbname, 0, TDB_DEFAULT, O_RDWR | O_CREAT, 0644);
-	if (db == NULL) {
-		d_fprintf(stderr, "ERROR: could not open dbname\n");
-		goto done;
+	switch (op) {
+	case OP_FETCH:
+	case OP_STORE:
+	case OP_DELETE:
+	case OP_ERASE:
+	case OP_LISTKEYS:
+		db = db_open(mem_ctx, dbname, 0, TDB_DEFAULT, O_RDWR | O_CREAT,
+			     0644, DBWRAP_LOCK_ORDER_1);
+		if (db == NULL) {
+			d_fprintf(stderr, "ERROR: could not open dbname\n");
+			goto done;
+		}
+		break;
+	default:
+		db = NULL;
+		break;
 	}
 
 	for (count = 0; dispatch_table[count].cmd != NULL; count++) {
 		if ((op == dispatch_table[count].op) &&
 		    (type == dispatch_table[count].type))
 		{
-			ret = dispatch_table[count].cmd(db, keyname, &value);
+			ret = dispatch_table[count].cmd(db, keyname, valuestr);
 			break;
 		}
 	}