aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Andree <matthias.andree@gmx.de>2007-03-24 10:35:33 +0000
committerMatthias Andree <matthias.andree@gmx.de>2007-03-24 10:35:33 +0000
commit31a826f29ccce437a450fdc8089d58ea0d63ed1b (patch)
treecbe6c8e8e34338133139fba12cd3a9984ae27aca
parente75ef8f8b5480be6ef8fcc84214228860bb48752 (diff)
downloadfetchmail-31a826f29ccce437a450fdc8089d58ea0d63ed1b.tar.gz
fetchmail-31a826f29ccce437a450fdc8089d58ea0d63ed1b.tar.bz2
fetchmail-31a826f29ccce437a450fdc8089d58ea0d63ed1b.zip
If SOCKS support was compiled in, add 'socks' to the feature_options
list emitted in --configdump. Reported by Rob MacGregor. svn path=/branches/BRANCH_6-3/; revision=5065
-rw-r--r--NEWS2
-rw-r--r--conf.c3
2 files changed, 5 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index 1d7c8ca7..2a75864f 100644
--- a/NEWS
+++ b/NEWS
@@ -72,6 +72,8 @@ fetchmail 6.3.8 (not yet released):
Fixes comment #9 in Gentoo Bug #163782, reported by Takuto Matsuu.
* Fix rendering of the "24 - 26, 28, 29" paragraph in the exit codes section.
Reported by Nico Golde.
+* If SOCKS support was compiled in, add 'socks' to the feature_options Python
+ list emitted in --configdump. Reported by Rob MacGregor.
# DOCUMENTATION:
* Extend --mda documentation, discourage use of qmail-inject.
diff --git a/conf.c b/conf.c
index 30c2e482..14562575 100644
--- a/conf.c
+++ b/conf.c
@@ -184,6 +184,9 @@ void dump_config(struct runctl *runp, struct query *querylist)
#ifdef OPIE_ENABLE
"'opie',"
#endif /* OPIE_ENABLE */
+#ifdef HAVE_SOCKS
+ "'socks',"
+#endif /* HAVE_SOCKS */
")\n";
fputs(features, stdout);