← Back to branch summary

~ubuntu-branches/debian/jessie/systemd/jessie

« back to all changes in this revision

Viewing changes to src/random-seed.c

  • Committer: Package Import Robot
  • Author(s): Tollef Fog Heen, Tollef Fog Heen, Michael Biebl
  • Date: 2012-04-03 19:59:17 UTC
  • mfrom: (1.1.10) (6.1.3 experimental)
  • Revision ID: package-import@ubuntu.com-20120403195917-l532urrbg4pkreas
Tags: 44-1
http://bugs.debian.org/664364
http://bugs.debian.org/663219
http://bugs.debian.org/663323
[ Tollef Fog Heen ]
* New upstream version.
  - Backport 3492207: journal: PAGE_SIZE is not known on ppc and other
    archs
  - Backport 5a2a2a1: journal: react with immediate rotation to a couple
    of more errors
  - Backport 693ce21: util: never follow symlinks in rm_rf_children()
    Fixes CVE-2012-1174, closes: #664364
* Drop output message from init-functions hook, it's pointless.
* Only rmdir /lib/init/rw if it exists.
* Explicitly order debian-fixup before sysinit.target to prevent a
  possible race condition with the creation of sockets.  Thanks to
  Michael Biebl for debugging this.
* Always restart the initctl socket on upgrades, to mask sysvinit
  removing it.

[ Michael Biebl ]
* Remove workaround for non-interactive sessions from pam config again.
* Create compat /dev/initctl symlink in case we are upgrading from a system
  running a newer version of sysvinit (using /run/initctl) and sysvinit is
  replaced with systemd-sysv during the upgrade. Closes: #663219
* Install new man pages.
* Build-Depend on valac (>= 0.12) instead of valac-0.12. Closes: #663323

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/random-seed.c
43
43
                return EXIT_FAILURE;
44
44
        }
45
45
 
46
 
        log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
 
46
        log_set_target(LOG_TARGET_AUTO);
47
47
        log_parse_environment();
48
48
        log_open();
49
49
 
51
51
 
52
52
        /* Read pool size, if possible */
53
53
        if ((f = fopen("/proc/sys/kernel/random/poolsize", "re"))) {
54
 
                fscanf(f, "%zu", &buf_size);
 
54
                if (fscanf(f, "%zu", &buf_size) > 0) {
 
55
                        /* poolsize is in bits on 2.6, but we want bytes */
 
56
                        buf_size /= 8;
 
57
                }
 
58
 
55
59
                fclose(f);
56
60
        }
57
61