diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:20:08 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:20:08 +0000 |
| commit | 953c525d7589178629f3e91e4bf4ea805a92a5b4 (patch) | |
| tree | 9411cddbd2f213fe4edf2150e2e8b02a9d27b4bf /pflocal/socket.c | |
| parent | 13ea39a34766fcbecd96ab94bcdf798b08e9bb60 (diff) | |
| parent | 5430151902aa7cb17458c0d71722a05fd379babf (diff) | |
| download | hurd-953c525d7589178629f3e91e4bf4ea805a92a5b4.tar.gz hurd-953c525d7589178629f3e91e4bf4ea805a92a5b4.tar.bz2 hurd-953c525d7589178629f3e91e4bf4ea805a92a5b4.zip | |
Merge branch 'master' into xkb
Conflicts:
console-client/Makefile
Diffstat (limited to 'pflocal/socket.c')
| -rw-r--r-- | pflocal/socket.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pflocal/socket.c b/pflocal/socket.c index 2684a723..a0e5b1da 100644 --- a/pflocal/socket.c +++ b/pflocal/socket.c @@ -372,7 +372,7 @@ S_socket_recv (struct sock_user *user, return EINVAL; /* XXX */ /* Fill in the pipe FLAGS from any corresponding ones in IN_FLAGS. */ - flags = 0; + flags = in_flags & MSG_PEEK; err = sock_acquire_read_pipe (user->sock, &pipe); if (err == EPIPE) |