← Back to branch summary

~ubuntu-branches/ubuntu/raring/clamav/raring

« back to all changes in this revision

Viewing changes to libclamav/cvd.c

  • Committer: Bazaar Package Importer
  • Author(s): Stephen Gran
  • Date: 2008-09-05 17:25:34 UTC
  • mfrom: (0.35.1 lenny)
  • Revision ID: james.westby@ubuntu.com-20080905172534-yi3f8fkye1o7u1r3
http://bugs.debian.org/497662
http://bugs.debian.org/497773
http://bugs.debian.org/496276
http://bugs.debian.org/491760
* New upstream version (closes: #497662, #497773)
  - lots of new options for clamd.conf
  - fixes CVEs CVE-2008-3912, CVE-2008-3913, CVE-2008-3914, and
    CVE-2008-1389
* No longer supports --unzip option, so typo is gone (closes: #496276)
* Translations:
  - sv (thanks Martin Bagge <brother@bsnet.se>) (closes: #491760)

Show diffs side-by-side

added added

removed removed

Lines of Context:
libclamav/cvd.c
286
286
        if(CLI_DBEXT(name)) {
287
287
            ret = cli_load(name, engine, signo, options, &dbio);
288
288
            if(ret) {
289
 
                cli_errmsg("cli_tgzload: Invalid size in header\n");
 
289
                cli_errmsg("cli_tgzload: Can't load %s\n", name);
290
290
                CLOSE_DBIO;
291
291
                return CL_EMALFDB;
292
292
            }
545
545
 
546
546
    if(options & CL_DB_CVDNOTMP) {
547
547
 
548
 
        return cli_tgzload(cfd, engine, signo, options);
 
548
        return cli_tgzload(cfd, engine, signo, options | CL_DB_OFFICIAL);
549
549
 
550
550
    } else {
551
551
 
565
565
        }
566
566
 
567
567
        /* load extracted directory */
568
 
        ret = cl_load(dir, engine, signo, options);
 
568
        ret = cl_load(dir, engine, signo, options | CL_DB_OFFICIAL);
569
569
 
570
570
        cli_rmdirs(dir);
571
571
        free(dir);