The branch, v3-5-test has been updated
via df5f448... s3-spoolss: Fix _spoolss_EnumPrinters servername
handling.
via cb6fcb9... s3-spoolss: in spoolss_EnumPrinters r->in.server is a
*unique* pointer!
from 7f57b62... Fix bug #7263 - Unable to print using Samba 3.5.1 and
cups-1.1.23-40.46 on SLES10.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test
- Log -----------------------------------------------------------------
commit df5f448fe371a1227a507cedc2642fa1a4b77e65
Author: Günther Deschner <[email protected]>
Date: Thu Feb 18 12:40:00 2010 +0100
s3-spoolss: Fix _spoolss_EnumPrinters servername handling.
Guenther
(cherry picked from commit b3c2b2260a503079b9abf22f6b35b56c61c2b372)
The last two patches address bug #7418 ("net rpc printer list" command is
inoperative).
commit cb6fcb9b16b36fcdc68bef382dbd7ecf89521d4e
Author: Günther Deschner <[email protected]>
Date: Thu Feb 18 02:03:53 2010 +0100
s3-spoolss: in spoolss_EnumPrinters r->in.server is a *unique* pointer!
Guenther
(cherry picked from commit 8ce66fba03f782c0b9948a9835bb488cfa74acf9)
-----------------------------------------------------------------------
Summary of changes:
source3/rpc_server/srv_spoolss_nt.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/rpc_server/srv_spoolss_nt.c
b/source3/rpc_server/srv_spoolss_nt.c
index 92f37e5..2b1a64f 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -4275,7 +4275,7 @@ static WERROR enumprinters_level5(TALLOC_CTX *mem_ctx,
WERROR _spoolss_EnumPrinters(pipes_struct *p,
struct spoolss_EnumPrinters *r)
{
- const char *name;
+ const char *name = NULL;
WERROR result;
/* that's an [in out] buffer */
@@ -4303,8 +4303,10 @@ WERROR _spoolss_EnumPrinters(pipes_struct *p,
* Level 5: same as Level 2
*/
- name = talloc_strdup_upper(p->mem_ctx, r->in.server);
- W_ERROR_HAVE_NO_MEMORY(name);
+ if (r->in.server) {
+ name = talloc_strdup_upper(p->mem_ctx, r->in.server);
+ W_ERROR_HAVE_NO_MEMORY(name);
+ }
switch (r->in.level) {
case 0:
--
Samba Shared Repository
