diff options
| author | Andrew Tridgell <tridge@samba.org> | 1996-05-29 07:54:01 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 1996-05-29 07:54:01 +0000 |
| commit | ec520018094a441017a539136e8f561900dd1318 (patch) | |
| tree | e531dd1daa64610ca6089060e89227dec3551741 | |
| parent | debd5b6ae9e4b308398d1d0a305ed4357ff6e1a5 (diff) | |
| download | samba-ec520018094a441017a539136e8f561900dd1318.tar.gz samba-ec520018094a441017a539136e8f561900dd1318.tar.bz2 samba-ec520018094a441017a539136e8f561900dd1318.zip | |
handle errors from receive_smb better, and print error string
(This used to be commit 7814eca4b22f909e75c3321d9a157c2228198c5c)
| -rw-r--r-- | source3/lib/util.c | 11 | ||||
| -rw-r--r-- | source3/smbd/server.c | 7 |
2 files changed, 9 insertions, 9 deletions
diff --git a/source3/lib/util.c b/source3/lib/util.c index 233e987271..e983a74673 100644 --- a/source3/lib/util.c +++ b/source3/lib/util.c @@ -2683,12 +2683,11 @@ BOOL receive_smb(int fd,char *buffer,int timeout) if (len == -1) return(False); - if (len > BUFFER_SIZE) - { - DEBUG(0,("Invalid packet length! (%d bytes)\n",len)); - if (len > BUFFER_SIZE + (SAFETY_MARGIN/2)) - exit(1); - } + if (len > BUFFER_SIZE) { + DEBUG(0,("Invalid packet length! (%d bytes)\n",len)); + if (len > BUFFER_SIZE + (SAFETY_MARGIN/2)) + exit(1); + } ok = (read_data(fd,buffer+4,len) == len); diff --git a/source3/smbd/server.c b/source3/smbd/server.c index 1d02477073..00f8c9e0fd 100644 --- a/source3/smbd/server.c +++ b/source3/smbd/server.c @@ -2394,7 +2394,8 @@ int make_connection(char *service,char *user,char *password, int pwlen, char *de if (ChDir(pcon->connectpath) != 0) { - DEBUG(0,("Can't change directory to %s\n",pcon->connectpath)); + DEBUG(0,("Can't change directory to %s (%s)\n", + pcon->connectpath,strerror(errno))); pcon->open = False; unbecome_user(); if (!IS_IPC(cnum)) { @@ -3721,8 +3722,8 @@ void process(void ) extern int keepalive; /* check for socket failure */ - if (errno == EBADF) { - DEBUG(3,("%s Bad file descriptor - exiting\n",timestring())); + if (errno) { + DEBUG(3,("receive_smb error (%s) exiting\n",strerror(errno))); return; } |