Rev 247: make catdb take a dbname instead of an id in http://samba.org/~tridge/ctdb

[tridge at samba.org]

------------------------------------------------------------
revno: 247
revision-id: tridge at samba.org-20070504032530-ni45j80aucjdgxfe
parent: tridge at samba.org-20070504021839-0d8138o2tzki943u
committer: Andrew Tridgell <tridge at samba.org>
branch nick: tridge
timestamp: Fri 2007-05-04 13:25:30 +1000
message:
  make catdb take a dbname instead of an id
modified:
  tools/ctdb_control.c           ctdb_control.c-20070426122705-9ehj1l5lu2gn9kuj-1
=== modified file 'tools/ctdb_control.c'
--- a/tools/ctdb_control.c	2007-05-04 02:18:39 +0000
+++ b/tools/ctdb_control.c	2007-05-04 03:25:30 +0000
@@ -46,7 +46,7 @@
 		"  getdbmap <vnn>                     lists databases on a node\n"
 		"  getnodemap <vnn>                   lists nodes known to a ctdb daemon\n"
 		"  createdb <vnn> <dbname>            create a database\n"
-		"  catdb <dbid>                       lists all keys/data in a db\n"
+		"  catdb <dbname>                     lists all keys/data in a db\n"
 		"  cpdb <fromvnn> <tovnn> <dbid>      lists all keys in a remote tdb\n"
 		"  setdmaster <vnn> <dbid> <dmaster>  sets new dmaster for all records in the database\n"
 		"  cleardb <vnn> <dbid>               deletes all records in a db\n"
@@ -512,7 +512,7 @@
  */
 static int control_catdb(struct ctdb_context *ctdb, int argc, const char **argv)
 {
-	uint32_t dbid;
+	const char *db_name;
 	struct ctdb_db_context *ctdb_db;
 	int ret;
 
@@ -520,11 +520,10 @@
 		usage();
 	}
 
-	dbid = strtoul(argv[0], NULL, 0);
-	
-	ctdb_db = find_ctdb_db(ctdb, dbid);
+	db_name = argv[0];
+	ctdb_db = ctdb_attach(ctdb, db_name);
 	if (ctdb_db == NULL) {
-		printf("Unable to find database 0x%x\n", dbid);
+		DEBUG(0,("Unable to attach to database '%s'\n", db_name));
 		return -1;
 	}
 
@@ -534,6 +533,8 @@
 		return -1;
 	}
 
+	talloc_free(ctdb_db);
+
 	printf("Dumped %d records\n", ret);
 	return 0;
 }