sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-19 21:57:57 +03:00
Code

Tidy up winbindd debug. Added Bill Moran's hide unreadable fix.

Browse Source 
Jeremy.
This commit is contained in:
Jeremy Allison -
parent f16033635f
commit a9895fcb30
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/nsswitch/winbindd.c
View File

@ -397,11 +397,8 @@ static void client_read(struct winbindd_cli_state *state)
} while (n == -1 && errno == EINTR);
DEBUG(10,("client_read: read %d bytes. Need %d more for a full request.\n", n, sizeof(state->request) - n - state->read_buf_len ));
/* Read failed, kill client */
if (n == -1 || n == 0) {
/* Read failed, kill client */
DEBUG(5,("read failed on sock %d, pid %d: %s\n",
state->sock, state->pid,
(n == -1) ? strerror(errno) : "EOF"));
@ -410,6 +407,8 @@ static void client_read(struct winbindd_cli_state *state)
return;
}
DEBUG(10,("client_read: read %d bytes. Need %d more for a full request.\n", n, sizeof(state->request) - n - state->read_buf_len ));
/* Update client state */
state->read_buf_len += n;

10
source/smbd/dir.c
View File

@ -680,7 +680,15 @@ static BOOL user_can_read_file(connection_struct *conn, char *name)
ZERO_STRUCT(ste);
/* if we can't stat it does not show it */
/*
* If user is a member of the Admin group
* we never hide files from them.
*/
if (conn->admin_user)
return True;
/* If we can't stat it does not show it */
if (vfs_stat(conn, name, &ste) != 0)
return False;