frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

If getpeerucred() is available, include pid & zoneid in audit messages too

This commit is contained in:
Alan Coopersmith 2006-11-01 16:17:49 -08:00
parent fbfb35189e
commit a7b944f0d9
1 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
os/connection.c
View File

@ -165,6 +165,11 @@ extern __const__ int _nfiles;
#include <netdnet/dn.h>
#endif /* DNETCONN */
#ifdef HAS_GETPEERUCRED
# include <ucred.h>
# include <zone.h>
#endif
int lastfdesc; /* maximum file descriptor */
fd_set WellKnownConnections; /* Listener mask */
@ -550,8 +555,13 @@ AuthAudit (ClientPtr client, Bool letin,
char addr[128];
char *out = addr;
int client_uid;
char client_uid_string[32];
char client_uid_string[64];
#ifdef HAS_GETPEERUCRED
ucred_t *peercred = NULL;
pid_t client_pid = -1;
zoneid_t client_zid = -1;
#endif
if (!len)
strcpy(out, "local host");
else
@ -588,10 +598,24 @@ AuthAudit (ClientPtr client, Bool letin,
strcpy(out, "unknown address");
}
#ifdef HAS_GETPEERUCRED
if (getpeerucred(((OsCommPtr)client->osPrivate)->fd, &peercred) >= 0) {
client_uid = ucred_geteuid(peercred);
client_pid = ucred_getpid(peercred);
client_zid = ucred_getzoneid(peercred);
ucred_free(peercred);
snprintf(client_uid_string, sizeof(client_uid_string),
" (uid %ld, pid %ld, zone %ld)",
(long) client_uid, (long) client_pid, (long) client_zid);
}
#else
if (LocalClientCred(client, &client_uid, NULL) != -1) {
snprintf(client_uid_string, sizeof(client_uid_string),
" (uid %d)", client_uid);
} else {
}
#endif
else {
client_uid_string[0] = '\0';
}