Use the term "primary KDC" in source and docs

Where it does not affect program behavior, use the term "primary KDC".
This commit does not change any profile variables, DNS labels,
pathnames, or externally visible identifiers, nor does it change the
term "master key".

ticket: 8921 (new)

3 files changed, 8 insertions, 8 deletions

diff --git a/src/include/iprop_hdr.h b/src/include/iprop_hdr.h
index 435ed7e..d214549 100644
--- a/src/include/iprop_hdr.h
+++ b/src/include/iprop_hdr.h
@@ -31,7 +31,7 @@ extern "C" {
 
 enum iprop_role {
     IPROP_NULL = 0,
-    IPROP_MASTER = 1,
+    IPROP_PRIMARY = 1,
     IPROP_REPLICA = 2
 };
 typedef enum iprop_role iprop_role;
diff --git a/src/include/k5-trace.h b/src/include/k5-trace.h
index 79ed740..b3e039d 100644
--- a/src/include/k5-trace.h
+++ b/src/include/k5-trace.h
@@ -200,8 +200,8 @@ void krb5int_trace(krb5_context context, const char *fmt, ...);
     TRACE(c, "Attempting password change; {int} tries remaining", tries)
 #define TRACE_GIC_PWD_EXPIRED(c)                                \
     TRACE(c, "Principal expired; getting changepw ticket")
-#define TRACE_GIC_PWD_MASTER(c)                         \
-    TRACE(c, "Retrying AS request with master KDC")
+#define TRACE_GIC_PWD_PRIMARY(c)                        \
+    TRACE(c, "Retrying AS request with primary KDC")
 
 #define TRACE_GSS_CLIENT_KEYTAB_FAIL(c, ret)                            \
     TRACE(c, "Unable to resolve default client keytab: {kerr}", ret)
@@ -379,13 +379,13 @@ void krb5int_trace(krb5_context context, const char *fmt, ...);
 #define TRACE_SENDTO_KDC_ERROR_SET_MESSAGE(c, raddr, err)               \
     TRACE(c, "Error preparing message to send to {raddr}: {errno}",     \
           raddr, err)
-#define TRACE_SENDTO_KDC(c, len, rlm, master, tcp)                     \
+#define TRACE_SENDTO_KDC(c, len, rlm, primary, tcp)                     \
     TRACE(c, "Sending request ({int} bytes) to {data}{str}{str}", len,  \
-          rlm, (master) ? " (master)" : "", (tcp) ? " (tcp only)" : "")
+          rlm, (primary) ? " (primary)" : "", (tcp) ? " (tcp only)" : "")
 #define TRACE_SENDTO_KDC_K5TLS_LOAD_ERROR(c, ret)       \
     TRACE(c, "Error loading k5tls module: {kerr}", ret)
-#define TRACE_SENDTO_KDC_MASTER(c, master)                              \
-    TRACE(c, "Response was{str} from master KDC", (master) ? "" : " not")
+#define TRACE_SENDTO_KDC_PRIMARY(c, primary)                            \
+    TRACE(c, "Response was{str} from primary KDC", (primary) ? "" : " not")
 #define TRACE_SENDTO_KDC_RESOLVING(c, hostname)         \
     TRACE(c, "Resolving hostname {str}", hostname)
 #define TRACE_SENDTO_KDC_RESPONSE(c, len, raddr)                        \
diff --git a/src/include/kdb.h b/src/include/kdb.h
index ff47716..f6cbb47 100644
--- a/src/include/kdb.h
+++ b/src/include/kdb.h
@@ -960,7 +960,7 @@ typedef struct _kdb_vftabl {
      *
      * If db_args contains the value "temporary", the module should create an
      * exclusively locked side copy of the database suitable for loading in a
-     * propagation from master to replica.  This side copy will later be
+     * propagation from primary to replica.  This side copy will later be
      * promoted with promote_db, allowing complete updates of the DB with no
      * loss in read availability.  If the module cannot comply with this
      * architecture, it should return an error.