[SCM] Samba Shared Repository - branch master updated

Kamen Mazdrashki kamenim at samba.org
Fri Jun 25 16:17:19 MDT 2010


The branch, master has been updated
       via  2f7fe9d... s4/net-drs: Fix error messages typo and formatting
       via  0c8ffc9... s4/drs-test: Fix whitespaces and permissions for delete_object.py test
      from  e40afe9... Move UCS2 macros to common code

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 2f7fe9db023022c03e104dcc43a39f20bf5c804b
Author: Kamen Mazdrashki <kamenim at samba.org>
Date:   Fri Jun 25 15:56:35 2010 +0300

    s4/net-drs: Fix error messages typo and formatting

commit 0c8ffc9f15bddeeee66b3a6971691aadf76b245e
Author: Kamen Mazdrashki <kamenim at samba.org>
Date:   Fri Jun 25 14:56:03 2010 +0300

    s4/drs-test: Fix whitespaces and permissions for delete_object.py test
    
    Sorry I've  missed to do this before

-----------------------------------------------------------------------

Summary of changes:
 source4/torture/drs/python/delete_object.py |   10 +++++-----
 source4/utils/net/drs/net_drs_showrepl.c    |   14 +++++++-------
 2 files changed, 12 insertions(+), 12 deletions(-)
 mode change 100755 => 100644 source4/torture/drs/python/delete_object.py


Changeset truncated at 500 lines:

diff --git a/source4/torture/drs/python/delete_object.py b/source4/torture/drs/python/delete_object.py
old mode 100755
new mode 100644
index 6b75b80..29c7565
--- a/source4/torture/drs/python/delete_object.py
+++ b/source4/torture/drs/python/delete_object.py
@@ -101,7 +101,7 @@ class DrsDeleteObjectTestCase(samba.tests.TestCase):
 
     def _make_username(self):
         return "DrsDelObjUser_" + time.strftime("%s", time.gmtime())
-    
+
     def _check_user(self, sam_ldb, user_orig, is_deleted):
         # search the user by guid as it may be deleted
         guid_str = self._GUID_string(user_orig["objectGUID"][0])
@@ -120,7 +120,7 @@ class DrsDeleteObjectTestCase(samba.tests.TestCase):
             self.assertEquals(user_cur["isDeleted"][0],"TRUE")
             self.assertTrue(not("objectCategory" in user_cur))
             self.assertTrue(not("sAMAccountType" in user_cur))
