>I did not receive any answers to my posting, so I repost it below, just
>in case something went wrong.
It got through, but I tend to ignore postings about Samba problems as I
(thankfully) have very little experience with it. However, since nobody
else is stupid enough to dive in ... :-)
>The main point is that AMANDA interprets the number of blocks from the
>SAMBA du command as the wanted estimate ...
The patterns in client-src/sendsize.c appear to have been redone between
2.4.1 and 2.4.2 to address this problem. I don't think I could generate
a sensible patch, so have two possible workarounds:
* Update the client to 2.4.2.
* Get a copy of 2.4.2 and copy the re_size array from 2.4.2 back to
your 2.4.1 sources. I think that will work OK, i.e. there should
not be any internal changes that would cause the table to misbehave.
I've appended a quick and dirty diff between the two tables that might
also be of help if you want to hack it together yourself w/o 2.4.2.
>Chris Karakas
John R. Jackson, Technical Software Specialist, [EMAIL PROTECTED]
--- 2.4.1 Tue Oct 31 18:59:43 2000
+++ 2.4.2 Tue Oct 31 18:59:51 2000
@@ -1,40 +1,54 @@
regex_t re_size[] = {
+#ifdef DUMP
{" DUMP: estimated -*[0-9][0-9]* tape blocks", 1024},
{" DUMP: [Ee]stimated [0-9][0-9]* blocks", 512},
{" DUMP: [Ee]stimated [0-9][0-9]* bytes", 1}, /* Ultrix 4.4 */
{" UFSDUMP: estimated [0-9][0-9]* blocks", 512}, /* NEC EWS-UX */
- {"vdump: Dumping [0-9][0-9]* bytes, ", 1}, /* OSF/1 vdump */
{"dump: Estimate: [0-9][0-9]* tape blocks", 1024}, /* OSF/1 */
- {"vxdump: estimated [0-9][0-9]* blocks", 512}, /* HPUX's vxdump */
{"backup: There are an estimated [0-9][0-9]* tape blocks.",1024}, /* AIX */
{"backup: estimated [0-9][0-9]* 1k blocks", 1024}, /* AIX */
{"backup: estimated [0-9][0-9]* tape blocks", 1024}, /* AIX */
{"backup: [0-9][0-9]* tape blocks on [0-9][0-9]* tape(s)",1024}, /* AIX */
{"backup: [0-9][0-9]* 1k blocks on [0-9][0-9]* volume(s)",1024}, /* AIX */
- {"[0-9][0-9]* blocks, [0-9][0-9]*.[0-9][0-9]* volumes", 1024},
- /* DU 3.2g dump -E */
{"dump: Estimate: [0-9][0-9]* blocks being output to pipe",1024},
/* DU 4.0 dump */
{"dump: Dumping [0-9][0-9]* bytes, ", 1}, /* DU 4.0 vdump */
{"DUMP: estimated [0-9][0-9]* KB output", 1024}, /* HPUX */
- {"xfsdump: estimated dump size: [0-9][0-9]* bytes", 1}, /* Irix 6.2 xfs */
{" UFSDUMP: estimated [0-9][0-9]* blocks", 512}, /* Sinix */
+
+#ifdef HAVE_DUMP_ESTIMATE
+ {"[0-9][0-9]* blocks, [0-9][0-9]*.[0-9][0-9]* volumes", 1024},
+ /* DU 3.2g dump -E */
+ {"^[0-9][0-9]* blocks$", 1024}, /* DU 4.0 dump -E */
+ {"^[0-9][0-9]*$", 1}, /* Solaris ufsdump -S */
+#endif
+#endif
+
+#ifdef VDUMP
+ {"vdump: Dumping [0-9][0-9]* bytes, ", 1}, /* OSF/1 vdump */
+#endif
+
+#ifdef VXDUMP
+ {"vxdump: estimated [0-9][0-9]* blocks", 512}, /* HPUX's vxdump */
{" VXDUMP: estimated [0-9][0-9]* blocks", 512}, /* Sinix */
+#endif
+
+#ifdef XFSDUMP
+ {"xfsdump: estimated dump size: [0-9][0-9]* bytes", 1}, /* Irix 6.2 xfs */
+#endif
+
+#ifdef GNUTAR
{"Total bytes written: [0-9][0-9]*", 1}, /* Gnutar client */
+#endif
#ifdef SAMBA_CLIENT
- {"Total bytes listed: [0-9][0-9]*", 1}, /* Samba client */
+#if SAMBA_VERSION >= 2
+#define SAMBA_DEBUG_LEVEL "0"
+ {"Total number of bytes: [0-9][0-9]*", 1}, /* Samba du */
+#else
+#define SAMBA_DEBUG_LEVEL "3"
+ {"Total bytes listed: [0-9][0-9]*", 1}, /* Samba dir */
#endif
-
-#ifdef HAVE_DUMP_ESTIMATE
-# ifdef SAMBA_CLIENT
- /* On DU 4.0, dump -E prints a line that matches an output line of
- smbclient. So, even if both are enabled by configure, dump
- estimates will be disabled here. */
-# undef HAVE_DUMP_ESTIMATE
-# else
- {"[0-9][0-9]* blocks", 1024}, /* DU 4.0 dump -E */
-# endif
#endif
{ NULL, 0 }
