← Back to branch summary

~ubuntu-branches/ubuntu/lucid/openssh/lucid

« back to all changes in this revision

Viewing changes to openbsd-compat/daemon.c

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2010-01-26 13:07:40 UTC
  • mfrom: (1.13.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20100126130740-d7r70jqrqlbvz3r0
Tags: 1:5.3p1-1ubuntu1
* Resynchronise with Debian.  Remaining changes:
  - Add support for registering ConsoleKit sessions on login.
  - Drop openssh-blacklist and openssh-blacklist-extra to Suggests; they
    take up a lot of CD space, and I suspect that rolling them out in
    security updates has covered most affected systems now.
  - Convert to Upstart.  The init script is still here for the benefit of
    people running sshd in chroots.

Show diffs side-by-side

added added

removed removed

Lines of Context:
openbsd-compat/daemon.c
57
57
        case -1:
58
58
                return (-1);
59
59
        case 0:
60
 
#ifdef HAVE_CYGWIN
61
 
                register_9x_service();
62
 
#endif
63
60
                break;
64
61
        default:
65
 
#ifdef HAVE_CYGWIN
66
 
                /*
67
 
                 * This sleep avoids a race condition which kills the
68
 
                 * child process if parent is started by a NT/W2K service.
69
 
                 */
70
 
                sleep(1);
71
 
#endif
72
62
                _exit(0);
73
63
        }
74
64