- tor-commits - lists.torproject.org

[tor/master] Merge branch 'bug6379' into maint-0.2.3
by nickm＠torproject.org 17 Aug '12

17 Aug '12

commit 97602c9de432cc1d49d4441de858ab73b8bf41c0 Merge: e9172e5 4c8fcba Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 17 13:57:07 2012 -0400 Merge branch 'bug6379' into maint-0.2.3 changes/bug6379 | 6 +++++ configure.in | 1 + src/common/OpenBSD_malloc_Linux.c | 40 ++++++++++++++++++++++++++++-------- 3 files changed, 38 insertions(+), 9 deletions(-)

1 0

[tor/maint-0.2.3] Fix warnings and 64-bit problems in openbsd-malloc code
by nickm＠torproject.org 17 Aug '12

17 Aug '12

commit 6a33c33a12f3af414e97b91d5718ea16f2d26673 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 15 19:26:53 2012 -0400 Fix warnings and 64-bit problems in openbsd-malloc code The warning fixes are: - Only define issetugid if it's missing. - Explicitly ignore the return value of writev. - Explicitly cast the retval of readlink() to int. The 64-bit problems are related to just storing a size_t in an int. Not cool! Use a size_t instead. Fix for bug 6379. Bugfix on 0.2.0.20-rc, which introduced openbsd-malloc. --- changes/bug6379 | 6 ++++++ configure.in | 1 + src/common/OpenBSD_malloc_Linux.c | 31 ++++++++++++++++++++++--------- 3 files changed, 29 insertions(+), 9 deletions(-) diff --git a/changes/bug6379 b/changes/bug6379 new file mode 100644 index 0000000..1f2b694 --- /dev/null +++ b/changes/bug6379 @@ -0,0 +1,6 @@ + o Minor bugfixes: + - Fix build warnings from --enable-openbsd-malloc with gcc warnings + enabled. Fixes bug 6379. + - Fix 64-bit warnings from --enable-openbsd-malloc. Fixes bug 6379. + Bugfix on 0.2.0.20-rc. + diff --git a/configure.in b/configure.in index 1db7d08..8aa90f6 100644 --- a/configure.in +++ b/configure.in @@ -300,6 +300,7 @@ AC_CHECK_FUNCS( gmtime_r \ inet_aton \ ioctl \ + issetugid \ localtime_r \ lround \ memmem \ diff --git a/src/common/OpenBSD_malloc_Linux.c b/src/common/OpenBSD_malloc_Linux.c index 92ca9c0..39c8f8b 100644 --- a/src/common/OpenBSD_malloc_Linux.c +++ b/src/common/OpenBSD_malloc_Linux.c @@ -14,6 +14,10 @@ * ---------------------------------------------------------------------------- */ +/* We use this macro to remove some code that we don't actually want, + * rather than to fix its warnings. */ +#define BUILDING_FOR_TOR + /* * Defining MALLOC_EXTRA_SANITY will enable extra checks which are * related to internal conditions and consistency in malloc.c. This has @@ -79,6 +83,7 @@ static size_t g_alignment = 0; extern int __libc_enable_secure; +#ifndef HAVE_ISSETUGID static int issetugid(void) { if (__libc_enable_secure) return 1; @@ -86,8 +91,10 @@ static int issetugid(void) if (getgid() != getegid()) return 1; return 0; } +#endif #define PGSHIFT 12 +#undef MADV_FREE #define MADV_FREE MADV_DONTNEED #include <pthread.h> static pthread_mutex_t gen_mutex = PTHREAD_MUTEX_INITIALIZER; @@ -456,7 +463,7 @@ wrterror(const char *p) iov[3].iov_len = strlen(p); iov[4].iov_base = (char*)"\n"; iov[4].iov_len = 1; - writev(STDERR_FILENO, iov, 5); + (void) writev(STDERR_FILENO, iov, 5); suicide = 1; #ifdef MALLOC_STATS @@ -489,8 +496,8 @@ wrtwarning(const char *p) iov[3].iov_len = strlen(p); iov[4].iov_base = (char*)"\n"; iov[4].iov_len = 1; - - writev(STDERR_FILENO, iov, 5); + + (void) writev(STDERR_FILENO, iov, 5); } #ifdef MALLOC_STATS @@ -665,7 +672,7 @@ malloc_init(void) for (i = 0; i < 3; i++) { switch (i) { case 0: - j = readlink("/etc/malloc.conf", b, sizeof b - 1); + j = (int) readlink("/etc/malloc.conf", b, sizeof b - 1); if (j <= 0) continue; b[j] = '\0'; @@ -1145,9 +1152,10 @@ malloc_bytes(size_t size) if (size == 0) j = 0; else { + size_t ii; j = 1; - i = size - 1; - while (i >>= 1) + ii = size - 1; + while (ii >>= 1) j++; } @@ -1971,6 +1979,7 @@ calloc(size_t num, size_t size) return(p); } +#ifndef BUILDING_FOR_TOR static int ispowerof2 (size_t a) { size_t b; for (b = 1ULL << (sizeof(size_t)*NBBY - 1); b > 1; b >>= 1) @@ -1978,7 +1987,9 @@ static int ispowerof2 (size_t a) { return 1; return 0; } +#endif +#ifndef BUILDING_FOR_TOR int posix_memalign(void **memptr, size_t alignment, size_t size) { void *r; @@ -2015,18 +2026,20 @@ void *valloc(size_t size) posix_memalign(&r, malloc_pagesize, size); return r; } +#endif size_t malloc_good_size(size_t size) { if (size == 0) { return 1; } else if (size <= malloc_maxsize) { - int i, j; + int j; + size_t ii; /* round up to the nearest power of 2, with same approach * as malloc_bytes() uses. */ j = 1; - i = size - 1; - while (i >>= 1) + ii = size - 1; + while (ii >>= 1) j++; return ((size_t)1) << j; } else {

