DBusNonceFile: don't always fail when use_subdir=TRUE, i.e. on Unix
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Tue, 22 Feb 2011 13:42:46 +0000 (13:42 +0000)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 25 May 2011 15:03:31 +0000 (16:03 +0100)
commit54de9c060a701f046e717abd7c0e312da4182928
treee0219466cffd72fef1d7207b9568147b1bf1b614
parent4bcffe1e05cfc22eb29b41d39f7ceca14b45a9a8
DBusNonceFile: don't always fail when use_subdir=TRUE, i.e. on Unix

In shell-like pseudocode, the desired result is:

if $use_subdir
  dir = $tmpdir/dbus_nonce-$random
  path = $dir/nonce
  mkdir $dir
  write file at $path
else
  dir = $user_owned_place
  path = $dir/dbus_nonce-$random
  write file at $path

However, /nonce was accidentally appended to $dir instead of $path,
resulting in an attempt to mkdir /tmp/dbus_nonce-XXXX/nonce when
dbus_nonce-XXXX hadn't been created yet.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=34569
Tested-by: David Zeuthen <davidz@redhat.com>
Reviewed-by: David Zeuthen <davidz@redhat.com>
dbus/dbus-nonce.c