Merge branch 'dbus-1.4'

7 files changed, 33 insertions, 28 deletions

diff --git a/HACKING b/HACKING
index 64dc0409..e776fd6d 100644
--- a/HACKING
+++ b/HACKING
@@ -303,6 +303,20 @@ rules are:
  - if there's a live unresolved controversy about a change,
    don't commit it while the argument is still raging.
 
+ - at their discretion, members of the reviewer group may also commit
+   branches/patches under these conditions:
+
+   - the branch does not add or change API, ABI or wire-protocol
+
+   - the branch solves a known problem and is covered by the regression tests
+
+   - there are no objections from the rest of the review group within
+     a week of the patches being attached to Bugzilla
+
+   - the committer gets a positive review on Bugzilla from someone they
+     consider qualified to review the change (e.g. a colleague with D-Bus
+     experience; not necessarily a member of the reviewer group)
+
  - regardless of reviews, to commit a patch:
     - make check must pass
     - the test suite must be extended to cover the new code
@@ -331,5 +345,4 @@ John Palmieri <johnp@redhat.com>
 Scott James Remnant <scott@netsplit.com>
 Will Thompson <will.thompson@collabora.co.uk>
 Simon McVittie <simon.mcvittie@collabora.co.uk>
-
-
+David Zeuthen <davidz@redhat.com>
diff --git a/NEWS b/NEWS
index a5fe4d71..6ea1dd79 100644
--- a/NEWS
+++ b/NEWS
@@ -29,12 +29,18 @@ Changes:
     (fd.o #32827, Simon McVittie)
   • Log system-bus activation information to syslog (fd.o #35705,
     Colin Walters)
+  • Make the nonce-tcp transport work on Unix (fd.o #34569, Simon McVittie)
   • On Unix, if /var/lib/dbus/machine-id cannot be read, try /etc/machine-id
     (fd.o #35228, Lennart Poettering)
   • In the regression tests, don't report fds as "leaked" if they were open
     on startup (fd.o #35173, Simon McVittie)
   • Make dbus-monitor bail out if asked to monitor more than one bus,
     rather than silently using the last one (fd.o #26548, Will Thompson)
+  • Clarify documentation (fd.o #35182, Simon McVittie)
+  • Clean up minor dead code and some incorrect error handling
+    (fd.o #33128, fd.o #29881; Simon McVittie)
+  • Windows:
+    • Remove obsolete workaround for winioctl.h (fd.o #35083, Ralf Habacker)
 
 D-Bus 1.5.0 (2011-04-11)
 ==
diff --git a/dbus/dbus-auth.c b/dbus/dbus-auth.c
index 3173f34f..270d85e4 100644
--- a/dbus/dbus-auth.c
+++ b/dbus/dbus-auth.c
@@ -1202,18 +1202,6 @@ handle_server_data_anonymous_mech (DBusAuth         *auth,
         {
           _dbus_verbose ("%s: Received invalid UTF-8 trace data from ANONYMOUS client\n",
                          DBUS_AUTH_NAME (auth));
-
-          {
-            DBusString plaintext;
-            DBusString encoded;
-            _dbus_string_init_const (&plaintext, "D-Bus " DBUS_VERSION_STRING);
-            _dbus_string_init (&encoded);
-            _dbus_string_hex_encode (&plaintext, 0,
-                                     &encoded,
-                                     0);
-              _dbus_verbose ("%s: try '%s'\n",
-                             DBUS_AUTH_NAME (auth), _dbus_string_get_const_data (&encoded));
-          }
           return send_rejected (auth);
         }
       
diff --git a/dbus/dbus-connection.c b/dbus/dbus-connection.c
index 2cdd365c..add3fc8a 100644
--- a/dbus/dbus-connection.c
+++ b/dbus/dbus-connection.c
@@ -4615,9 +4615,6 @@ dbus_connection_dispatch (DBusConnection *connection)
       /* unlocks and calls user code */
       _dbus_connection_update_dispatch_status_and_unlock (connection,
                                                           DBUS_DISPATCH_NEED_MEMORY);
-
-      if (pending)
-        dbus_pending_call_unref (pending);
       dbus_connection_unref (connection);
       
       return DBUS_DISPATCH_NEED_MEMORY;
diff --git a/dbus/dbus-nonce.c b/dbus/dbus-nonce.c
index d7cee64d..d30b2535 100644
--- a/dbus/dbus-nonce.c
+++ b/dbus/dbus-nonce.c
@@ -275,7 +275,7 @@ do_noncefile_create (DBusNonceFile *noncefile,
           }
         if (!_dbus_string_init (&noncefile->path)
             || !_dbus_string_copy (&noncefile->dir, 0, &noncefile->path, 0)
-            || !_dbus_string_append (&noncefile->dir, "/nonce"))
+            || !_dbus_string_append (&noncefile->path, "/nonce"))
           {
             dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
             goto on_error;
diff --git a/tools/dbus-launch.c b/tools/dbus-launch.c
index ce9c7b1c..af935386 100644
--- a/tools/dbus-launch.c
+++ b/tools/dbus-launch.c
@@ -690,10 +690,11 @@ pass_info (const char *runprog, const char *bus_address, pid_t bus_pid,
            int binary_syntax,
            int argc, char **argv, int remaining_args)
 {
+  char *envvar = NULL;
+  char **args = NULL;
+
   if (runprog)
     {
-      char *envvar;
-      char **args;
       int i;
 
       envvar = malloc (strlen ("DBUS_SESSION_BUS_ADDRESS=") +
@@ -701,11 +702,7 @@ pass_info (const char *runprog, const char *bus_address, pid_t bus_pid,
       args = malloc (sizeof (char *) * ((argc-remaining_args)+2));
 
       if (envvar == NULL || args == NULL)
-        {
-          free (envvar);
-          free (args);
-          goto oom;
-        }
+        goto oom;
 
      args[0] = xstrdup (runprog);
       if (!args[0])
@@ -741,6 +738,12 @@ pass_info (const char *runprog, const char *bus_address, pid_t bus_pid,
   close (2);
   exit (0);
 oom:
+  if (envvar)
+    free (envvar);
+
+  if (args)
+    free (args);
+
   fprintf (stderr, "Out of memory!");
   exit (1);
 }
diff --git a/tools/dbus-send.c b/tools/dbus-send.c
index c7d50908..e5df15cf 100644
--- a/tools/dbus-send.c
+++ b/tools/dbus-send.c
@@ -302,10 +302,8 @@ main (int argc, char *argv[])
 	usage (1);
       else if (path == NULL)
         path = arg;
-      else if (name == NULL)
+      else /* name == NULL guaranteed by the 'while' loop */
         name = arg;
-      else
-        usage (1);
     }
 
   if (name == NULL)