From 92d1e90d497b7795dd671c1a52092ef7ba6d542b Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Tue, 29 Aug 2000 14:38:38 +0000
Subject: fixed previous bug spotted by Elrond in get_printerdrivernumber().
 Thought I had already committed this.

jerry
(This used to be commit 2ceb704c3d06a92b97ba67ac82c007a7ba084b75)
---
 source3/smbd/lanman.c | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/source3/smbd/lanman.c b/source3/smbd/lanman.c
index 712016285e..170bb9e6bd 100644
--- a/source3/smbd/lanman.c
+++ b/source3/smbd/lanman.c
@@ -542,16 +542,16 @@ static void fill_printq_info_52(connection_struct *conn, int snum, int uLevel,
 			desc->errcode=NERR_notsupported;
 			return;
 		} 
-		else 
+
+		/* lookup the long printer driver name in the file description */
+		for (i=0;lines[i] && !ok;i++) 
 		{
-			/* lookup the long printer driver name in the file description */
-			for (i=0;lines[i] && !ok;i++) 
+			p = lines[i];
+			if (next_token(&p,tok,":",sizeof(tok)) &&
+		    	   (strlen(lp_printerdriver(snum)) == strlen(tok)) &&
+		    	   (!strncmp(tok,lp_printerdriver(snum),strlen(lp_printerdriver(snum)))))
 			{
-				p = lines[i];
-				if (next_token(&p,tok,":",sizeof(tok)) &&
-			    	   (strlen(lp_printerdriver(snum)) == strlen(tok)) &&
-			    	   (!strncmp(tok,lp_printerdriver(snum),strlen(lp_printerdriver(snum)))))
-					ok = True;
+				ok = True;
 			}
 		}
 	}
@@ -777,17 +777,18 @@ static int get_printerdrivernumber(int snum)
 		if (!lines) 
 		{
 			DEBUG(3,("Can't open %s - %s\n", lp_driverfile(snum),strerror(errno)));
+			return 0;
 		} 
-		else 
+
+		/* lookup the long printer driver name in the file description */
+		for (i=0;lines[i] && !ok;i++) 
 		{
-			/* lookup the long printer driver name in the file description */
-			for (i=0;lines[i] && !ok;i++) 
+			p = lines[i];
+			if (next_token(&p,tok,":",sizeof(tok)) &&
+			   (strlen(lp_printerdriver(snum)) == strlen(tok)) &&
+			   (!strncmp(tok,lp_printerdriver(snum),strlen(lp_printerdriver(snum))))) 
 			{
-				p = lines[i];
-				if (next_token(&p,tok,":",sizeof(tok)) &&
-						(strlen(lp_printerdriver(snum)) == strlen(tok)) &&
-					    (!strncmp(tok,lp_printerdriver(snum),strlen(lp_printerdriver(snum))))) 
-					ok = True;
+				ok = True;
 			}
 		}
 	}
-- 
cgit