← Back to branch summary

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

« back to all changes in this revision

Viewing changes to freshclam/freshclam.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
https://launchpad.net/bugs/296704
https://launchpad.net/bugs/288942
* 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:
freshclam/freshclam.c
144
144
    mprintf("    --on-error-execute=COMMAND           execute COMMAND if errors occured\n");
145
145
    mprintf("    --on-outdated-execute=COMMAND        execute COMMAND when software is outdated\n");
146
146
    mprintf("    --list-mirrors                       print mirrors from mirrors.dat\n");
 
147
    mprintf("    --submit-stats[=/path/clamd.conf]    only submit detection statistics\n");
147
148
 
148
149
    mprintf("\n");
149
150
}
233
234
            {"on-error-execute", 1, 0, 0},
234
235
            {"on-outdated-execute", 1, 0, 0},
235
236
            {"list-mirrors", 0, 0, 0},
236
 
            /* {"submit-stats", 2, 0, 0}, */
 
237
            {"submit-stats", 2, 0, 0},
237
238
            {0, 0, 0, 0}
238
239
        };
239
240
 
580
581
        }
581
582
 
582
583
    } else {
583
 
        /*
584
584
        if(opt_check(opt, "submit-stats")) {
585
585
            cfgfile = opt_arg(opt, "submit-stats");
586
586
            if(!cfgfile)
587
587
                cfgfile = CONFDIR"/clamd.conf";
 
588
            if(!opt_check(opt, "no-warnings"))
 
589
                logg(" *** Virus databases are not updated in this mode ***\n");
588
590
            ret = submitstats(cfgfile, copt);
589
591
        } else {
590
592
            ret = download(copt, opt, newdir, cfgfile);
592
594
            if((cpt = cfgopt(copt, "SubmitDetectionStats"))->enabled)
593
595
                submitstats(cpt->strarg, copt);
594
596
        }
595
 
        */
596
 
        ret = download(copt, opt, newdir, cfgfile);
597
 
 
598
 
        if((cpt = cfgopt(copt, "SubmitDetectionStats"))->enabled)
599
 
            submitstats(cpt->strarg, copt);
600
 
 
601
597
    }
602
598
 
603
599
    if(ret > 1) {