Add utility that takes a samba log file (at least level 5 for headers and

10 for data contents as well) and creates a packet trace readable by
ethereal.

What does not work yet:
 - SMB data contents (log level 5)
 - SMB data contents beyond the 512 byte range (log level 99 or something?)
(This used to be commit 95b1d4933b0de63613fe041c273d413d86909b4b)

2 files changed, 22 insertions, 16 deletions

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 94c6a5c8d9..ebf4c1abd5 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -523,6 +523,8 @@ VFSTEST_OBJ = torture/cmd_vfs.o torture/vfstest.o $(SMBD_OBJ_BASE) $(READLINE_OB
 
 SMBICONV_OBJ = $(PARAM_OBJ) torture/smbiconv.o $(LIB_OBJ) $(UBIQX_OBJ) $(POPT_LIB_OBJ)
 
+LOG2PCAP_OBJ = utils/log2pcaphex.o
+
 LOCKTEST2_OBJ = torture/locktest2.o $(PARAM_OBJ) $(LOCKING_OBJ) $(LIBSMB_OBJ) \
 		$(KRBCLIENT_OBJ) $(UBIQX_OBJ) $(LIB_OBJ)
 
@@ -865,6 +867,10 @@ bin/smbiconv@EXEEXT@: $(SMBICONV_OBJ) @BUILD_POPT@ bin/.dummy
 	@echo Linking $@
 	@$(CC) $(FLAGS) -o $@ $(SMBICONV_OBJ) $(LDFLAGS) $(TERMLDFLAGS) $(TERMLIBS) $(DYNEXP) $(LIBS) @POPTLIBS@
 
+bin/log2pcaphex@EXEEXT@: $(LOG2PCAP_OBJ) @BUILD_POPT@ bin/.dummy
+	@echo Linking $@
+	@$(CC) $(FLAGS) -o $@ $(LOG2PCAP_OBJ) $(LDFLAGS) @POPTLIBS@ $(LIBS)
+
 bin/locktest2@EXEEXT@: $(LOCKTEST2_OBJ) bin/.dummy
 	@echo Linking $@
 	@$(CC) $(FLAGS) -o $@ $(LOCKTEST2_OBJ) $(LDFLAGS) $(LIBS) $(KRB5LIBS) $(LDAPLIBS)
diff --git a/source3/utils/log2pcaphex.c b/source3/utils/log2pcaphex.c
index 790c699c55..ba5082da1e 100644
--- a/source3/utils/log2pcaphex.c
+++ b/source3/utils/log2pcaphex.c
@@ -1,25 +1,25 @@
 /* 
-Unix SMB/CIFS implementation.
-Utility to extract pcap files from samba (log level 10) log files
+   Unix SMB/CIFS implementation.
+   Utility to extract pcap files from samba (log level 10) log files
 
-Copyright (C) Jelmer Vernooij 2003
-Thanks to Tim Potter for the genial idea
+   Copyright (C) Jelmer Vernooij 2003
+   Thanks to Tim Potter for the genial idea
 
-Example use: log2pcaphex < samba-log-file | text2pcap -T 139,139 - foo.pcap
+   Example use: log2pcaphex < samba-log-file | text2pcap -T 139,139 - foo.pcap
 
-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
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+   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
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
 #include "includes.h"