1 0

[tor/maint-0.2.3] Merge branch 'bug6379' into maint-0.2.3
by nickm＠torproject.org 17 Aug '12

17 Aug '12

commit 97602c9de432cc1d49d4441de858ab73b8bf41c0 Merge: e9172e5 4c8fcba Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 17 13:57:07 2012 -0400 Merge branch 'bug6379' into maint-0.2.3 changes/bug6379 | 6 +++++ configure.in | 1 + src/common/OpenBSD_malloc_Linux.c | 40 ++++++++++++++++++++++++++++-------- 3 files changed, 38 insertions(+), 9 deletions(-)

1 0

[tor/maint-0.2.3] Fix more warnings from openbsd_malloc
by nickm＠torproject.org 17 Aug '12

17 Aug '12

commit 4c8fcba86c35bd8e2cfde4c65f394c7837638ff0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 17 13:49:52 2012 -0400 Fix more warnings from openbsd_malloc Apparently, (void)writev is not enough to suppress the "you are ignoring the return value!" warnings on Linux. Instead, remove the whole warning/error logic when compiling openbsd_malloc for Tor: we can't use it. --- src/common/OpenBSD_malloc_Linux.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/common/OpenBSD_malloc_Linux.c b/src/common/OpenBSD_malloc_Linux.c index 39c8f8b..da82729 100644 --- a/src/common/OpenBSD_malloc_Linux.c +++ b/src/common/OpenBSD_malloc_Linux.c @@ -450,6 +450,7 @@ extern char *__progname; static void wrterror(const char *p) { +#ifndef BUILDING_FOR_TOR const char *q = " error: "; struct iovec iov[5]; @@ -463,8 +464,10 @@ wrterror(const char *p) iov[3].iov_len = strlen(p); iov[4].iov_base = (char*)"\n"; iov[4].iov_len = 1; - (void) writev(STDERR_FILENO, iov, 5); - + writev(STDERR_FILENO, iov, 5); +#else + (void)p; +#endif suicide = 1; #ifdef MALLOC_STATS if (malloc_stats) @@ -478,14 +481,17 @@ wrterror(const char *p) static void wrtwarning(const char *p) { +#ifndef BUILDING_FOR_TOR const char *q = " warning: "; struct iovec iov[5]; +#endif if (malloc_abort) wrterror(p); else if (malloc_silent) return; +#ifndef BUILDING_FOR_TOR iov[0].iov_base = __progname; iov[0].iov_len = strlen(__progname); iov[1].iov_base = (char*)malloc_func; @@ -498,6 +504,9 @@ wrtwarning(const char *p) iov[4].iov_len = 1; (void) writev(STDERR_FILENO, iov, 5); +#else + (void)p; +#endif } #ifdef MALLOC_STATS

