diff options
| author | Ben Pfaff <blp@nicira.com> | 2012-05-14 14:32:14 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2012-07-18 10:29:20 -0700 |
| commit | 5ca92d1d5dc0d8dba9ed554444cd0ae00a43209f (patch) | |
| tree | 189dd562b11e7b1403a43e1447ea632a0d721004 /lib/socket-util.c | |
| parent | c50c79431efa7b85688fb4be61d97c5ee7a9c459 (diff) | |
| download | openvswitch-5ca92d1d5dc0d8dba9ed554444cd0ae00a43209f.tar.gz | |
socket-util: Remove 'passcred' parameter from make_unix_socket().
Nothing in the tree ever tries to send or receive credentials over a Unix
domain socket so there's no point in configuring them to be received.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Diffstat (limited to 'lib/socket-util.c')
| -rw-r--r-- | lib/socket-util.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/lib/socket-util.c b/lib/socket-util.c index 82a33c207..53d0fb69e 100644 --- a/lib/socket-util.c +++ b/lib/socket-util.c @@ -384,12 +384,11 @@ bind_unix_socket(int fd, struct sockaddr *sun, socklen_t sun_len) /* Creates a Unix domain socket in the given 'style' (either SOCK_DGRAM or * SOCK_STREAM) that is bound to '*bind_path' (if 'bind_path' is non-null) and * connected to '*connect_path' (if 'connect_path' is non-null). If 'nonblock' - * is true, the socket is made non-blocking. If 'passcred' is true, the socket - * is configured to receive SCM_CREDENTIALS control messages. + * is true, the socket is made non-blocking. * * Returns the socket's fd if successful, otherwise a negative errno value. */ int -make_unix_socket(int style, bool nonblock, bool passcred OVS_UNUSED, +make_unix_socket(int style, bool nonblock, const char *bind_path, const char *connect_path) { int error; @@ -457,16 +456,6 @@ make_unix_socket(int style, bool nonblock, bool passcred OVS_UNUSED, } } -#ifdef SCM_CREDENTIALS - if (passcred) { - int enable = 1; - if (setsockopt(fd, SOL_SOCKET, SO_PASSCRED, &enable, sizeof(enable))) { - error = errno; - goto error; - } - } -#endif - return fd; error: |