summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2001-05-31 17:28:40 +0000
committerGerald Carter <jerry@samba.org>2001-05-31 17:28:40 +0000
commit7a33f253e15a0907b22eb03a3a2c79e9998aa1ec (patch)
treee617b1dda8d25f4d8410fd7584b9814b0cdff83b /source3
parent0b1f72eda3daf8c9a3a77930b646bd6d29a27fbf (diff)
downloadsamba-7a33f253e15a0907b22eb03a3a2c79e9998aa1ec.tar.gz
samba-7a33f253e15a0907b22eb03a3a2c79e9998aa1ec.tar.bz2
samba-7a33f253e15a0907b22eb03a3a2c79e9998aa1ec.zip
merge from 2.2
(This used to be commit 7e23ed48908cf396610d26efda9f54d5f5f0e83c)
Diffstat (limited to 'source3')
-rw-r--r--source3/libsmb/cli_spoolss.c2
-rw-r--r--source3/rpcclient/cmd_spoolss.c2
2 files changed, 1 insertions, 3 deletions
diff --git a/source3/libsmb/cli_spoolss.c b/source3/libsmb/cli_spoolss.c
index 4f8d6c0c88..2c962ef27a 100644
--- a/source3/libsmb/cli_spoolss.c
+++ b/source3/libsmb/cli_spoolss.c
@@ -677,7 +677,6 @@ uint32 cli_spoolss_setprinter(
make_spoolss_q_setprinter(mem_ctx, &q, pol, level, ctr, command);
/* Marshall data and send request */
- result = NT_STATUS_UNSUCCESSFUL;
if (!spoolss_io_q_setprinter("", &q, &qbuf, 0) ||
!rpc_api_pipe_req(cli, SPOOLSS_SETPRINTER, &qbuf, &rbuf))
{
@@ -686,7 +685,6 @@ uint32 cli_spoolss_setprinter(
}
/* Unmarshall response */
- result = NT_STATUS_UNSUCCESSFUL;
if (!spoolss_io_r_setprinter("", &r, &rbuf, 0))
{
goto done;
diff --git a/source3/rpcclient/cmd_spoolss.c b/source3/rpcclient/cmd_spoolss.c
index 9562df94c3..6b5d45a249 100644
--- a/source3/rpcclient/cmd_spoolss.c
+++ b/source3/rpcclient/cmd_spoolss.c
@@ -1285,7 +1285,7 @@ static uint32 cmd_spoolss_setdriver (struct cli_state *cli, int argc, char **arg
ctr.printers_2 = &info2;
if ((result = cli_spoolss_getprinter(cli, mem_ctx, &pol, level, &ctr)) != NT_STATUS_NOPROBLEMO)
{
- printf ("Unable to retreive printer information!\n");
+ printf ("Unable to retrieve printer information!\n");
goto done;
}