Merge branch 'upstream'

[debian/amanda] / client-src / sendbackup-gnutar.c

diff --git a/client-src/sendbackup-gnutar.c b/client-src/sendbackup-gnutar.c
index c11b55c5a65947ea1984fba7b4ab7274c3f7aa54..7e1a2a889cbfd3275d1da02e33891c8d41eff9bd 100644 (file)
--- a/client-src/sendbackup-gnutar.c
+++ b/client-src/sendbackup-gnutar.c
@@ -65,7 +65,8 @@ static amregex_t re_table[] = {
   /* samba may produce these output messages */
   AM_NORMAL_RE("^[Aa]dded interface"),
   AM_NORMAL_RE("^session request to "),
-  AM_NORMAL_RE("^tar: dumped [0-9][0-9]* (tar )?files"),
+  AM_NORMAL_RE("^ *tar: dumped [0-9][0-9]* (tar )?files"),
+  AM_NORMAL_RE("^Domain="),
 
 #if SAMBA_VERSION < 2
   AM_NORMAL_RE("^doing parameter"),
@@ -73,7 +74,6 @@ static amregex_t re_table[] = {
   AM_NORMAL_RE("^adding IPC"),
   AM_NORMAL_RE("^Opening"),
   AM_NORMAL_RE("^Connect"),
-  AM_NORMAL_RE("^Domain="),
   AM_NORMAL_RE("^max"),
   AM_NORMAL_RE("^security="),
   AM_NORMAL_RE("^capabilities"),