diff options
| author | Eloy Paris <peloy@samba.org> | 2003-07-15 17:22:38 +0000 |
|---|---|---|
| committer | Eloy Paris <peloy@samba.org> | 2003-07-15 17:22:38 +0000 |
| commit | 4a12fe6044229cc5f59bd5029309ba9fe331b214 (patch) | |
| tree | 582683bfb7da617aad2fd4a40ed323c52dfab2cc /packaging/Debian/debian/patches/smbclient-tar.patch | |
| parent | 8c4be2bbc9d1b42ae1b26a3a2519dd2c911dee45 (diff) | |
| download | samba-4a12fe6044229cc5f59bd5029309ba9fe331b214.tar.gz samba-4a12fe6044229cc5f59bd5029309ba9fe331b214.tar.bz2 samba-4a12fe6044229cc5f59bd5029309ba9fe331b214.zip | |
Debian updates. Brings files in packaging/Debian on par with the
latest Debian official packages for Debian unstable. Also fixes
patches that got out of date in the beta2->beta3 development process.
(This used to be commit 03871fd574bf9c0f6d88c96423f77e9ada7b16f7)
Diffstat (limited to 'packaging/Debian/debian/patches/smbclient-tar.patch')
| -rw-r--r-- | packaging/Debian/debian/patches/smbclient-tar.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/packaging/Debian/debian/patches/smbclient-tar.patch b/packaging/Debian/debian/patches/smbclient-tar.patch new file mode 100644 index 0000000000..e6cdcafbf8 --- /dev/null +++ b/packaging/Debian/debian/patches/smbclient-tar.patch @@ -0,0 +1,43 @@ +diff -uNr samba-3.0.0beta2.orig/source/client/client.c samba-3.0.0beta2/source/client/client.c +--- samba-3.0.0beta2.orig/source/client/client.c 2003-07-01 22:36:24.000000000 -0500 ++++ samba-3.0.0beta2/source/client/client.c 2003-07-06 15:17:36.000000000 -0500 +@@ -2731,6 +2731,7 @@ + int opt; + pstring query_host; + BOOL message = False; ++ char* tar_args = NULL; + extern char tar_type; + pstring term_code; + static const char *new_name_resolve_order = NULL; +@@ -2816,7 +2817,7 @@ + max_protocol = interpret_protocol(poptGetOptArg(pc), max_protocol); + break; + case 'T': +- if (!tar_parseargs(argc, argv, poptGetOptArg(pc), optind)) { ++ if (!(tar_args = poptGetOptArg(pc))) { + poptPrintUsage(pc, stderr, 0); + exit(1); + } +@@ -2848,6 +2849,22 @@ + pstrcpy(cmdline_auth_info.password,poptGetArg(pc)); + } + ++ /* The tar command may take a number of string options; pass ++ everything we have left to tar_parseargs(). */ ++ if (tar_args) { ++ const char **argv2 = poptGetArgs(pc); ++ int argc2 = 0; ++ ++ if (argv2) { ++ while (argv2[argc2]) argc2++; ++ } ++ ++ if (!tar_parseargs(argc2, argv2, tar_args, 0)) { ++ poptPrintUsage(pc, stderr, 0); ++ exit(1); ++ } ++ } ++ + init_names(); + + if(new_name_resolve_order) |