From 48a5e3fa09f1f5fc2ca7c7b5a17b58999092861a Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Fri, 19 Sep 2003 06:21:46 +0000
Subject: [PATCH] Merge from 3.0:

>The -P option to smbclient no longer works - update all smbprint scripts to
>remove it.  Closes bug #473.
(This used to be commit 87e8d584e992df9170b3a36ef60bcdea8ddc9887)
---
 examples/printing/smbprint        | 1 -
 examples/printing/smbprint-new.sh | 1 -
 examples/printing/smbprint.sysv   | 2 +-
 packaging/Mandrake/smbprint       | 2 +-
 packaging/RedHat/smbprint         | 2 +-
 5 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/examples/printing/smbprint b/examples/printing/smbprint
index 68bd66a13fe..61ee41f4440 100755
--- a/examples/printing/smbprint
+++ b/examples/printing/smbprint
@@ -140,6 +140,5 @@ $smbclient \
 	$IP \
 	$debugargs \
 	-U $username \
-	-P \
 	-c "$command"
 #
diff --git a/examples/printing/smbprint-new.sh b/examples/printing/smbprint-new.sh
index 68bd66a13fe..61ee41f4440 100644
--- a/examples/printing/smbprint-new.sh
+++ b/examples/printing/smbprint-new.sh
@@ -140,6 +140,5 @@ $smbclient \
 	$IP \
 	$debugargs \
 	-U $username \
-	-P \
 	-c "$command"
 #
diff --git a/examples/printing/smbprint.sysv b/examples/printing/smbprint.sysv
index 3e1cec47f50..11fea21441b 100644
--- a/examples/printing/smbprint.sysv
+++ b/examples/printing/smbprint.sysv
@@ -47,6 +47,6 @@ password=""
        echo translate
 	echo "print -"
 	cat $*
-) | /opt/samba/smbclient "\\\\$server\\$service" $password -N -P  > /dev/null
+) | /opt/samba/smbclient "\\\\$server\\$service" $password -N > /dev/null
 exit $?
 
diff --git a/packaging/Mandrake/smbprint b/packaging/Mandrake/smbprint
index 0d07c9c7833..b5f689f2912 100755
--- a/packaging/Mandrake/smbprint
+++ b/packaging/Mandrake/smbprint
@@ -74,4 +74,4 @@ echo "server $server, service $service" >> $logfile
 #       echo translate
 	echo "print -"
 	cat
-) | /usr/bin/smbclient "//$server/$service" $password -U $server -N -P >> $logfile
+) | /usr/bin/smbclient "//$server/$service" $password -U $server -N >> $logfile
diff --git a/packaging/RedHat/smbprint b/packaging/RedHat/smbprint
index ec083eede62..a0fd2e481b5 100755
--- a/packaging/RedHat/smbprint
+++ b/packaging/RedHat/smbprint
@@ -74,4 +74,4 @@ echo "server $server, service $service" >> $logfile
 #       echo translate
 	echo "print -"
 	cat
-) | /usr/bin/smbclient "\\\\$server\\$service" $password -U $server -N -P >> $logfile
+) | /usr/bin/smbclient "\\\\$server\\$service" $password -U $server -N >> $logfile
-- 
2.34.1