The branch, master has been updated
via b61c38f s3: Fix some typos in dsgetdcname
via 60e8e33 s3: "port" is not used in dsgetdcname
from 4f6b1e8 s3: Check for res_ninit
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit b61c38fde6eee796097ae4f0cd4c3c31b052c599
Author: Volker Lendecke <v...@samba.org>
Date: Mon Apr 25 11:25:02 2011 +0200
s3: Fix some typos in dsgetdcname
Autobuild-User: Volker Lendecke <vlen...@samba.org>
Autobuild-Date: Mon Apr 25 12:35:30 CEST 2011 on sn-devel-104
commit 60e8e33414f7dee8deb99b276182975b234bed0d
Author: Volker Lendecke <v...@samba.org>
Date: Mon Apr 25 11:24:31 2011 +0200
s3: "port" is not used in dsgetdcname
Günther, please check!
-----------------------------------------------------------------------
Summary of changes:
source3/libsmb/dsgetdcname.c | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/libsmb/dsgetdcname.c b/source3/libsmb/dsgetdcname.c
index e062818..7706994 100644
--- a/source3/libsmb/dsgetdcname.c
+++ b/source3/libsmb/dsgetdcname.c
@@ -32,7 +32,6 @@
struct ip_service_name {
struct sockaddr_storage ss;
- unsigned port;
const char *hostname;
};
@@ -514,7 +513,6 @@ static NTSTATUS discover_dc_netbios(TALLOC_CTX *mem_ctx,
&iplist[i].ss);
r->ss = iplist[i].ss;
- r->port = iplist[i].port;
r->hostname = talloc_strdup(mem_ctx, addr);
if (!r->hostname) {
SAFE_FREE(iplist);
@@ -598,7 +596,6 @@ static NTSTATUS discover_dc_dns(TALLOC_CTX *mem_ctx,
struct ip_service_name *r = &dclist[count];
- r->port = dcs[i].port;
r->hostname = dcs[i].hostname;
/* If we don't have an IP list for a name, lookup it up */
@@ -609,7 +606,7 @@ static NTSTATUS discover_dc_dns(TALLOC_CTX *mem_ctx,
i++;
j = 0;
} else {
- /* use the IP addresses from the SRV sresponse */
+ /* use the IP addresses from the SRV response */
if (j >= dcs[i].num_ips) {
i++;
@@ -623,8 +620,8 @@ static NTSTATUS discover_dc_dns(TALLOC_CTX *mem_ctx,
/* make sure it is a valid IP. I considered checking the
* negative connection cache, but this is the wrong place for
- * it. Maybe only as a hac. After think about it, if all of
- * the IP addresses retuend from DNS are dead, what hope does a
+ * it. Maybe only as a hack. After think about it, if all of
+ * the IP addresses returned from DNS are dead, what hope does a
* netbios name lookup have? The standard reason for falling
* back to netbios lookups is that our DNS server doesn't know
* anything about the DC's -- jerry */
--
Samba Shared Repository
