- some tidying up in files.c

- handle null fsp in DEBUG() at end of reply_ntcreate_and_X(). Jeremy,
  can you fix this properly?

- get snum right in print queue code in ipc.c (it was broken by my
  connections_struct changes).
(This used to be commit b3dd3785751db2d5d0a80ffac9c3df01c9909891)

1 files changed, 6 insertions, 7 deletions

diff --git a/source3/smbd/ipc.c b/source3/smbd/ipc.c
index ae225956a2..be7fb8d8e3 100644
--- a/source3/smbd/ipc.c
+++ b/source3/smbd/ipc.c
@@ -833,20 +833,19 @@ static BOOL api_DosPrintQGetInfo(connection_struct *conn,
   
   if (snum < 0 || !VALID_SNUM(snum)) return(False);
 
-  if (uLevel==52)
-  {
-    count = get_printerdrivernumber(snum);
-    DEBUG(3,("api_DosPrintQGetInfo: Driver files count: %d\n",count));
+  if (uLevel==52) {
+	  count = get_printerdrivernumber(snum);
+	  DEBUG(3,("api_DosPrintQGetInfo: Driver files count: %d\n",count));
   } else {
-    count = get_printqueue(SNUM(conn), conn,&queue,&status);
+	  count = get_printqueue(snum, conn,&queue,&status);
   }
 
   if (mdrcnt > 0) *rdata = REALLOC(*rdata,mdrcnt);
   desc.base = *rdata;
   desc.buflen = mdrcnt;
   if (init_package(&desc,1,count)) {
-    desc.subcount = count;
-    fill_printq_info(conn,snum,uLevel,&desc,count,queue,&status);
+	  desc.subcount = count;
+	  fill_printq_info(conn,snum,uLevel,&desc,count,queue,&status);
   }
 
   *rdata_len = desc.usedlen;