[SCM] Samba Shared Repository - branch master updated - tevent-0-9-8-163-gbda7061
Andrew Bartlett
abartlet at samba.org
Thu Sep 10 15:44:32 MDT 2009
The branch, master has been updated
via bda70613347c96d328c1d8899ae38057709e4151 (commit)
via 344fb71cb8a2d8d02e4442c24c22e37ce3cff095 (commit)
via 45b7b713a3aadec896ed1bd1bdef1a941b1abc1b (commit)
via 0c8eee971172f74a896d9e8c499efd9805491fd9 (commit)
via bebeb4ff701caa353d82dc7c2c9cb4555aff101f (commit)
via ebfc13b452b970e5c676933701819a28b77ac8bf (commit)
from 41596d2c434b9d3f0c7719d716f865f7b40fff9d (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit bda70613347c96d328c1d8899ae38057709e4151
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Sep 11 07:25:11 2009 +1000
s4:setup Updated Display Specifiers from Microsoft (with #s)
This fixes the issue with the original files that they didn't have a
leading # in front of the comments, which caused our parsing scripts
much pain. The files are now exactly as delivered.
Andrew Bartlett
commit 344fb71cb8a2d8d02e4442c24c22e37ce3cff095
Author: Matthieu Patou <mat at matws.net>
Date: Thu Sep 10 23:33:16 2009 +0400
s4: Pass WINBINDD_SOCKET_DIR var in order to overide the location of the Winbind socket
commit 45b7b713a3aadec896ed1bd1bdef1a941b1abc1b
Author: Andrew Kroeger <andrew at id10ts.net>
Date: Thu Sep 10 10:04:47 2009 -0500
s4:ldb_map: Don't free ares too early.
As found when running "make test" with the MALLOC_CHECK_ and MALLOC_PERTURB_
environment variables set.
commit 0c8eee971172f74a896d9e8c499efd9805491fd9
Author: Kamen Mazdrashki <kamen.mazdrashki at postpath.com>
Date: Thu Sep 10 13:47:14 2009 +0300
s4/tort: CRACKNAMES tests to use private structure for testing.
DsCrackNamesPrivate structure basically inherits DsPrivate
structure while adding few test-specific members.
commit bebeb4ff701caa353d82dc7c2c9cb4555aff101f
Author: Kamen Mazdrashki <kamen.mazdrashki at postpath.com>
Date: Thu Sep 10 13:45:10 2009 +0300
s4/tort: Make common setup/teardown drsuapi test funcs really common
commit ebfc13b452b970e5c676933701819a28b77ac8bf
Author: Kamen Mazdrashki <kamen.mazdrashki at postpath.com>
Date: Wed Sep 9 17:07:27 2009 +0300
s4/tort: CrackNames test update to work against W2K3.
DRSUAPI_DS_NAME_FORMAT_UKNOWN added to 'known-to-fail'
responses as this actually means to ask AD to resolve
a name from FQDN format to Unknown format.
-----------------------------------------------------------------------
Summary of changes:
nsswitch/config.mk | 2 +
source4/lib/ldb/ldb_map/ldb_map_outbound.c | 6 ++--
.../DisplaySpecifiers-Win2k3.txt | 24 +++---------
.../DisplaySpecifiers-Win2k3R2.txt | 25 +++----------
.../DisplaySpecifiers-Win2k8.txt | 24 +++---------
.../DisplaySpecifiers-Win2k8R2.txt | 24 +++---------
.../DisplaySpecifiers-win2k0.txt | 24 +++---------
source4/torture/rpc/drsuapi.c | 19 +++-------
source4/torture/rpc/drsuapi_cracknames.c | 39 +++++++++++++++++++-
9 files changed, 78 insertions(+), 109 deletions(-)
Changeset truncated at 500 lines:
diff --git a/nsswitch/config.mk b/nsswitch/config.mk
index a85939c..9ad873b 100644
--- a/nsswitch/config.mk
+++ b/nsswitch/config.mk
@@ -2,6 +2,7 @@
PRIVATE_DEPENDENCIES = SOCKET_WRAPPER
LIBWINBIND-CLIENT_OBJ_FILES = $(nsswitchsrcdir)/wb_common.o
+$(LIBWINBIND-CLIENT_OBJ_FILES): CFLAGS+=-DWINBINDD_SOCKET_DIR=\"$(winbindd_socket_dir)\"
#################################
# Start BINARY nsstest
@@ -37,3 +38,4 @@ PRIVATE_DEPENDENCIES = \
wbinfo_OBJ_FILES = \
$(nsswitchsrcdir)/wbinfo.o
+$(wbinfo_OBJ_FILES): CFLAGS+=-DWINBINDD_SOCKET_DIR=\"$(winbindd_socket_dir)\"
diff --git a/source4/lib/ldb/ldb_map/ldb_map_outbound.c b/source4/lib/ldb/ldb_map/ldb_map_outbound.c
index 4487d7e..5f5be89 100644
--- a/source4/lib/ldb/ldb_map/ldb_map_outbound.c
+++ b/source4/lib/ldb/ldb_map/ldb_map_outbound.c
@@ -1250,15 +1250,15 @@ static int map_remote_search_callback(struct ldb_request *req,
ares->response, LDB_SUCCESS);
}
- talloc_free(ares);
-
/* reset the pointer to the start of the list */
ac->r_current = ac->r_list;
/* no entry just return */
if (ac->r_current == NULL) {
- return ldb_module_done(ac->req, ares->controls,
+ ret = ldb_module_done(ac->req, ares->controls,
ares->response, LDB_SUCCESS);
+ talloc_free(ares);
+ return ret;
}
ret = map_search_local(ac);
diff --git a/source4/setup/display-specifiers/DisplaySpecifiers-Win2k3.txt b/source4/setup/display-specifiers/DisplaySpecifiers-Win2k3.txt
index 4716c53..84231f2 100644
--- a/source4/setup/display-specifiers/DisplaySpecifiers-Win2k3.txt
+++ b/source4/setup/display-specifiers/DisplaySpecifiers-Win2k3.txt
@@ -1,31 +1,19 @@
-###
-# This file has been modified from the original file distributed by Microsoft.
-#
-# The following changes have been made:
-# - Added this header itemizing the changes made.
-# - Added a line containing five hash marks ("#") immediately before and
-# immediately after the Microsoft-provided document header.
-# - Commented each line of the the Microsoft-provided document header (as
-# delimited by the five hash marks ("#") using single hash marks ("#").
-###
-#####
#Intellectual Property Rights Notice for Open Specifications Documentation
#
-#- Technical Documentation. Microsoft publishes Open Specifications documentation for protocols, file formats, languages, standards as well as overviews of the interaction among each of these technologies.
-# - Copyrights. This documentation is covered by Microsoft copyrights. Regardless of any other terms that are contained in the terms of use for the Microsoft website that hosts this documentation, you may make copies of it in order to develop implementations of the technologies described in the Open Specifications and may distribute portions of it in your implementations using these technologies or your documentation as necessary to properly document the implementation. You may also distribute in your implementation, with or without modification, any schema, IDL’s, or code samples that are included in the documentation. This permission also applies to any documents that are referenced in the Open Specifications.
+#- Technical Documentation. Microsoft publishes Open Specifications documentation for protocols, file formats, languages, standards as well as overviews of the interaction among each of these technologies.
+#- Copyrights. This documentation is covered by Microsoft copyrights. Regardless of any other terms that are contained in the terms of use for the Microsoft website that hosts this documentation, you may make copies of it in order to develop implementations of the technologies described in the Open Specifications and may distribute portions of it in your implementations using these technologies or your documentation as necessary to properly document the implementation. You may also distribute in your implementation, with or without modification, any schema, IDL’s, or code samples that are included in the documentation. This permission also applies to any documents that are referenced in the Open Specifications.
#
-#- No Trade Secrets. Microsoft does not claim any trade secret rights in this documentation.
+#- No Trade Secrets. Microsoft does not claim any trade secret rights in this documentation.
#
-#- Patents. Microsoft has patents that may cover your implementations of the technologies described in the Open Specifications. Neither this notice nor Microsoft's delivery of the documentation grants any licenses under those or any other Microsoft patents. However, a given Open Specification may be covered by Microsoft's Open Specification Promise (available here: http://www.microsoft.com/interop/osp) or the Community Promise (available here: http://www.microsoft.com/interop/cp/default.mspx). If you would prefer a written license, or if the technologies described n the Open Specifications are not covered by the Open Specifications Promise or Community Promise, as applicable, patent licenses are available by contacting iplg at microsoft.com.
+#- Patents. Microsoft has patents that may cover your implementations of the technologies described in the Open Specifications. Neither this notice nor Microsoft's delivery of the documentation grants any licenses under those or any other Microsoft patents. However, a given Open Specification may be covered by Microsoft's Open Specification Promise (available here: http://www.microsoft.com/interop/osp) or the Community Promise (available here: http://www.microsoft.com/interop/cp/default.mspx). If you would prefer a written license, or if the technologies described n the Open Specifications are not covered by the Open Specifications Promise or Community Promise, as applicable, patent licenses are available by contacting iplg at microsoft.com.
#
-#- Trademarks. The names of companies and products contained in this documentation may be covered by trademarks or similar intellectual property rights. This notice does not grant any licenses under those rights.
+#- Trademarks. The names of companies and products contained in this documentation may be covered by trademarks or similar intellectual property rights. This notice does not grant any licenses under those rights.
#
-#- Reservation of Rights. All other rights are reserved, and this notice does not grant any rights other than specifically described above, whether by implication, estoppel, or otherwise.
+#- Reservation of Rights. All other rights are reserved, and this notice does not grant any rights other than specifically described above, whether by implication, estoppel, or otherwise.
#
#- Tools. The Open Specifications do not require the use of Microsoft programming tools or programming environments in order for you to develop an implementation. If you have access to Microsoft programming tools and environments you are free to take advantage of them. Certain Open Specifications are intended for use in conjunction with publicly available standard specifications and network programming art, and assumes that the reader either is familiar with the aforementioned material or has immediate access to it.
#
#- Preliminary Documentation. This Open Specification is preliminary documentation for this technology. Since the documentation may change between this preliminary version and the final version, there are risks in relying on preliminary documentation. To the extent that you incur additional development obligations or any other costs as a result of relying on this preliminary documentation, you do so at your own risk.
-#####
dn: CN=DisplaySpecifiers,<Configuration NC Distinguished Name>
changetype: add
diff --git a/source4/setup/display-specifiers/DisplaySpecifiers-Win2k3R2.txt b/source4/setup/display-specifiers/DisplaySpecifiers-Win2k3R2.txt
index 60b048e..d6b7378 100644
--- a/source4/setup/display-specifiers/DisplaySpecifiers-Win2k3R2.txt
+++ b/source4/setup/display-specifiers/DisplaySpecifiers-Win2k3R2.txt
@@ -1,33 +1,20 @@
-###
-# This file has been modified from the original file distributed by Microsoft.
-#
-# The following changes have been made:
-# - Added this header itemizing the changes made.
-# - Added a line containing five hash marks ("#") immediately before and
-# immediately after the Microsoft-provided document header.
-# - Commented each line of the the Microsoft-provided document header (as
-# delimited by the five hash marks ("#") using single hash marks ("#").
-###
-#####
#Intellectual Property Rights Notice for Open Specifications Documentation
#
+#- Technical Documentation. Microsoft publishes Open Specifications documentation for protocols, file formats, languages, standards as well as overviews of the interaction among each of these technologies.
#
-#- Technical Documentation. Microsoft publishes Open Specifications documentation for protocols, file formats, languages, standards as well as overviews of the interaction among each of these technologies.
-#
-#- Copyrights. This documentation is covered by Microsoft copyrights. Regardless of any other terms that are contained in the terms of use for the Microsoft website that hosts this documentation, you may make copies of it in order to develop implementations of the technologies described in the Open Specifications and may distribute portions of it in your implementations using these technologies or your documentation as necessary to properly document the implementation. You may also distribute in your implementation, with or without modification, any schema, IDL’s, or code samples that are included in the documentation. This permission also applies to any documents that are referenced in the Open Specifications.
+#- Copyrights. This documentation is covered by Microsoft copyrights. Regardless of any other terms that are contained in the terms of use for the Microsoft website that hosts this documentation, you may make copies of it in order to develop implementations of the technologies described in the Open Specifications and may distribute portions of it in your implementations using these technologies or your documentation as necessary to properly document the implementation. You may also distribute in your implementation, with or without modification, any schema, IDL’s, or code samples that are included in the documentation. This permission also applies to any documents that are referenced in the Open Specifications.
#
-#- No Trade Secrets. Microsoft does not claim any trade secret rights in this documentation.
+#- No Trade Secrets. Microsoft does not claim any trade secret rights in this documentation.
#
-#- Patents. Microsoft has patents that may cover your implementations of the technologies described in the Open Specifications. Neither this notice nor Microsoft's delivery of the documentation grants any licenses under those or any other Microsoft patents. However, a given Open Specification may be covered by Microsoft's Open Specification Promise (available here: http://www.microsoft.com/interop/osp) or the Community Promise (available here: http://www.microsoft.com/interop/cp/default.mspx). If you would prefer a written license, or if the technologies described n the Open Specifications are not covered by the Open Specifications Promise or Community Promise, as applicable, patent licenses are available by contacting iplg at microsoft.com.
+#- Patents. Microsoft has patents that may cover your implementations of the technologies described in the Open Specifications. Neither this notice nor Microsoft's delivery of the documentation grants any licenses under those or any other Microsoft patents. However, a given Open Specification may be covered by Microsoft's Open Specification Promise (available here: http://www.microsoft.com/interop/osp) or the Community Promise (available here: http://www.microsoft.com/interop/cp/default.mspx). If you would prefer a written license, or if the technologies described n the Open Specifications are not covered by the Open Specifications Promise or Community Promise, as applicable, patent licenses are available by contacting iplg at microsoft.com.
#
-#- Trademarks. The names of companies and products contained in this documentation may be covered by trademarks or similar intellectual property rights. This notice does not grant any licenses under those rights.
+#- Trademarks. The names of companies and products contained in this documentation may be covered by trademarks or similar intellectual property rights. This notice does not grant any licenses under those rights.
#
-#- Reservation of Rights. All other rights are reserved, and this notice does not grant any rights other than specifically described above, whether by implication, estoppel, or otherwise.
+#- Reservation of Rights. All other rights are reserved, and this notice does not grant any rights other than specifically described above, whether by implication, estoppel, or otherwise.
#
#- Tools. The Open Specifications do not require the use of Microsoft programming tools or programming environments in order for you to develop an implementation. If you have access to Microsoft programming tools and environments you are free to take advantage of them. Certain Open Specifications are intended for use in conjunction with publicly available standard specifications and network programming art, and assumes that the reader either is familiar with the aforementioned material or has immediate access to it.
#
#- Preliminary Documentation. This Open Specification is preliminary documentation for this technology. Since the documentation may change between this preliminary version and the final version, there are risks in relying on preliminary documentation. To the extent that you incur additional development obligations or any other costs as a result of relying on this preliminary documentation, you do so at your own risk.
-#####
dn: CN=DisplaySpecifiers,<Configuration NC Distinguished Name>
changetype: add
diff --git a/source4/setup/display-specifiers/DisplaySpecifiers-Win2k8.txt b/source4/setup/display-specifiers/DisplaySpecifiers-Win2k8.txt
index ab09cc5..b344ed7 100644
--- a/source4/setup/display-specifiers/DisplaySpecifiers-Win2k8.txt
+++ b/source4/setup/display-specifiers/DisplaySpecifiers-Win2k8.txt
@@ -1,32 +1,20 @@
-###
-# This file has been modified from the original file distributed by Microsoft.
-#
-# The following changes have been made:
-# - Added this header itemizing the changes made.
-# - Added a line containing five hash marks ("#") immediately before and
-# immediately after the Microsoft-provided document header.
-# - Commented each line of the the Microsoft-provided document header (as
-# delimited by the five hash marks ("#") using single hash marks ("#").
-###
-#####
#Intellectual Property Rights Notice for Open Specifications Documentation
#
-#- Technical Documentation. Microsoft publishes Open Specifications documentation for protocols, file formats, languages, standards as well as overviews of the interaction among each of these technologies.
+#- Technical Documentation. Microsoft publishes Open Specifications documentation for protocols, file formats, languages, standards as well as overviews of the interaction among each of these technologies.
#
-#- Copyrights. This documentation is covered by Microsoft copyrights. Regardless of any other terms that are contained in the terms of use for the Microsoft website that hosts this documentation, you may make copies of it in order to develop implementations of the technologies described in the Open Specifications and may distribute portions of it in your implementations using these technologies or your documentation as necessary to properly document the implementation. You may also distribute in your implementation, with or without modification, any schema, IDL’s, or code samples that are included in the documentation. This permission also applies to any documents that are referenced in the Open Specifications.
+#- Copyrights. This documentation is covered by Microsoft copyrights. Regardless of any other terms that are contained in the terms of use for the Microsoft website that hosts this documentation, you may make copies of it in order to develop implementations of the technologies described in the Open Specifications and may distribute portions of it in your implementations using these technologies or your documentation as necessary to properly document the implementation. You may also distribute in your implementation, with or without modification, any schema, IDL’s, or code samples that are included in the documentation. This permission also applies to any documents that are referenced in the Open Specifications.
#
-#- No Trade Secrets. Microsoft does not claim any trade secret rights in this documentation.
+#- No Trade Secrets. Microsoft does not claim any trade secret rights in this documentation.
#
-#- Patents. Microsoft has patents that may cover your implementations of the technologies described in the Open Specifications. Neither this notice nor Microsoft's delivery of the documentation grants any licenses under those or any other Microsoft patents. However, a given Open Specification may be covered by Microsoft's Open Specification Promise (available here: http://www.microsoft.com/interop/osp) or the Community Promise (available here: http://www.microsoft.com/interop/cp/default.mspx). If you would prefer a written license, or if the technologies described n the Open Specifications are not covered by the Open Specifications Promise or Community Promise, as applicable, patent licenses are available by contacting iplg at microsoft.com.
+#- Patents. Microsoft has patents that may cover your implementations of the technologies described in the Open Specifications. Neither this notice nor Microsoft's delivery of the documentation grants any licenses under those or any other Microsoft patents. However, a given Open Specification may be covered by Microsoft's Open Specification Promise (available here: http://www.microsoft.com/interop/osp) or the Community Promise (available here: http://www.microsoft.com/interop/cp/default.mspx). If you would prefer a written license, or if the technologies described n the Open Specifications are not covered by the Open Specifications Promise or Community Promise, as applicable, patent licenses are available by contacting iplg at microsoft.com.
#
-#- Trademarks. The names of companies and products contained in this documentation may be covered by trademarks or similar intellectual property rights. This notice does not grant any licenses under those rights.
+#- Trademarks. The names of companies and products contained in this documentation may be covered by trademarks or similar intellectual property rights. This notice does not grant any licenses under those rights.
#
-#- Reservation of Rights. All other rights are reserved, and this notice does not grant any rights other than specifically described above, whether by implication, estoppel, or otherwise.
+#- Reservation of Rights. All other rights are reserved, and this notice does not grant any rights other than specifically described above, whether by implication, estoppel, or otherwise.
#
#- Tools. The Open Specifications do not require the use of Microsoft programming tools or programming environments in order for you to develop an implementation. If you have access to Microsoft programming tools and environments you are free to take advantage of them. Certain Open Specifications are intended for use in conjunction with publicly available standard specifications and network programming art, and assumes that the reader either is familiar with the aforementioned material or has immediate access to it.
#
#- Preliminary Documentation. This Open Specification is preliminary documentation for this technology. Since the documentation may change between this preliminary version and the final version, there are risks in relying on preliminary documentation. To the extent that you incur additional development obligations or any other costs as a result of relying on this preliminary documentation, you do so at your own risk.
-#####
dn: CN=DisplaySpecifiers,<Configuration NC Distinguished Name>
changetype: add
diff --git a/source4/setup/display-specifiers/DisplaySpecifiers-Win2k8R2.txt b/source4/setup/display-specifiers/DisplaySpecifiers-Win2k8R2.txt
index 163fedb..5d41d70 100644
--- a/source4/setup/display-specifiers/DisplaySpecifiers-Win2k8R2.txt
+++ b/source4/setup/display-specifiers/DisplaySpecifiers-Win2k8R2.txt
@@ -1,32 +1,20 @@
-###
-# This file has been modified from the original file distributed by Microsoft.
-#
-# The following changes have been made:
-# - Added this header itemizing the changes made.
-# - Added a line containing five hash marks ("#") immediately before and
-# immediately after the Microsoft-provided document header.
-# - Commented each line of the the Microsoft-provided document header (as
-# delimited by the five hash marks ("#") using single hash marks ("#").
-###
-#####
#Intellectual Property Rights Notice for Open Specifications Documentation
#
-#- Technical Documentation. Microsoft publishes Open Specifications documentation for protocols, file formats, languages, standards as well as overviews of the interaction among each of these technologies.
+#- Technical Documentation. Microsoft publishes Open Specifications documentation for protocols, file formats, languages, standards as well as overviews of the interaction among each of these technologies.
#
-#- Copyrights. This documentation is covered by Microsoft copyrights. Regardless of any other terms that are contained in the terms of use for the Microsoft website that hosts this documentation, you may make copies of it in order to develop implementations of the technologies described in the Open Specifications and may distribute portions of it in your implementations using these technologies or your documentation as necessary to properly document the implementation. You may also distribute in your implementation, with or without modification, any schema, IDL’s, or code samples that are included in the documentation. This permission also applies to any documents that are referenced in the Open Specifications.
+#- Copyrights. This documentation is covered by Microsoft copyrights. Regardless of any other terms that are contained in the terms of use for the Microsoft website that hosts this documentation, you may make copies of it in order to develop implementations of the technologies described in the Open Specifications and may distribute portions of it in your implementations using these technologies or your documentation as necessary to properly document the implementation. You may also distribute in your implementation, with or without modification, any schema, IDL’s, or code samples that are included in the documentation. This permission also applies to any documents that are referenced in the Open Specifications.
#
-#- No Trade Secrets. Microsoft does not claim any trade secret rights in this documentation.
+#- No Trade Secrets. Microsoft does not claim any trade secret rights in this documentation.
#
-#- Patents. Microsoft has patents that may cover your implementations of the technologies described in the Open Specifications. Neither this notice nor Microsoft's delivery of the documentation grants any licenses under those or any other Microsoft patents. However, a given Open Specification may be covered by Microsoft's Open Specification Promise (available here: http://www.microsoft.com/interop/osp) or the Community Promise (available here: http://www.microsoft.com/interop/cp/default.mspx). If you would prefer a written license, or if the technologies described n the Open Specifications are not covered by the Open Specifications Promise or Community Promise, as applicable, patent licenses are available by contacting iplg at microsoft.com.
+#- Patents. Microsoft has patents that may cover your implementations of the technologies described in the Open Specifications. Neither this notice nor Microsoft's delivery of the documentation grants any licenses under those or any other Microsoft patents. However, a given Open Specification may be covered by Microsoft's Open Specification Promise (available here: http://www.microsoft.com/interop/osp) or the Community Promise (available here: http://www.microsoft.com/interop/cp/default.mspx). If you would prefer a written license, or if the technologies described n the Open Specifications are not covered by the Open Specifications Promise or Community Promise, as applicable, patent licenses are available by contacting iplg at microsoft.com.
#
-#- Trademarks. The names of companies and products contained in this documentation may be covered by trademarks or similar intellectual property rights. This notice does not grant any licenses under those rights.
+#- Trademarks. The names of companies and products contained in this documentation may be covered by trademarks or similar intellectual property rights. This notice does not grant any licenses under those rights.
#
-#- Reservation of Rights. All other rights are reserved, and this notice does not grant any rights other than specifically described above, whether by implication, estoppel, or otherwise.
+#- Reservation of Rights. All other rights are reserved, and this notice does not grant any rights other than specifically described above, whether by implication, estoppel, or otherwise.
#
#- Tools. The Open Specifications do not require the use of Microsoft programming tools or programming environments in order for you to develop an implementation. If you have access to Microsoft programming tools and environments you are free to take advantage of them. Certain Open Specifications are intended for use in conjunction with publicly available standard specifications and network programming art, and assumes that the reader either is familiar with the aforementioned material or has immediate access to it.
#
#- Preliminary Documentation. This Open Specification is preliminary documentation for this technology. Since the documentation may change between this preliminary version and the final version, there are risks in relying on preliminary documentation. To the extent that you incur additional development obligations or any other costs as a result of relying on this preliminary documentation, you do so at your own risk.
-#####
dn: CN=DisplaySpecifiers,<Configuration NC Distinguished Name>
changetype: add
diff --git a/source4/setup/display-specifiers/DisplaySpecifiers-win2k0.txt b/source4/setup/display-specifiers/DisplaySpecifiers-win2k0.txt
index e4c2925..65be3f6 100644
--- a/source4/setup/display-specifiers/DisplaySpecifiers-win2k0.txt
+++ b/source4/setup/display-specifiers/DisplaySpecifiers-win2k0.txt
@@ -1,33 +1,21 @@
-###
-# This file has been modified from the original file distributed by Microsoft.
-#
-# The following changes have been made:
-# - Added this header itemizing the changes made.
-# - Added a line containing five hash marks ("#") immediately before and
-# immediately after the Microsoft-provided document header.
-# - Commented each line of the the Microsoft-provided document header (as
-# delimited by the five hash marks ("#") using single hash marks ("#").
-###
-#####
#
#Intellectual Property Rights Notice for Open Specifications Documentation
#
-#- Technical Documentation. Microsoft publishes Open Specifications documentation for protocols, file formats, languages, standards as well as overviews of the interaction among each of these technologies.
+#- Technical Documentation. Microsoft publishes Open Specifications documentation for protocols, file formats, languages, standards as well as overviews of the interaction among each of these technologies.
#
-#- Copyrights. This documentation is covered by Microsoft copyrights. Regardless of any other terms that are contained in the terms of use for the Microsoft website that hosts this documentation, you may make copies of it in order to develop implementations of the technologies described in the Open Specifications and may distribute portions of it in your implementations using these technologies or your documentation as necessary to properly document the implementation. You may also distribute in your implementation, with or without modification, any schema, IDL’s, or code samples that are included in the documentation. This permission also applies to any documents that are referenced in the Open Specifications.
+#- Copyrights. This documentation is covered by Microsoft copyrights. Regardless of any other terms that are contained in the terms of use for the Microsoft website that hosts this documentation, you may make copies of it in order to develop implementations of the technologies described in the Open Specifications and may distribute portions of it in your implementations using these technologies or your documentation as necessary to properly document the implementation. You may also distribute in your implementation, with or without modification, any schema, IDL’s, or code samples that are included in the documentation. This permission also applies to any documents that are referenced in the Open Specifications.
#
-#- No Trade Secrets. Microsoft does not claim any trade secret rights in this documentation.
+#- No Trade Secrets. Microsoft does not claim any trade secret rights in this documentation.
#
-#- Patents. Microsoft has patents that may cover your implementations of the technologies described in the Open Specifications. Neither this notice nor Microsoft's delivery of the documentation grants any licenses under those or any other Microsoft patents. However, a given Open Specification may be covered by Microsoft's Open Specification Promise (available here: http://www.microsoft.com/interop/osp) or the Community Promise (available here: http://www.microsoft.com/interop/cp/default.mspx). If you would prefer a written license, or if the technologies described n the Open Specifications are not covered by the Open Specifications Promise or Community Promise, as applicable, patent licenses are available by contacting iplg at microsoft.com.
+#- Patents. Microsoft has patents that may cover your implementations of the technologies described in the Open Specifications. Neither this notice nor Microsoft's delivery of the documentation grants any licenses under those or any other Microsoft patents. However, a given Open Specification may be covered by Microsoft's Open Specification Promise (available here: http://www.microsoft.com/interop/osp) or the Community Promise (available here: http://www.microsoft.com/interop/cp/default.mspx). If you would prefer a written license, or if the technologies described n the Open Specifications are not covered by the Open Specifications Promise or Community Promise, as applicable, patent licenses are available by contacting iplg at microsoft.com.
#
-#- Trademarks. The names of companies and products contained in this documentation may be covered by trademarks or similar intellectual property rights. This notice does not grant any licenses under those rights.
+#- Trademarks. The names of companies and products contained in this documentation may be covered by trademarks or similar intellectual property rights. This notice does not grant any licenses under those rights.
#
-#- Reservation of Rights. All other rights are reserved, and this notice does not grant any rights other than specifically described above, whether by implication, estoppel, or otherwise.
+#- Reservation of Rights. All other rights are reserved, and this notice does not grant any rights other than specifically described above, whether by implication, estoppel, or otherwise.
#
#- Tools. The Open Specifications do not require the use of Microsoft programming tools or programming environments in order for you to develop an implementation. If you have access to Microsoft programming tools and environments you are free to take advantage of them. Certain Open Specifications are intended for use in conjunction with publicly available standard specifications and network programming art, and assumes that the reader either is familiar with the aforementioned material or has immediate access to it.
#
#- Preliminary Documentation. This Open Specification is preliminary documentation for this technology. Since the documentation may change between this preliminary version and the final version, there are risks in relying on preliminary documentation. To the extent that you incur additional development obligations or any other costs as a result of relying on this preliminary documentation, you do so at your own risk.
-#####
dn: CN=DisplaySpecifiers,<Configuration NC Distinguished Name>
changetype: add
diff --git a/source4/torture/rpc/drsuapi.c b/source4/torture/rpc/drsuapi.c
index 2b4b17a..5880b16 100644
--- a/source4/torture/rpc/drsuapi.c
+++ b/source4/torture/rpc/drsuapi.c
@@ -830,29 +830,27 @@ bool torture_rpc_drsuapi_get_dcinfo(struct torture_context *torture,
* Common test case setup function to be used
* in DRS suit of test when appropriate
*/
-bool torture_rpc_drsuapi_tcase_setup(struct torture_context *tctx, void **data)
+bool torture_drsuapi_tcase_setup_common(struct torture_context *tctx, struct DsPrivate *priv)
{
NTSTATUS status;
- struct DsPrivate *priv;
struct cli_credentials *machine_credentials;
- *data = priv = talloc_zero(tctx, struct DsPrivate);
- torture_assert(tctx, priv, "Not enough memory");
+ torture_assert(tctx, priv, "Invalid argument");
- torture_comment(tctx, "Create DRSUAPI pipe");
+ torture_comment(tctx, "Create DRSUAPI pipe\n");
status = torture_rpc_connection(tctx,
&priv->pipe,
&ndr_table_drsuapi);
torture_assert(tctx, NT_STATUS_IS_OK(status), "Unable to connect to DRSUAPI pipe");
- torture_comment(tctx, "Connected to DRSUAPI pipe\n");
+ torture_comment(tctx, "About to join domain\n");
priv->join = torture_join_domain(tctx, TEST_MACHINE_NAME, ACB_SVRTRUST,
&machine_credentials);
torture_assert(tctx, priv->join, "Failed to join as BDC");
if (!test_DsBind(priv->pipe, tctx, priv)) {
/* clean up */
- torture_rpc_drsuapi_tcase_teardown(tctx, priv);
+ torture_drsuapi_tcase_teardown_common(tctx, priv);
torture_fail(tctx, "Failed execute test_DsBind()");
}
@@ -866,16 +864,11 @@ bool torture_rpc_drsuapi_tcase_setup(struct torture_context *tctx, void **data)
* Common test case teardown function to be used
* in DRS suit of test when appropriate
*/
-bool torture_rpc_drsuapi_tcase_teardown(struct torture_context *tctx, void *data)
+bool torture_drsuapi_tcase_teardown_common(struct torture_context *tctx, struct DsPrivate *priv)
{
- struct DsPrivate *priv = (struct DsPrivate *)data;
-
if (priv->join) {
torture_leave_domain(tctx, priv->join);
}
- talloc_free(priv);
-
return true;
}
-
diff --git a/source4/torture/rpc/drsuapi_cracknames.c b/source4/torture/rpc/drsuapi_cracknames.c
index 5377882..c14776b 100644
--- a/source4/torture/rpc/drsuapi_cracknames.c
+++ b/source4/torture/rpc/drsuapi_cracknames.c
@@ -28,6 +28,15 @@
#include "ldb/include/ldb.h"
#include "libcli/security/security.h"
+struct DsCrackNamesPrivate {
+ struct DsPrivate base;
+
+ /* following names are used in Crack Names Matrix test */
+ const char *fqdn_name;
+ const char *user_principal_name;
+ const char *service_principal_name;
+};
+
static bool test_DsCrackNamesMatrix(struct torture_context *tctx,
struct DsPrivate *priv, const char *dn,
const char *user_principal_name, const char *service_principal_name)
@@ -115,6 +124,7 @@ static bool test_DsCrackNamesMatrix(struct torture_context *tctx,
}
torture_comment(tctx, __location__ ": (expected) error\n");
break;
+ case DRSUAPI_DS_NAME_FORMAT_UNKNOWN: /* should fail as we ask server to convert to Unknown format */
case DRSUAPI_DS_NAME_FORMAT_DNS_DOMAIN:
case DRSUAPI_DS_NAME_FORMAT_SID_OR_SID_HISTORY:
if (r.out.ctr->ctr1->array[0].status != DRSUAPI_DS_NAME_STATUS_RESOLVE_ERROR) {
@@ -132,6 +142,7 @@ static bool test_DsCrackNamesMatrix(struct torture_context *tctx,
r.out.ctr->ctr1->array[0].status);
torture_fail(tctx, err_msg);
}
+ break;
}
switch (formats[i]) {
@@ -141,6 +152,7 @@ static bool test_DsCrackNamesMatrix(struct torture_context *tctx,
case DRSUAPI_DS_NAME_FORMAT_SERVICE_PRINCIPAL:
n_from[i] = service_principal_name;
break;
+ case DRSUAPI_DS_NAME_FORMAT_UNKNOWN:
case DRSUAPI_DS_NAME_FORMAT_SID_OR_SID_HISTORY:
case DRSUAPI_DS_NAME_FORMAT_DNS_DOMAIN:
n_from[i] = NULL;
@@ -148,6 +160,7 @@ static bool test_DsCrackNamesMatrix(struct torture_context *tctx,
default:
n_from[i] = r.out.ctr->ctr1->array[0].result_name;
printf("%s\n", n_from[i]);
+ break;
}
}
@@ -1004,6 +1017,28 @@ bool test_DsCrackNames(struct torture_context *tctx,
}
/**
+ * Test case setup for CrackNames
+ */
+static bool torture_drsuapi_cracknames_setup(struct torture_context *tctx, void **data)
+{
+ struct DsCrackNamesPrivate *priv;
+
+ *data = priv = talloc_zero(tctx, struct DsCrackNamesPrivate);
+
+ return torture_drsuapi_tcase_setup_common(tctx, &priv->base);
+}
+
+/**
+ * Test case tear-down for CrackNames
+ */
+static bool torture_drsuapi_cracknames_teardown(struct torture_context *tctx, void *data)
+{
+ struct DsCrackNamesPrivate *priv = talloc_get_type(data, struct DsCrackNamesPrivate);
+
+ return torture_drsuapi_tcase_teardown_common(tctx, &priv->base);
+}
+
+/**
* CRACKNAMES test suite implementation
*/
void torture_rpc_drsuapi_cracknames_tcase(struct torture_suite *suite)
@@ -1014,8 +1049,8 @@ void torture_rpc_drsuapi_cracknames_tcase(struct torture_suite *suite)
struct torture_tcase *tcase = torture_suite_add_tcase(suite, "CRACKNAMES");
torture_tcase_set_fixture(tcase,
- torture_rpc_drsuapi_tcase_setup,
- torture_rpc_drsuapi_tcase_teardown);
+ torture_drsuapi_cracknames_setup,
+ torture_drsuapi_cracknames_teardown);
test = torture_tcase_add_simple_test(tcase, "CRACKNAMES-TEST", (run_func)test_DsCrackNames);
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list