Rev 5323: merge from upstream in
http://samba.sernet.de/ma/bzr/SAMBA_3_0-registry.bzr/
Michael Adam
ma at sernet.de
Tue Apr 3 14:06:08 GMT 2007
At http://samba.sernet.de/ma/bzr/SAMBA_3_0-registry.bzr/
------------------------------------------------------------
revno: 5323
revision-id: ma at sernet.de-20070403140604-2790a9b4aa642558
parent: ma at sernet.de-20070403075257-2e642e2cd15e38e3
parent: metze at samba.org-20070403110435-8x51uxe9ewjrmb17
committer: Michael Adam <ma at sernet.de>
branch nick: SAMBA_3_0-registry.bzr
timestamp: Tue 2007-04-03 16:06:04 +0200
message:
merge from upstream
modified:
REVISION REVISION-20060530022625-68239662668b41c3
source/tdb/tools/tdbtool.c tdbtool.c-20060823151056-3fc2ae66c2a66158
------------------------------------------------------------
merged: metze at samba.org-20070403110435-8x51uxe9ewjrmb17
parent: metze at samba.org-20070403110154-1jy83ysidoekb3o7
committer: metze at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Tue 2007-04-03 06:04:35 -0500
message:
metze at samba.org (r22054) 2007-04-03 05:15:15 -0500 (Tue, 03 Apr 2007)
merge from samba4:
remove broken samba3 specific stuff from tdbtool
metze
------------------------------------------------------------
merged: metze at samba.org-20070403110154-1jy83ysidoekb3o7
parent: jra at samba.org-20070403050343-63g4g3ljd1xgbys5
committer: metze at samba.org
branch nick: SAMBA_3_0.bzr
timestamp: Tue 2007-04-03 06:01:54 -0500
message:
metze at samba.org (r22051) 2007-04-03 02:00:53 -0500 (Tue, 03 Apr 2007)
use libreplace headers
metze
=== modified file 'REVISION'
--- a/REVISION 2007-04-03 05:03:43 +0000
+++ b/REVISION 2007-04-03 11:04:35 +0000
@@ -2,9 +2,9 @@
URL: svn+ssh://svn.samba.org/home/svn/samba/branches/SAMBA_3_0
Repository Root: svn+ssh://svn.samba.org/home/svn/samba
Repository UUID: 0c0555d6-39d7-0310-84fc-f1cc0bd64818
-Revision: 22050
+Revision: 22054
Node Kind: directory
-Last Changed Author: jra
-Last Changed Rev: 22050
-Last Changed Date: 2007-04-02 23:52:09 -0500 (Mon, 02 Apr 2007)
+Last Changed Author: metze
+Last Changed Rev: 22054
+Last Changed Date: 2007-04-03 05:15:15 -0500 (Tue, 03 Apr 2007)
=== modified file 'source/tdb/tools/tdbtool.c'
--- a/source/tdb/tools/tdbtool.c 2007-04-02 23:03:37 +0000
+++ b/source/tdb/tools/tdbtool.c 2007-04-03 11:04:35 +0000
@@ -21,27 +21,16 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <errno.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <string.h>
-#include <fcntl.h>
-#include <time.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <ctype.h>
-#include <signal.h>
+#include "replace.h"
+#include "system/locale.h"
+#include "system/time.h"
+#include "system/filesys.h"
#include "tdb.h"
-#include "pstring.h"
static int do_command(void);
const char *cmdname;
char *arg1, *arg2;
size_t arg1len, arg2len;
-int do_connections;
int bIterate = 0;
char *line;
TDB_DATA iterate_kbuf;
@@ -52,7 +41,6 @@
CMD_OPEN_TDB,
CMD_ERASE,
CMD_DUMP,
- CMD_CDUMP,
CMD_INSERT,
CMD_MOVE,
CMD_STORE,
@@ -80,7 +68,6 @@
{"open", CMD_OPEN_TDB},
{"erase", CMD_ERASE},
{"dump", CMD_DUMP},
- {"cdump", CMD_CDUMP},
{"insert", CMD_INSERT},
{"move", CMD_MOVE},
{"store", CMD_STORE},
@@ -103,31 +90,8 @@
/* a tdb tool for manipulating a tdb database */
-/* these are taken from smb.h - make sure they are in sync */
-
-typedef struct connections_key {
- pid_t pid;
- int cnum;
- fstring name;
-} connections_key;
-
-typedef struct connections_data {
- int magic;
- pid_t pid;
- int cnum;
- uid_t uid;
- gid_t gid;
- char name[24];
- char addr[24];
- char machine[FSTRING_LEN];
- time_t start;
- unsigned bcast_msg_flags;
-} connections_data;
-
static TDB_CONTEXT *tdb;
-static int print_crec(TDB_CONTEXT *the_tdb, TDB_DATA key, TDB_DATA dbuf, void *state);
-static int print_arec(TDB_CONTEXT *the_tdb, TDB_DATA key, TDB_DATA dbuf, void *state);
static int print_rec(TDB_CONTEXT *the_tdb, TDB_DATA key, TDB_DATA dbuf, void *state);
static int print_key(TDB_CONTEXT *the_tdb, TDB_DATA key, TDB_DATA dbuf, void *state);
static int print_hexkey(TDB_CONTEXT *the_tdb, TDB_DATA key, TDB_DATA dbuf, void *state);
@@ -186,7 +150,6 @@
" open dbname : open an existing database\n"
" erase : erase the database\n"
" dump : dump the database as strings\n"
-" cdump : dump the database as connection records\n"
" keys : dump the database keys as strings\n"
" hexkeys : dump the database keys as hex values\n"
" info : print summary info about the database\n"
@@ -360,50 +323,8 @@
return;
}
-static int print_conn_key(TDB_DATA key)
-{
- printf( "\nkey %d bytes\n", (int)key.dsize);
- printf( "pid =%5d ", ((connections_key*)key.dptr)->pid);
- printf( "cnum =%10d ", ((connections_key*)key.dptr)->cnum);
- printf( "name =[%s]\n", ((connections_key*)key.dptr)->name);
- return 0;
-}
-
-static int print_conn_data(TDB_DATA dbuf)
-{
- printf( "\ndata %d bytes\n", (int)dbuf.dsize);
- printf( "pid =%5d ", ((connections_data*)dbuf.dptr)->pid);
- printf( "cnum =%10d ", ((connections_data*)dbuf.dptr)->cnum);
- printf( "name =[%s]\n", ((connections_data*)dbuf.dptr)->name);
-
- printf( "uid =%5d ", ((connections_data*)dbuf.dptr)->uid);
- printf( "addr =[%s]\n", ((connections_data*)dbuf.dptr)->addr);
- printf( "gid =%5d ", ((connections_data*)dbuf.dptr)->gid);
- printf( "machine=[%s]\n", ((connections_data*)dbuf.dptr)->machine);
- printf( "start = %s\n", ctime(&((connections_data*)dbuf.dptr)->start));
- printf( "magic = 0x%x ", ((connections_data*)dbuf.dptr)->magic);
- printf( "flags = 0x%x\n", ((connections_data*)dbuf.dptr)->bcast_msg_flags);
- return 0;
-}
-
static int print_rec(TDB_CONTEXT *the_tdb, TDB_DATA key, TDB_DATA dbuf, void *state)
{
- if (do_connections && (dbuf.dsize == sizeof(connections_data)))
- print_crec(the_tdb, key, dbuf, state);
- else
- print_arec(the_tdb, key, dbuf, state);
- return 0;
-}
-
-static int print_crec(TDB_CONTEXT *the_tdb, TDB_DATA key, TDB_DATA dbuf, void *state)
-{
- print_conn_key(key);
- print_conn_data(dbuf);
- return 0;
-}
-
-static int print_arec(TDB_CONTEXT *the_tdb, TDB_DATA key, TDB_DATA dbuf, void *state)
-{
printf("\nkey %d bytes\n", (int)key.dsize);
print_asc((const char *)key.dptr, key.dsize);
printf("\ndata %d bytes\n", (int)dbuf.dsize);
@@ -493,8 +414,6 @@
enum commands mycmd = CMD_HELP;
int cmd_len;
- do_connections = 0;
-
if (cmdname && strlen(cmdname) == 0) {
mycmd = CMD_NEXT;
} else {
@@ -540,11 +459,6 @@
bIterate = 0;
tdb_traverse(tdb, print_rec, NULL);
return 0;
- case CMD_CDUMP:
- do_connections = 1;
- bIterate = 0;
- tdb_traverse(tdb, print_rec, NULL);
- return 0;
case CMD_INSERT:
bIterate = 0;
insert_tdb(arg1, arg1len,arg2,arg2len);
More information about the samba-cvs
mailing list