The branch, v3-3-test has been updated
via 4bef77a4566590b3e20470f538f20848ed49f264 (commit)
via 9fcda4627b1c1d2836b6cbd1141f4e843ecab115 (commit)
via a81818ae54159755df441cc6421e5b272035f412 (commit)
from 3feaa9829cc5bdeb7a5401c3c24b3811816396ce (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -----------------------------------------------------------------
commit 4bef77a4566590b3e20470f538f20848ed49f264
Author: Günther Deschner <[EMAIL PROTECTED]>
Date: Wed May 7 14:11:27 2008 +0200
re-run make idl.
Guenther
commit 9fcda4627b1c1d2836b6cbd1141f4e843ecab115
Author: Günther Deschner <[EMAIL PROTECTED]>
Date: Wed May 7 14:10:34 2008 +0200
IDL: add missing case 14 and 15 to nbt_cldap_netlogon union.
Guenther
commit a81818ae54159755df441cc6421e5b272035f412
Author: Günther Deschner <[EMAIL PROTECTED]>
Date: Wed May 7 14:09:41 2008 +0200
dsgetdcname: remove invalid assumptions when using DNS for the DC query.
Guenther
-----------------------------------------------------------------------
Summary of changes:
source/librpc/gen_ndr/ndr_nbt.c | 36 ++++++++++++++++++++++++++++++++++++
source/librpc/idl/nbt.idl | 2 ++
source/libsmb/dsgetdcname.c | 13 ++-----------
3 files changed, 40 insertions(+), 11 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/librpc/gen_ndr/ndr_nbt.c b/source/librpc/gen_ndr/ndr_nbt.c
index ed2ea81..30fb30a 100644
--- a/source/librpc/gen_ndr/ndr_nbt.c
+++ b/source/librpc/gen_ndr/ndr_nbt.c
@@ -2976,6 +2976,14 @@ _PUBLIC_ enum ndr_err_code
ndr_push_nbt_cldap_netlogon(struct ndr_push *ndr, int
NDR_CHECK(ndr_push_nbt_cldap_netlogon_13(ndr, NDR_SCALARS, &r->logon13));
break; }
+ case 14: {
+
NDR_CHECK(ndr_push_nbt_cldap_netlogon_13(ndr, NDR_SCALARS, &r->logon13));
+ break; }
+
+ case 15: {
+
NDR_CHECK(ndr_push_nbt_cldap_netlogon_13(ndr, NDR_SCALARS, &r->logon13));
+ break; }
+
default: {
NDR_CHECK(ndr_push_nbt_cldap_netlogon_29(ndr, NDR_SCALARS, &r->logon29));
break; }
@@ -3027,6 +3035,12 @@ _PUBLIC_ enum ndr_err_code
ndr_push_nbt_cldap_netlogon(struct ndr_push *ndr, int
case 13:
break;
+ case 14:
+ break;
+
+ case 15:
+ break;
+
default:
break;
@@ -3102,6 +3116,14 @@ _PUBLIC_ enum ndr_err_code
ndr_pull_nbt_cldap_netlogon(struct ndr_pull *ndr, int
NDR_CHECK(ndr_pull_nbt_cldap_netlogon_13(ndr, NDR_SCALARS, &r->logon13));
break; }
+ case 14: {
+
NDR_CHECK(ndr_pull_nbt_cldap_netlogon_13(ndr, NDR_SCALARS, &r->logon13));
+ break; }
+
+ case 15: {
+
NDR_CHECK(ndr_pull_nbt_cldap_netlogon_13(ndr, NDR_SCALARS, &r->logon13));
+ break; }
+
default: {
NDR_CHECK(ndr_pull_nbt_cldap_netlogon_29(ndr, NDR_SCALARS, &r->logon29));
break; }
@@ -3152,6 +3174,12 @@ _PUBLIC_ enum ndr_err_code
ndr_pull_nbt_cldap_netlogon(struct ndr_pull *ndr, int
case 13:
break;
+ case 14:
+ break;
+
+ case 15:
+ break;
+
default:
break;
@@ -3227,6 +3255,14 @@ _PUBLIC_ void ndr_print_nbt_cldap_netlogon(struct
ndr_print *ndr, const char *na
ndr_print_nbt_cldap_netlogon_13(ndr, "logon13",
&r->logon13);
break;
+ case 14:
+ ndr_print_nbt_cldap_netlogon_13(ndr, "logon13",
&r->logon13);
+ break;
+
+ case 15:
+ ndr_print_nbt_cldap_netlogon_13(ndr, "logon13",
&r->logon13);
+ break;
+
default:
ndr_print_nbt_cldap_netlogon_29(ndr, "logon29",
&r->logon29);
break;
diff --git a/source/librpc/idl/nbt.idl b/source/librpc/idl/nbt.idl
index 5569c50..07d2fe2 100644
--- a/source/librpc/idl/nbt.idl
+++ b/source/librpc/idl/nbt.idl
@@ -587,6 +587,8 @@ interface nbt
[case(11)] nbt_cldap_netlogon_13 logon13;
[case(12)] nbt_cldap_netlogon_13 logon13;
[case(13)] nbt_cldap_netlogon_13 logon13;
+ [case(14)] nbt_cldap_netlogon_13 logon13;
+ [case(15)] nbt_cldap_netlogon_13 logon13;
[default] nbt_cldap_netlogon_29 logon29;
} nbt_cldap_netlogon;
diff --git a/source/libsmb/dsgetdcname.c b/source/libsmb/dsgetdcname.c
index 1bd54d8..1006b97 100644
--- a/source/libsmb/dsgetdcname.c
+++ b/source/libsmb/dsgetdcname.c
@@ -466,14 +466,6 @@ static NTSTATUS discover_dc_dns(TALLOC_CTX *mem_ctx,
struct ip_service_name *dclist = NULL;
int count = 0;
- if ((!(flags & DS_DIRECTORY_SERVICE_REQUIRED)) &&
- (!(flags & DS_KDC_REQUIRED)) &&
- (!(flags & DS_GC_SERVER_REQUIRED)) &&
- (!(flags & DS_PDC_REQUIRED))) {
- DEBUG(1,("discover_dc_dns: invalid flags\n"));
- return NT_STATUS_INVALID_PARAMETER;
- }
-
if (flags & DS_PDC_REQUIRED) {
status = ads_dns_query_pdc(mem_ctx, domain_name,
&dcs, &numdcs);
@@ -490,9 +482,8 @@ static NTSTATUS discover_dc_dns(TALLOC_CTX *mem_ctx,
status = ads_dns_query_dcs_guid(mem_ctx, domain_name,
domain_guid, &dcs, &numdcs);
} else {
- /* FIXME: ? */
- DEBUG(1,("discover_dc_dns: not enough input\n"));
- status = NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND;
+ status = ads_dns_query_dcs(mem_ctx, domain_name, site_name,
+ &dcs, &numdcs);
}
if (!NT_STATUS_IS_OK(status)) {
--
Samba Shared Repository
