diff options
| author | Alex Dowad <alexinbeijing@gmail.com> | 2014-04-17 21:48:50 +0200 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2014-04-25 10:21:03 +0300 |
| commit | bc510426cc7981cafa2c9a350f56d2489000a61d (patch) | |
| tree | a148e69af5fe5bfc021e0c20cbbdb7076a216b70 /src | |
| parent | 4f30890daa5f982a43bbe41e89129e27578cae81 (diff) | |
| download | squark-bc510426cc7981cafa2c9a350f56d2489000a61d.tar.bz2 squark-bc510426cc7981cafa2c9a350f56d2489000a61d.tar.xz | |
squark-filter, squark-auth-ip: filter DB file path can be set using -d option
Diffstat (limited to 'src')
| -rw-r--r-- | src/config.c | 2 | ||||
| -rw-r--r-- | src/config.h | 2 | ||||
| -rw-r--r-- | src/squark-auth-ip.c | 5 | ||||
| -rw-r--r-- | src/squark-filter.c | 5 |
4 files changed, 10 insertions, 4 deletions
diff --git a/src/config.c b/src/config.c index aea8fee..af7ff42 100644 --- a/src/config.c +++ b/src/config.c @@ -10,4 +10,4 @@ const char *squark_version = SQUARK_VERSION; char *squark_config = CONFDIR "/squark.conf"; -const char *squark_dbname = LIBDIR "/squark.db"; +char *squark_dbname = LIBDIR "/squark.db"; diff --git a/src/config.h b/src/config.h index de633f5..fc3328c 100644 --- a/src/config.h +++ b/src/config.h @@ -5,6 +5,6 @@ extern const char *squark_version; extern char *squark_config; -extern const char *squark_dbname; +extern char *squark_dbname; #endif diff --git a/src/squark-auth-ip.c b/src/squark-auth-ip.c index 22e8fc0..baf0b4b 100644 --- a/src/squark-auth-ip.c +++ b/src/squark-auth-ip.c @@ -126,7 +126,7 @@ int main(int argc, char **argv) reporting_init("squark-auth-ip"); - while ((opt = getopt(argc, argv, "Vc:i:u:olpLrsqv::")) != -1) { + while ((opt = getopt(argc, argv, "Vc:d:i:u:olpLrsqv::")) != -1) { switch (opt) { case 'V': fprintf(stderr, "squark-auth-ip %s\n", squark_version); @@ -134,6 +134,9 @@ int main(int argc, char **argv) case 'c': squark_config = optarg; break; + case 'd': + squark_dbname = optarg; + break; case 'i': ip = BLOB_STRLEN(optarg); if (!addr_parse(ip, &ipaddr)) { diff --git a/src/squark-filter.c b/src/squark-filter.c index 7aaaca5..11b9de3 100644 --- a/src/squark-filter.c +++ b/src/squark-filter.c @@ -462,7 +462,7 @@ int main(int argc, char **argv) reporting_init("squark-filter"); - while ((opt = getopt(argc, argv, "Vc:sqv::")) != -1) { + while ((opt = getopt(argc, argv, "Vc:d:sqv::")) != -1) { switch (opt) { case 'V': fprintf(stderr, "squark-filter %s\n", squark_version); @@ -470,6 +470,9 @@ int main(int argc, char **argv) case 'c': squark_config = optarg; break; + case 'd': + squark_dbname = optarg; + break; case 's': reporting_use_syslog(1); break; |