The branch, master has been updated via 497f032 build: check for libarchive version via pkgconfig via 43227c3 cli: do not dump libarchive absence warning on startup via 6759008 s3-clitar: Fix identation. via 9951184 s3-clitar: Simplify is_subpath(). via 3b207dc s3-clitar: Improve readabilty of fix_unix_path(). via ef150e7 s3-clitar: Improve readabilty of max_token(). via 4f6552c s3-clitar: Improve readabilty of make_remote_path(). via 98ede41 s3-clitar: Improve readabilty of tar_path_in_list(). via 2ccba45 s3-clitar: Improve readabilty of tar_read_inclusion_file(). via f955bc4 s3-clitar: Improve readabilty of tar_set_newer_than(). via 75dbb27 s3-clitar: Improve readabilty of tar_send_file(). via f58ef38 s3-clitar: Improve readabilty of tar_extract(). via f8ac29d s3-clitar: Improve readabilty of get_file_callback(). via 4dd84bb s3-clitar: Improve readabilty of tar_create_from_list(). via 87c5258 s3-clitar: Improve readabilty of tar_parse_args(). via 034da62 s3-clitar: Improve readabilty of cmd_setmode(). via 7bb9836 s3-clitar: Improve readabilty of cmd_tar(). via a65f557 s3-clitar: Improve readabilty of cmd_block(). via 3707fba s3-clitar: Use ARRAY_SIZE macro. via 8524cf6 build: use configure var for libarchive depenency via 8dc6f0f clitar: get tar context handle via helper function via 14c6e9b s3: fix --with-libarchive bug, remove useless DEFINE() via a66942d clitar.c: fix segfault in cmd_block() via 95f9e60 s3: add --with-libarchive to build configuration via 92356e1 s3/selftest/tests.py: add test_smbclient_tarmode.pl to test suite via 1be1303 manpages/smbclient: remove trailing whitespace via 2155b5b manpages/smbclient: update tarmode documentation via b8844fc clitar.c: check all allocations return value via 68305d9 clitar.c: create and free talloc context properly via 08f3c4e clitar: remove unnecessary public function prototypes via 4426572 clitar.c: add prototype, rearrange definition for easier reading. via 5cd72b3 clitar.c: documentation via 82dce8f clitar.c: honor regex flag, emulate old behaviour (and quirks), add tests via fc05ff3 clitar.c: blocksize in block unit, fix error handling in tar_create(). via cae6738 client: fix tar_parse_args() compiler warning via 3a7efaa clitar.c: when returning int, always use 0 for success via 5fbe36c clitar.h: delete file via 9cb9077 clitar.c: default block size was a multiple of TBLOCK via 7c973de clitar.c: only list <include list> instead of whole share, handle wildcards via 679cd16 clitar.c: implement interactive command + respective test via 3348b13 clitar.c: cosmetic changes via 5f99b09 clitar.c: operation INCLUDE_LIST same as INCLUDE via 6d0ff6d clitar.c: fix creation exclusion, don't reverse in exclusion mode via b825854 clitar.c: fix include mode bug via cbad767 clitar.c: implement reset mode via e2b0092 clitar: implement exclusion filter for extraction via d96e2b2 clitar.c: implement dry mode, add total_size and fix write bug via d23074c clitar.c: add line in DBG macro via 39a21cd clitar.c: implement nosystem, nohidden and include filter. via 9032fc7 clitar.c: implement basic tar creation via ec1583e clitar.c: don't create file when processing dir via b7f6fd2 clitar.c: implement basic full extraction via c9e23fd clitar.c: fix_unix_path() now replace / with \ via dfd627b clitar.c: factor path_list handling in a function, remove tar_fd via 5af65f8 clitar.c: update TAR_DEFAULT_BLOCK_SIZE comment via 29542d1 clitar.c: start processing tar files in extraction mode via ed9d220 client.c: fix negation in tar_to_process test via 0babaf7 s3/wscript, s3/wscript_build: add libarchive dependency. via 50d0696 client.c, clitar.c: rename process_tar to tar_process, prepare code via 60eec86 clitar.c, client.c: add flag to know if there's a tar operation to do. via b753900 clitar.c: fix path name when adding them via 3a8e326 clitar: use lowercase for bool value via 113aa6f clitar.c: add tar_dump() debug function, fix bugs via 431483e client.c: remove unused extern declaration via 45a45c8 implement argument parsing, split client_proto.h via eebd378 client.c: remove trailing whitespace via 342d38e clitar.c: start of argument parsing via b9b5bc4 clitar.c: add doc, remove _t suffix in enum name via a896f04 clitar.c: add cmd_setmode(), remove typedef via 1d142c6 clitar.c: expand context structure and implement cmd_block() via 2945596 clitar.c: fresh new compilable file. from c28d16e Define the winbindd socket directory when building wbclient
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 497f0327a08fbfa444308c90a418ccb6b45b96d6 Author: David Disseldorp <dd...@samba.org> Date: Wed Feb 19 17:17:45 2014 +0100 build: check for libarchive version via pkgconfig The previous libarchive linker and header file check was not suitible for older libarchive versions that do not provide the function archive_read_support_filter_all(). Signed-off-by: David Disseldorp <dd...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> Autobuild-User(master): Andreas Schneider <a...@cryptomilk.org> Autobuild-Date(master): Wed Feb 19 20:19:07 CET 2014 on sn-devel-104 commit 43227c3d9fda806dc510fd552e340127192b9424 Author: David Disseldorp <dd...@samba.org> Date: Wed Feb 19 16:41:35 2014 +0100 cli: do not dump libarchive absence warning on startup tar_parse_args() already prints the warning if a tarmode argument is provided. Signed-off-by: David Disseldorp <dd...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit 67590086664abcae2fe1478a58ab45d5ff5594ec Author: Andreas Schneider <a...@samba.org> Date: Mon Feb 17 15:00:43 2014 +0100 s3-clitar: Fix identation. Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: David Disseldorp <dd...@samba.org> commit 995118484f7c1ef92b5539567cf878acc1c48b0a Author: Andreas Schneider <a...@samba.org> Date: Mon Feb 17 11:24:33 2014 +0100 s3-clitar: Simplify is_subpath(). Signed-off-by: Andreas Schneider <a...@samba.org> Signed-off-by: David Disseldorp <dd...@samba.org> commit 3b207dc0f3ef642ec5f16bc1dbce7c018c89cf55 Author: Andreas Schneider <a...@samba.org> Date: Mon Feb 17 11:32:14 2014 +0100 s3-clitar: Improve readabilty of fix_unix_path(). Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: David Disseldorp <dd...@samba.org> commit ef150e7dfa17bd0b6432ac8b5e1a6afd055edb17 Author: Andreas Schneider <a...@samba.org> Date: Mon Feb 17 11:28:13 2014 +0100 s3-clitar: Improve readabilty of max_token(). Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: David Disseldorp <dd...@samba.org> commit 4f6552c63ba0cc293463f38ed08cd30399fdad65 Author: Andreas Schneider <a...@samba.org> Date: Mon Feb 17 11:25:43 2014 +0100 s3-clitar: Improve readabilty of make_remote_path(). Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: David Disseldorp <dd...@samba.org> commit 98ede411e3baeb4da8854450e002e4478c32ddd3 Author: Andreas Schneider <a...@samba.org> Date: Mon Feb 17 11:12:05 2014 +0100 s3-clitar: Improve readabilty of tar_path_in_list(). Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: David Disseldorp <dd...@samba.org> commit 2ccba45d301997042e9b3ba07bd157d02b7e7b94 Author: Andreas Schneider <a...@samba.org> Date: Mon Feb 17 11:10:11 2014 +0100 s3-clitar: Improve readabilty of tar_read_inclusion_file(). Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: David Disseldorp <dd...@samba.org> commit f955bc4b5de449a6c6ffcbefa807b207d754adf8 Author: Andreas Schneider <a...@samba.org> Date: Mon Feb 17 11:07:16 2014 +0100 s3-clitar: Improve readabilty of tar_set_newer_than(). Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: David Disseldorp <dd...@samba.org> commit 75dbb27115ff2d32a69215075cc79bdfe956160f Author: Andreas Schneider <a...@samba.org> Date: Mon Feb 17 11:05:28 2014 +0100 s3-clitar: Improve readabilty of tar_send_file(). Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: David Disseldorp <dd...@samba.org> commit f58ef3878e0718cd95e09ffbba5dbaa374c2c2f0 Author: Andreas Schneider <a...@samba.org> Date: Mon Feb 17 11:03:53 2014 +0100 s3-clitar: Improve readabilty of tar_extract(). Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: David Disseldorp <dd...@samba.org> commit f8ac29d1acb528ae2471ac1300d134588ccaf990 Author: Andreas Schneider <a...@samba.org> Date: Mon Feb 17 10:59:27 2014 +0100 s3-clitar: Improve readabilty of get_file_callback(). Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: David Disseldorp <dd...@samba.org> commit 4dd84bb8300e987acaad6d887bf32438e668f847 Author: Andreas Schneider <a...@samba.org> Date: Mon Feb 17 10:57:29 2014 +0100 s3-clitar: Improve readabilty of tar_create_from_list(). Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: David Disseldorp <dd...@samba.org> commit 87c5258fa38bcef3776c42abe636291d16ec65b0 Author: Andreas Schneider <a...@samba.org> Date: Mon Feb 17 10:55:59 2014 +0100 s3-clitar: Improve readabilty of tar_parse_args(). Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: David Disseldorp <dd...@samba.org> commit 034da62e6bfa006974aac345d5140344c136a2d5 Author: Andreas Schneider <a...@samba.org> Date: Mon Feb 17 10:50:17 2014 +0100 s3-clitar: Improve readabilty of cmd_setmode(). Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: David Disseldorp <dd...@samba.org> commit 7bb9836c94e5659a2b9d6cca3becdd1dfc205932 Author: Andreas Schneider <a...@samba.org> Date: Mon Feb 17 10:49:16 2014 +0100 s3-clitar: Improve readabilty of cmd_tar(). Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: David Disseldorp <dd...@samba.org> commit a65f557c6b588b725d1e4900f1a0bf5772d9c892 Author: Andreas Schneider <a...@samba.org> Date: Mon Feb 17 10:47:15 2014 +0100 s3-clitar: Improve readabilty of cmd_block(). Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: David Disseldorp <dd...@samba.org> commit 3707fba088873988427875c60ae379dc6e218eda Author: Andreas Schneider <a...@samba.org> Date: Sat Feb 15 17:05:18 2014 +0100 s3-clitar: Use ARRAY_SIZE macro. Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: David Disseldorp <dd...@samba.org> commit 8524cf69d683107a488945bf39c55ceb57ed19a9 Author: David Disseldorp <dd...@samba.org> Date: Sat Feb 15 10:37:28 2014 +0100 build: use configure var for libarchive depenency Avoid CONFIG_SET('HAVE_LIBARCHIVE') checks in wscript_build, by using a simple archive_lib variable. Signed-off-by: David Disseldorp <dd...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit 8dc6f0fb39647e37a444ac582b5b33e27b40b3dc Author: David Disseldorp <dd...@samba.org> Date: Fri Feb 14 17:16:14 2014 +0100 clitar: get tar context handle via helper function Add and use tar_get_ctx() to get the tarmode context handle in client.c, rather than declaring an extern. Also, add checks for NULL context pointer arguments. Signed-off-by: David Disseldorp <dd...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit 14c6e9b6b8c0f67a0cd85508c94413fb42ac20f7 Author: Aurélien Aptel <aurelien.ap...@gmail.com> Date: Wed Aug 7 17:50:15 2013 +0200 s3: fix --with-libarchive bug, remove useless DEFINE() Signed-off-by: Aurélien Aptel <aurelien.ap...@gmail.com> Reviewed-by: David Disseldorp <dd...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit a66942df05ea536cdb2680f658b3d0d5683cceef Author: Aurélien Aptel <aurelien.ap...@gmail.com> Date: Wed Aug 7 16:49:20 2013 +0200 clitar.c: fix segfault in cmd_block() Signed-off-by: Aurélien Aptel <aurelien.ap...@gmail.com> Reviewed-by: David Disseldorp <dd...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit 95f9e60ef70a1925a463038f41476400b8990d5c Author: Aurélien Aptel <aurelien.ap...@gmail.com> Date: Wed Aug 7 16:34:22 2013 +0200 s3: add --with-libarchive to build configuration * skip tar tests if disabled * print error message when using disabled command * autodetection of libarchive Signed-off-by: Aurélien Aptel <aurelien.ap...@gmail.com> [dd...@samba.org: rebased against makefile cleanup] Reviewed-by: David Disseldorp <dd...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit 92356e1524b97abc7e8f8fb5c7e625dc200de277 Author: Aurélien Aptel <aurelien.ap...@gmail.com> Date: Mon Aug 5 19:02:47 2013 +0200 s3/selftest/tests.py: add test_smbclient_tarmode.pl to test suite Signed-off-by: Aurélien Aptel <aurelien.ap...@gmail.com> Reviewed-by: David Disseldorp <dd...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit 1be1303f1bfdd99bd13e3270fb87bbe02dc2b69a Author: Aurélien Aptel <aurelien.ap...@gmail.com> Date: Wed Jul 31 17:29:10 2013 +0200 manpages/smbclient: remove trailing whitespace Signed-off-by: Aurélien Aptel <aurelien.ap...@gmail.com> [dd...@samba.org: split from tarmode documentation chages] Reviewed-by: David Disseldorp <dd...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit 2155b5bb40403132117fb5fcb054ef036a4fedc1 Author: Aurélien Aptel <aurelien.ap...@gmail.com> Date: Thu Jan 30 13:05:31 2014 +0100 manpages/smbclient: update tarmode documentation * document tarmode (nosystem, nohidden) * deprecate r switch in tar options Signed-off-by: Aurélien Aptel <aurelien.ap...@gmail.com> [dd...@samba.org: split from whitespace cleanup] Reviewed-by: David Disseldorp <dd...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit b8844fcdaecdcaefe73b0455ed61da4d93c74793 Author: Aurélien Aptel <aurelien.ap...@gmail.com> Date: Wed Jul 24 17:32:17 2013 +0200 clitar.c: check all allocations return value Signed-off-by: Aurélien Aptel <aurelien.ap...@gmail.com> Reviewed-by: David Disseldorp <dd...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit 68305d90b3cfaa85d64321486e12c70eb2837111 Author: Aurélien Aptel <aurelien.ap...@gmail.com> Date: Wed Jul 24 16:48:02 2013 +0200 clitar.c: create and free talloc context properly Signed-off-by: Aurélien Aptel <aurelien.ap...@gmail.com> Reviewed-by: David Disseldorp <dd...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit 08f3c4e942ea3ff1d18ae4f39cce3eb271ad901e Author: David Disseldorp <dd...@samba.org> Date: Fri Feb 14 17:22:50 2014 +0100 clitar: remove unnecessary public function prototypes Public functions declared in clitar_proto.h needn't be listed as prototypes in clitar.c. Signed-off-by: David Disseldorp <dd...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit 44265721bc7137b7382c720f2b896653085e43f1 Author: Aurélien Aptel <aurelien.ap...@gmail.com> Date: Tue Jul 23 17:39:09 2013 +0200 clitar.c: add prototype, rearrange definition for easier reading. Signed-off-by: Aurélien Aptel <aurelien.ap...@gmail.com> Reviewed-by: David Disseldorp <dd...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit 5cd72b39b35efc5129596ed258187def57f2f209 Author: Aurélien Aptel <aurelien.ap...@gmail.com> Date: Tue Jul 23 16:55:50 2013 +0200 clitar.c: documentation Signed-off-by: Aurélien Aptel <aurelien.ap...@gmail.com> Reviewed-by: David Disseldorp <dd...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit 82dce8f7a8d340a39e08dcc12fb38b8ed254dc64 Author: Aurélien Aptel <aurelien.ap...@gmail.com> Date: Fri Jul 19 18:35:01 2013 +0200 clitar.c: honor regex flag, emulate old behaviour (and quirks), add tests Signed-off-by: Aurélien Aptel <aurelien.ap...@gmail.com> [dd...@samba.org: split from test changes already upstream] Reviewed-by: David Disseldorp <dd...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit fc05ff32fd7e8484f00e02a27d000e05748cdf74 Author: Aurélien Aptel <aurelien.ap...@gmail.com> Date: Thu Jul 18 17:06:33 2013 +0200 clitar.c: blocksize in block unit, fix error handling in tar_create(). Signed-off-by: Aurélien Aptel <aurelien.ap...@gmail.com> Reviewed-by: David Disseldorp <dd...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit cae67383ddd4373dcf8fc1f82a41dc30b1b7d299 Author: David Disseldorp <dd...@samba.org> Date: Fri Feb 14 18:08:28 2014 +0100 client: fix tar_parse_args() compiler warning tar_parse_args() requires a const argument array pointer. Signed-off-by: David Disseldorp <dd...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit 3a7efaa009d0d171b7c5920ccdf1fc43099d63c7 Author: Aurélien Aptel <aurelien.ap...@gmail.com> Date: Thu Jul 18 16:22:26 2013 +0200 clitar.c: when returning int, always use 0 for success Signed-off-by: Aurélien Aptel <aurelien.ap...@gmail.com> Reviewed-by: David Disseldorp <dd...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit 5fbe36cbaf2421327f25576e1b2c76322b765479 Author: Aurélien Aptel <aurelien.ap...@gmail.com> Date: Wed Jul 17 18:04:20 2013 +0200 clitar.h: delete file Signed-off-by: Aurélien Aptel <aurelien.ap...@gmail.com> Reviewed-by: David Disseldorp <dd...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit 9cb90772339c4beb87d85229b4010e7d36d12205 Author: Aurélien Aptel <aurelien.ap...@gmail.com> Date: Wed Jul 17 18:01:59 2013 +0200 clitar.c: default block size was a multiple of TBLOCK Signed-off-by: Aurélien Aptel <aurelien.ap...@gmail.com> Reviewed-by: David Disseldorp <dd...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit 7c973de80218a1f6f45c2aeeec4f485690d163bd Author: Aurélien Aptel <aurelien.ap...@gmail.com> Date: Wed Jul 17 16:25:34 2013 +0200 clitar.c: only list <include list> instead of whole share, handle wildcards Signed-off-by: Aurélien Aptel <aurelien.ap...@gmail.com> Reviewed-by: David Disseldorp <dd...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit 679cd1627021daf96ddc4c1dd8f71a2067dbaa99 Author: Aurélien Aptel <aurelien.ap...@gmail.com> Date: Tue Jul 16 19:15:48 2013 +0200 clitar.c: implement interactive command + respective test Signed-off-by: Aurélien Aptel <aurelien.ap...@gmail.com> [dd...@samba.org: split from test changes already upstream] Reviewed-by: David Disseldorp <dd...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit 3348b139d2a73c62181ad71be10973ec6e3a0366 Author: Aurélien Aptel <aurelien.ap...@gmail.com> Date: Tue Jul 16 16:32:29 2013 +0200 clitar.c: cosmetic changes Signed-off-by: Aurélien Aptel <aurelien.ap...@gmail.com> Reviewed-by: David Disseldorp <dd...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit 5f99b0915da12a2455555de4e9ac27d06fc92346 Author: Aurélien Aptel <aurelien.ap...@gmail.com> Date: Tue Jul 16 16:22:13 2013 +0200 clitar.c: operation INCLUDE_LIST same as INCLUDE use local variable during argument parsing to separate the 2 cases. Signed-off-by: Aurélien Aptel <aurelien.ap...@gmail.com> Reviewed-by: David Disseldorp <dd...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit 6d0ff6d2f0366e2b8f6d5dc3b15ddb3abb57163a Author: Aurélien Aptel <aurelien.ap...@gmail.com> Date: Tue Jul 16 16:16:29 2013 +0200 clitar.c: fix creation exclusion, don't reverse in exclusion mode Signed-off-by: Aurélien Aptel <aurelien.ap...@gmail.com> Reviewed-by: David Disseldorp <dd...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit b8258540055e01fcb2d26776be4b5914b00b5a8d Author: Aurélien Aptel <aurelien.ap...@gmail.com> Date: Tue Jul 16 15:49:27 2013 +0200 clitar.c: fix include mode bug - if we include path/a/, path/ was skipped because it's not in path/a/. - solution: add a flag to tar_path_in_list() to also check the opposite ie. if the list is in the path Signed-off-by: Aurélien Aptel <aurelien.ap...@gmail.com> Reviewed-by: David Disseldorp <dd...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit cbad767ded9fa50bb3045809e6af3287a59c69b4 Author: Aurélien Aptel <aurelien.ap...@gmail.com> Date: Tue Jul 16 14:47:29 2013 +0200 clitar.c: implement reset mode Signed-off-by: Aurélien Aptel <aurelien.ap...@gmail.com> Reviewed-by: David Disseldorp <dd...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit e2b0092e1dd7c5a9657960a2d80970dd9d04332e Author: Aurélien Aptel <aurelien.ap...@gmail.com> Date: Mon Jul 15 18:58:36 2013 +0200 clitar: implement exclusion filter for extraction Signed-off-by: Aurélien Aptel <aurelien.ap...@gmail.com> Reviewed-by: David Disseldorp <dd...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit d96e2b205298b637ba0d7eb7b2d47a818e64737d Author: Aurélien Aptel <aurelien.ap...@gmail.com> Date: Thu Jul 11 18:17:25 2013 +0200 clitar.c: implement dry mode, add total_size and fix write bug Signed-off-by: Aurélien Aptel <aurelien.ap...@gmail.com> Reviewed-by: David Disseldorp <dd...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit d23074cece79432bbeeac1d364300a9ccb0d5f76 Author: Aurélien Aptel <aurelien.ap...@gmail.com> Date: Thu Jul 11 18:12:38 2013 +0200 clitar.c: add line in DBG macro Signed-off-by: Aurélien Aptel <aurelien.ap...@gmail.com> Reviewed-by: David Disseldorp <dd...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit 39a21cdce3ba6deeb7c787de68f41ba88b87e88b Author: Aurélien Aptel <aurelien.ap...@gmail.com> Date: Thu Jul 11 15:56:03 2013 +0200 clitar.c: implement nosystem, nohidden and include filter. Signed-off-by: Aurélien Aptel <aurelien.ap...@gmail.com> Reviewed-by: David Disseldorp <dd...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit 9032fc7eec40dcd42b853ccd95e3c69c069b0b58 Author: Aurélien Aptel <aurelien.ap...@gmail.com> Date: Thu Jul 11 00:57:40 2013 +0200 clitar.c: implement basic tar creation Signed-off-by: Aurélien Aptel <aurelien.ap...@gmail.com> Reviewed-by: David Disseldorp <dd...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit ec1583ebd48d0077aa48149bcabd47fd87c65c83 Author: Aurélien Aptel <aurelien.ap...@gmail.com> Date: Wed Jul 10 14:12:25 2013 +0200 clitar.c: don't create file when processing dir Signed-off-by: Aurélien Aptel <aurelien.ap...@gmail.com> Reviewed-by: David Disseldorp <dd...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit b7f6fd26b6346eac7ec37cf6742d49cd179df960 Author: Aurélien Aptel <aurelien.ap...@gmail.com> Date: Wed Jul 10 13:16:08 2013 +0200 clitar.c: implement basic full extraction Signed-off-by: Aurélien Aptel <aurelien.ap...@gmail.com> Reviewed-by: David Disseldorp <dd...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit c9e23fd1a6c7595413dc0ea93db2c9936051b51d Author: Aurélien Aptel <aurelien.ap...@gmail.com> Date: Tue Jul 9 23:44:16 2013 +0200 clitar.c: fix_unix_path() now replace / with \ Signed-off-by: Aurélien Aptel <aurelien.ap...@gmail.com> Reviewed-by: David Disseldorp <dd...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit dfd627b902c8b81346fb8c5fd5f666a70762286a Author: Aurélien Aptel <aurelien.ap...@gmail.com> Date: Tue Jul 9 23:17:46 2013 +0200 clitar.c: factor path_list handling in a function, remove tar_fd Signed-off-by: Aurélien Aptel <aurelien.ap...@gmail.com> Reviewed-by: David Disseldorp <dd...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit 5af65f87b563690be773e79f1061225ab60d5d32 Author: Aurélien Aptel <aurelien.ap...@gmail.com> Date: Tue Jul 9 23:07:06 2013 +0200 clitar.c: update TAR_DEFAULT_BLOCK_SIZE comment Signed-off-by: Aurélien Aptel <aurelien.ap...@gmail.com> Reviewed-by: David Disseldorp <dd...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit 29542d1cb5d94b5edf952210f800db1e7b0d210b Author: Aurélien Aptel <aurelien.ap...@gmail.com> Date: Tue Jul 9 18:01:47 2013 +0200 clitar.c: start processing tar files in extraction mode - move default block size to a define - add doc comments - basic processing in tar_extract Signed-off-by: Aurélien Aptel <aurelien.ap...@gmail.com> Reviewed-by: David Disseldorp <dd...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit ed9d22097d2595fb096646f3a63ec434c4f20b60 Author: Aurélien Aptel <aurelien.ap...@gmail.com> Date: Tue Jul 9 18:01:07 2013 +0200 client.c: fix negation in tar_to_process test Signed-off-by: Aurélien Aptel <aurelien.ap...@gmail.com> [dd...@samba.org: rebase against lp_cli_maxprotocol() changes] Reviewed-by: David Disseldorp <dd...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit 0babaf7e9de4d700afb465d93d55c9ee42547dc3 Author: Aurélien Aptel <aurelien.ap...@gmail.com> Date: Tue Jul 9 17:57:37 2013 +0200 s3/wscript, s3/wscript_build: add libarchive dependency. - add header and lib checks. Signed-off-by: Aurélien Aptel <aurelien.ap...@gmail.com> [dd...@samba.org: rebase against makefile cleanup] Reviewed-by: David Disseldorp <dd...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit 50d069637d9a95c5728069600f9cd9e945725a42 Author: Aurélien Aptel <aurelien.ap...@gmail.com> Date: Tue Jul 9 15:24:40 2013 +0200 client.c, clitar.c: rename process_tar to tar_process, prepare code Signed-off-by: Aurélien Aptel <aurelien.ap...@gmail.com> Reviewed-by: David Disseldorp <dd...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit 60eec86ceb08814dabb986219f756d1645efb82c Author: Aurélien Aptel <aurelien.ap...@gmail.com> Date: Tue Jul 9 15:10:44 2013 +0200 clitar.c, client.c: add flag to know if there's a tar operation to do. - remove tar_type global. Signed-off-by: Aurélien Aptel <aurelien.ap...@gmail.com> [dd...@samba.org: rebase against lp_cli_maxprotocol() changes] Reviewed-by: David Disseldorp <dd...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit b753900b09e6b5001042e45388b72ad36e8a0093 Author: Aurélien Aptel <aurelien.ap...@gmail.com> Date: Tue Jul 9 14:27:55 2013 +0200 clitar.c: fix path name when adding them Signed-off-by: Aurélien Aptel <aurelien.ap...@gmail.com> Reviewed-by: David Disseldorp <dd...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit 3a8e3264d0da83817629def666c483b558d8d49d Author: Aurélien Aptel <aurelien.ap...@gmail.com> Date: Tue Jul 9 13:09:56 2013 +0200 clitar: use lowercase for bool value Signed-off-by: Aurélien Aptel <aurelien.ap...@gmail.com> Reviewed-by: David Disseldorp <dd...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit 113aa6f3d4b784e707bc8cc7084dd912f6a77252 Author: Aurélien Aptel <aurelien.ap...@gmail.com> Date: Tue Jul 9 11:41:06 2013 +0200 clitar.c: add tar_dump() debug function, fix bugs Signed-off-by: Aurélien Aptel <aurelien.ap...@gmail.com> Reviewed-by: David Disseldorp <dd...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit 431483e6b9210c396ddf119ded603ecc95c1ea98 Author: Aurélien Aptel <aurelien.ap...@gmail.com> Date: Mon Jul 8 18:18:09 2013 +0200 client.c: remove unused extern declaration Signed-off-by: Aurélien Aptel <aurelien.ap...@gmail.com> Reviewed-by: David Disseldorp <dd...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit 45a45c8edac20469e5b9e7b30a55e3a591b62f79 Author: Aurélien Aptel <aurelien.ap...@gmail.com> Date: Mon Jul 8 18:09:47 2013 +0200 implement argument parsing, split client_proto.h Signed-off-by: Aurélien Aptel <aurelien.ap...@gmail.com> Reviewed-by: David Disseldorp <dd...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit eebd378b6cbc4b19c35b670cd5e493ef575c19cb Author: Aurélien Aptel <aurelien.ap...@gmail.com> Date: Mon Jul 8 18:07:19 2013 +0200 client.c: remove trailing whitespace Signed-off-by: Aurélien Aptel <aurelien.ap...@gmail.com> Reviewed-by: David Disseldorp <dd...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit 342d38eb4b872c341cf25884f795ae38b04fca0f Author: Aurélien Aptel <aurelien.ap...@gmail.com> Date: Fri Jul 5 18:14:50 2013 +0200 clitar.c: start of argument parsing Signed-off-by: Aurélien Aptel <aurelien.ap...@gmail.com> Reviewed-by: David Disseldorp <dd...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit b9b5bc433d07376ae0bd96de3704162c67684734 Author: Aurélien Aptel <aurelien.ap...@gmail.com> Date: Fri Jul 5 11:33:55 2013 +0200 clitar.c: add doc, remove _t suffix in enum name Signed-off-by: Aurélien Aptel <aurelien.ap...@gmail.com> Reviewed-by: David Disseldorp <dd...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit a896f046fecde4d6601d4789ad2a7057a1d0c8da Author: Aurélien Aptel <aurelien.ap...@gmail.com> Date: Fri Jul 5 09:51:43 2013 +0200 clitar.c: add cmd_setmode(), remove typedef Signed-off-by: Aurélien Aptel <aurelien.ap...@gmail.com> Reviewed-by: David Disseldorp <dd...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit 1d142c6237ded9994e4846fccb5c2ea085fb31ee Author: Aurélien Aptel <aurelien.ap...@gmail.com> Date: Wed Jul 3 18:18:25 2013 +0200 clitar.c: expand context structure and implement cmd_block() Signed-off-by: Aurélien Aptel <aurelien.ap...@gmail.com> Reviewed-by: David Disseldorp <dd...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> commit 2945596011cc31df938692bdbad04e2feaee6fbb Author: Aurélien Aptel <aurelien.ap...@gmail.com> Date: Wed Jul 3 16:47:05 2013 +0200 clitar.c: fresh new compilable file. Signed-off-by: Aurélien Aptel <aurelien.ap...@gmail.com> Reviewed-by: David Disseldorp <dd...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> ----------------------------------------------------------------------- Summary of changes: docs-xml/manpages/smbclient.1.xml | 495 ++-- source3/client/client.c | 52 +- source3/client/client_proto.h | 9 - source3/client/clitar.c | 3109 +++++++++----------- .../passwd_proto.h => client/clitar_proto.h} | 26 +- source3/include/clitar.h | 40 - source3/selftest/tests.py | 35 +- source3/wscript | 12 + source3/wscript_build | 3 +- 9 files changed, 1799 insertions(+), 1982 deletions(-) copy source3/{utils/passwd_proto.h => client/clitar_proto.h} (61%) delete mode 100644 source3/include/clitar.h Changeset truncated at 500 lines: diff --git a/docs-xml/manpages/smbclient.1.xml b/docs-xml/manpages/smbclient.1.xml index b4f7896..81a47d3 100644 --- a/docs-xml/manpages/smbclient.1.xml +++ b/docs-xml/manpages/smbclient.1.xml @@ -80,171 +80,171 @@ <para>This tool is part of the <citerefentry><refentrytitle>samba</refentrytitle> <manvolnum>7</manvolnum></citerefentry> suite.</para> - <para><command>smbclient</command> is a client that can + <para><command>smbclient</command> is a client that can 'talk' to an SMB/CIFS server. It offers an interface similar to that of the ftp program (see <citerefentry><refentrytitle>ftp</refentrytitle> - <manvolnum>1</manvolnum></citerefentry>). - Operations include things like getting files from the server - to the local machine, putting files from the local machine to - the server, retrieving directory information from the server + <manvolnum>1</manvolnum></citerefentry>). + Operations include things like getting files from the server + to the local machine, putting files from the local machine to + the server, retrieving directory information from the server and so on. </para> </refsect1> <refsect1> <title>OPTIONS</title> - + <variablelist> <varlistentry> <term>servicename</term> - <listitem><para>servicename is the name of the service + <listitem><para>servicename is the name of the service you want to use on the server. A service name takes the form <filename>//server/service</filename> where <parameter>server - </parameter> is the NetBIOS name of the SMB/CIFS server - offering the desired service and <parameter>service</parameter> - is the name of the service offered. Thus to connect to + </parameter> is the NetBIOS name of the SMB/CIFS server + offering the desired service and <parameter>service</parameter> + is the name of the service offered. Thus to connect to the service "printer" on the SMB/CIFS server "smbserver", you would use the servicename <filename>//smbserver/printer </filename></para> - <para>Note that the server name required is NOT necessarily - the IP (DNS) host name of the server ! The name required is + <para>Note that the server name required is NOT necessarily + the IP (DNS) host name of the server ! The name required is a NetBIOS server name, which may or may not be the same as the IP hostname of the machine running the server. </para> - <para>The server name is looked up according to either - the <parameter>-R</parameter> parameter to <command>smbclient</command> or - using the name resolve order parameter in + <para>The server name is looked up according to either + the <parameter>-R</parameter> parameter to <command>smbclient</command> or + using the name resolve order parameter in the <citerefentry><refentrytitle>smb.conf</refentrytitle> - <manvolnum>5</manvolnum></citerefentry> file, - allowing an administrator to change the order and methods + <manvolnum>5</manvolnum></citerefentry> file, + allowing an administrator to change the order and methods by which server names are looked up. </para></listitem> </varlistentry> <varlistentry> <term>password</term> - <listitem><para>The password required to access the specified - service on the specified server. If this parameter is - supplied, the <parameter>-N</parameter> option (suppress + <listitem><para>The password required to access the specified + service on the specified server. If this parameter is + supplied, the <parameter>-N</parameter> option (suppress password prompt) is assumed. </para> - <para>There is no default password. If no password is supplied - on the command line (either by using this parameter or adding - a password to the <parameter>-U</parameter> option (see - below)) and the <parameter>-N</parameter> option is not - specified, the client will prompt for a password, even if - the desired service does not require one. (If no password is + <para>There is no default password. If no password is supplied + on the command line (either by using this parameter or adding + a password to the <parameter>-U</parameter> option (see + below)) and the <parameter>-N</parameter> option is not + specified, the client will prompt for a password, even if + the desired service does not require one. (If no password is required, simply press ENTER to provide a null password.) </para> - <para>Note: Some servers (including OS/2 and Windows for - Workgroups) insist on an uppercase password. Lowercase - or mixed case passwords may be rejected by these servers. + <para>Note: Some servers (including OS/2 and Windows for + Workgroups) insist on an uppercase password. Lowercase + or mixed case passwords may be rejected by these servers. </para> <para>Be cautious about including passwords in scripts. </para></listitem> </varlistentry> - + <varlistentry> <term>-R|--name-resolve <name resolve order></term> - <listitem><para>This option is used by the programs in the Samba - suite to determine what naming services and in what order to resolve - host names to IP addresses. The option takes a space-separated + <listitem><para>This option is used by the programs in the Samba + suite to determine what naming services and in what order to resolve + host names to IP addresses. The option takes a space-separated string of different name resolution options.</para> - <para>The options are :"lmhosts", "host", "wins" and "bcast". They + <para>The options are :"lmhosts", "host", "wins" and "bcast". They cause names to be resolved as follows:</para> <itemizedlist> - <listitem><para><constant>lmhosts</constant>: Lookup an IP - address in the Samba lmhosts file. If the line in lmhosts has - no name type attached to the NetBIOS name (see + <listitem><para><constant>lmhosts</constant>: Lookup an IP + address in the Samba lmhosts file. If the line in lmhosts has + no name type attached to the NetBIOS name (see the <citerefentry><refentrytitle>lmhosts</refentrytitle> <manvolnum>5</manvolnum></citerefentry> for details) then any name type matches for lookup.</para> </listitem> - - <listitem><para><constant>host</constant>: Do a standard host + + <listitem><para><constant>host</constant>: Do a standard host name to IP address resolution, using the system <filename>/etc/hosts - </filename>, NIS, or DNS lookups. This method of name resolution - is operating system dependent, for instance on IRIX or Solaris this - may be controlled by the <filename>/etc/nsswitch.conf</filename> - file). Note that this method is only used if the NetBIOS name - type being queried is the 0x20 (server) name type, otherwise + </filename>, NIS, or DNS lookups. This method of name resolution + is operating system dependent, for instance on IRIX or Solaris this + may be controlled by the <filename>/etc/nsswitch.conf</filename> + file). Note that this method is only used if the NetBIOS name + type being queried is the 0x20 (server) name type, otherwise it is ignored.</para> </listitem> - - <listitem><para><constant>wins</constant>: Query a name with + + <listitem><para><constant>wins</constant>: Query a name with the IP address listed in the <parameter>wins server</parameter> - parameter. If no WINS server has + parameter. If no WINS server has been specified this method will be ignored.</para> </listitem> - - <listitem><para><constant>bcast</constant>: Do a broadcast on - each of the known local interfaces listed in the + + <listitem><para><constant>bcast</constant>: Do a broadcast on + each of the known local interfaces listed in the <parameter>interfaces</parameter> - parameter. This is the least reliable of the name resolution - methods as it depends on the target host being on a locally + parameter. This is the least reliable of the name resolution + methods as it depends on the target host being on a locally connected subnet.</para> </listitem> </itemizedlist> - <para>If this parameter is not set then the name resolve order + <para>If this parameter is not set then the name resolve order defined in the <citerefentry><refentrytitle>smb.conf</refentrytitle> - <manvolnum>5</manvolnum></citerefentry> file parameter + <manvolnum>5</manvolnum></citerefentry> file parameter (name resolve order) will be used. </para> - <para>The default order is lmhosts, host, wins, bcast and without + <para>The default order is lmhosts, host, wins, bcast and without this parameter or any entry in the <parameter>name resolve order </parameter> parameter of the <citerefentry><refentrytitle>smb.conf</refentrytitle> <manvolnum>5</manvolnum></citerefentry> file the name resolution methods will be attempted in this order. </para></listitem> </varlistentry> - - + + <varlistentry> <term>-M|--message NetBIOS name</term> - <listitem><para>This options allows you to send messages, using - the "WinPopup" protocol, to another computer. Once a connection is - established you then type your message, pressing ^D (control-D) to + <listitem><para>This options allows you to send messages, using + the "WinPopup" protocol, to another computer. Once a connection is + established you then type your message, pressing ^D (control-D) to end. </para> - <para>If the receiving computer is running WinPopup the user will - receive the message and probably a beep. If they are not running - WinPopup the message will be lost, and no error message will + <para>If the receiving computer is running WinPopup the user will + receive the message and probably a beep. If they are not running + WinPopup the message will be lost, and no error message will occur. </para> - <para>The message is also automatically truncated if the message - is over 1600 bytes, as this is the limit of the protocol. + <para>The message is also automatically truncated if the message + is over 1600 bytes, as this is the limit of the protocol. </para> <para> - One useful trick is to pipe the message through <command>smbclient</command>. - For example: smbclient -M FRED < mymessage.txt will send the - message in the file <filename>mymessage.txt</filename> to the + One useful trick is to pipe the message through <command>smbclient</command>. + For example: smbclient -M FRED < mymessage.txt will send the + message in the file <filename>mymessage.txt</filename> to the machine FRED. </para> - <para>You may also find the <parameter>-U</parameter> and - <parameter>-I</parameter> options useful, as they allow you to + <para>You may also find the <parameter>-U</parameter> and + <parameter>-I</parameter> options useful, as they allow you to control the FROM and TO parts of the message. </para> <para>See the <parameter>message command</parameter> parameter in the <citerefentry><refentrytitle>smb.conf</refentrytitle> - <manvolnum>5</manvolnum></citerefentry> for a description of how to handle incoming + <manvolnum>5</manvolnum></citerefentry> for a description of how to handle incoming WinPopup messages in Samba. </para> - <para><emphasis>Note</emphasis>: Copy WinPopup into the startup group - on your WfWg PCs if you want them to always be able to receive + <para><emphasis>Note</emphasis>: Copy WinPopup into the startup group + on your WfWg PCs if you want them to always be able to receive messages. </para></listitem> </varlistentry> <varlistentry> <term>-p|--port port</term> - <listitem><para>This number is the TCP port number that will be used + <listitem><para>This number is the TCP port number that will be used when making connections to the server. The standard (well-known) - TCP port number for an SMB/CIFS server is 139, which is the + TCP port number for an SMB/CIFS server is 139, which is the default. </para></listitem> </varlistentry> @@ -281,40 +281,40 @@ <listitem><para><replaceable>IP address</replaceable> is the address of the server to connect to. It should be specified in standard "a.b.c.d" notation. </para> - <para>Normally the client would attempt to locate a named - SMB/CIFS server by looking it up via the NetBIOS name resolution - mechanism described above in the <parameter>name resolve order</parameter> + <para>Normally the client would attempt to locate a named + SMB/CIFS server by looking it up via the NetBIOS name resolution + mechanism described above in the <parameter>name resolve order</parameter> parameter above. Using this parameter will force the client - to assume that the server is on the machine with the specified IP - address and the NetBIOS name component of the resource being + to assume that the server is on the machine with the specified IP + address and the NetBIOS name component of the resource being connected to will be ignored. </para> - <para>There is no default for this parameter. If not supplied, - it will be determined automatically by the client as described + <para>There is no default for this parameter. If not supplied, + it will be determined automatically by the client as described above. </para></listitem> </varlistentry> - + <varlistentry> <term>-E|--stderr</term> - <listitem><para>This parameter causes the client to write messages - to the standard error stream (stderr) rather than to the standard + <listitem><para>This parameter causes the client to write messages + to the standard error stream (stderr) rather than to the standard output stream. </para> - - <para>By default, the client writes messages to standard output + + <para>By default, the client writes messages to standard output - typically the user's tty. </para></listitem> </varlistentry> - + <varlistentry> <term>-L|--list</term> - <listitem><para>This option allows you to look at what services - are available on a server. You use it as <command>smbclient -L + <listitem><para>This option allows you to look at what services + are available on a server. You use it as <command>smbclient -L host</command> and a list should appear. The <parameter>-I - </parameter> option may be useful if your NetBIOS names don't - match your TCP/IP DNS host names or if you are trying to reach a + </parameter> option may be useful if your NetBIOS names don't + match your TCP/IP DNS host names or if you are trying to reach a host on another network. </para></listitem> </varlistentry> - - <varlistentry> + + <varlistentry> <term>-b|--send-buffer buffersize</term> <listitem><para> When sending or receiving files, smbclient uses an @@ -328,7 +328,7 @@ using the <command>iosize</command> command inside smbclient. </para></listitem> </varlistentry> - + <varlistentry> <term>-B|--browse</term> <listitem><para>Browse SMB servers using DNS.</para> @@ -340,7 +340,7 @@ &popt.common.credentials; &popt.common.connection; &popt.autohelp; - + <varlistentry> <term>-t|--timeout <timeout-seconds></term> <listitem><para>This allows the user to tune the default @@ -357,144 +357,142 @@ <term>-T|--tar tar options</term> <listitem><para>smbclient may be used to create <command>tar(1) </command> compatible backups of all the files on an SMB/CIFS - share. The secondary tar flags that can be given to this option - are : </para> - + share. The secondary tar flags that can be given to this option + are:</para> + <itemizedlist> - <listitem><para><parameter>c</parameter> - Create a tar file on UNIX. - Must be followed by the name of a tar file, tape device - or "-" for standard output. If using standard output you must - turn the log level to its lowest value -d0 to avoid corrupting - your tar file. This flag is mutually exclusive with the + <listitem><para><parameter>c</parameter> - Create a tar + backup archive on the local system. Must be followed by + the name of a tar file, tape device or "-" for standard + output. If using standard output you must turn the log + level to its lowest value -d0 to avoid corrupting your tar + file. This flag is mutually exclusive with the <parameter>x</parameter> flag. </para></listitem> - - <listitem><para><parameter>x</parameter> - Extract (restore) a local - tar file back to a share. Unless the -D option is given, the tar - files will be restored from the top level of the share. Must be - followed by the name of the tar file, device or "-" for standard - input. Mutually exclusive with the <parameter>c</parameter> flag. + + <listitem><para><parameter>x</parameter> - Extract (restore) a local + tar file back to a share. Unless the -D option is given, the tar + files will be restored from the top level of the share. Must be + followed by the name of the tar file, device or "-" for standard + input. Mutually exclusive with the <parameter>c</parameter> flag. Restored files have their creation times (mtime) set to the - date saved in the tar file. Directories currently do not get + date saved in the tar file. Directories currently do not get their creation dates restored properly. </para></listitem> - - <listitem><para><parameter>I</parameter> - Include files and directories. - Is the default behavior when filenames are specified above. Causes - files to be included in an extract or create (and therefore - everything else to be excluded). See example below. Filename globbing - works in one of two ways. See <parameter>r</parameter> below. </para></listitem> - - <listitem><para><parameter>X</parameter> - Exclude files and directories. - Causes files to be excluded from an extract or create. See - example below. Filename globbing works in one of two ways now. + + <listitem><para><parameter>I</parameter> - Include files and directories. + Is the default behavior when filenames are specified above. Causes + files to be included in an extract or create (and therefore + everything else to be excluded). See example below. Filename globbing + works in one of two ways. See <parameter>r</parameter> below. </para></listitem> + + <listitem><para><parameter>X</parameter> - Exclude files and directories. + Causes files to be excluded from an extract or create. See + example below. Filename globbing works in one of two ways. See <parameter>r</parameter> below. </para></listitem> - + <listitem><para><parameter>F</parameter> - File containing a list of files and directories. The <parameter>F</parameter> causes the name following the tarfile to - create to be read as a filename that contains a list of files and directories to + create to be read as a filename that contains a list of files and directories to be included in an extract or create (and therefore everything else to be excluded). See example below. Filename globbing works in one of two ways. See <parameter>r</parameter> below. </para></listitem> - - <listitem><para><parameter>b</parameter> - Blocksize. Must be followed - by a valid (greater than zero) blocksize. Causes tar file to be - written out in blocksize*TBLOCK (usually 512 byte) blocks. + + <listitem><para><parameter>b</parameter> - Blocksize. Must be followed + by a valid (greater than zero) blocksize. Causes tar file to be + written out in blocksize*TBLOCK (512 byte) blocks. </para></listitem> - - <listitem><para><parameter>g</parameter> - Incremental. Only back up - files that have the archive bit set. Useful only with the + + <listitem><para><parameter>g</parameter> - Incremental. Only back up + files that have the archive bit set. Useful only with the <parameter>c</parameter> flag. </para></listitem> - <listitem><para><parameter>q</parameter> - Quiet. Keeps tar from printing - diagnostics as it works. This is the same as tarmode quiet. + <listitem><para><parameter>q</parameter> - Quiet. Keeps tar from printing + diagnostics as it works. This is the same as tarmode quiet. </para></listitem> - - <listitem><para><parameter>r</parameter> - Regular expression include - or exclude. Uses 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 '?'. + + <listitem><para><parameter>r</parameter> - Use wildcard + matching to include or exclude. Deprecated. </para></listitem> - - <listitem><para><parameter>N</parameter> - 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 tar file. Useful only with the + + <listitem><para><parameter>N</parameter> - 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 tar file. Useful only with the <parameter>c</parameter> flag. </para></listitem> - - <listitem><para><parameter>a</parameter> - Set archive bit. Causes the - archive bit to be reset when a file is backed up. Useful with the - <parameter>g</parameter> and <parameter>c</parameter> flags. + + <listitem><para><parameter>a</parameter> - Set archive bit. Causes the + archive bit to be reset when a file is backed up. Useful with the + <parameter>g</parameter> and <parameter>c</parameter> flags. </para></listitem> </itemizedlist> - + <para><emphasis>Tar Long File Names</emphasis></para> - - <para><command>smbclient</command>'s tar option now supports long - file names both on backup and restore. However, the full path - name of the file must be less than 1024 bytes. Also, when - a tar archive is created, <command>smbclient</command>'s tar option places all - files in the archive with relative names, not absolute names. + + <para><command>smbclient</command>'s tar option now supports long + file names both on backup and restore. However, the full path + name of the file must be less than 1024 bytes. Also, when + a tar archive is created, <command>smbclient</command>'s tar option places all + files in the archive with relative names, not absolute names. </para> <para><emphasis>Tar Filenames</emphasis></para> - - <para>All file names can be given as DOS path names (with '\\' - as the component separator) or as UNIX path names (with '/' as + + <para>All file names can be given as DOS path names (with '\\' + as the component separator) or as UNIX path names (with '/' as the component separator). </para> - + <para><emphasis>Examples</emphasis></para> - - <para>Restore from tar file <filename>backup.tar</filename> into myshare on mypc + + <para>Restore from tar file <filename>backup.tar</filename> into myshare on mypc (no password on share). </para> - + <para><command>smbclient //mypc/myshare "" -N -Tx backup.tar </command></para> - + <para>Restore everything except <filename>users/docs</filename> </para> - - <para><command>smbclient //mypc/myshare "" -N -TXx backup.tar + + <para><command>smbclient //mypc/myshare "" -N -TXx backup.tar users/docs</command></para> - + -- Samba Shared Repository