[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  4affc58... s3-lanman: before trying to call spoolss_ClosePrinter make sure we have a connection.
      from  e2e3911... Replaced DS_FLAG_ATTR_IS_CRITICAL with SCHEMA_FLAG_ATTR_IS_CRITICAL.

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


- Log -----------------------------------------------------------------
commit 4affc58c6a757c379aeb22d0b71cfa06aa926761
Author: Günther Deschner <gd at samba.org>
Date:   Mon May 3 17:02:21 2010 +0200

    s3-lanman: before trying to call spoolss_ClosePrinter make sure we have a connection.
    
    Guenther

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

Summary of changes:
 source3/smbd/lanman.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/lanman.c b/source3/smbd/lanman.c
index ec87dbb..affce70 100644
--- a/source3/smbd/lanman.c
+++ b/source3/smbd/lanman.c
@@ -936,7 +936,7 @@ static bool api_DosPrintQGetInfo(connection_struct *conn, uint16 vuid,
 		desc.errcode = ERRbuftoosmall;
 
  out:
-	if (is_valid_policy_hnd(&handle)) {
+	if (cli && is_valid_policy_hnd(&handle)) {
 		rpccli_spoolss_ClosePrinter(cli, mem_ctx, &handle, NULL);
 	}
 
@@ -1133,7 +1133,7 @@ static bool api_DosPrintQEnum(connection_struct *conn, uint16 vuid,
 		subcntarr[i] = num_jobs;
 		subcnt += subcntarr[i];
 
-		if (is_valid_policy_hnd(&handle)) {
+		if (cli && is_valid_policy_hnd(&handle)) {
 			rpccli_spoolss_ClosePrinter(cli, mem_ctx, &handle, NULL);
 		}
 	}
@@ -3128,7 +3128,7 @@ static bool api_RDosPrintJobDel(connection_struct *conn,uint16 vuid,
 	}
 
  out:
-	if (is_valid_policy_hnd(&handle)) {
+	if (cli && is_valid_policy_hnd(&handle)) {
 		rpccli_spoolss_ClosePrinter(cli, mem_ctx, &handle, NULL);
 	}
 
@@ -3257,7 +3257,7 @@ static bool api_WPrintQueueCtrl(connection_struct *conn,uint16 vuid,
 
  out:
 
-	if (is_valid_policy_hnd(&handle)) {
+	if (cli && is_valid_policy_hnd(&handle)) {
 		rpccli_spoolss_ClosePrinter(cli, mem_ctx, &handle, NULL);
 	}
 
@@ -3437,7 +3437,7 @@ static bool api_PrintJobInfo(connection_struct *conn, uint16 vuid,
 	errcode = NERR_Success;
  out:
 
-	if (is_valid_policy_hnd(&handle)) {
+	if (cli && is_valid_policy_hnd(&handle)) {
 		rpccli_spoolss_ClosePrinter(cli, mem_ctx, &handle, NULL);
 	}
 
@@ -4411,7 +4411,7 @@ static bool api_WPrintJobGetInfo(connection_struct *conn, uint16 vuid,
 		*rdata_len = 0;
 	}
  out:
-	if (is_valid_policy_hnd(&handle)) {
+	if (cli && is_valid_policy_hnd(&handle)) {
 		rpccli_spoolss_ClosePrinter(cli, mem_ctx, &handle, NULL);
 	}
 
@@ -4544,7 +4544,7 @@ static bool api_WPrintJobEnumerate(connection_struct *conn, uint16 vuid,
 		}
 	}
  out:
-	if (is_valid_policy_hnd(&handle)) {
+	if (cli && is_valid_policy_hnd(&handle)) {
 		rpccli_spoolss_ClosePrinter(cli, mem_ctx, &handle, NULL);
 	}
 
@@ -4742,7 +4742,7 @@ static bool api_WPrintDestGetInfo(connection_struct *conn, uint16 vuid,
 	}
 
  out:
-	if (is_valid_policy_hnd(&handle)) {
+	if (cli && is_valid_policy_hnd(&handle)) {
 		rpccli_spoolss_ClosePrinter(cli, mem_ctx, &handle, NULL);
 	}
 


-- 
Samba Shared Repository