-            self.assertTrue(dodn in str(user_cur["dn"]), 
+            self.assertTrue(dodn in str(user_cur["dn"]),
                             "User %s is deleted but it is not located under %s!" % (name_orig, dodn))
             self.assertEquals(name_cur, name_orig + "\nDEL:" + guid_str)
         else:
@@ -135,10 +135,10 @@ class DrsDeleteObjectTestCase(samba.tests.TestCase):
         net_cmd = os.path.abspath("./bin/net")
         # make command line credentials string
         creds = samba.tests.cmdline_credentials
-        cmd_line_auth = "-U%s/%s%%%s" % (creds.get_domain(), 
+        cmd_line_auth = "-U%s/%s%%%s" % (creds.get_domain(),
                                          creds.get_username(), creds.get_password())
         # bin/net drs replicate <Dest_DC_NAME> <Src_DC_NAME> <Naming Context>
-        cmd_line = "%s drs replicate %s %s %s %s" % (net_cmd, DC, fromDC, 
+        cmd_line = "%s drs replicate %s %s %s %s" % (net_cmd, DC, fromDC,
                                                      self.domain_dn, cmd_line_auth)
         ret = os.system(cmd_line)
         self.assertEquals(ret, 0, "Replicating %s from %s has failed!" % (DC, fromDC))
@@ -213,7 +213,7 @@ def connect_samdb(samdb_url):
             samdb_url = "ldap://%s" % samdb_url
             # user 'paged_search' module when connecting remotely
             ldb_options = ["modules:paged_searches"]
-    
+
     return SamDB(url=samdb_url,
                  lp=samba.tests.env_loadparm(),
                  session_info=system_session(),
diff --git a/source4/utils/net/drs/net_drs_showrepl.c b/source4/utils/net/drs/net_drs_showrepl.c
index b5d355e..d429df4 100644
--- a/source4/utils/net/drs/net_drs_showrepl.c
+++ b/source4/utils/net/drs/net_drs_showrepl.c
@@ -126,7 +126,7 @@ static bool net_drs_showrepl_print_dc_info(struct net_drs_context *drs_ctx)
 
 	/* parse NTDS Settings DN */
 	if (!net_drs_parse_ntds_dn(dn, mem_ctx, &dc_name, &site_name, NULL)) {
-		d_printf("Unexptected: Failed to parse %s DN!\n",
+		d_printf("Unexpected: Failed to parse %s DN!\n",
 		         ldb_dn_get_linearized(dn));
 		goto failed;
 	}
@@ -224,7 +224,7 @@ static bool net_drs_exec_DsReplicaGetInfo(struct net_drs_context *drs_ctx,
 	}
 
 	if (info_type != info_type_got) {
-		d_printf("DsReplicaGetInfo: Error requested info %d, got info %d",
+		d_printf("DsReplicaGetInfo: Error requested info %d, got info %d.\n",
 		         info_type, info_type_got);
 		return false;
 	}
@@ -302,7 +302,7 @@ static bool net_drs_showrepl_print_inbound_neihbors(struct net_drs_context *drs_
 	bret = net_drs_exec_DsReplicaGetInfo(drs_ctx,
 	                                     DRSUAPI_DS_REPLICA_INFO_NEIGHBORS, &replica_info);
 	if (!bret) {
-		d_printf("DsReplicaGetInfo() failed for DRSUAPI_DS_REPLICA_INFO_KCC_DSA_CONNECT_FAILURES");
+		d_printf("DsReplicaGetInfo() failed for DRSUAPI_DS_REPLICA_INFO_KCC_DSA_CONNECT_FAILURES.\n");
 		return false;
 	}
 	reps_from = replica_info.neighbours;
@@ -331,7 +331,7 @@ static bool net_drs_showrepl_print_outbound_neihbors(struct net_drs_context *drs
 	bret = net_drs_exec_DsReplicaGetInfo(drs_ctx,
 	                                     DRSUAPI_DS_REPLICA_INFO_REPSTO, &replica_info);
 	if (!bret) {
-		d_printf("DsReplicaGetInfo() failed for DRSUAPI_DS_REPLICA_INFO_KCC_DSA_CONNECT_FAILURES");
+		d_printf("DsReplicaGetInfo() failed for DRSUAPI_DS_REPLICA_INFO_KCC_DSA_CONNECT_FAILURES.\n");
 		return false;
 	}
 	reps_to = replica_info.repsto;
@@ -470,7 +470,7 @@ static bool net_drs_showrepl_print_connect_failures(struct net_drs_context *drs_
 	                                     DRSUAPI_DS_REPLICA_INFO_KCC_DSA_CONNECT_FAILURES,
 	                                     &replica_info);
 	if (!bret) {
-		d_printf("DsReplicaGetInfo() failed for DRSUAPI_DS_REPLICA_INFO_KCC_DSA_CONNECT_FAILURES");
+		d_printf("DsReplicaGetInfo() failed for DRSUAPI_DS_REPLICA_INFO_KCC_DSA_CONNECT_FAILURES.\n");
 		return false;
 	}
 	connect_failures = replica_info.connectfailures;
@@ -485,7 +485,7 @@ static bool net_drs_showrepl_print_connect_failures(struct net_drs_context *drs_
 		d_printf("******* %d CONSECUTIVE FAILURES since %s\n",
 			 failure->num_failures,
 			 nt_time_string(mem_ctx, failure->first_failure));
-		d_printf("Last error: %d (%s):",
+		d_printf("Last error: %d (%s):\n",
 		         W_ERROR_V(failure->last_result),
 		         win_errstr(failure->last_result));
 		d_printf("\t\t\t%s\n", get_friendly_werror_msg(failure->last_result));
@@ -513,7 +513,7 @@ static bool net_drs_showrepl_print_link_failures(struct net_drs_context *drs_ctx
 	bret = net_drs_exec_DsReplicaGetInfo(drs_ctx,
 	                                     DRSUAPI_DS_REPLICA_INFO_KCC_DSA_LINK_FAILURES, &replica_info);
 	if (!bret) {
-		d_printf("DsReplicaGetInfo() failed for DRSUAPI_DS_REPLICA_INFO_KCC_DSA_CONNECT_FAILURES");
+		d_printf("DsReplicaGetInfo() failed for DRSUAPI_DS_REPLICA_INFO_KCC_DSA_CONNECT_FAILURES.\n");
 		return false;
 	}
 	link_failures = replica_info.linkfailures;


-- 
Samba Shared Repository


More information about the samba-cvs mailing list