← Back to branch summary

~yolanda.robla/ubuntu/saucy/clamav/dep-8-tests

« back to all changes in this revision

Viewing changes to clamscan/manager.c

  • Committer: Bazaar Package Importer
  • Author(s): Scott Kitterman
  • Date: 2009-11-02 23:27:19 UTC
  • mfrom: (0.35.9 sid)
  • Revision ID: james.westby@ubuntu.com-20091102232719-61ay35095dhbuxfm
Tags: 0.95.3+dfsg-1ubuntu1
* Merge from debian unstable, remaining changes:
  - Drop build-dep on electric-fence (in Universe)
  - Build-dep on libltdl3-dev instead of libltdl-dev for updating earlier
    releases more easily
  - Add apparmor profiles for clamd and freshclam along with maintainer
    script changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
clamscan/manager.c
452
452
 
453
453
    /* set limits */
454
454
 
455
 
    if((opt = optget(opts, "max-scansize"))->enabled) {
 
455
    if((opt = optget(opts, "max-scansize"))->active) {
456
456
        if((ret = cl_engine_set_num(engine, CL_ENGINE_MAX_SCANSIZE, opt->numarg))) {
457
457
            logg("!cli_engine_set_num(CL_ENGINE_MAX_SCANSIZE) failed: %s\n", cl_strerror(ret));
458
458
            cl_engine_free(engine);
460
460
        }
461
461
    }
462
462
 
463
 
    if((opt = optget(opts, "max-filesize"))->enabled) {
 
463
    if((opt = optget(opts, "max-filesize"))->active) {
464
464
        if((ret = cl_engine_set_num(engine, CL_ENGINE_MAX_FILESIZE, opt->numarg))) {
465
465
            logg("!cli_engine_set_num(CL_ENGINE_MAX_FILESIZE) failed: %s\n", cl_strerror(ret));
466
466
            cl_engine_free(engine);
479
479
    }
480
480
#endif
481
481
 
482
 
    if((opt = optget(opts, "max-files"))->enabled) {
 
482
    if((opt = optget(opts, "max-files"))->active) {
483
483
        if((ret = cl_engine_set_num(engine, CL_ENGINE_MAX_FILES, opt->numarg))) {
484
484
            logg("!cli_engine_set_num(CL_ENGINE_MAX_FILES) failed: %s\n", cl_strerror(ret));
485
485
            cl_engine_free(engine);
487
487
        }
488
488
    }
489
489
 
490
 
    if((opt = optget(opts, "max-recursion"))->enabled) {
 
490
    if((opt = optget(opts, "max-recursion"))->active) {
491
491
        if((ret = cl_engine_set_num(engine, CL_ENGINE_MAX_RECURSION, opt->numarg))) {
492
492
            logg("!cli_engine_set_num(CL_ENGINE_MAX_RECURSION) failed: %s\n", cl_strerror(ret));
493
493
            cl_engine_free(engine);
561
561
            options |= CL_SCAN_STRUCTURED_SSN_NORMAL;
562
562
        }
563
563
 
564
 
        if((opt = optget(opts, "structured-ssn-count"))->enabled) {
 
564
        if((opt = optget(opts, "structured-ssn-count"))->active) {
565
565
            if((ret = cl_engine_set_num(engine, CL_ENGINE_MIN_SSN_COUNT, opt->numarg))) {
566
566
                logg("!cli_engine_set_num(CL_ENGINE_MIN_SSN_COUNT) failed: %s\n", cl_strerror(ret));
567
567
                cl_engine_free(engine);
569
569
            }
570
570
        }
571
571
 
572
 
        if((opt = optget(opts, "structured-cc-count"))->enabled) {
 
572
        if((opt = optget(opts, "structured-cc-count"))->active) {
573
573
            if((ret = cl_engine_set_num(engine, CL_ENGINE_MIN_CC_COUNT, opt->numarg))) {
574
574
                logg("!cli_engine_set_num(CL_ENGINE_MIN_CC_COUNT) failed: %s\n", cl_strerror(ret));
575
575
                cl_engine_free(engine);