summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2007-03-13 18:17:31 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:49:33 -0500
commit37f2d53528273c355fd646233a8037565b5432fc (patch)
tree78b704a6630967f2e9023b7289b30e7d6487a4a7
parent63fd883e54ea6fe808b72368e95aeebf265f2451 (diff)
downloadsamba-37f2d53528273c355fd646233a8037565b5432fc.tar.gz
samba-37f2d53528273c355fd646233a8037565b5432fc.tar.bz2
samba-37f2d53528273c355fd646233a8037565b5432fc.zip
r21827: move comments to the place where the functionality is implemented
metze (This used to be commit 5d49d8b9e149d320cb08c5c2a4fc4cb8bfd74129)
-rw-r--r--source4/libnet/libnet_unbecome_dc.c156
-rw-r--r--source4/torture/rpc/testjoin.c121
2 files changed, 157 insertions, 120 deletions
diff --git a/source4/libnet/libnet_unbecome_dc.c b/source4/libnet/libnet_unbecome_dc.c
index c0dbfcc68d..0c781b66ec 100644
--- a/source4/libnet/libnet_unbecome_dc.c
+++ b/source4/libnet/libnet_unbecome_dc.c
@@ -29,6 +29,162 @@
#include "dsdb/common/flags.h"
#include "librpc/gen_ndr/ndr_drsuapi_c.h"
+/*****************************************************************************
+ * Windows 2003 (w2k3) does the following steps when changing the server role
+ * from domain controller back to domain member
+ *
+ * We mostly do the same.
+ *****************************************************************************/
+
+/*
+ * lookup DC:
+ * - using nbt name<1C> request and a samlogon mailslot request
+ * or
+ * - using a DNS SRV _ldap._tcp.dc._msdcs. request and a CLDAP netlogon request
+ *
+ * see: unbecomeDC_send_cldap() and unbecomeDC_recv_cldap()
+ */
+
+/*
+ * Open 1st LDAP connection to the DC using admin credentials
+ *
+ * see: unbecomeDC_ldap_connect()
+ */
+
+/*
+ * LDAP search 1st LDAP connection:
+ *
+ * see: unbecomeDC_ldap_rootdse()
+ *
+ * Request:
+ * basedn: ""
+ * scope: base
+ * filter: (objectClass=*)
+ * attrs: defaultNamingContext
+ * configurationNamingContext
+ * Result:
+ * ""
+ * defaultNamingContext: <domain_partition>
+ * configurationNamingContext:CN=Configuration,<domain_partition>
+ */
+
+/*
+ * LDAP search 1st LDAP connection:
+ *
+ * see: unbecomeDC_ldap_computer_object()
+ *
+ * Request:
+ * basedn: <domain_partition>
+ * scope: sub
+ * filter: (&(|(objectClass=user)(objectClass=computer))(sAMAccountName=<new_dc_account_name>))
+ * attrs: distinguishedName
+ * userAccountControl
+ * Result:
+ * CN=<new_dc_netbios_name>,CN=Domain Controllers,<domain_partition>
+ * distinguishedName: CN=<new_dc_netbios_name>,CN=Domain Controllers,<domain_partition>
+ * userAccoountControl: 532480 <0x82000>
+ */
+
+/*
+ * LDAP search 1st LDAP connection:
+ *
+ * see: unbecomeDC_ldap_modify_computer()
+ *
+ * Request:
+ * basedn: CN=<new_dc_netbios_name>,CN=Computers,<domain_partition>
+ * scope: base
+ * filter: (objectClass=*)
+ * attrs: userAccountControl
+ * Result:
+ * CN=<new_dc_netbios_name>,CN=Computers,<domain_partition>
+ * userAccoountControl: 532480 <0x82000>
+ */
+
+/*
+ * LDAP modify 1st LDAP connection:
+ *
+ * see: unbecomeDC_ldap_modify_computer()
+ *
+ * Request (replace):
+ * CN=<new_dc_netbios_name>,CN=Computers,<domain_partition>
+ * userAccoountControl: 4096 <0x1000>
+ * Result:
+ * <success>
+ */
+
+/*
+ * LDAP search 1st LDAP connection:
+ *
+ * see: unbecomeDC_ldap_move_computer()
+ *
+ * Request:
+ * basedn: <WKGUID=aa312825768811d1aded00c04fd8d5cd,<domain_partition>>
+ * scope: base
+ * filter: (objectClass=*)
+ * attrs: 1.1
+ * Result:
+ * CN=Computers,<domain_partition>
+ */
+
+/*
+ * LDAP search 1st LDAP connection:
+ *
+ * not implemented because it doesn't give any new information
+ *
+ * Request:
+ * basedn: CN=Computers,<domain_partition>
+ * scope: base
+ * filter: (objectClass=*)
+ * attrs: distinguishedName
+ * Result:
+ * CN=Computers,<domain_partition>
+ * distinguishedName: CN=Computers,<domain_partition>
+ */
+
+/*
+ * LDAP modifyRDN 1st LDAP connection:
+ *
+ * see: unbecomeDC_ldap_move_computer()
+ *
+ * Request:
+ * entry: CN=<new_dc_netbios_name>,CN=Domain Controllers,<domain_partition>
+ * newrdn: CN=<new_dc_netbios_name>
+ * deleteoldrdn: TRUE
+ * newparent: CN=Computers,<domain_partition>
+ * Result:
+ * <success>
+ */
+
+/*
+ * LDAP unbind on the 1st LDAP connection
+ *
+ * not implemented, because it's not needed...
+ */
+
+/*
+ * Open 1st DRSUAPI connection to the DC using admin credentials
+ * DsBind with DRSUAPI_DS_BIND_GUID ("e24d201a-4fd6-11d1-a3da-0000f875ae0d")
+ *
+ * see: unbecomeDC_drsuapi_connect_send(), unbecomeDC_drsuapi_connect_recv(),
+ * unbecomeDC_drsuapi_bind_send() and unbecomeDC_drsuapi_bind_recv()
+ */
+
+/*
+ * DsRemoveDsServer to remove the
+ * CN=<machine_name>,CN=Servers,CN=<site_name>,CN=Configuration,<domain_partition>
+ * and CN=NTDS Settings,CN=<machine_name>,CN=Servers,CN=<site_name>,CN=Configuration,<domain_partition>
+ * on the 1st DRSUAPI connection
+ *
+ * see: unbecomeDC_drsuapi_remove_ds_server_send() and unbecomeDC_drsuapi_remove_ds_server_recv()
+ */
+
+/*
+ * DsUnbind on the 1st DRSUAPI connection
+ *
+ * not implemented, because it's not needed...
+ */
+
+
struct libnet_UnbecomeDC_state {
struct composite_context *creq;
diff --git a/source4/torture/rpc/testjoin.c b/source4/torture/rpc/testjoin.c
index 0d89cd479d..c52ef6e853 100644
--- a/source4/torture/rpc/testjoin.c
+++ b/source4/torture/rpc/testjoin.c
@@ -672,126 +672,7 @@ struct test_join_ads_dc *torture_join_domain_ads_dc(const char *machine_name,
void torture_leave_domain_ads_dc(struct test_join_ads_dc *join)
{
-/* W2K3: */
- /*
- * lookup DC:
- * - using nbt name<1C> request and a samlogon mailslot request
- * or
- * - using a DNS SRV _ldap._tcp.dc._msdcs. request and a CLDAP netlogon request
- */
- /*
- * Open 1st LDAP connection to the DC using admin credentials
- */
-
- /*
- * LDAP search 1st LDAP connection:
- *
- * Request:
- * basedn: ""
- * scope: base
- * filter: (objectClass=*)
- * attrs: defaultNamingContext
- * configurationNamingContext
- * Result:
- * ""
- * defaultNamingContext: <domain_partition>
- * configurationNamingContext:CN=Configuration,<domain_partition>
- */
-
- /*
- * LDAP search 1st LDAP connection:
- *
- * Request:
- * basedn: <domain_partition>
- * scope: sub
- * filter: (&(|(objectClass=user)(objectClass=computer))(sAMAccountName=<new_dc_account_name>))
- * attrs: distinguishedName
- * userAccountControl
- * Result:
- * CN=<new_dc_netbios_name>,CN=Domain Controllers,<domain_partition>
- * distinguishedName: CN=<new_dc_netbios_name>,CN=Domain Controllers,<domain_partition>
- * userAccoountControl: 532480 <0x82000>
- */
-
- /*
- * LDAP search 1st LDAP connection:
- *
- * Request:
- * basedn: CN=<new_dc_netbios_name>,CN=Computers,<domain_partition>
- * scope: base
- * filter: (objectClass=*)
- * attrs: userAccountControl
- * Result:
- * CN=<new_dc_netbios_name>,CN=Computers,<domain_partition>
- * userAccoountControl: 532480 <0x82000>
- */
-
- /*
- * LDAP modify 1st LDAP connection:
- *
- * Request (replace):
- * CN=<new_dc_netbios_name>,CN=Computers,<domain_partition>
- * userAccoountControl: 4096 <0x1000>
- * Result:
- * <success>
- */
-
- /*
- * LDAP search 1st LDAP connection:
- *
- * Request:
- * basedn: <WKGUID=aa312825768811d1aded00c04fd8d5cd,<domain_partition>>
- * scope: base
- * filter: (objectClass=*)
- * attrs: 1.1
- * Result:
- * CN=Computers,<domain_partition>
- */
-
- /*
- * LDAP search 1st LDAP connection:
- *
- * Request:
- * basedn: CN=Computers,<domain_partition>
- * scope: base
- * filter: (objectClass=*)
- * attrs: distinguishedName
- * Result:
- * CN=Computers,<domain_partition>
- * distinguishedName: CN=Computers,<domain_partition>
- */
-
- /*
- * LDAP modifyRDN 1st LDAP connection:
- *
- * Request:
- * entry: CN=<new_dc_netbios_name>,CN=Domain Controllers,<domain_partition>
- * newrdn: CN=<new_dc_netbios_name>
- * deleteoldrdn: TRUE
- * newparent: CN=Computers,<domain_partition>
- * Result:
- * <success>
- */
-
- /*
- * LDAP unbind on the 1st LDAP connection
- */
-
- /*
- * Open 1st DRSUAPI connection to the DC using admin credentials
- * DsBind with DRSUAPI_DS_BIND_GUID ("e24d201a-4fd6-11d1-a3da-0000f875ae0d")
- */
-
- /*
- * DsRemoveDsServer to remove the
- * CN=<machine_name>,CN=Servers,CN=<site_name>,CN=Configuration,<domain_partition>
- * and CN=NTDS Settings,CN=<machine_name>,CN=Servers,CN=<site_name>,CN=Configuration,<domain_partition>
- * on the 1st DRSUAPI connection
- */
-
- /*
- * DsUnbind on the 1st DRSUAPI connection
- */
+/* W2K3: see libnet/libnet_unbecome_dc.c */
if (join->join) {
torture_leave_domain(join->join);