← Back to branch summary

~ubuntu-branches/ubuntu/natty/dbus/natty-201012211412

« back to all changes in this revision

Viewing changes to dbus/dbus-spawn.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-spawn.c
74
74
  
75
75
  while (TRUE)
76
76
    {
77
 
      size_t chunk;
78
 
      ssize_t to_read;
 
77
      ssize_t chunk;
 
78
      size_t to_read;
79
79
 
80
80
      to_read = sizeof (int) * n_ints_in_buf - bytes;
81
81
 
129
129
  
130
130
  while (TRUE)
131
131
    {
132
 
      size_t chunk;    
133
 
      ssize_t to_read;
134
 
      
 
132
      ssize_t chunk;
 
133
      size_t to_read;
 
134
 
135
135
      to_read = sizeof (pid_t) - bytes;
136
136
 
137
137
      if (to_read == 0)