The branch, master has been updated via 13095a9 dfs_server_ad: s/acct/aname as acct() is a function via 6c21ae7 dfs_server_ad: return STATUS_NOT_FOUND if the client connects to an ip address from b567d3a s4-dsdb: Fill in lastKnownParent when moving to lostAndFound
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 13095a9df6880ebaae87fb08320899bcf6d5b3ee Author: Stefan Metzmacher <me...@samba.org> Date: Mon Jul 30 01:21:16 2012 +0200 dfs_server_ad: s/acct/aname as acct() is a function metze Autobuild-User(master): Stefan Metzmacher <me...@samba.org> Autobuild-Date(master): Mon Jul 30 03:17:49 CEST 2012 on sn-devel-104 commit 6c21ae71035d5bec3a1056ea10e0a72073a3717b Author: Stefan Metzmacher <me...@samba.org> Date: Mon Jul 30 00:49:13 2012 +0200 dfs_server_ad: return STATUS_NOT_FOUND if the client connects to an ip address metze ----------------------------------------------------------------------- Summary of changes: dfs_server/dfs_server_ad.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/dfs_server/dfs_server_ad.c b/dfs_server/dfs_server_ad.c index 6b71f70..ceabe05 100644 --- a/dfs_server/dfs_server_ad.c +++ b/dfs_server/dfs_server_ad.c @@ -26,6 +26,7 @@ #include "param/param.h" #include "lib/tsocket/tsocket.h" #include "dfs_server/dfs_server_ad.h" +#include "lib/util/util_net.h" #define MAX_DFS_RESPONSE 56*1024 /* 56 Kb */ @@ -232,15 +233,15 @@ static NTSTATUS get_dcs_insite(TALLOC_CTX *ctx, struct ldb_context *ldb, NT_STATUS_HAVE_NO_MEMORY_AND_FREE(list->names[list->count], r); } else { char *tmp; - const char *acct = ldb_msg_find_attr_as_string(r2->msgs[0], "sAMAccountName", NULL); - if (acct == NULL) { + const char *aname = ldb_msg_find_attr_as_string(r2->msgs[0], "sAMAccountName", NULL); + if (aname == NULL) { DEBUG(2,(__location__ ": sAMAccountName missing on %s\n", ldb_dn_get_linearized(dn))); talloc_free(r); return NT_STATUS_INTERNAL_ERROR; } - tmp = talloc_strdup(list->names, acct); + tmp = talloc_strdup(list->names, aname); NT_STATUS_HAVE_NO_MEMORY_AND_FREE(tmp, r); /* Netbios name is also the sAMAccountName for @@ -816,7 +817,14 @@ NTSTATUS dfs_server_ad_get_referrals(struct loadparm_context *lp_ctx, * handle it here. */ return NT_STATUS_NOT_FOUND; + } + if (is_ipaddress(server_name)) { + /* + * If it is not domain related do not + * handle it here. + */ + return NT_STATUS_NOT_FOUND; } if ((strcasecmp_m(server_name, netbios_domain) != 0) && -- Samba Shared Repository