Merge from 3.0:

>The -P option to smbclient no longer works - update all smbprint scripts to
>remove it.  Closes bug #473.

diff --git a/examples/printing/smbprint b/examples/printing/smbprint
index 68bd66a13fe510f2213ada71a1611989f69e8f26..61ee41f4440f20d7a03ae65ed8b89b87d2562927 100755 (executable)
--- 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 68bd66a13fe510f2213ada71a1611989f69e8f26..61ee41f4440f20d7a03ae65ed8b89b87d2562927 100644 (file)
--- 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 3e1cec47f50b7265d1c2b235b3cb1f8b96f57797..11fea21441b61983362306e2c4f2c5e718392667 100644 (file)
--- 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 0d07c9c7833db3c62144acf1dd40e684838457d4..b5f689f29127be3e0fdc5a81084c6e47bc1164d9 100755 (executable)
--- 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 ec083eede6236f3e789395470db7853fca93d12a..a0fd2e481b5f22efc4f0911c49bc5ba7f9be83d1 100755 (executable)
--- 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