X-Git-Url: http://git.rot13.org/?p=BackupPC.git;a=blobdiff_plain;f=conf%2Fconfig.pl;h=679908eafed6ccf5e28c44f2687e0699f965d37d;hp=596dd10ee8522a53d1652d52cf2f64598888ec58;hb=8a5f496e93ee77491746cb72ef9949ab91c82dae;hpb=dcf156b7d70fbe2f114c1fed738f613d0b1a2775

diff --git a/conf/config.pl b/conf/config.pl
index 596dd10..679908e 100644
--- a/conf/config.pl
+++ b/conf/config.pl
@@ -531,17 +531,32 @@ $Conf{XferMethod} = 'smb';
 $Conf{SmbClientPath} = '/usr/bin/smbclient';
 
 #
-# Additional optional arguments to smbclient.
-#
-# Some users have reported that the -b option can be used to improve
-# performance of smbclient.  The default value is 4096, and if you
-# find smbclient has low throughput you might try a value of 2048, eg:
+# Commands to run smbclient for a full dump, incremental dump or a restore.
+# This setting only matters if $Conf{XferMethod} = 'smb'.
 #
-#     $Conf{SmbClientArgs} = '-b 2048';
+# Several variables are substituted at run-time:
 #
-# This setting only matters if $Conf{XferMethod} = 'smb'.
+#    $smbClientPath   same as $Conf{SmbClientPath}
+#    $host            host to backup/restore
+#    $hostIP          host IP address
+#    $shareName       share name
+#    $userName        user name
+#    $fileList        list of files to backup (based on exclude/include)
+#    $I_option        optional -I option to smbclient
+#    $X_option        exclude option (if $fileList is an exclude list)
+#    $timeStampFile   start time for incremental dump
 #
-$Conf{SmbClientArgs} = '';
+$Conf{SmbClientFullCmd} = '$smbClientPath \\\\$host\\$shareName'
+	    . ' $I_option -U $userName -E -N -d 1'
+            . ' -c tarmode\\ full -Tc$X_option - $fileList';
+
+$Conf{SmbClientIncrCmd} = '$smbClientPath \\\\$host\\$shareName'
+	    . ' $I_option -U $userName -E -N -d 1'
+	    . ' -c tarmode\\ full -TcN$X_option $timeStampFile - $fileList';
+
+$Conf{SmbClientRestoreCmd} = '$smbClientPath \\\\$host\\$shareName'
+            . ' $I_option -U $userName -E -N -d 1'
+            . ' -c tarmode\\ full -Tx -';
 
 #
 # Full command to run tar on the client.  GNU tar is required.  You will
@@ -796,13 +811,30 @@ $Conf{SshPath} = '/usr/bin/ssh';
 $Conf{NmbLookupPath} = '/usr/bin/nmblookup';
 
 #
-# NmbLookup command.  Several variables are substituted at run-time:
+# NmbLookup command.  Given an IP address, does an nmblookup on that
+# IP address.  Several variables are substituted at run-time:
 #
 #   $nmbLookupPath      path to nmblookup ($Conf{NmbLookupPath})
 #   $host               host name
 #
 $Conf{NmbLookupCmd} = '$nmbLookupPath -A $host';
 
+#
+# NmbLookup command.  Given a netbios name, finds that host by doing
+# a NetBios multicast.  Several variables are substituted at run-time:
+#
+#   $nmbLookupPath      path to nmblookup ($Conf{NmbLookupPath})
+#   $host               NetBios name
+#
+# In some cases you might need to change the broadcast address, for
+# example if nmblookup uses 192.168.255.255 by default and you find
+# that doesn't work, try 192.168.1.255 (or your equivalent class C
+# address) using the -B option:
+#
+#    $Conf{NmbLookupFindHostCmd} = '$nmbLookupPath -B 192.168.1.255 $host';
+#
+$Conf{NmbLookupFindHostCmd} = '$nmbLookupPath $host';
+
 #
 # For fixed IP address hosts, BackupPC_dump can also verify the netbios
 # name to ensure it matches the host name.  An error is generated if
@@ -920,6 +952,15 @@ $Conf{DumpPostUserCmd}    = undef;
 $Conf{RestorePreUserCmd}  = undef;
 $Conf{RestorePostUserCmd} = undef;
 
+#
+# Override the client's host name.  This allows multiple clients
+# to all refer to the same physical hosts.  This should only be
+# set in the per-PC config file.
+#
+# Note: this setting doesn't work for DHCP hosts.
+#
+$Conf{ClientNameAlias} = undef;
+
 #
 # Advanced option for asking BackupPC to load additional perl modules.
 # Can be a list (array ref) of module names to load at startup.