security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

agent: Minor fix for get_client_pid.

Browse Source 
* agent/command-ssh.c (get_client_pid): Use 0 to initialize.

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2017-04-04 10:39:00 +09:00
parent 943176c732
commit 5744d2038b
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
agent/command-ssh.c
View File

@ -3567,7 +3567,7 @@ ssh_request_process (ctrl_t ctrl, estream_t stream_sock)
static unsigned long static unsigned long
get_client_pid (int fd) get_client_pid (int fd)
{ {
pid_t client_pid = (pid_t)(-1); pid_t client_pid = (pid_t)0;
#ifdef SO_PEERCRED #ifdef SO_PEERCRED
{ {
@ -3578,7 +3578,7 @@ get_client_pid (int fd)
#endif #endif
socklen_t cl = sizeof cr; 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) #if defined (HAVE_STRUCT_SOCKPEERCRED_PID) || defined (HAVE_STRUCT_UCRED_PID)
client_pid = cr.pid; client_pid = cr.pid;
@ -3593,7 +3593,7 @@ get_client_pid (int fd)
{ {
socklen_t len = sizeof (pid_t); 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) #elif defined (LOCAL_PEEREID)
{ {
@ -3613,9 +3613,11 @@ get_client_pid (int fd)
ucred_free (ucred); ucred_free (ucred);
} }
} }
#else
(void)fd;
#endif #endif
return client_pid == (pid_t)(-1)? 0 : (unsigned long)client_pid; return (unsigned long)client_pid;
} }