[SCM] Samba Shared Repository - branch v3-6-test updated

[Jeremy Allison]

The branch, v3-6-test has been updated
       via  9c21cac Make 'net rpc printer driver' behave the same as rpcclient enumdrivers when dealing with unsupported architectures. (cherry picked from commit c00120fdaf37a12e510218bf3e726c08e4ea4b3f)
      from  0c15472 s3-spoolss: make sure members of "BUILTIN\Print Operators" can open printers with admin privileges.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit 9c21cac3533feda61e3b24ebdd854bb35fa38d23
Author: Joerg Pulz <Joerg.Pulz at frm2.tum.de>
Date:   Thu Nov 18 11:47:23 2010 -0800

    Make 'net rpc printer driver' behave the same as rpcclient enumdrivers
    when dealing with unsupported architectures.
    (cherry picked from commit c00120fdaf37a12e510218bf3e726c08e4ea4b3f)

-----------------------------------------------------------------------

Summary of changes:
 source3/utils/net_rpc_printer.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/utils/net_rpc_printer.c b/source3/utils/net_rpc_printer.c
index 589a569..0a6ad27 100644
--- a/source3/utils/net_rpc_printer.c
+++ b/source3/utils/net_rpc_printer.c
@@ -975,8 +975,14 @@ static bool net_spoolss_enumprinterdrivers (struct rpc_pipe_client *pipe_hnd,
 						   count,
 						   info);
 	if (!W_ERROR_IS_OK(result)) {
-		printf(_("cannot enum drivers: %s\n"), win_errstr(result));
-		return false;
+		if (W_ERROR_V(result) != W_ERROR_V(WERR_INVALID_ENVIRONMENT)) {
+			printf(_("cannot enum drivers for environment %s: %s\n"), env,
+				win_errstr(result));
+			return false;
+		} else {
+			printf(_("Server does not support environment [%s]\n"),
+				env);
+		}
 	}
 
 	return true;


-- 
Samba Shared Repository