From a45031933bf4a221daffed84ddb61f8ac2b8c979 Mon Sep 17 00:00:00 2001 From: Bryan Mason Date: Mon, 16 Sep 2019 12:35:06 -0700 Subject: [PATCH] s3:client:Use DEVICE_URI, instead of argv[0],for Device URI CUPS sanitizes argv[0] by removing username/password, so use DEVICE_URI environment variable first. BUG: https://bugzilla.samba.org/show_bug.cgi?id=14128 Signed-off-by: Bryan Mason --- source3/client/smbspool.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/source3/client/smbspool.c b/source3/client/smbspool.c index ad988eb0df9..6cc3364eb92 100644 --- a/source3/client/smbspool.c +++ b/source3/client/smbspool.c @@ -256,13 +256,12 @@ main(int argc, /* I - Number of command-line arguments */ /* * Find the URI ... + * Use DEVICE_URI if available, otherwise keep the URI found in argv */ - if (dev_uri == NULL) { - env = getenv("DEVICE_URI"); - if (env != NULL && env[0] != '\0') { - dev_uri = env; - } - } + env = getenv("DEVICE_URI"); + if (env != NULL && env[0] != '\0') { + dev_uri = env; + } if (dev_uri == NULL) { fprintf(stderr, -- 2.21.0