[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  2e00a8a... Fix bug 7297 - smbd crashes with CUPS printers and no [printers] share defined.
      from  462322f... s3: vfs_smb_traffic_analyzer.c: remove warnings from developer build

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


- Log -----------------------------------------------------------------
commit 2e00a8a74b7c5c95b61e6c7f365ed852c7d95289
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Mar 25 17:09:23 2010 -0700

    Fix bug 7297 - smbd crashes with CUPS printers and no [printers] share defined.
    
    Ensure we don't dereference an array with an index of -1.
    
    Jeremy.

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

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


Changeset truncated at 500 lines:

diff --git a/source3/smbd/service.c b/source3/smbd/service.c
index db54d46..36184af 100644
--- a/source3/smbd/service.c
+++ b/source3/smbd/service.c
@@ -339,7 +339,7 @@ int find_service(fstring service)
 		if ((iPrinterService = lp_servicenumber(PRINTERS_NAME)) < 0) {
 			iPrinterService = load_registry_service(PRINTERS_NAME);
 		}
-		if (iPrinterService) {
+		if (iPrinterService >= 0) {
 			DEBUG(3,("checking whether %s is a valid printer name...\n", service));
 			if (pcap_printername_ok(service)) {
 				DEBUG(3,("%s is a valid printer name\n", service));


-- 
Samba Shared Repository