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 | |
| parent | 13ea39a34766fcbecd96ab94bcdf798b08e9bb60 (diff) | |
| parent | 5430151902aa7cb17458c0d71722a05fd379babf (diff) | |
Merge branch 'master' into xkb
Conflicts:
console-client/Makefile
Diffstat (limited to 'pflocal')
| -rw-r--r-- | pflocal/Makefile | 3 | ||||
| -rw-r--r-- | pflocal/socket.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/pflocal/Makefile b/pflocal/Makefile index 7258e587..78b4c3f9 100644 --- a/pflocal/Makefile +++ b/pflocal/Makefile @@ -1,6 +1,6 @@ # Makefile for pflocal # -# Copyright (C) 1995, 1996, 2000 Free Software Foundation, Inc. +# Copyright (C) 1995, 1996, 2000, 2012 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as @@ -22,7 +22,6 @@ makemode := server target = pflocal SRCS = connq.c io.c pflocal.c socket.c pf.c sock.c sserver.c -LCLHDRS = connq.h sock.h mig-decls.h mig-mutate.h sserver.h MIGSTUBS = ioServer.o socketServer.o OBJS = $(SRCS:.c=.o) $(MIGSTUBS) 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) |