← Back to branch summary

~ubuntu-branches/ubuntu/utopic/vsftpd/utopic-proposed

« back to all changes in this revision

Viewing changes to sysdeputil.c

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2010-06-21 14:07:17 UTC
  • mfrom: (2.3.10 squeeze)
  • Revision ID: james.westby@ubuntu.com-20100621140717-fnd7ghb4s1vholau
Tags: 2.3.0~pre2-3ubuntu1
https://launchpad.net/bugs/513978
* Merge from debian unstable:
  - Use snakeoil SSL certificates and key.
  - debian/rules, debian/vsftpd.upstart: migrate vsftpd to upstart
  - Add apport hook: (LP: #513978): 
    - debian/vsftpd.apport: Added.
    - debian/control: Build-depends on dh-apport.
    - debian/rules: Add --with apport.
  - Dropped:
    + debian/patches/07_vsftpd-enable-utf8.patch: Add support for UTF8:
      Use the debian version instead.
  - Add debian/watch file 

Show diffs side-by-side

added added

removed removed

Lines of Context:
sysdeputil.c
1260
1260
}
1261
1261
 
1262
1262
int
 
1263
vsf_sysutil_fork_isolate_all_failok()
 
1264
{
 
1265
#ifdef VSF_SYSDEP_HAVE_LINUX_CLONE
 
1266
  static int cloneflags_work = 1;
 
1267
  if (cloneflags_work)
 
1268
  {
 
1269
    int ret = syscall(__NR_clone,
 
1270
                      CLONE_NEWPID | CLONE_NEWIPC | CLONE_NEWNET | SIGCHLD,
 
1271
                      NULL);
 
1272
    if (ret != -1 || (errno != EINVAL && errno != EPERM))
 
1273
    {
 
1274
      if (ret == 0)
 
1275
      {
 
1276
        vsf_sysutil_post_fork();
 
1277
      }
 
1278
      return ret;
 
1279
    }
 
1280
    cloneflags_work = 0;
 
1281
  }
 
1282
#endif
 
1283
  return vsf_sysutil_fork_isolate_failok();
 
1284
}
 
1285
 
 
1286
int
1263
1287
vsf_sysutil_fork_isolate_failok()
1264
1288
{
1265
1289
#ifdef VSF_SYSDEP_HAVE_LINUX_CLONE