← Back to branch summary

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

« back to all changes in this revision

Viewing changes to clamd/clamd.c

  • Committer: Bazaar Package Importer
  • Author(s): Scott Kitterman
  • Date: 2011-10-24 11:57:42 UTC
  • mfrom: (0.47.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20111024115742-8g7826vbzwi0vxyi
Tags: 0.97.3+dfsg-1ubuntu1
* Merge from Debian unstable.  Remaining changes:
  - Drop build-dep on electric-fence (in Universe)
  - Add apparmor profiles for clamd and freshclam along with maintainer
    script changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
clamd/clamd.c
440
440
            enum bytecode_security s;
441
441
            if (!strcmp(opt->strarg, "TrustSigned")) {
442
442
                s = CL_BYTECODE_TRUST_SIGNED;
443
 
                logg("Bytecode: Security mode set to \"TrustSigned\".\n");
 
443
                logg("#Bytecode: Security mode set to \"TrustSigned\".\n");
444
444
            } else if (!strcmp(opt->strarg, "Paranoid")) {
445
445
                s = CL_BYTECODE_TRUST_NOTHING;
446
 
                logg("Bytecode: Security mode set to \"Paranoid\".\n");
 
446
                logg("#Bytecode: Security mode set to \"Paranoid\".\n");
447
447
            } else {
448
448
                logg("!Unable to parse bytecode security setting:%s\n",
449
449
                    opt->strarg);
451
451
                break;
452
452
            }
453
453
            if ((ret = cl_engine_set_num(engine, CL_ENGINE_BYTECODE_SECURITY, s))) {
454
 
                logg("Invalid bytecode security setting %s: %s\n", opt->strarg, cl_strerror(ret));
 
454
                logg("^Invalid bytecode security setting %s: %s\n", opt->strarg, cl_strerror(ret));
455
455
                ret = 1;
456
456
                break;
457
457
            }
458
458
        }
459
459
        if((opt = optget(opts,"BytecodeUnsigned"))->enabled) {
460
460
            dboptions |= CL_DB_BYTECODE_UNSIGNED;
461
 
            logg("Bytecode: Enabled support for unsigned bytecode.\n");
 
461
            logg("#Bytecode: Enabled support for unsigned bytecode.\n");
462
462
        }
463
463
        if((opt = optget(opts,"BytecodeMode"))->enabled) {
464
464
            enum bytecode_mode mode;
476
476
            cl_engine_set_num(engine, CL_ENGINE_BYTECODE_TIMEOUT, opt->numarg);
477
477
        }
478
478
    } else
479
 
        logg("Bytecode support disabled.\n");
 
479
        logg("#Bytecode support disabled.\n");
480
480
 
481
481
    if(optget(opts,"PhishingScanURLs")->enabled)
482
482
        dboptions |= CL_DB_PHISHING_URLS;