diff options
| author | NIIBE Yutaka <[email protected]> | 2017-04-04 01:39:00 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2017-04-04 01:39:00 +0000 |
| commit | 5744d2038bd17b8b1be4e73d0ad3bc41772efe96 (patch) | |
| tree | 57e279da4612a772d09a3e0e5b2e2d2ad952cf3a /agent/command-ssh.c | |
| parent | Post release updates. (diff) | |
| download | gnupg-5744d2038bd17b8b1be4e73d0ad3bc41772efe96.tar.gz gnupg-5744d2038bd17b8b1be4e73d0ad3bc41772efe96.zip | |
agent: Minor fix for get_client_pid.
* agent/command-ssh.c (get_client_pid): Use 0 to initialize.
Signed-off-by: NIIBE Yutaka <[email protected]>
Diffstat (limited to 'agent/command-ssh.c')
| -rw-r--r-- | agent/command-ssh.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/agent/command-ssh.c b/agent/command-ssh.c index 5a0254267..b15d8b287 100644 --- a/agent/command-ssh.c +++ b/agent/command-ssh.c @@ -3567,7 +3567,7 @@ ssh_request_process (ctrl_t ctrl, estream_t stream_sock) static unsigned long get_client_pid (int fd) { - pid_t client_pid = (pid_t)(-1); + pid_t client_pid = (pid_t)0; #ifdef SO_PEERCRED { @@ -3578,7 +3578,7 @@ get_client_pid (int fd) #endif socklen_t cl = sizeof cr; - if ( !getsockopt (fd, SOL_SOCKET, SO_PEERCRED, &cr, &cl)) + if (!getsockopt (fd, SOL_SOCKET, SO_PEERCRED, &cr, &cl)) { #if defined (HAVE_STRUCT_SOCKPEERCRED_PID) || defined (HAVE_STRUCT_UCRED_PID) client_pid = cr.pid; @@ -3593,7 +3593,7 @@ get_client_pid (int fd) { socklen_t len = sizeof (pid_t); - getsockopt(fd, SOL_LOCAL, LOCAL_PEERPID, &client_pid, &len); + getsockopt (fd, SOL_LOCAL, LOCAL_PEERPID, &client_pid, &len); } #elif defined (LOCAL_PEEREID) { @@ -3613,9 +3613,11 @@ get_client_pid (int fd) ucred_free (ucred); } } +#else + (void)fd; #endif - return client_pid == (pid_t)(-1)? 0 : (unsigned long)client_pid; + return (unsigned long)client_pid; } |