summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2003-09-19 06:21:46 +0000
committerTim Potter <tpot@samba.org>2003-09-19 06:21:46 +0000
commit48a5e3fa09f1f5fc2ca7c7b5a17b58999092861a (patch)
treef1e9d72da6f6fd25d080a86eafdeb86ff29f6bd0
parentdfc79d317e74c8a0fd38982e9a8491d8effd9ad4 (diff)
downloadsamba-48a5e3fa09f1f5fc2ca7c7b5a17b58999092861a.tar.gz
samba-48a5e3fa09f1f5fc2ca7c7b5a17b58999092861a.tar.bz2
samba-48a5e3fa09f1f5fc2ca7c7b5a17b58999092861a.zip
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)
-rwxr-xr-xexamples/printing/smbprint1
-rw-r--r--examples/printing/smbprint-new.sh1
-rw-r--r--examples/printing/smbprint.sysv2
-rwxr-xr-xpackaging/Mandrake/smbprint2
-rwxr-xr-xpackaging/RedHat/smbprint2
5 files changed, 3 insertions, 5 deletions
diff --git a/examples/printing/smbprint b/examples/printing/smbprint
index 68bd66a13f..61ee41f444 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 68bd66a13f..61ee41f444 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 3e1cec47f5..11fea21441 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 0d07c9c783..b5f689f291 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 ec083eede6..a0fd2e481b 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