/* GDBus - GLib D-Bus Library
*
- * Copyright (C) 2008-2009 Red Hat, Inc.
+ * Copyright (C) 2008-2010 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
*
* Author: David Zeuthen <davidz@redhat.com>
*/
#include "config.h"
#include <string.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <sys/types.h>
-#include "gdbusauthmechanismsha1.h"
-#include "gcredentials.h"
-#include "gdbuserror.h"
-#include "gioenumtypes.h"
-#include "gioerror.h"
+#include <glib/gstdio.h>
#ifdef G_OS_UNIX
#include <unistd.h>
-#include <sys/types.h>
-#include <fcntl.h>
+#endif
+#ifdef G_OS_WIN32
+#include <io.h>
#endif
-#include <errno.h>
-
-#include <glib/gstdio.h>
+#include "gdbusauthmechanismsha1.h"
+#include "gcredentials.h"
+#include "gdbuserror.h"
+#include "gioenumtypes.h"
+#include "gioerror.h"
+#include "gdbusprivate.h"
#include "glibintl.h"
/* ---------------------------------------------------------------------------------------------------- */
-G_DEFINE_TYPE (GDBusAuthMechanismSha1, _g_dbus_auth_mechanism_sha1, G_TYPE_DBUS_AUTH_MECHANISM);
+G_DEFINE_TYPE_WITH_PRIVATE (GDBusAuthMechanismSha1, _g_dbus_auth_mechanism_sha1, G_TYPE_DBUS_AUTH_MECHANISM)
/* ---------------------------------------------------------------------------------------------------- */
GObjectClass *gobject_class;
GDBusAuthMechanismClass *mechanism_class;
- g_type_class_add_private (klass, sizeof (GDBusAuthMechanismSha1Private));
-
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->finalize = _g_dbus_auth_mechanism_sha1_finalize;
static void
_g_dbus_auth_mechanism_sha1_init (GDBusAuthMechanismSha1 *mechanism)
{
- mechanism->priv = G_TYPE_INSTANCE_GET_PRIVATE (mechanism,
- G_TYPE_DBUS_AUTH_MECHANISM_SHA1,
- GDBusAuthMechanismSha1Private);
+ mechanism->priv = _g_dbus_auth_mechanism_sha1_get_instance_private (mechanism);
}
/* ---------------------------------------------------------------------------------------------------- */
g_set_error (error,
G_IO_ERROR,
g_io_error_from_errno (errno),
- _("Error statting directory `%s': %s"),
+ _("Error when getting information for directory '%s': %s"),
path,
strerror (errno));
g_free (path);
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_FAILED,
- _("Permissions on directory `%s' are malformed. Expected mode 0700, got 0%o"),
+ _("Permissions on directory '%s' are malformed. Expected mode 0700, got 0%o"),
path,
statbuf.st_mode & 0777);
g_free (path);
goto out;
}
#else
-#error Please implement permission checking on non-UNIX platforms
+#ifdef __GNUC__
+#warning Please implement permission checking on this non-UNIX platform
+#endif
#endif
}
goto out;
g_set_error (error,
G_IO_ERROR,
g_io_error_from_errno (errno),
- _("Error creating directory `%s': %s"),
+ _("Error creating directory '%s': %s"),
path,
strerror (errno));
g_free (path);
guint n;
gchar **lines;
- g_return_val_if_fail (cookie_context != NULL, FALSE);
- g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+ g_return_val_if_fail (cookie_context != NULL, NULL);
+ g_return_val_if_fail (error == NULL || *error == NULL, NULL);
ret = NULL;
path = NULL;
error))
{
g_prefix_error (error,
- _("Error opening keyring `%s' for reading: "),
+ _("Error opening keyring '%s' for reading: "),
path);
goto out;
}
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_FAILED,
- _("Line %d of the keyring at `%s' with content `%s' is malformed"),
+ _("Line %d of the keyring at '%s' with content '%s' is malformed"),
n + 1,
path,
line);
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_FAILED,
- _("First token of line %d of the keyring at `%s' with content `%s' is malformed"),
+ _("First token of line %d of the keyring at '%s' with content '%s' is malformed"),
n + 1,
path,
line);
}
line_when = g_ascii_strtoll (tokens[1], &endp, 10);
+ line_when = line_when; /* To avoid -Wunused-but-set-variable */
if (*endp != '\0')
{
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_FAILED,
- _("Second token of line %d of the keyring at `%s' with content `%s' is malformed"),
+ _("Second token of line %d of the keyring at '%s' with content '%s' is malformed"),
n + 1,
path,
line);
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_FAILED,
- _("Didn't find cookie with id %d in the keyring at `%s'"),
+ _("Didn't find cookie with id %d in the keyring at '%s'"),
cookie_id,
path);
}
/* function for logging important events that the system administrator should take notice of */
+G_GNUC_PRINTF(1, 2)
static void
_log (const gchar *message,
...)
num_tries++;
if (num_tries == 50)
{
- /* ok, we slept 50*10ms = 0.5 seconds.. Conclude that the lock-file must be
+ /* ok, we slept 50*10ms = 0.5 seconds. Conclude that the lock file must be
* stale (nuke the it from orbit)
*/
if (g_unlink (lock) != 0)
g_set_error (error,
G_IO_ERROR,
g_io_error_from_errno (errno),
- _("Error deleting stale lock-file `%s': %s"),
+ _("Error deleting stale lock file '%s': %s"),
lock,
strerror (errno));
goto out;
}
- _log ("Deleted stale lock-file `%s'", lock);
+ _log ("Deleted stale lock file '%s'", lock);
break;
}
}
goto again;
}
#endif
+ num_create_tries = num_create_tries; /* To avoid -Wunused-but-set-variable */
g_set_error (error,
G_IO_ERROR,
g_io_error_from_errno (errno),
- _("Error creating lock-file `%s': %s"),
+ _("Error creating lock file '%s': %s"),
lock,
strerror (errno));
goto out;
ret = FALSE;
lock = g_strdup_printf ("%s.lock", path);
- if (g_unlink (lock) != 0)
+ if (close (lock_fd) != 0)
{
g_set_error (error,
G_IO_ERROR,
g_io_error_from_errno (errno),
- _("Error unlinking lock-file `%s': %s"),
+ _("Error closing (unlinked) lock file '%s': %s"),
lock,
strerror (errno));
goto out;
}
- if (close (lock_fd) != 0)
+ if (g_unlink (lock) != 0)
{
g_set_error (error,
G_IO_ERROR,
g_io_error_from_errno (errno),
- _("Error closing (unlinked) lock-file `%s': %s"),
+ _("Error unlinking lock file '%s': %s"),
lock,
strerror (errno));
goto out;
lines = NULL;
new_contents = NULL;
have_id = FALSE;
+ use_id = 0;
use_cookie = NULL;
lock_fd = -1;
{
g_propagate_prefixed_error (error,
local_error,
- _("Error opening keyring `%s' for writing: "),
+ _("Error opening keyring '%s' for writing: "),
path);
goto out;
}
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_FAILED,
- _("Line %d of the keyring at `%s' with content `%s' is malformed"),
+ _("Line %d of the keyring at '%s' with content '%s' is malformed"),
n + 1,
path,
line);
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_FAILED,
- _("First token of line %d of the keyring at `%s' with content `%s' is malformed"),
+ _("First token of line %d of the keyring at '%s' with content '%s' is malformed"),
n + 1,
path,
line);
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_FAILED,
- _("Second token of line %d of the keyring at `%s' with content `%s' is malformed"),
+ _("Second token of line %d of the keyring at '%s' with content '%s' is malformed"),
n + 1,
path,
line);
g_strfreev (tokens);
goto out;
}
+ line_when = line_when; /* To avoid -Wunused-but-set-variable */
+
/* D-Bus spec says:
*
else
{
g_prefix_error (error,
- _("(Additionally, releasing the lock for `%s' also failed: %s) "),
+ _("(Additionally, releasing the lock for '%s' also failed: %s) "),
path,
local_error->message);
}
}
}
#elif defined(G_OS_WIN32)
- GCredentials *credentials;
- credentials = g_credentials_new_for_process ();
- if (g_strcmp0 (g_credentials_get_windows_user (credentials), initial_response) == 0)
+ gchar *sid;
+ sid = _g_dbus_win32_get_user_sid ();
+ if (g_strcmp0 (initial_response, sid) == 0)
m->priv->state = G_DBUS_AUTH_MECHANISM_STATE_HAVE_DATA_TO_SEND;
- g_object_unref (credentials);
+ g_free (sid);
#else
#error Please implement for your OS
#endif
tokens = g_strsplit (data, " ", 0);
if (g_strv_length (tokens) != 2)
{
- g_warning ("Malformed data `%s'", data);
+ g_warning ("Malformed data '%s'", data);
m->priv->state = G_DBUS_AUTH_MECHANISM_STATE_REJECTED;
goto out;
}
/* TODO: use GDBusAuthObserver here to get the cookie context to use? */
cookie_context = "org_gtk_gdbus_general";
+ cookie_id = -1;
error = NULL;
if (!keyring_generate_entry (cookie_context,
&cookie_id,
#ifdef G_OS_UNIX
initial_response = g_strdup_printf ("%" G_GINT64_FORMAT, (gint64) getuid ());
#elif defined (G_OS_WIN32)
- {
- GCredentials *credentials;
- credentials = g_credentials_new_for_process ();
- initial_response = g_strdup (g_credentials_get_windows_user (credentials));
- g_object_unref (credentials);
- }
+initial_response = _g_dbus_win32_get_user_sid ();
#else
+#error Please implement for your OS
#endif
g_assert (initial_response != NULL);
tokens = g_strsplit (data, " ", 0);
if (g_strv_length (tokens) != 3)
{
- g_warning ("Malformed data `%s'", data);
+ g_warning ("Malformed data '%s'", data);
m->priv->state = G_DBUS_AUTH_MECHANISM_STATE_REJECTED;
goto out;
}
cookie_id = g_ascii_strtoll (tokens[1], &endp, 10);
if (*endp != '\0')
{
- g_warning ("Malformed cookie_id `%s'", tokens[1]);
+ g_warning ("Malformed cookie_id '%s'", tokens[1]);
m->priv->state = G_DBUS_AUTH_MECHANISM_STATE_REJECTED;
goto out;
}
projects / platform / upstream / glib.git / blobdiff