1 0

r25758: {website} bump stable packages for tor 0.2.2.38 (website/trunk/include)
by Erinn Clark 17 Aug '12

17 Aug '12

Author: erinn Date: 2012-08-17 17:08:41 +0000 (Fri, 17 Aug 2012) New Revision: 25758 Modified: website/trunk/include/versions.wmi Log: bump stable packages for tor 0.2.2.38 Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2012-08-17 07:17:51 UTC (rev 25757) +++ website/trunk/include/versions.wmi 2012-08-17 17:08:41 UTC (rev 25758) @@ -1,30 +1,30 @@ <define-tag version-stable whitespace=delete>0.2.2.38</define-tag> <define-tag version-alpha whitespace=delete>0.2.3.20-rc</define-tag> -<define-tag version-win32-stable whitespace=delete>0.2.2.37</define-tag> +<define-tag version-win32-stable whitespace=delete>0.2.2.38</define-tag> <define-tag version-win32-alpha whitespace=delete>0.2.3.20-rc</define-tag> -<define-tag version-win32-bundle-stable whitespace=delete>0.2.2.37</define-tag> +<define-tag version-win32-bundle-stable whitespace=delete>0.2.2.38</define-tag> <define-tag version-win32-bundle-alpha whitespace=delete>0.2.3.20-rc</define-tag> <define-tag version-win32-bridge-bundle-alpha whitespace=delete>0.2.3.20-rc-<version-vidalia-stable></define-tag> <define-tag version-win32-relay-bundle-alpha whitespace=delete>0.2.3.20-rc-<version-vidalia-stable></define-tag> <define-tag version-win32-exit-bundle-alpha whitespace=delete>0.2.3.20-rc-<version-vidalia-stable></define-tag> -<define-tag version-osx-x86-bundle-stable whitespace=delete>0.2.2.37</define-tag> +<define-tag version-osx-x86-bundle-stable whitespace=delete>0.2.2.38</define-tag> <define-tag version-osx-x86-bundle-alpha whitespace=delete>0.2.3.20-rc</define-tag> -<define-tag version-osx-ppc-bundle-stable whitespace=delete>0.2.2.37</define-tag> -<define-tag version-osx-ppc-bundle-alpha whitespace=delete>0.2.3.19-rc</define-tag> +<define-tag version-osx-ppc-bundle-stable whitespace=delete>0.2.2.38</define-tag> +<define-tag version-osx-ppc-bundle-alpha whitespace=delete>0.2.3.20-rc</define-tag> -<define-tag version-osx-x86-stable whitespace=delete>0.2.2.37</define-tag> +<define-tag version-osx-x86-stable whitespace=delete>0.2.2.38</define-tag> <define-tag version-osx-x86-alpha whitespace=delete>0.2.3.20-rc</define-tag> -<define-tag version-osx-ppc-stable whitespace=delete>0.2.2.37</define-tag> -<define-tag version-osx-ppc-alpha whitespace=delete>0.2.3.19-rc</define-tag> +<define-tag version-osx-ppc-stable whitespace=delete>0.2.2.38</define-tag> +<define-tag version-osx-ppc-alpha whitespace=delete>0.2.3.20-rc</define-tag> -<define-tag version-torbrowserbundle whitespace=delete>2.2.37-2</define-tag> -<define-tag version-torbrowser-tor whitespace=delete>0.2.2.37</define-tag> +<define-tag version-torbrowserbundle whitespace=delete>2.2.38-1</define-tag> +<define-tag version-torbrowser-tor whitespace=delete>0.2.2.38</define-tag> <define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.19-stable, zlib-1.2.7, openssl-1.0.1c</define-tag> <define-tag version-torbrowser-firefox whitespace=delete>10.0.6esr</define-tag> <define-tag version-torbrowser-torbutton whitespace=delete>1.4.6</define-tag> @@ -35,9 +35,9 @@ <define-tag version-torbrowserbundlealpha whitespace=delete>2.3.20-alpha-1</define-tag> <define-tag version-torobfsbundlealpha whitespace=delete>2.3.20-alpha-1</define-tag> -<define-tag version-torbrowserbundlelinux32 whitespace=delete>2.2.37-2</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.2.37-2</define-tag> -<define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.2.37</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>2.2.38-1</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>2.2.38-1</define-tag> +<define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.2.38</define-tag> <define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.19-stable, zlib-1.2.7, openssl-1.0.1c</define-tag> <define-tag version-gnu-torbrowser-firefox whitespace=delete>10.0.6esr</define-tag> <define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.4.6</define-tag> @@ -47,9 +47,9 @@ <define-tag version-torobfsbundlelinux32alpha whitespace=delete>2.3.20-alpha-1</define-tag> <define-tag version-torobfsbundlelinux64alpha whitespace=delete>2.3.20-alpha-1</define-tag> -<define-tag version-torbrowserbundleosx32 whitespace=delete>2.2.37-2</define-tag> -<define-tag version-torbrowserbundleosx64 whitespace=delete>2.2.37-2</define-tag> -<define-tag version-osx-torbrowser-tor whitespace=delete>0.2.2.37</define-tag> +<define-tag version-torbrowserbundleosx32 whitespace=delete>2.2.38-1</define-tag> +<define-tag version-torbrowserbundleosx64 whitespace=delete>2.2.38-1</define-tag> +<define-tag version-osx-torbrowser-tor whitespace=delete>0.2.2.38</define-tag> <define-tag version-osx-torbrowser-firefox whitespace=delete>10.0.6esr</define-tag> <define-tag version-osx-torbrowser-torbutton whitespace=delete>1.4.6</define-tag> <define-tag version-osx-torbrowser-vidalia whitespace=delete>0.2.20</define-tag>

1 0

[tor/master] Raise the part of torrc mapaddress handling that knows wildcards
by nickm＠torproject.org 17 Aug '12

17 Aug '12

commit 959f850056f5f6a7ebbe7ec0e56da239e4f7de3e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 15 17:49:18 2012 -0400 Raise the part of torrc mapaddress handling that knows wildcards This patch extracts the inner part of config_register_addressmaps -- the part that knows about detecting wildcard addresses addresses -- and makes it into a new function. The new function is deliberately not moved or reindented, so that the diff is smaller. I need this to fix bug 6244. --- src/or/config.c | 61 +++++++++++++++++++++++++++++++++++------------------- src/or/config.h | 6 +++++ 2 files changed, 45 insertions(+), 22 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index a369297..3498f60 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4864,12 +4864,11 @@ config_register_addressmaps(const or_options_t *options) { smartlist_t *elts; config_line_t *opt; - char *from, *to; + const char *from, *to, *msg; addressmap_clear_configured(); elts = smartlist_new(); for (opt = options->AddressMap; opt; opt = opt->next) { - int from_wildcard = 0, to_wildcard = 0; smartlist_split_string(elts, opt->value, NULL, SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 2); if (smartlist_len(elts) < 2) { @@ -4887,11 +4886,39 @@ config_register_addressmaps(const or_options_t *options) goto cleanup; } - if (!strcmp(to, "*") || !strcmp(from, "*")) { - log_warn(LD_CONFIG,"MapAddress '%s' is unsupported - can't remap from " - "or to *. Ignoring.",opt->value); + if (addressmap_register_auto(from, to, 0, ADDRMAPSRC_TORRC, &msg) < 0) { + log_warn(LD_CONFIG,"MapAddress '%s' failed: %s. Ignoring.", opt->value, + msg); goto cleanup; } + + if (smartlist_len(elts) > 2) + log_warn(LD_CONFIG,"Ignoring extra arguments to MapAddress."); + + cleanup: + SMARTLIST_FOREACH(elts, char*, cp, tor_free(cp)); + smartlist_clear(elts); + } + smartlist_free(elts); +} + +/** As addressmap_register(), but detect the wildcarded status of "from" and + * "to", and do not steal a reference to <b>to</b>. */ +/* XXXX024 move to connection_edge.c */ +int +addressmap_register_auto(const char *from, const char *to, + time_t expires, + addressmap_entry_source_t addrmap_source, + const char **msg) +{ + int from_wildcard = 0, to_wildcard = 0; + + *msg = "whoops, forgot the error message"; + if (1) { + if (!strcmp(to, "*") || !strcmp(from, "*")) { + *msg = "can't remap from or to *"; + return -1; + } /* Detect asterisks in expressions of type: '*.example.com' */ if (!strncmp(from,"*.",2)) { from += 2; @@ -4903,30 +4930,20 @@ config_register_addressmaps(const or_options_t *options) } if (to_wildcard && !from_wildcard) { - log_warn(LD_CONFIG, - "Skipping invalid argument '%s' to MapAddress: " - "can only use wildcard (i.e. '*.') if 'from' address " - "uses wildcard also", opt->value); - goto cleanup; + *msg = "can only use wildcard (i.e. '*.') if 'from' address " + "uses wildcard also"; + return -1; } if (address_is_invalid_destination(to, 1)) { - log_warn(LD_CONFIG, - "Skipping invalid argument '%s' to MapAddress", opt->value); - goto cleanup; + *msg = "destination is invalid"; + return -1; } - addressmap_register(from, tor_strdup(to), 0, ADDRMAPSRC_TORRC, + addressmap_register(from, tor_strdup(to), expires, addrmap_source, from_wildcard, to_wildcard); - - if (smartlist_len(elts) > 2) - log_warn(LD_CONFIG,"Ignoring extra arguments to MapAddress."); - - cleanup: - SMARTLIST_FOREACH(elts, char*, cp, tor_free(cp)); - smartlist_clear(elts); } - smartlist_free(elts); + return 0; } /** diff --git a/src/or/config.h b/src/or/config.h index ce7e319..48f4e86 100644 --- a/src/or/config.h +++ b/src/or/config.h @@ -96,6 +96,12 @@ or_options_t *options_new(void); #endif void config_register_addressmaps(const or_options_t *options); +/* XXXX024 move to connection_edge.h */ +int addressmap_register_auto(const char *from, const char *to, + time_t expires, + addressmap_entry_source_t addrmap_source, + const char **msg); + #endif

1 0

[tor/master] Fix wildcarded address mappings from the control port
by nickm＠torproject.org 17 Aug '12

17 Aug '12

commit 2ba52f409546961a0a950978a875b22bcb6bfaff Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 15 17:59:30 2012 -0400 Fix wildcarded address mappings from the control port Apparently, we weren't actually detecting wildcardedness when parsing them: whoops! bug 6244. Bugfix on 0.2.3.9-alpha --- changes/bug6244_part_c | 6 ++++++ src/or/control.c | 15 ++++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/changes/bug6244_part_c b/changes/bug6244_part_c new file mode 100644 index 0000000..dea6e7b --- /dev/null +++ b/changes/bug6244_part_c @@ -0,0 +1,6 @@ + o Major bugfixes (controller): + - Make wildcarded addresses (that is, ones beginning with *.) work when + provided via the controller's MapAddress command. Previously, they + were accepted, but we never actually noticed that they were wildcards. + Fix for bug 6244; bugfix on 0.2.3.9-alpha. + diff --git a/src/or/control.c b/src/or/control.c index ce571f9..913d18a 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1366,9 +1366,18 @@ handle_control_mapaddress(control_connection_t *conn, uint32_t len, smartlist_add_asprintf(reply, "250-%s=%s", address, to); } } else { - addressmap_register(from, tor_strdup(to), 1, - ADDRMAPSRC_CONTROLLER, 0, 0); - smartlist_add_asprintf(reply, "250-%s", line); + const char *msg; + if (addressmap_register_auto(from, to, 1, + ADDRMAPSRC_CONTROLLER, &msg) < 0) { + smartlist_add_asprintf(reply, + "512-syntax error: invalid address mapping " + " '%s': %s", line, msg); + log_warn(LD_CONTROL, + "Skipping invalid argument '%s' in MapAddress msg: %s", + line, msg); + } else { + smartlist_add_asprintf(reply, "250-%s", line); + } } } else { smartlist_add_asprintf(reply, "512-syntax error: mapping '%s' is "

1 0

[tor/master] Merge remote-tracking branch 'public/bug6244_part_c' into maint-0.2.3
by nickm＠torproject.org 17 Aug '12

17 Aug '12

commit e9172e51fb13cfe5d4c70a98809a45e05b528482 Merge: 676f710 2ba52f4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 17 12:37:49 2012 -0400 Merge remote-tracking branch 'public/bug6244_part_c' into maint-0.2.3 changes/bug6244_part_c | 6 ++++ src/or/config.c | 61 ++++++++++++++++++++++++++++++----------------- src/or/config.h | 6 ++++ src/or/control.c | 15 +++++++++-- 4 files changed, 63 insertions(+), 25 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.3'
by nickm＠torproject.org 17 Aug '12

17 Aug '12

commit eec86939d13681b3b6560caf6c49ec1b55c2489b Merge: 1728801 e9172e5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 17 12:39:31 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' changes/bug6244_part_c | 6 ++++ src/or/config.c | 61 ++++++++++++++++++++++++++++++----------------- src/or/config.h | 6 ++++ src/or/control.c | 15 +++++++++-- 4 files changed, 63 insertions(+), 25 deletions(-)

1 0

[tor/maint-0.2.3] Fix wildcarded address mappings from the control port
by nickm＠torproject.org 17 Aug '12

17 Aug '12

commit 2ba52f409546961a0a950978a875b22bcb6bfaff Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 15 17:59:30 2012 -0400 Fix wildcarded address mappings from the control port Apparently, we weren't actually detecting wildcardedness when parsing them: whoops! bug 6244. Bugfix on 0.2.3.9-alpha --- changes/bug6244_part_c | 6 ++++++ src/or/control.c | 15 ++++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/changes/bug6244_part_c b/changes/bug6244_part_c new file mode 100644 index 0000000..dea6e7b --- /dev/null +++ b/changes/bug6244_part_c @@ -0,0 +1,6 @@ + o Major bugfixes (controller): + - Make wildcarded addresses (that is, ones beginning with *.) work when + provided via the controller's MapAddress command. Previously, they + were accepted, but we never actually noticed that they were wildcards. + Fix for bug 6244; bugfix on 0.2.3.9-alpha. + diff --git a/src/or/control.c b/src/or/control.c index ce571f9..913d18a 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1366,9 +1366,18 @@ handle_control_mapaddress(control_connection_t *conn, uint32_t len, smartlist_add_asprintf(reply, "250-%s=%s", address, to); } } else { - addressmap_register(from, tor_strdup(to), 1, - ADDRMAPSRC_CONTROLLER, 0, 0); - smartlist_add_asprintf(reply, "250-%s", line); + const char *msg; + if (addressmap_register_auto(from, to, 1, + ADDRMAPSRC_CONTROLLER, &msg) < 0) { + smartlist_add_asprintf(reply, + "512-syntax error: invalid address mapping " + " '%s': %s", line, msg); + log_warn(LD_CONTROL, + "Skipping invalid argument '%s' in MapAddress msg: %s", + line, msg); + } else { + smartlist_add_asprintf(reply, "250-%s", line); + } } } else { smartlist_add_asprintf(reply, "512-syntax error: mapping '%s' is "

1 0