From 3bf21904ad29eaaf5966ef60bd7f864a99275f46 Mon Sep 17 00:00:00 2001 From: aCaB Date: Wed, 4 Feb 2009 17:18:49 +0000 Subject: [PATCH] straight reload git-svn-id: file:///var/lib/svn/clamav-devel/branches/clamd-proto@4676 77e5149b-7576-45b1-b177-96237e5ba77b --- clamdscan/clamdscan.c | 11 +---------- clamdscan/client.c | 5 ++--- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/clamdscan/clamdscan.c b/clamdscan/clamdscan.c index 0d109ba0e..ba4835a8d 100644 --- a/clamdscan/clamdscan.c +++ b/clamdscan/clamdscan.c @@ -47,15 +47,6 @@ static void print_server_version(const struct optstruct *opt) } } -static int reload_server_database(const struct optstruct *opt) -{ - if(reload_clamd_database(opt)) { - logg("!Clamd did not reload the database\n"); - return 2; - } - return 0; -} - int main(int argc, char **argv) { int ds, dms, ret, infected; @@ -110,7 +101,7 @@ int main(int argc, char **argv) if(optget(opts, "reload")->enabled) { - ret = reload_server_database(opts); + ret = reload_clamd_database(opts); optfree(opts); logg_close(); exit(ret); diff --git a/clamdscan/client.c b/clamdscan/client.c index 5953a9fb8..2eda47e04 100644 --- a/clamdscan/client.c +++ b/clamdscan/client.c @@ -405,7 +405,7 @@ struct client_cb_data { int spam; }; -int callback(struct stat *sb, char *filename, const char *path, enum cli_ftw_reason reason, struct cli_ftw_cbdata *data) { +static int callback(struct stat *sb, char *filename, const char *path, enum cli_ftw_reason reason, struct cli_ftw_cbdata *data) { struct client_cb_data *c = (struct client_cb_data *)data->data; int sockd, ret; const char *f = filename; @@ -536,11 +536,10 @@ int reload_clamd_database(const struct optstruct *opts) } if(!(len = recvln(&rcv, &buff, NULL)) || len < 10 || memcmp(buff, "RELOADING", 9)) { - logg("!Incorrect reply from clamd\n"); + logg("!Clamd did not reload the database\n"); close(sockd); return 2; } - close(sockd); return 0; }