Author: brad Date: 2005-07-30 05:08:13 +0000 (Sat, 30 Jul 2005) New Revision: 8860
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=8860 Log: Changed comments to C style /**/ (thanks Richard), some more changes to test_CompleteJoin(). Modified: branches/SOC/SAMBA_4_0/source/torture/rpc/dssync.c Changeset: Modified: branches/SOC/SAMBA_4_0/source/torture/rpc/dssync.c =================================================================== --- branches/SOC/SAMBA_4_0/source/torture/rpc/dssync.c 2005-07-30 03:59:17 UTC (rev 8859) +++ branches/SOC/SAMBA_4_0/source/torture/rpc/dssync.c 2005-07-30 05:08:13 UTC (rev 8860) @@ -151,13 +151,14 @@ ldb_errstring(ctx->ldb_ctx)); return; } - // * req = ldap_ldif2msg(ctx, ldif); - // * req.messageid = ; - //req->type = LDAP_TAG_DelRequest; - //req->r.DelRequest.dn = ctx->new_dc.dc_info2.ntds_dn; - // * req.num_controls = ; - // * req.controls = ; - //rtn = ldap_transaction(ctx->admin.ldap.conn, req); + /* req = ldap_ldif2msg(ctx, ldif); + req.messageid = ; + req->type = LDAP_TAG_DelRequest; + req->r.DelRequest.dn = ctx->new_dc.dc_info2.ntds_dn; + req.num_controls = ; + req.controls = ; + rtn = ldap_transaction(ctx->admin.ldap.conn, req); + */ } { @@ -177,10 +178,12 @@ ldb_errstring(ctx->ldb_ctx)); return; } - //req = ldap_ldif2msg(ctx, ldif); - //req->type = LDAP_TAG_DelRequest; - //req->r.DelRequest.dn = ctx->new_dc.dc_info2.ntds_dn; - //rtn = ldap_transaction(ctx->admin.ldap.conn, req); + /* + req = ldap_ldif2msg(ctx, ldif); + req->type = LDAP_TAG_DelRequest; + req->r.DelRequest.dn = ctx->new_dc.dc_info2.ntds_dn; + rtn = ldap_transaction(ctx->admin.ldap.conn, req); + */ } if (ctx->new_dc.join) { @@ -306,7 +309,7 @@ ctx->schema_dn = talloc_asprintf(ctx, "CN=Schema,%s", ctx->config_dn); ctx->new_dc.dc_info2.server_dn = talloc_asprintf(ctx, -// "CN=%s,CN=Servers,CN=Standardname-des-ersten-Standorts,CN=Sites,CN=Configuration,%s", +/* "CN=%s,CN=Servers,CN=Standardname-des-ersten-Standorts,CN=Sites,CN=Configuration,%s", */ "CN=%s,CN=Servers,CN=Default-First-Site-Name,CN=Sites,CN=Configuration,%s", TEST_MACHINE_NAME, ctx->domain_dn); @@ -333,17 +336,16 @@ printf("test_CompleteJoin(): Connected to %s.\n",ctx->ldap_url); /* userAccountControl: 532480 0x82000 - * UF_SERVER_TRUST_ACCOUNT|UF_TRUSTED_FOR_DELEGATION - */ - //ldif = talloc_asprintf(ctx, - // "dn: %s\n" - // "changetype: modify\n" - // "replace: userAccountControl\n" - // "userAccountControl: %u\n", - // ctx->new_dc.dc_info2.computer_dn, - // UF_SERVER_TRUST_ACCOUNT|UF_TRUSTED_FOR_DELEGATION); - -// = UF_SERVER_TRUST_ACCOUNT|UF_TRUSTED_FOR_DELEGATION; + * UF_SERVER_TRUST_ACCOUNT|UF_TRUSTED_FOR_DELEGATION + ldif = talloc_asprintf(ctx, + "dn: %s\n" + "changetype: modify\n" + "replace: userAccountControl\n" + "userAccountControl: %u\n", + ctx->new_dc.dc_info2.computer_dn, + UF_SERVER_TRUST_ACCOUNT|UF_TRUSTED_FOR_DELEGATION); + */ +/* = UF_SERVER_TRUST_ACCOUNT|UF_TRUSTED_FOR_DELEGATION; */ ctx->ldb_msg = ldb_msg_new(ctx); ldb_msg_add_fmt(ctx->ldb_ctx,ctx->ldb_msg,"userAccountControl","%u",UF_SERVER_TRUST_ACCOUNT|UF_TRUSTED_FOR_DELEGATION); @@ -359,7 +361,7 @@ printf("ldb_modify() succeeded.\n"); ldb_msg_free(ctx->ldb_ctx,ctx->ldb_msg); - // * rtn = ldap_transaction(ctx->admin.ldap.conn, req); + /* rtn = ldap_transaction(ctx->admin.ldap.conn, req); */ /* add entry CN=<NETBIOSNAME>,CN=Servers * objectClass: server @@ -381,27 +383,6 @@ printf("dn: %s\nserverReference: %s.\n",ctx->new_dc.dc_info2.server_dn,ctx->new_dc.dc_info2.computer_dn); -// * req = ldap_ldif2msg(ctx, ldif); -// * req->type = LDAP_TAG_AddRequest; -// * req.r.AddRequest.dn = ctx->new_dc.dc_info2.server_dn; -// * req.r.AddRequest.num_attributes = 3; - -// * req.r.AddRequest.attributes.flags = LDB_FLAG_MOD_ADD; -// * req.r.AddRequest.attributes.name = 'objectClass'; -// * req.r.AddRequest.attributes.num_values = 1; -// * req.r.AddRequest.attributes.values = 'server'; - -// * req.r.AddRequest.attributes.flags = LDB_FLAG_MOD_ADD; -// * req.r.AddRequest.attributes.name = 'systemFlags'; -// * req.r.AddRequest.attributes.num_values = 1; -// * req.r.AddRequest.attributes.values = '50000000'; - -// * req.r.AddRequest.attributes.flags = LDB_FLAG_MOD_ADD; -// * req.r.AddRequest.attributes.name = 'serverReference'; -// * req.r.AddRequest.attributes.num_values = 1; -// * req.r.AddRequest.attributes.values = ctx->new_dc.dc_info2.computer_dn; - - //rtn = ldb_modify(ldb_ctx,ldb_req->msg); ctx->ldb_msg = ldb_msg_new(ctx); ldb_msg_add_string(ctx->ldb_ctx,ctx->ldb_msg,"objectClass","server"); ldb_msg_add_string(ctx->ldb_ctx,ctx->ldb_msg,"systemFlags","50000000"); @@ -416,7 +397,8 @@ return False; } printf("ldb_add() succeeded.\n"); - // rtn = ldap_transaction(ctx->admin.ldap.conn, req); + ldb_msg_free(ctx->ldb_ctx,ctx->ldb_msg); + /* rtn = ldap_transaction(ctx->admin.ldap.conn, req); */ /* add entry CN=NTDS Settings * @@ -748,13 +730,14 @@ { #include <unistd.h> - int sec = 5000; +/* int sec = 5000;*/ + int sec = 10; printf("Sleep for %d secs\n", sec); sleep(sec); printf("...\n"); } /* modrdn to OU=Domain Controllers,... - */ + */ /* ldif = talloc_asprintf(ctx, "dn: %s\n" @@ -774,12 +757,13 @@ return False; } */ -// * rtn = ldap_transaction(ctx->admin.ldap.conn, req); - +/* rtn = ldap_transaction(ctx->admin.ldap.conn, req); */ + printf("ldb_rename: olddn: %s\n\tnewrdn: CN=%s\n\tnewsuperior:%s.\n", + ctx->new_dc.dc_info2.computer_dn,TEST_MACHINE_NAME,ctx->domain_dn); + /*rtn = ldb_rename(ctx->ldb_ctx,olddn,newdn);*/ ctx->new_dc.dc_info2.computer_dn = talloc_asprintf(ctx, "CN=%s,OU=Domain Controllers,%s", TEST_MACHINE_NAME, ctx->domain_dn); - return ret; } @@ -796,18 +780,11 @@ TALLOC_CTX *mem_ctx; struct DsSyncTest *ctx; int rtn = 0; - //struct ldb_context *ldb_ctx; mem_ctx = talloc_init("torture_rpc_dssync"); ctx = test_create_context(mem_ctx); ctx->ldb_ctx = ldb_init(mem_ctx); - //ctx->ldb_msg = talloc_init("ldb_message"); -// url = talloc_asprintf(mem_ctx, "ldap://%s/",host); - -// ldb method - - //printf("ctx->ldap_url: %s.\n",ctx->ldap_url); rtn = ldb_connect(ctx->ldb_ctx,ctx->ldap_url,0,NULL); printf("Connected to %s.\n",ctx->ldap_url); @@ -830,18 +807,19 @@ } printf("SASL bind to LDAP successful.\n"); - */ - //that was like a test_LDAPBind. + + that was like a test_LDAPBind. + */ ret &= test_DsBind(ctx, ctx->admin.credentials, &ctx->admin.drsuapi); - //ret &= test_LDAPBind(ctx, ctx->admin.credentials, &ctx->admin.ldap); + /* ret &= test_LDAPBind(ctx, ctx->admin.credentials, &ctx->admin.ldap); */ ret &= test_GetInfo(ctx); ret &= test_CompleteJoin(ctx); - //ret &= test_FetchData(ctx); + /* ret &= test_FetchData(ctx); */ test_destroy_context(ctx);
