← Back to branch summary

~louis/ubuntu/trusty/clamav/lp799623_fix_logrotate

« back to all changes in this revision

Viewing changes to clamdscan/clamdscan.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:
clamdscan/clamdscan.c
43
43
 
44
44
extern int notremoved, notmoved;
45
45
 
46
 
#ifdef CL_EXPERIMENTAL
47
 
#define VERSION_EXP     VERSION"-exp"
48
 
#else
49
 
#define VERSION_EXP     VERSION
50
 
#endif
51
 
 
52
46
static void print_server_version(const struct optstruct *opt)
53
47
{
54
48
    if(get_clamd_version(opt)) {
55
49
        /* can't get version from server, fallback */
56
 
        printf("ClamAV "VERSION_EXP"\n");
 
50
        printf("ClamAV %s\n", get_version());
57
51
    }
58
52
}
59
53
 
66
60
        struct optstruct *opt;
67
61
        const char *clamdscan_accepted[] = { "help", "version", "verbose", "quiet",
68
62
                                  "stdout", "log", "move", "copy", "remove",
69
 
                                  "config-file", "no-summary",
 
63
                                  "config-file", "no-summary",  "fdpass",
70
64
                                  "disable-summary", "multiscan", NULL };
71
65
 
72
66
 
149
143
    mprintf_stdout = 1;
150
144
 
151
145
    mprintf("\n");
152
 
    mprintf("                       ClamAV Daemon Client "VERSION"\n");
 
146
    mprintf("                       ClamAV Daemon Client %s\n", get_version());
153
147
    mprintf("     (C) 2002 - 2007 ClamAV Team - http://www.clamav.net/team\n\n");
154
148
 
155
149
    mprintf("    --help              -h             Show help\n");
166
160
    mprintf("    --multiscan           -m           Force MULTISCAN mode\n");
167
161
    mprintf("    --infected            -i           Only print infected files\n");
168
162
    mprintf("    --no-summary                       Disable summary at end of scanning\n");
 
163
    mprintf("    --fdpass                           pass filedescriptor to clamd (useful if clamd is running as a different user)\n");
169
164
    mprintf("\n");
170
165
 
171
166
    exit(0);