← Back to branch summary

~ubuntu-branches/ubuntu/maverick/dbus/maverick-proposed

« back to all changes in this revision

Viewing changes to dbus/dbus-transport-socket.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2010-08-09 16:09:57 UTC
  • mfrom: (1.3.8 sid)
  • Revision ID: james.westby@ubuntu.com-20100809160957-3xh1a1tnhxebs159
Tags: 1.2.24-3ubuntu1
https://launchpad.net/bugs/275229
* Resync on Debian
* Remaining Ubuntu Changes:
  - Install into / rather than /usr.
  - debian/control: Depend on ConsoleKit for "at_console" policy stanza.
  - debian/dbus.postinst: Do not restart dbus on upgrades, since it breaks
    too many applications. Instead, trigger a "reboot required" notification.
  - debian/dbus.postinst: Create /var/run/dbus in postinst to handle system
    being rebooted before package is configured.  LP: #275229.
  - Add debian/dbus.upstart and bump debhelper b-dep to ensure that it is
    properly installed.
  - 20_system_conf_limit.patch: Increase max_match_rules_per_connection for
    the system bus to 5000 (LP #454093)
  - 81-session.conf-timeout.patch: Raise the service startup timeout from 25
    to 60 seconds. It may be too short on the live CD with slow machines.

Show diffs side-by-side

added added

removed removed

Lines of Context:
dbus/dbus-transport-socket.c
1288
1288
                 host, port);
1289
1289
  
1290
1290
  transport = _dbus_transport_new_for_socket (fd, NULL, &address);
 
1291
  _dbus_string_free (&address);
1291
1292
  if (transport == NULL)
1292
1293
    {
1293
1294
      dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
1294
1295
      _dbus_close_socket (fd, NULL);
1295
 
      _dbus_string_free (&address);
1296
1296
      fd = -1;
1297
1297
    }
1298
1298
 
1299
 
  _dbus_string_free (&address);
1300
 
  
1301
1299
  return transport;
1302
1300
 
1303
1301
error: