The branch, v3-2-stable has been updated via cdeefea298c5dd53e1d01f0580bb8d33d8dbae22 (commit) from d47838897a30c85db268a7424cb90d3d0ee3acac (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-stable - Log ----------------------------------------------------------------- commit cdeefea298c5dd53e1d01f0580bb8d33d8dbae22 Author: Gerald W. Carter <[EMAIL PROTECTED]> Date: Wed Mar 26 16:58:27 2008 -0500 Fix a bug in the output from print_canonical_sockaddr() fix from 36f8bafbd3dee66a8.... Make sure that IPv4 addresses are not enclised in []'s. (cherry picked from commit 4ddf58dbdc3d74cb72788ef4a2ec7587d4948c40) ----------------------------------------------------------------------- Summary of changes: source/lib/util_sock.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/source/lib/util_sock.c b/source/lib/util_sock.c index 8ceabe1..30a3b83 100644 --- a/source/lib/util_sock.c +++ b/source/lib/util_sock.c @@ -556,11 +556,17 @@ char *print_canonical_sockaddr(TALLOC_CTX *ctx, if (ret != 0) { return NULL; } + + if (pss->ss_family != AF_INET) { #if defined(HAVE_IPV6) - dest = talloc_asprintf(ctx, "[%s]", addr); + dest = talloc_asprintf(ctx, "[%s]", addr); #else - dest = talloc_asprintf(ctx, "%s", addr); + return NULL; #endif + } else { + dest = talloc_asprintf(ctx, "%s", addr); + } + return dest; } -- Samba Shared Repository