The branch, master has been updated
via d8f1298a9cb s3:tests: test_smbspool.sh should be calling
smbspool_argv_wrapper
via 6a7d404def0 s3:tests: Fix smbspool_argv_wrapper.c
from b3cae8dcf19 conf: Remove "smb3 unix extensions" parameter
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit d8f1298a9cbadd0021041ab6276573cc4f07d11f
Author: Pavel Filipenský <pfilipen...@samba.org>
Date: Sun Sep 24 21:07:04 2023 +0200
s3:tests: test_smbspool.sh should be calling smbspool_argv_wrapper
There is no variable named 'smbspool_argv_wrapper', the correct name is
'samba_argv_wrapper'. The smbspool_argv_wrapper was not called from this
test till now.
Signed-off-by: Pavel Filipenský <pfilipen...@samba.org>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
Autobuild-User(master): Pavel Filipensky <pfilipen...@samba.org>
Autobuild-Date(master): Sun Sep 24 22:33:07 UTC 2023 on atb-devel-224
commit 6a7d404def018213e823abbfc37de1f05ca65e2b
Author: Pavel Filipenský <pfilipen...@samba.org>
Date: Sun Sep 24 22:17:29 2023 +0200
s3:tests: Fix smbspool_argv_wrapper.c
smbspool_argv_wrapper must copy also the last argument
Signed-off-by: Pavel Filipenský <pfilipen...@samba.org>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
source3/script/tests/smbspool_argv_wrapper.c | 2 +-
source3/script/tests/test_smbspool.sh | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/script/tests/smbspool_argv_wrapper.c
b/source3/script/tests/smbspool_argv_wrapper.c
index f3024d9490d..6f84f3bbe47 100644
--- a/source3/script/tests/smbspool_argv_wrapper.c
+++ b/source3/script/tests/smbspool_argv_wrapper.c
@@ -57,7 +57,7 @@ int main(int argc, char *argv[], char *envp[])
* argv[0] 1 2 3 4 5 6
*/
- for (a = 2; a < argc-1; a++) {
+ for (a = 2; a < argc; a++) {
new_argv[a-2] = argv[a];
}
diff --git a/source3/script/tests/test_smbspool.sh
b/source3/script/tests/test_smbspool.sh
index 062d81cb9b8..acec0f2dbef 100755
--- a/source3/script/tests/test_smbspool.sh
+++ b/source3/script/tests/test_smbspool.sh
@@ -257,7 +257,7 @@ testit "vlp verify example.ps" \
DEVICE_URI="smb://$USERNAME:$PASSWORD@$SERVER_IP/print1"
export DEVICE_URI
testit "smbspool print sanitized Device URI in argv0 example.ps" \
- $smbspool_argv_wrapper $samba_smbspool smb://$SERVER_IP/print1 200
$USERNAME "Testprint" 1 "options" $SRCDIR/testdata/printing/example.ps ||
+ $samba_argv_wrapper $samba_smbspool smb://$SERVER_IP/print1 200
$USERNAME "Testprint" 1 "options" $SRCDIR/testdata/printing/example.ps ||
failed=$(expr $failed + 1)
unset DEVICE_URI
@@ -268,7 +268,7 @@ testit "vlp verify example.ps" \
DEVICE_URI="smb://$USERNAME:$PASSWORD@$SERVER_IP/print1"
export DEVICE_URI
testit "smbspool print sanitized Device URI in argv0 example.ps via stdin" \
- $smbspool_argv_wrapper $samba_smbspool smb://$SERVER_IP/print1 200
$USERNAME "Testprint" 1 "options" <$SRCDIR/testdata/printing/example.ps ||
+ $samba_argv_wrapper $samba_smbspool smb://$SERVER_IP/print1 200
$USERNAME "Testprint" 1 "options" <$SRCDIR/testdata/printing/example.ps ||
failed=$(expr $failed + 1)
unset DEVICE_URI
--
Samba Shared Repository
