The branch, v3-2-test has been updated
via 79b7972de4c2a8c71e37642ddf7e5bbed53dd58a (commit)
from f2aa921505e49f894bfed4e5e2f9fc01918b1bb0 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit 79b7972de4c2a8c71e37642ddf7e5bbed53dd58a
Author: Jeremy Allison <[EMAIL PROTECTED]>
Date: Wed Jan 16 13:28:24 2008 -0800
Tidy up code and debug for non-default krb5 IPv6 port.
Jeremy.
-----------------------------------------------------------------------
Summary of changes:
source/libads/kerberos.c | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/libads/kerberos.c b/source/libads/kerberos.c
index f7e947b..b995250 100644
--- a/source/libads/kerberos.c
+++ b/source/libads/kerberos.c
@@ -689,25 +689,31 @@ static char *print_kdc_line(char *mem_ctx,
krb5 port with an address, as this requires a ':'.
Resolve to a name. */
char hostname[MAX_DNS_NAME_LENGTH];
- if (sys_getnameinfo((const struct sockaddr *)pss,
+ int ret = sys_getnameinfo((const struct sockaddr *)pss,
sizeof(*pss),
hostname, sizeof(hostname),
NULL, 0,
- NI_NAMEREQD) == 0) {
- /* Success, use host:port */
- kdc_str = talloc_asprintf(mem_ctx,
+ NI_NAMEREQD);
+ if (ret) {
+ DEBUG(0,("print_kdc_line: can't resolve name "
+ "for kdc with non-default port %s. "
+ "Error %s\n.",
+ print_canonical_sockaddr(mem_ctx, pss),
+ gai_strerror(ret)));
+ }
+ /* Success, use host:port */
+ kdc_str = talloc_asprintf(mem_ctx,
"%s\tkdc = %s:%u\n",
- prev_line,
+ prev_line,
hostname,
(unsigned int)port);
- return kdc_str;
- }
- }
- kdc_str = talloc_asprintf(mem_ctx, "%s\tkdc = %s\n",
+ } else {
+ kdc_str = talloc_asprintf(mem_ctx, "%s\tkdc = %s\n",
prev_line,
print_sockaddr(addr,
sizeof(addr),
pss));
+ }
}
return kdc_str;
}
--
Samba Shared Repository
