Issue 4656 - Remove problematic language from source code

Description:  Remove problematic language from source code

relates: https://github.com/389ds/389-ds-base/issues/4656

Reviewed by: spichugi, progier, vashirov, firstyear (Thanks!!!!)

dirsrvtests/tests/suites/fourwaymmr/__init__.py

@@ -1,3 +1,3 @@
 """
-   :Requirement: 389-ds-base: Four way Multi-Master Replication
+   :Requirement: 389-ds-base: Four way Multi-Supplier Replication
 """

docker.mk

@@ -1,6 +1,6 @@
 
 suse:
-	docker build -t 389-ds-suse:master -f docker/389-ds-suse/Dockerfile .
+	docker build -t 389-ds-suse:latest -f docker/389-ds-suse/Dockerfile .
 
 fedora:
-	docker build -t 389-ds-fedora:master -f docker/389-ds-fedora/Dockerfile .
+	docker build -t 389-ds-fedora:latest -f docker/389-ds-fedora/Dockerfile .

include/libaccess/aclglobal.h

@@ -20,7 +20,7 @@
 
 struct ACLGlobal_s
 {
-    ACLListHandle_t *masterlist;
+    ACLListHandle_t *primarylist;
     pool_handle_t *pool; /* Deallocate at the start of cache flush */
     pool_handle_t *databasepool;
     pool_handle_t *methodpool;

ldap/schema/60kerberos.ldif

@@ -111,7 +111,7 @@ attributetypes: ( 2.16.840.1.113719.1.301.4.36.1 NAME 'krbPwdPolicyReference' EQ
 ##### The time at which the principal's password expires
 attributetypes: ( 2.16.840.1.113719.1.301.4.37.1 NAME 'krbPasswordExpiration' EQUALITY generalizedTimeMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 SINGLE-VALUE)
 ##### This attribute holds the principal's key (krbPrincipalKey) that is encrypted with
-##### the master key (krbMKey). 
+##### the master key (krbMKey).
 ##### The attribute is ASN.1 encoded.
 #####
 ##### The format of the value for this attribute is explained below,

ldap/servers/slapd/csngen.c

@@ -843,9 +843,9 @@ int32_t _csngen_tester_gettime(struct timespec *tp)
 /* Mimic a fully meshed multi supplier topology */
 void csngen_multi_suppliers_test(void)
 {
-#define NB_TEST_MASTERS	6
+#define NB_TEST_SUPPLIERS	6
 #define NB_TEST_STATES	500
-    CSNGen *gen[NB_TEST_MASTERS];
+    CSNGen *gen[NB_TEST_SUPPLIERS];
     struct timespec now = {0};
     CSN *last_csn = NULL;
     CSN *csn = NULL;
@@ -853,7 +853,7 @@ void csngen_multi_suppliers_test(void)
 
     _csngen_tester_gettime(&now);
 
-    for (i=0; i< NB_TEST_MASTERS; i++) {
+    for (i=0; i< NB_TEST_SUPPLIERS; i++) {
         gen[i] = csngen_new(i+1, NULL);
         if (gen[i]) {
             gen[i]->gettime = _csngen_tester_gettime;
@@ -862,7 +862,7 @@ void csngen_multi_suppliers_test(void)
     }
 
     for (_csngen_tester_state=0; _csngen_tester_state < NB_TEST_STATES; _csngen_tester_state++) {
-        for (i=0; i< NB_TEST_MASTERS; i++) {
+        for (i=0; i< NB_TEST_SUPPLIERS; i++) {
             _csngen_tester_state_rid = i+1;
             csn = NULL;
             rc = csngen_new_csn(gen[i], &csn, PR_FALSE);
@@ -882,7 +882,7 @@ void csngen_multi_suppliers_test(void)
             csn_free(&last_csn);
             last_csn = csn;
 
-            for (j=0; j< NB_TEST_MASTERS; j++) {
+            for (j=0; j< NB_TEST_SUPPLIERS; j++) {
                 if (i==j) {
                     continue;
                 }

ldap/servers/slapd/dse.c

@@ -1621,9 +1621,9 @@ dse_search(Slapi_PBlock *pb) /* JCM There should only be one exit point from thi
 {
     Slapi_Filter *filter;
     Slapi_DN *basesdn = NULL;
-    Slapi_DN *old_repl_sdn = NULL;
     struct dse *pdse;
     char **attrs;
+    const char *ndn = NULL;
     char returntext[SLAPI_DSE_RETURNTEXT_SIZE] = "";
     int attrsonly;
     int estimate = 0; /* estimated search result set size */
@@ -1652,14 +1652,14 @@ dse_search(Slapi_PBlock *pb) /* JCM There should only be one exit point from thi
     isrootdse = slapi_sdn_isempty(basesdn);
 
     /* Hopefully this plugin DN mapping can be removed in 3.x */
-    old_repl_sdn = slapi_sdn_new_dn_byval("cn=Multimaster Replication Plugin,cn=plugins,cn=config");
-    if(slapi_sdn_compare(basesdn, old_repl_sdn) == 0) {
-        /* Map the old name to the new one */
+    ndn = slapi_sdn_get_ndn(basesdn);
+    if (strstr(ndn, "aster replication plugin,cn=plugins,cn=config")) {
+        /* Map the old "problematic" name to the new one */
         slapi_sdn_free(&basesdn);
         basesdn = slapi_sdn_new_dn_byval("cn=Multisupplier Replication Plugin,cn=plugins,cn=config");
         slapi_pblock_set(pb, SLAPI_SEARCH_TARGET_SDN, basesdn);
     }
-    slapi_sdn_free(&old_repl_sdn);
+
     /*
      * Now optimise the filter for use: note that unlike ldbm_search,
      * because we don't change the outer filter container, we don't need

lib/libaccess/aclflush.cpp

@@ -87,7 +87,7 @@ ACL_CacheFlush(void)
     NSErr_t *errp = 0;
 
     PR_ASSERT(ACLGlobal);
-    PR_ASSERT(ACLGlobal->masterlist);
+    PR_ASSERT(ACLGlobal->primarylist);
     PR_ASSERT(ACLGlobal->listhash);
     PR_ASSERT(ACLGlobal->urihash);
     PR_ASSERT(ACLGlobal->urigethash);
@@ -119,9 +119,9 @@ ACL_CacheFlush(void)
     //	Mark all existing ACL Lists as stale. Delete any unreferenced ones.
     PR_HashTableEnumerateEntries(oldACLGlobal->listhash, deletelists, NULL);
 
-    //  Delete the old master list.
-    ACL_ListDestroy(errp, oldACLGlobal->masterlist);
-    oldACLGlobal->masterlist = NULL;
+    //  Delete the old primary list.
+    ACL_ListDestroy(errp, oldACLGlobal->primarylist);
+    oldACLGlobal->primarylist = NULL;
     PR_HashTableDestroy(oldACLGlobal->listhash);
     oldACLGlobal->listhash = NULL;
     PR_HashTableDestroy(oldACLGlobal->urihash);
@@ -150,7 +150,7 @@ ACL_Restart(void *clntData)
     NSErr_t *errp = 0;
 
     PR_ASSERT(ACLGlobal);
-    PR_ASSERT(ACLGlobal->masterlist);
+    PR_ASSERT(ACLGlobal->primarylist);
     PR_ASSERT(ACLGlobal->listhash);
     PR_ASSERT(ACLGlobal->urihash);
     PR_ASSERT(ACLGlobal->urigethash);
@@ -167,8 +167,8 @@ ACL_Restart(void *clntData)
     //  (i.e. all of them)
     PR_HashTableEnumerateEntries(ACLGlobal->listhash, restartdeletelists, NULL);
 
-    //  Delete the  master list.
-    ACL_ListDestroy(errp, ACLGlobal->masterlist);
+    //  Delete the primary list.
+    ACL_ListDestroy(errp, ACLGlobal->primarylist);
 
     ACL_LasHashDestroy();
     PR_HashTableDestroy(ACLGlobal->listhash);

lib/libsi18n/getstrmem.h

@@ -567,7 +567,7 @@ static char *dsgw[] = {
     "A size limit was exceeded in responding to your request.  If\nyou are searching for entries, you may achieve better results\nif you are more specific in your search, because too many entries\nmatched your search criteria.",
     "The gateway attempted to authenticate to the server using\na method the server does not understand.",
     "The gateway attempted to authenticate to the server using an\nauthentication method which the server does not support. ",
-    "Your request could not be fulfilled, probably because the server\nthat was contacted does not contain the data you are looking\nfor.  It is possible that a referral to another server was\nreturned but could not be followed.  If you were trying to make\nchanges to the directory, it may be that the server that holds\nthe master copy of the data is not available.",
+    "Your request could not be fulfilled, probably because the server\nthat was contacted does not contain the data you are looking\nfor.  It is possible that a referral to another server was\nreturned but could not be followed.  If you were trying to make\nchanges to the directory, it may be that the server that holds\nthe primary copy of the data is not available.",
     "Your request exceeded an administrative limit in the server.",
     "A critical extension that the gateway requested is not available in this server.",
     "The server was unable to process the request, because the\nrequest referred to an attribute which does not exist in the\nentry.",
@@ -580,7 +580,7 @@ static char *dsgw[] = {
     "You do not have sufficient privileges to perform the operation. ",
     "The server is too busy to service your request.  Try again\nin a few minutes.",
     "The LDAP server could not be contacted.",
-    "The server was unwilliing to process your request.  Usually,\nthis indicates that serving your request would put a heavy load\non the server.  It may also indicate that the server is not\nconfigured to process your request.  If searching, you may wish\nto limit the scope of your search.",
+    "The server was unwilling to process your request.  Usually,\nthis indicates that serving your request would put a heavy load\non the server.  It may also indicate that the server is not\nconfigured to process your request.  If searching, you may wish\nto limit the scope of your search.",
     "The directory server could not honor your request because it\nviolates the schema requirements.  Typically, this means that you\nhave not provided a value for a required field.  It could also mean\nthat the schema in the directory server needs to be updated.",
     "The directory server will not allow you to delete or rename\nan entry if that entry has children.  If you wish to do this, you\nmust first delete all the child entries.",
     "The server was unable to add a new entry, or rename an existing\nentry, because an entry by that name already exists.",

man/man1/ds-replcheck.1

@@ -1,4 +1,4 @@
-.TH DS-REPLCHECK 1 "Nov 26, 2018"
+.TH DS-REPLCHECK 1 "July 22, 2022"
 .SH NAME
 ds-replcheck
 .SH SYNOPSIS
@@ -22,15 +22,15 @@ Compare two replication LDIF files for differences (LDIF file generated by 'db2l
 Get the general state of replication between two replicas
 
 .SH OPTIONS 'ds-replcheck state'
-usage: ds-replcheck online [-h] -m MURL -r RURL -b SUFFIX -D BINDDN
+usage: ds-replcheck online [-h] -m URL -r URL -b SUFFIX -D BINDDN
                            [-w BINDPW] [-W] [-y PASS_FILE] [-Z CERTDIR] 
 
 .TP
-\fB\-m\fR \fI\,MURL\/\fR, \fB\-\-master\-url\fR \fI\,MURL\/\fR
-The LDAP URL for the Master server
+\fB\-m\fR \fI\,URL\/\fR, \fB\-\-supplier\-url\fR \fI\,URL\/\fR
+The LDAP URL for the Supplier server
 
 .TP
-\fB\-r\fR \fI\,RURL\/\fR, \fB\-\-replica\-url\fR \fI\,RURL\/\fR
+\fB\-r\fR \fI\,URL\/\fR, \fB\-\-replica\-url\fR \fI\,URL\/\fR
 The LDAP URL for the Replica server
 
 .TP
@@ -59,17 +59,17 @@ The certificate database directory for secure connections
 
 
 .SH OPTIONS 'ds-replcheck online'
-usage: ds-replcheck online [-h] -m MURL -r RURL --rid RID -b SUFFIX -D BINDDN
+usage: ds-replcheck online [-h] -m URL -r URL --rid RID -b SUFFIX -D BINDDN
                            [-w BINDPW] [-W] [-y PASS_FILE] [-l LAG] [-c]
                            [-Z CERTDIR] [-i IGNORE] [-p PAGESIZE] [-o FILE]
 
 
 .TP
-\fB\-m\fR \fI\,MURL\/\fR, \fB\-\-master\-url\fR \fI\,MURL\/\fR
-The LDAP URL for the Master server
+\fB\-m\fR \fI\,URL\/\fR, \fB\-\-supplier\-url\fR \fI\,MRL\/\fR
+The LDAP URL for the Supplier server
 
 .TP
-\fB\-r\fR \fI\,RURL\/\fR, \fB\-\-replica\-url\fR \fI\,RURL\/\fR
+\fB\-r\fR \fI\,URL\/\fR, \fB\-\-replica\-url\fR \fI\,URL\/\fR
 The LDAP URL for the Replica server
 
 .TP
@@ -117,21 +117,21 @@ The paged\-search result grouping size (default 500 entries)
 The output file
 
 .SH OPTIONS 'ds-replcheck offline'
-usage: ds-replcheck offline [-h] -m MLDIF -r RLDIF --rid RID -b SUFFIX [-c]
+usage: ds-replcheck offline [-h] -m LDIF_FILE -r LDIF_FILE --rid RID -b SUFFIX [-c]
                             [-i IGNORE] [-o FILE]
 
 
 .TP
-\fB\-m\fR \fI\,MLDIF\/\fR, \fB\-\-master\-ldif\fR \fI\,MLDIF\/\fR
-Master LDIF file
+\fB\-m\fR \fI\,LDIF_FILE\/\fR, \fB\-\-supplier\-ldif\fR \fI\,LDIF_FILE\/\fR
+Supplier LDIF file
 
 .TP
-\fB\-r\fR \fI\,RLDIF\/\fR, \fB\-\-replica\-ldif\fR \fI\,RLDIF\/\fR
+\fB\-r\fR \fI\,LDIF_FILE\/\fR, \fB\-\-replica\-ldif\fR \fI\,LDIF_FILE\/\fR
 Replica LDIF file
 
 .TP
 \fB\-\-rid\fR \fI\,RID\/\fR
-The Replica Identifier (rid) for the "Master" server
+The Replica Identifier (rid) for the "Supplier" server
 
 .TP
 \fB\-b\fR \fI\,SUFFIX\/\fR, \fB\-\-suffix\fR \fI\,SUFFIX\/\fR
@@ -160,4 +160,4 @@ ds-replcheck was written by the 389 Project.
 Report bugs to https://github.com/389ds/389-ds-base/issues/new
 
 .SH COPYRIGHT
-Copyright \(co 2018 Red Hat, Inc.
+Copyright \(co 2022 Red Hat, Inc.

man/man1/ldclt.1

@@ -27,7 +27,7 @@ ldclt \- load test program for LDAP
 [\fI\-I <err number>\fR] [\fI\-T <total>\fR]
 [\fI\-r <low> \-R <high>\fR]
 [\fI\-f <filter>\fR] [\fI\-s <scope>\fR]
-[\fI\-S <slave>\fR] [\fI\-P<master port>\fR]
+[\fI\-S <consumer>\fR] [\fI\-P<supplier port>\fR]
 [\fI\-W <waitsec>\fR] [\fI\-Z <certfile>\fR]
 .PP
 .SH DESCRIPTION
@@ -77,7 +77,7 @@ SASL Option.
 Server port. Default 389.
 .TP
 .B \fB\-P\fR
-Master port (to check replication). Default 16000.
+Supplier port (to check replication). Default 16000.
 .TP
 .B \fB\-q\fR
 Quiet mode. See option \fB\-I\fR.
@@ -95,7 +95,7 @@ Range's high value.
 Scope. May be base, subtree or one. Default subtree.
 .TP
 .B \fB\-S\fR
-Slave to check.
+Consumer to check.
 .TP
 .B \fB\-t\fR
 LDAP operations timeout. Default 30 seconds.