[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  0f6a4a2 Make 'net rpc printer driver' behave the same as rpcclient enumdrivers when dealing with unsupported architectures.
      from  469d15e s4-tests: Changed descriptor tests to use existing method in samdb for adding users to a group.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 0f6a4a2f72b30f8a6b7ab03b5fae33ccae6cfea6
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.
    
    Autobuild-User: Jeremy Allison <jra at samba.org>
    Autobuild-Date: Thu Nov 18 21:40:40 CET 2010 on sn-devel-104

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

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 1e21804..8408235 100644
--- a/source3/utils/net_rpc_printer.c
+++ b/source3/utils/net_rpc_printer.c
@@ -976,8 +976,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