Added changes to smbtar submitted by Sandy Whitesel

Added some extra documentation for smbclient

Grr, Jeremy beat me to a bug fix in client.c

Will have to get Jeremy to tell me how to check out SAMBA_2_0 :-)
(This used to be commit 8594c4bcae503972679c55a2fcab8eb69faf3ae3)

2 files changed, 16 insertions, 4 deletions

diff --git a/docs/yodldocs/smbclient.1.yo b/docs/yodldocs/smbclient.1.yo
index a211499408..e332f82556 100644
--- a/docs/yodldocs/smbclient.1.yo
+++ b/docs/yodldocs/smbclient.1.yo
@@ -357,12 +357,12 @@ share. The secondary tar flags that can be given to this option are :
 	dit(bf(I)) Include files and directories. Is the default
 	behavior when filenames are specified above. Causes tar files to
 	be included in an extract or create (and therefore everything else to
-	be excluded). See example below.  Filename globbing does not work for
-	included files for extractions (yet).
+	be excluded). See example below.  Filename globbing works 
+	in one of two ways.  See bf(r) below.
 
 	dit(bf(X)) Exclude files and directories. Causes tar files to
 	be excluded from an extract or create. See example below.  Filename
-	globbing does not work for excluded files (yet).
+	globbing works in one of two ways now. See bf(r) below.
 
 	dit(bf(b)) Blocksize. Must be followed by a valid (greater than
 	zero) blocksize.  Causes tar file to be written out in
@@ -374,6 +374,12 @@ share. The secondary tar flags that can be given to this option are :
 	dit(bf(q)) Quiet. Keeps tar from printing diagnostics as it
 	works.  This is the same as tarmode quiet.
 
+	dit(bf(r)) Regular expression include or exclude.  Uses regular 
+	regular expression matching for excluding or excluding files if 
+	compiled with HAVE_REGEX_H. However this mode can be very slow. If 
+	not compiled with HAVE_REGEX_H, does a limited wildcard match on * and 
+	?.
+
 	dit(bf(N)) Newer than. Must be followed by the name of a file
 	whose date is compared against files found on the share during a
 	create. Only files newer than the file specified are backed up to the
diff --git a/source3/script/smbtar b/source3/script/smbtar
index 25c36b2a8f..203d24cf63 100644
--- a/source3/script/smbtar
+++ b/source3/script/smbtar
@@ -7,6 +7,8 @@
 #
 # (May need to change shell to ksh for HPUX or OSF for better getopts)
 #
+# sandy nov 3 '98 added -a flag
+#
 # Richard Sharpe, added -c 'tarmode full' so that we back up all files to
 # fix a bug in clitar when a patch was added to stop system and hidden files
 # being backed up.
@@ -43,6 +45,7 @@ Function: backup/restore a Windows PC directories to a local tape file
 Options:         (Description)                 (Default)
   -r             Restore from tape file to PC  Save from PC to tapefile
   -i             Incremental mode              Full backup mode
+  -a             Reset archive bit mode        Don't reset archive bit
   -v             Verbose mode: echo command    Don't echo anything
   -s <server>    Specify PC Server             $server
   -p <password>  Specify PC Password           $password
@@ -69,7 +72,7 @@ if [ $# = 0 ]; then
 
 fi
 
-while getopts rivl:b:d:N:s:p:x:u:Xt: c; do
+while getopts riavl:b:d:N:s:p:x:u:Xt: c; do
   case $c in
    r) # [r]estore to Windows (instead of the default "Save from Windows")
       tarcmd="x"
@@ -77,6 +80,9 @@ while getopts rivl:b:d:N:s:p:x:u:Xt: c; do
    i) # [i]ncremental
       tarargs=${tarargs}g
       ;;
+   a) # [a]rchive
+      tarargs=${tarargs}a
+      ;;
    l) # specify [l]og file
       log="-d $OPTARG"
       case "$OPTARG" in