diff options
| author | Joe Marcus Clarke <marcus@freebsd.org> | 2010-09-09 14:10:01 -0400 |
|---|---|---|
| committer | David Zeuthen <davidz@redhat.com> | 2010-09-09 14:10:01 -0400 |
| commit | 964eb62343b53cf9172d409adacbb58d78896092 (patch) | |
| tree | 3db2c4ec02622a27e04e8bf83d703009f8f0fe43 /gio/gunixcredentialsmessage.c | |
| parent | ee945d8f621609086a8777ca4226cb93308c12e4 (diff) | |
| download | glib-964eb62343b53cf9172d409adacbb58d78896092.tar.gz | |
Bug 628904 – Add credential support for FreeBSD and fix a socket issue
Signed-off-by: David Zeuthen <davidz@redhat.com>
Diffstat (limited to 'gio/gunixcredentialsmessage.c')
| -rw-r--r-- | gio/gunixcredentialsmessage.c | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/gio/gunixcredentialsmessage.c b/gio/gunixcredentialsmessage.c index e6dadfb4d..82224ab6b 100644 --- a/gio/gunixcredentialsmessage.c +++ b/gio/gunixcredentialsmessage.c @@ -46,6 +46,13 @@ #include <fcntl.h> #define G_UNIX_CREDENTIALS_MESSAGE_SUPPORTED 1 +#elif defined(__FreeBSD__) +#include <sys/types.h> +#include <sys/socket.h> +#include <sys/un.h> +#include <unistd.h> +#include <fcntl.h> +#define G_UNIX_CREDENTIALS_MESSAGE_SUPPORTED 1 #else /* TODO: please add support for your UNIX flavor */ #define G_UNIX_CREDENTIALS_MESSAGE_SUPPORTED 0 @@ -79,6 +86,8 @@ g_unix_credentials_message_get_size (GSocketControlMessage *message) { #ifdef __linux__ return sizeof (struct ucred); +#elif defined(__FreeBSD__) + return sizeof (struct cmsgcred); #else return 0; #endif @@ -89,6 +98,8 @@ g_unix_credentials_message_get_level (GSocketControlMessage *message) { #ifdef __linux__ return SOL_SOCKET; +#elif defined(__FreeBSD__) + return SOL_SOCKET; #else return 0; #endif @@ -99,6 +110,8 @@ g_unix_credentials_message_get_msg_type (GSocketControlMessage *message) { #ifdef __linux__ return SCM_CREDENTIALS; +#elif defined(__FreeBSD__) + return SCM_CREDS; #else return 0; #endif @@ -140,6 +153,33 @@ g_unix_credentials_message_deserialize (gint level, out: ; } +#elif defined(__FreeBSD__) + { + GCredentials *credentials; + struct cmsgcred *cred; + + if (level != SOL_SOCKET || type != SCM_CREDS) + { + goto out; + } + if (size < CMSG_LEN (sizeof *cred)) + { + g_warning ("Expected a struct cmsgcred (%" G_GSIZE_FORMAT " bytes) but " + "got %" G_GSIZE_FORMAT " bytes of data", + CMSG_LEN (sizeof *cred), + size); + goto out; + } + + cred = data; + + credentials = g_credentials_new (); + g_credentials_set_native (credentials, G_CREDENTIALS_TYPE_FREEBSD_CMSGCRED, cred); + message = g_unix_credentials_message_new_with_credentials (credentials); + g_object_unref (credentials); + out: + ; + } #endif return message; @@ -155,6 +195,12 @@ g_unix_credentials_message_serialize (GSocketControlMessage *_message, g_credentials_get_native (message->priv->credentials, G_CREDENTIALS_TYPE_LINUX_UCRED), sizeof (struct ucred)); +#elif defined(__FreeBSD__) + memcpy (data, + g_credentials_get_native (message->priv->credentials, + G_CREDENTIALS_TYPE_FREEBSD_CMSGCRED), + sizeof (struct cmsgcred)); + #endif } |