~ubuntu-branches/ubuntu/natty/clamav/natty-updates

« back to all changes in this revision

Viewing changes to libclamav/special.c

  • Committer: Bazaar Package Importer
  • Author(s): Scott Kitterman
  • Date: 2008-11-11 22:24:38 UTC
  • mfrom: (0.35.2 sid)
  • Revision ID: james.westby@ubuntu.com-20081111222438-ezhpc4lldn62u9cg
Tags: 0.94.dfsg.1-1ubuntu1
* Merge from Debian Unstable (LP: #296704).  Remaining Ubuntu changes:
  - debian/control: Recommends apparmor >= 2.1+1075-0ubuntu6 for
    clamav-daemon and clamav-freshclam
  - add debian/usr.bin.freshclam and debian/usr.sbin.clamd
  - debian/clamav-(daemon|freshclam).dirs: add etc/apparmor.d/force-complain
  - debian/clamav-(daemon|freshclam).install: install profiles
  - debian/clamav-(daemon|freshclam).preinst: create symlink for
    force-complain/ on pre-feisty upgrades, upgrades where apparmor-profiles
    profile is unchanged (ie non-enforcing) and upgrades where the profile
    doesn't exist.
  - debian/clamav-(daemon|freshclam).postrm: remove symlink in
    force-complain/ on purge.
  - debian/clamav-(daemon|freshclam).postinst.in: reload apparmor
  - update README.Debian with note on Apparmor
* Update apparmor profile for clamd to work with TCP sockets (LP: #288942)

Show diffs side-by-side

added added

removed removed

Lines of Context:
58
58
        if (cli_readn(desc, &record, 32) != 32) {
59
59
            break;
60
60
        }
 
61
        if(!j && record[0] == 0xffffffff) /* bb#1241 */
 
62
            return CL_CLEAN;
61
63
 
62
64
        /* Decode the key */
63
65
        record[0] = ~ntohl(record[0]);