diff options
| author | Jeremy Allison <jra@samba.org> | 2002-04-13 02:24:07 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2002-04-13 02:24:07 +0000 |
| commit | 5c2dfd959c0facc299bca62356d1221bcea653bf (patch) | |
| tree | ac65b4e92cf1305429dba14ee0145b5875ef2cf4 | |
| parent | 45b291b851834f4c4dffb1a2eb8d5afd53d5823d (diff) | |
| download | samba-5c2dfd959c0facc299bca62356d1221bcea653bf.tar.gz samba-5c2dfd959c0facc299bca62356d1221bcea653bf.tar.bz2 samba-5c2dfd959c0facc299bca62356d1221bcea653bf.zip | |
Tidy up winbindd debug. Added Bill Moran's hide unreadable fix.
Jeremy.
(This used to be commit a9895fcb30cdcb572cd254b0d370d79f95c7214d)
| -rw-r--r-- | source3/nsswitch/winbindd.c | 7 | ||||
| -rw-r--r-- | source3/smbd/dir.c | 10 |
2 files changed, 12 insertions, 5 deletions
diff --git a/source3/nsswitch/winbindd.c b/source3/nsswitch/winbindd.c index e9ee2a7693..479be79574 100644 --- a/source3/nsswitch/winbindd.c +++ b/source3/nsswitch/winbindd.c @@ -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; diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c index f56e0e9ef0..d224e4bdbe 100644 --- a/source3/smbd/dir.c +++ b/source3/smbd/dir.c @@ -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; |