diff options
| -rw-r--r-- | source3/smbd/files.c | 6 | ||||
| -rw-r--r-- | source3/smbd/ipc.c | 13 | ||||
| -rw-r--r-- | source3/smbd/nttrans.c | 2 |
3 files changed, 10 insertions, 11 deletions
diff --git a/source3/smbd/files.c b/source3/smbd/files.c index 66fbaebeb0..8f1cefbbb6 100644 --- a/source3/smbd/files.c +++ b/source3/smbd/files.c @@ -223,9 +223,9 @@ void file_init(void) { struct rlimit rlp; getrlimit(RLIMIT_NOFILE, &rlp); - /* Set the fd limit to be MAX_OPEN_FILES + 10 to - * account for the extra fd we need to read - * directories, as well as the log files and standard + /* Set the fd limit to be MAX_FNUMS + 10 to + * account for the extra fd we need + * as well as the log files and standard * handles etc. */ rlp.rlim_cur = (MAX_FNUMS+10>rlp.rlim_max)? rlp.rlim_max:MAX_FNUMS+10; 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; diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c index 4778e3a66b..9bfdddf704 100644 --- a/source3/smbd/nttrans.c +++ b/source3/smbd/nttrans.c @@ -667,7 +667,7 @@ int reply_ntcreate_and_X(connection_struct *conn, chain_fsp = fsp; DEBUG(5,("reply_ntcreate_and_X: open name = %s\n", - fsp->fsp_name)); + fsp?fsp->fsp_name:"NULL")); return chain_reply(inbuf,outbuf,length,bufsize); } |