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)

29 files changed, 179 insertions, 172 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.
diff --git a/src/kadmin/dbutil/kdb5_util.c b/src/kadmin/dbutil/kdb5_util.c
index 8cd0537..024edb1 100644
--- a/src/kadmin/dbutil/kdb5_util.c
+++ b/src/kadmin/dbutil/kdb5_util.c
@@ -337,7 +337,7 @@ int main(argc, argv)
         return exit_status;
 
     if (global_params.iprop_enabled == TRUE)
-        ulog_set_role(util_context, IPROP_MASTER);
+        ulog_set_role(util_context, IPROP_PRIMARY);
     else
         ulog_set_role(util_context, IPROP_NULL);
 
diff --git a/src/kadmin/server/ovsec_kadmd.c b/src/kadmin/server/ovsec_kadmd.c
index 6305e83..73d9bac 100644
--- a/src/kadmin/server/ovsec_kadmd.c
+++ b/src/kadmin/server/ovsec_kadmd.c
@@ -536,7 +536,7 @@ main(int argc, char *argv[])
         fail_to_start(ret, _("getting random seed"));
 
     if (params.iprop_enabled == TRUE) {
-        ulog_set_role(context, IPROP_MASTER);
+        ulog_set_role(context, IPROP_PRIMARY);
 
         ret = ulog_map(context, params.iprop_logfile, params.iprop_ulogsize);
         if (ret)
diff --git a/src/kprop/kpropd.c b/src/kprop/kpropd.c
index 5881a89..874ba13 100644
--- a/src/kprop/kpropd.c
+++ b/src/kprop/kpropd.c
@@ -158,7 +158,7 @@ static void load_database(krb5_context context, char *kdb_util,
 static void send_error(krb5_context context, int fd, krb5_error_code err_code,
                        char *err_text);
 static void recv_error(krb5_context context, krb5_data *inbuf);
-static unsigned int backoff_from_master(int *cnt);
+static unsigned int backoff_from_primary(int *cnt);
 static kadm5_ret_t kadm5_get_kiprop_host_srv_name(krb5_context context,
                                                   const char *realm_name,
                                                   char **host_service_name);
@@ -634,7 +634,7 @@ do_iprop()
     kadm5_ret_t retval;
     krb5_principal iprop_svc_principal;
     void *server_handle = NULL;
-    char *iprop_svc_princstr = NULL, *master_svc_princstr = NULL;
+    char *iprop_svc_princstr = NULL, *primary_svc_princstr = NULL;
     unsigned int pollin, backoff_time;
     int backoff_cnt = 0, reinit_cnt = 0;
     struct timeval iprop_start, iprop_end;
@@ -652,9 +652,9 @@ do_iprop()
     if (pollin == 0)
         pollin = 10;
 
-    if (master_svc_princstr == NULL) {
+    if (primary_svc_princstr == NULL) {
         retval = kadm5_get_kiprop_host_srv_name(kpropd_context, realm,
-                                                &master_svc_princstr);
+                                                &primary_svc_princstr);
         if (retval) {
             com_err(progname, retval,
                     _("%s: unable to get kiprop host based "
@@ -692,7 +692,7 @@ reinit:
     }
     retval = kadm5_init_with_skey(kpropd_context, iprop_svc_princstr,
                                   keytab_path,
-                                  master_svc_princstr,
+                                  primary_svc_princstr,
                                   &params,
                                   KADM5_STRUCT_VERSION,
                                   KADM5_API_VERSION_4,
@@ -711,8 +711,8 @@ reinit:
 
             com_err(progname, retval, _(
                         "while attempting to connect"
-                        " to master KDC ... retrying"));
-            backoff_time = backoff_from_master(&reinit_cnt);
+                        " to primary KDC ... retrying"));
+            backoff_time = backoff_from_primary(&reinit_cnt);
             if (debug) {
                 fprintf(stderr, _("Sleeping %d seconds to re-initialize "
                                   "kadm5 (RPC ERROR)\n"), backoff_time);
@@ -732,7 +732,7 @@ reinit:
             com_err(progname, retval,
                     _("while initializing %s interface, retrying"),
                     progname);
-            backoff_time = backoff_from_master(&reinit_cnt);
+            backoff_time = backoff_from_primary(&reinit_cnt);
             if (debug) {
                 fprintf(stderr, _("Sleeping %d seconds to re-initialize "
                                   "kadm5 (krb5kdc not running?)\n"),
@@ -762,7 +762,7 @@ reinit:
 
         /*
          * Get the most recent ulog entry sno + ts, which
-         * we package in the request to the master KDC
+         * we package in the request to the primary KDC
          */
         retval = ulog_get_last(kpropd_context, &mylast);
         if (retval) {
@@ -772,7 +772,7 @@ reinit:
 
         /*
          * Loop continuously on an iprop_get_updates_1(),
-         * so that we can keep probing the master for updates
+         * so that we can keep probing the primary for updates
          * or (if needed) do a full resync of the krb5 db.
          */
 
@@ -858,19 +858,19 @@ reinit:
 
             case UPDATE_ERROR:
                 if (debug)
-                    fprintf(stderr, _("Full resync error from master\n"));
+                    fprintf(stderr, _("Full resync error from primary\n"));
                 syslog(LOG_ERR, _(" Full resync, "
-                       "error returned from master KDC."));
+                       "error returned from primary KDC."));
                 goto error;
 
             default:
                 backoff_cnt = 0;
                 if (debug) {
                     fprintf(stderr,
-                            _("Full resync invalid result from master\n"));
+                            _("Full resync invalid result from primary\n"));
                 }
                 syslog(LOG_ERR, _("Full resync, "
-                                  "invalid return from master KDC."));
+                                  "invalid return from primary KDC."));
                 break;
             }
             break;
@@ -926,8 +926,9 @@ reinit:
 
         case UPDATE_ERROR:
             if (debug)
-                fprintf(stderr, _("get_updates error from master\n"));
-            syslog(LOG_ERR, _("get_updates, error returned from master KDC."));
+                fprintf(stderr, _("get_updates error from primary\n"));
+            syslog(LOG_ERR,
+                   _("get_updates, error returned from primary KDC."));
             goto error;
 
         case UPDATE_BUSY:
@@ -935,25 +936,28 @@ reinit:
              * Exponential backoff
              */
             if (debug)
-                fprintf(stderr, _("get_updates master busy; backoff\n"));
+                fprintf(stderr, _("get_updates primary busy; backoff\n"));
             backoff_cnt++;
             break;
 
         case UPDATE_NIL:
             /*
-             * Master-replica are in sync
+             * Primary-replica are in sync
              */
             if (debug)
-                fprintf(stderr, _("KDC is synchronized with master.\n"));
+                fprintf(stderr, _("KDC is synchronized with primary.\n"));
             backoff_cnt = 0;
             frrequested = 0;
             break;
 
         default:
             backoff_cnt = 0;
-            if (debug)
-                fprintf(stderr, _("get_updates invalid result from master\n"));
-            syslog(LOG_ERR, _("get_updates, invalid return from master KDC."));
+            if (debug) {
+                fprintf(stderr,
+                        _("get_updates invalid result from primary\n"));
+            }
+            syslog(LOG_ERR,
+                   _("get_updates, invalid return from primary KDC."));
             break;
         }
 
@@ -966,10 +970,10 @@ reinit:
          * UPDATE_BUSY signal
          */
         if (backoff_cnt > 0) {
-            backoff_time = backoff_from_master(&backoff_cnt);
+            backoff_time = backoff_from_primary(&backoff_cnt);
             if (debug) {
                 fprintf(stderr, _("Busy signal received "
-                                  "from master, backoff for %d secs\n"),
+                                  "from primary, backoff for %d secs\n"),
                         backoff_time);
             }
             sleep(backoff_time);
@@ -986,11 +990,11 @@ reinit:
 
 error:
     if (debug)
-        fprintf(stderr, _("ERROR returned by master, bailing\n"));
-    syslog(LOG_ERR, _("ERROR returned by master KDC, bailing.\n"));
+        fprintf(stderr, _("ERROR returned by primary, bailing\n"));
+    syslog(LOG_ERR, _("ERROR returned by primary KDC, bailing.\n"));
 done:
     free(iprop_svc_princstr);
-    free(master_svc_princstr);
+    free(primary_svc_princstr);
     krb5_free_default_realm(kpropd_context, def_realm);
     kadm5_destroy(server_handle);
     krb5_db_fini(kpropd_context);
@@ -1001,9 +1005,9 @@ done:
 }
 
 
-/* Do exponential backoff, since master KDC is BUSY or down. */
+/* Do exponential backoff, since primary KDC is BUSY or down. */
 static unsigned int
-backoff_from_master(int *cnt)
+backoff_from_primary(int *cnt)
 {
     unsigned int btime;
 
diff --git a/src/kprop/kproplog.c b/src/kprop/kproplog.c
index 865b0d6..0c025f0 100644
--- a/src/kprop/kproplog.c
+++ b/src/kprop/kproplog.c
@@ -5,7 +5,7 @@
  */
 
 /*
- * This module will parse the update logs on the master or replica servers.
+ * This module will parse the update logs on the primary or replica servers.
  */
 
 #include "k5-int.h"
diff --git a/src/lib/gssapi/krb5/iakerb.c b/src/lib/gssapi/krb5/iakerb.c
index 5da276b..b0d0ede 100644
--- a/src/lib/gssapi/krb5/iakerb.c
+++ b/src/lib/gssapi/krb5/iakerb.c
@@ -329,7 +329,7 @@ iakerb_acceptor_step(iakerb_ctx_id_t ctx,
     krb5_data request = empty_data(), reply = empty_data();
     krb5_data realm = empty_data();
     OM_uint32 tmp;
-    int tcp_only, use_master;
+    int tcp_only, use_primary;
     krb5_ui_4 kdc_code;
 
     output_token->length = 0;
@@ -355,9 +355,9 @@ iakerb_acceptor_step(iakerb_ctx_id_t ctx,
         goto cleanup;
 
     for (tcp_only = 0; tcp_only <= 1; tcp_only++) {
-        use_master = 0;
+        use_primary = 0;
         code = krb5_sendto_kdc(ctx->k5c, &request, &realm,
-                               &reply, &use_master, tcp_only);
+                               &reply, &use_primary, tcp_only);
         if (code == 0 && krb5_is_krb_error(&reply)) {
             krb5_error *error;
 
diff --git a/src/lib/kadm5/srv/server_init.c b/src/lib/kadm5/srv/server_init.c
index 87a7322..3adc4b5 100644
--- a/src/lib/kadm5/srv/server_init.c
+++ b/src/lib/kadm5/srv/server_init.c
@@ -425,7 +425,7 @@ kadm5_init_iprop(void *handle, char **db_args)
 
     iprop_h = handle;
     if (iprop_h->params.iprop_enabled) {
-        ulog_set_role(iprop_h->context, IPROP_MASTER);
+        ulog_set_role(iprop_h->context, IPROP_PRIMARY);
         retval = ulog_map(iprop_h->context, iprop_h->params.iprop_logfile,
                           iprop_h->params.iprop_ulogsize);
         if (retval)
diff --git a/src/lib/kdb/kdb5.c b/src/lib/kdb/kdb5.c
index a3fc0bf..47e9b31 100644
--- a/src/lib/kdb/kdb5.c
+++ b/src/lib/kdb/kdb5.c
@@ -104,13 +104,13 @@ kdb_unlock_list()
     k5_mutex_unlock(&db_lock);
 }
 
-/* Return true if the ulog is mapped in the master role. */
+/* Return true if the ulog is mapped in the primary role. */
 static inline krb5_boolean
 logging(krb5_context context)
 {
     kdb_log_context *log_ctx = context->kdblog_context;
 
-    return log_ctx != NULL && log_ctx->iproprole == IPROP_MASTER &&
+    return log_ctx != NULL && log_ctx->iproprole == IPROP_PRIMARY &&
         log_ctx->ulog != NULL;
 }
 
diff --git a/src/lib/krb5/krb/gc_via_tkt.c b/src/lib/krb5/krb/gc_via_tkt.c
index 5ac8a52..f8a256b 100644
--- a/src/lib/krb5/krb/gc_via_tkt.c
+++ b/src/lib/krb5/krb/gc_via_tkt.c
@@ -345,7 +345,7 @@ krb5_get_cred_via_tkt_ext(krb5_context context, krb5_creds *tkt,
     krb5_timestamp timestamp;
     krb5_int32 nonce;
     krb5_keyblock *subkey = NULL;
-    int tcp_only = 0, use_master = 0;
+    int tcp_only = 0, use_primary = 0;
     struct krb5int_fast_request_state *fast_state = NULL;
 
     request_data.data = NULL;
@@ -367,9 +367,9 @@ krb5_get_cred_via_tkt_ext(krb5_context context, krb5_creds *tkt,
         goto cleanup;
 
 send_again:
-    use_master = 0;
+    use_primary = 0;
     retval = krb5_sendto_kdc(context, &request_data, &in_cred->server->realm,
-                             &response_data, &use_master, tcp_only);
+                             &response_data, &use_primary, tcp_only);
     if (retval == 0) {
         if (krb5_is_krb_error(&response_data)) {
             if (!tcp_only) {
diff --git a/src/lib/krb5/krb/get_creds.c b/src/lib/krb5/krb/get_creds.c
index 32401bc..c35b8d6 100644
--- a/src/lib/krb5/krb/get_creds.c
+++ b/src/lib/krb5/krb/get_creds.c
@@ -1198,7 +1198,7 @@ krb5_tkt_creds_get(krb5_context context, krb5_tkt_creds_context ctx)
     krb5_data request = empty_data(), reply = empty_data();
     krb5_data realm = empty_data();
     unsigned int flags = 0;
-    int tcp_only = 0, use_master;
+    int tcp_only = 0, use_primary;
 
     for (;;) {
         /* Get the next request and realm.  Turn on TCP if necessary. */
@@ -1212,9 +1212,9 @@ krb5_tkt_creds_get(krb5_context context, krb5_tkt_creds_context ctx)
         krb5_free_data_contents(context, &reply);
 
         /* Send it to a KDC for the appropriate realm. */
-        use_master = 0;
+        use_primary = 0;
         code = krb5_sendto_kdc(context, &request, &realm,
-                               &reply, &use_master, tcp_only);
+                               &reply, &use_primary, tcp_only);
         if (code != 0)
             break;
 
diff --git a/src/lib/krb5/krb/get_etype_info.c b/src/lib/krb5/krb/get_etype_info.c
index 3a9589d..1a75b9f 100644
--- a/src/lib/krb5/krb/get_etype_info.c
+++ b/src/lib/krb5/krb/get_etype_info.c
@@ -96,7 +96,7 @@ krb5_get_etype_info(krb5_context context, krb5_principal principal,
     krb5_data reply = empty_data(), req = empty_data(), realm = empty_data();
     krb5_data salt = empty_data(), s2kparams = empty_data();
     unsigned int flags;
-    int master, tcp_only;
+    int primary, tcp_only;
     krb5_error_code ret;
 
     *enctype_out = ENCTYPE_NULL;
@@ -118,8 +118,8 @@ krb5_get_etype_info(krb5_context context, krb5_principal principal,
     /* Send the packet (possibly once with UDP and again with TCP). */
     tcp_only = 0;
     for (;;) {
-        master = 0;
-        ret = krb5_sendto_kdc(context, &req, &realm, &reply, &master,
+        primary = 0;
+        ret = krb5_sendto_kdc(context, &req, &realm, &reply, &primary,
                               tcp_only);
         if (ret)
             goto cleanup;
diff --git a/src/lib/krb5/krb/get_in_tkt.c b/src/lib/krb5/krb/get_in_tkt.c
index feab6fb..0245f11 100644
--- a/src/lib/krb5/krb/get_in_tkt.c
+++ b/src/lib/krb5/krb/get_in_tkt.c
@@ -549,14 +549,14 @@ krb5_init_creds_free(krb5_context context,
 
 krb5_error_code
 k5_init_creds_get(krb5_context context, krb5_init_creds_context ctx,
-                  int *use_master)
+                  int *use_primary)
 {
     krb5_error_code code;
     krb5_data request;
     krb5_data reply;
     krb5_data realm;
     unsigned int flags = 0;
-    int tcp_only = 0, master = *use_master;
+    int tcp_only = 0, primary = *use_primary;
 
     request.length = 0;
     request.data = NULL;
@@ -580,9 +580,9 @@ k5_init_creds_get(krb5_context context, krb5_init_creds_context ctx,
 
         krb5_free_data_contents(context, &reply);
 
-        master = *use_master;
+        primary = *use_primary;
         code = krb5_sendto_kdc(context, &request, &realm,
-                               &reply, &master, tcp_only);
+                               &reply, &primary, tcp_only);
         if (code != 0)
             break;
 
@@ -594,7 +594,7 @@ k5_init_creds_get(krb5_context context, krb5_init_creds_context ctx,
     krb5_free_data_contents(context, &reply);
     krb5_free_data_contents(context, &realm);
 
-    *use_master = master;
+    *use_primary = primary;
     return code;
 }
 
@@ -603,9 +603,9 @@ krb5_error_code KRB5_CALLCONV
 krb5_init_creds_get(krb5_context context,
                     krb5_init_creds_context ctx)
 {
-    int use_master = 0;
+    int use_primary = 0;
 
-    return k5_init_creds_get(context, ctx, &use_master);
+    return k5_init_creds_get(context, ctx, &use_primary);
 }
 
 krb5_error_code KRB5_CALLCONV
@@ -1903,7 +1903,7 @@ k5_get_init_creds(krb5_context context, krb5_creds *creds,
                   krb5_principal client, krb5_prompter_fct prompter,
                   void *prompter_data, krb5_deltat start_time,
                   const char *in_tkt_service, krb5_get_init_creds_opt *options,
-                  get_as_key_fn gak_fct, void *gak_data, int *use_master,
+                  get_as_key_fn gak_fct, void *gak_data, int *use_primary,
                   krb5_kdc_rep **as_reply)
 {
     krb5_error_code code;
@@ -1928,7 +1928,7 @@ k5_get_init_creds(krb5_context context, krb5_creds *creds,
             goto cleanup;
     }
 
-    code = k5_init_creds_get(context, ctx, use_master);
+    code = k5_init_creds_get(context, ctx, use_primary);
     if (code != 0)
         goto cleanup;
 
@@ -1954,7 +1954,7 @@ k5_identify_realm(krb5_context context, krb5_principal client,
     krb5_error_code ret;
     krb5_get_init_creds_opt *opts = NULL;
     krb5_init_creds_context ctx = NULL;
-    int use_master = 0;
+    int use_primary = 0;
 
     *client_out = NULL;
 
@@ -1974,7 +1974,7 @@ k5_identify_realm(krb5_context context, krb5_principal client,
     ctx->identify_realm = TRUE;
     ctx->subject_cert = subject_cert;
 
-    ret = k5_init_creds_get(context, ctx, &use_master);
+    ret = k5_init_creds_get(context, ctx, &use_primary);
     if (ret)
         goto cleanup;
 
diff --git a/src/lib/krb5/krb/gic_keytab.c b/src/lib/krb5/krb/gic_keytab.c
index b2b4ac9..d204570 100644
--- a/src/lib/krb5/krb/gic_keytab.c
+++ b/src/lib/krb5/krb/gic_keytab.c
@@ -238,7 +238,7 @@ static krb5_error_code
 get_init_creds_keytab(krb5_context context, krb5_creds *creds,
                       krb5_principal client, krb5_keytab keytab,
                       krb5_deltat start_time, const char *in_tkt_service,
-                      krb5_get_init_creds_opt *options, int *use_master)
+                      krb5_get_init_creds_opt *options, int *use_primary)
 {
     krb5_error_code ret;
     krb5_init_creds_context ctx = NULL;
@@ -258,7 +258,7 @@ get_init_creds_keytab(krb5_context context, krb5_creds *creds,
     if (ret != 0)
         goto cleanup;
 
-    ret = k5_init_creds_get(context, ctx, use_master);
+    ret = k5_init_creds_get(context, ctx, use_primary);
     if (ret != 0)
         goto cleanup;
 
@@ -282,7 +282,7 @@ krb5_get_init_creds_keytab(krb5_context context,
                            krb5_get_init_creds_opt *options)
 {
     krb5_error_code ret;
-    int use_master;
+    int use_primary;
     krb5_keytab keytab;
     struct errinfo errsave = EMPTY_ERRINFO;
 
@@ -293,12 +293,12 @@ krb5_get_init_creds_keytab(krb5_context context,
         keytab = arg_keytab;
     }
 
-    use_master = 0;
+    use_primary = 0;
 
     /* first try: get the requested tkt from any kdc */
 
     ret = get_init_creds_keytab(context, creds, client, keytab, start_time,
-                                in_tkt_service, options, &use_master);
+                                in_tkt_service, options, &use_primary);
 
     /* check for success */
 
@@ -310,27 +310,27 @@ krb5_get_init_creds_keytab(krb5_context context,
     if ((ret == KRB5_KDC_UNREACH) || (ret == KRB5_REALM_CANT_RESOLVE))
         goto cleanup;
 
-    /* if the reply did not come from the master kdc, try again with
-       the master kdc */
+    /* If the reply did not come from the primary kdc, try again with
+     * the primary kdc. */
 
-    if (!use_master) {
-        use_master = 1;
+    if (!use_primary) {
+        use_primary = 1;
 
         k5_save_ctx_error(context, ret, &errsave);
         ret = get_init_creds_keytab(context, creds, client, keytab,
                                     start_time, in_tkt_service, options,
-                                    &use_master);
+                                    &use_primary);
         if (ret == 0)
             goto cleanup;
 
-        /* If the master is unreachable, return the error from the replica we
+        /* If the primary is unreachable, return the error from the replica we
          * were able to contact. */
         if (ret == KRB5_KDC_UNREACH || ret == KRB5_REALM_CANT_RESOLVE ||
             ret == KRB5_REALM_UNKNOWN)
             ret = k5_restore_ctx_error(context, &errsave);
     }
 
-    /* at this point, we have a response from the master.  Since we don't
+    /* at this point, we have a response from the primary.  Since we don't
        do any prompting or changing for keytabs, that's it. */
 
 cleanup:
@@ -352,7 +352,7 @@ krb5_get_in_tkt_with_keytab(krb5_context context, krb5_flags options,
     char * server = NULL;
     krb5_keytab keytab;
     krb5_principal client_princ, server_princ;
-    int use_master = 0;
+    int use_primary = 0;
 
     retval = k5_populate_gic_opt(context, &opts, options, addrs, ktypes,
                                  pre_auth_types, creds);
@@ -373,7 +373,7 @@ krb5_get_in_tkt_with_keytab(krb5_context context, krb5_flags options,
     client_princ = creds->client;
     retval = k5_get_init_creds(context, creds, creds->client,
                                krb5_prompter_posix,  NULL, 0, server, opts,
-                               get_as_key_keytab, (void *)keytab, &use_master,
+                               get_as_key_keytab, (void *)keytab, &use_primary,
                                ret_as_reply);
     krb5_free_unparsed_name( context, server);
     if (retval) {
diff --git a/src/lib/krb5/krb/gic_pwd.c b/src/lib/krb5/krb/gic_pwd.c
index cdfdb48..9a3d598 100644
--- a/src/lib/krb5/krb/gic_pwd.c
+++ b/src/lib/krb5/krb/gic_pwd.c
@@ -182,7 +182,7 @@ krb5_get_init_creds_password(krb5_context context,
                              krb5_get_init_creds_opt *options)
 {
     krb5_error_code ret;
-    int use_master;
+    int use_primary;
     krb5_kdc_rep *as_reply;
     int tries;
     krb5_creds chpw_creds;
@@ -195,7 +195,7 @@ krb5_get_init_creds_password(krb5_context context,
     struct errinfo errsave = EMPTY_ERRINFO;
     char *message;
 
-    use_master = 0;
+    use_primary = 0;
     as_reply = NULL;
     memset(&chpw_creds, 0, sizeof(chpw_creds));
     memset(&gakpw, 0, sizeof(gakpw));
@@ -209,7 +209,7 @@ krb5_get_init_creds_password(krb5_context context,
 
     ret = k5_get_init_creds(context, creds, client, prompter, data, start_time,
                             in_tkt_service, options, krb5_get_as_key_password,
-                            &gakpw, &use_master, &as_reply);
+                            &gakpw, &use_primary, &as_reply);
 
     /* check for success */
 
@@ -223,12 +223,12 @@ krb5_get_init_creds_password(krb5_context context,
         ret == KRB5_LIBOS_PWDINTR || ret == KRB5_LIBOS_CANTREADPWD)
         goto cleanup;
 
-    /* if the reply did not come from the master kdc, try again with
-       the master kdc */
+    /* If the reply did not come from the primary kdc, try again with
+     * the primary kdc. */
 
-    if (!use_master) {
-        TRACE_GIC_PWD_MASTER(context);
-        use_master = 1;
+    if (!use_primary) {
+        TRACE_GIC_PWD_PRIMARY(context);
+        use_primary = 1;
 
         k5_save_ctx_error(context, ret, &errsave);
         if (as_reply) {
@@ -237,22 +237,22 @@ krb5_get_init_creds_password(krb5_context context,
         }
         ret = k5_get_init_creds(context, creds, client, prompter, data,
                                 start_time, in_tkt_service, options,
-                                krb5_get_as_key_password, &gakpw, &use_master,
+                                krb5_get_as_key_password, &gakpw, &use_primary,
                                 &as_reply);
 
         if (ret == 0)
             goto cleanup;
 
-        /* If the master is unreachable, return the error from the replica we
-         * were able to contact and reset the use_master flag. */
+        /* If the primary is unreachable, return the error from the replica we
+         * were able to contact and reset the use_primary flag. */
         if (ret == KRB5_KDC_UNREACH || ret == KRB5_REALM_CANT_RESOLVE ||
             ret == KRB5_REALM_UNKNOWN) {
             ret = k5_restore_ctx_error(context, &errsave);
-            use_master = 0;
+            use_primary = 0;
         }
     }
 
-    /* at this point, we have an error from the master.  if the error
+    /* at this point, we have an error from the primary.  if the error
        is not password expired, or if it is but there's no prompter,
        return this error */
 
@@ -277,7 +277,7 @@ krb5_get_init_creds_password(krb5_context context,
         goto cleanup;
     ret = k5_get_init_creds(context, &chpw_creds, client, prompter, data,
                             start_time, "kadmin/changepw", chpw_opts,
-                            krb5_get_as_key_password, &gakpw, &use_master,
+                            krb5_get_as_key_password, &gakpw, &use_primary,
                             NULL);
     if (ret)
         goto cleanup;
@@ -375,15 +375,14 @@ krb5_get_init_creds_password(krb5_context context,
     if (ret)
         goto cleanup;
 
-    /* the password change was successful.  Get an initial ticket
-       from the master.  this is the last try.  the return from this
-       is final.  */
+    /* The password change was successful.  Get an initial ticket from the
+     * primary.  This is the last try.  The return from this is final. */
 
     TRACE_GIC_PWD_CHANGED(context);
     gakpw.password = &pw0;
     ret = k5_get_init_creds(context, creds, client, prompter, data,
                             start_time, in_tkt_service, options,
-                            krb5_get_as_key_password, &gakpw, &use_master,
+                            krb5_get_as_key_password, &gakpw, &use_primary,
                             &as_reply);
     if (ret)
         goto cleanup;
@@ -433,7 +432,7 @@ krb5_get_in_tkt_with_password(krb5_context context, krb5_flags options,
     krb5_data pw;
     char * server;
     krb5_principal server_princ, client_princ;
-    int use_master = 0;
+    int use_primary = 0;
     krb5_get_init_creds_opt *opts = NULL;
 
     memset(&gakpw, 0, sizeof(gakpw));
@@ -454,7 +453,7 @@ krb5_get_in_tkt_with_password(krb5_context context, krb5_flags options,
     client_princ = creds->client;
     retval = k5_get_init_creds(context, creds, creds->client,
                                krb5_prompter_posix, NULL, 0, server, opts,
-                               krb5_get_as_key_password, &gakpw, &use_master,
+                               krb5_get_as_key_password, &gakpw, &use_primary,
                                ret_as_reply);
     krb5_free_unparsed_name( context, server);
     krb5_get_init_creds_opt_free(context, opts);
diff --git a/src/lib/krb5/krb/in_tkt_sky.c b/src/lib/krb5/krb/in_tkt_sky.c
index 4787fa0..55c951a 100644
--- a/src/lib/krb5/krb/in_tkt_sky.c
+++ b/src/lib/krb5/krb/in_tkt_sky.c
@@ -75,7 +75,7 @@ krb5_get_in_tkt_with_skey(krb5_context context, krb5_flags options,
     krb5_error_code retval;
     char *server;
     krb5_principal server_princ, client_princ;
-    int use_master = 0;
+    int use_primary = 0;
     krb5_get_init_creds_opt *opts = NULL;
 
     retval = k5_populate_gic_opt(context, &opts, options, addrs, ktypes,
@@ -105,7 +105,7 @@ krb5_get_in_tkt_with_skey(krb5_context context, krb5_flags options,
     client_princ = creds->client;
     retval = k5_get_init_creds(context, creds, creds->client,
                                krb5_prompter_posix, NULL, 0, server, opts,
-                               get_as_key_skey, (void *)key, &use_master,
+                               get_as_key_skey, (void *)key, &use_primary,
                                ret_as_reply);
     krb5_free_unparsed_name(context, server);
     if (retval)
diff --git a/src/lib/krb5/krb/int-proto.h b/src/lib/krb5/krb/int-proto.h
index 5211044..f2a2a3c 100644
--- a/src/lib/krb5/krb/int-proto.h
+++ b/src/lib/krb5/krb/int-proto.h
@@ -201,7 +201,7 @@ k5_ccselect_free_context(krb5_context context);
 
 krb5_error_code
 k5_init_creds_get(krb5_context context, krb5_init_creds_context ctx,
-                  int *use_master);
+                  int *use_primary);
 
 krb5_error_code
 k5_init_creds_current_time(krb5_context context, krb5_init_creds_context ctx,
@@ -291,7 +291,7 @@ k5_get_init_creds(krb5_context context, krb5_creds *creds,
                   krb5_principal client, krb5_prompter_fct prompter,
                   void *prompter_data, krb5_deltat start_time,
                   const char *in_tkt_service, krb5_get_init_creds_opt *options,
-                  get_as_key_fn gak, void *gak_data, int *master,
+                  get_as_key_fn gak, void *gak_data, int *primary,
                   krb5_kdc_rep **as_reply);
 
 /*
diff --git a/src/lib/krb5/os/locate_kdc.c b/src/lib/krb5/os/locate_kdc.c
index c32a967..7036c74 100644
--- a/src/lib/krb5/os/locate_kdc.c
+++ b/src/lib/krb5/os/locate_kdc.c
@@ -132,7 +132,7 @@ new_server_entry(struct serverlist *list)
     list->servers = newservers;
     entry = &newservers[list->nservers];
     memset(entry, 0, sizeof(*entry));
-    entry->master = -1;
+    entry->primary = -1;
     return entry;
 }
 
@@ -160,7 +160,7 @@ add_addr_to_list(struct serverlist *list, k5_transport transport, int family,
 static int
 add_host_to_list(struct serverlist *list, const char *hostname, int port,
                  k5_transport transport, int family, const char *uri_path,
-                 int master)
+                 int primary)
 {
     struct server_entry *entry;
 
@@ -178,7 +178,7 @@ add_host_to_list(struct serverlist *list, const char *hostname, int port,
             goto oom;
     }
     entry->port = port;
-    entry->master = master;
+    entry->primary = primary;
     list->nservers++;
     return 0;
 oom:
@@ -523,7 +523,7 @@ prof_locate_server(krb5_context context, const krb5_data *realm,
 
 /*
  * Parse the initial part of the URI, first confirming the scheme name.  Get
- * the transport, flags (indicating master status), and host.  The host is
+ * the transport, flags (indicating primary status), and host.  The host is
  * either an address or hostname with an optional port, or an HTTPS URL.
  * The format is krb5srv:flags:udp|tcp|kkdcp:host
  *
@@ -531,15 +531,15 @@ prof_locate_server(krb5_context context, const krb5_data *realm,
  */
 static void
 parse_uri_fields(const char *uri, k5_transport *transport_out,
-                 const char **host_out, int *master_out)
+                 const char **host_out, int *primary_out)
 
 {
     k5_transport transport;
-    int master = FALSE;
+    int primary = FALSE;
 
     *transport_out = 0;
     *host_out = NULL;
-    *master_out = -1;
+    *primary_out = -1;
 
     /* Confirm the scheme name. */
     if (strncasecmp(uri, "krb5srv", 7) != 0)
@@ -556,7 +556,7 @@ parse_uri_fields(const char *uri, k5_transport *transport_out,
     /* Check the flags field for supported flags. */
     for (; *uri != ':' && *uri != '\0'; uri++) {
         if (*uri == 'm' || *uri == 'M')
-            master = TRUE;
+            primary = TRUE;
     }
     if (*uri != ':')
         return;
@@ -583,7 +583,7 @@ parse_uri_fields(const char *uri, k5_transport *transport_out,
     /* The rest of the URI is the host (with optional port) or URI. */
     *host_out = uri + 1;
     *transport_out = transport;
-    *master_out = master;
+    *primary_out = primary;
 }
 
 /*
@@ -594,14 +594,14 @@ static krb5_error_code
 locate_uri(krb5_context context, const krb5_data *realm,
            const char *req_service, struct serverlist *serverlist,
            k5_transport req_transport, int default_port,
-           krb5_boolean master_only)
+           krb5_boolean primary_only)
 {
     krb5_error_code ret;
     k5_transport transport, host_trans;
     struct srv_dns_entry *answers, *entry;
     char *host;
     const char *host_field, *path;
-    int port, def_port, master;
+    int port, def_port, primary;
 
     ret = k5_make_uri_query(context, realm, req_service, &answers);
     if (ret || answers == NULL)
@@ -611,7 +611,7 @@ locate_uri(krb5_context context, const krb5_data *realm,
         def_port = default_port;
         path = NULL;
 
-        parse_uri_fields(entry->host, &transport, &host_field, &master);
+        parse_uri_fields(entry->host, &transport, &host_field, &primary);
         if (host_field == NULL)
             continue;
 
@@ -639,7 +639,7 @@ locate_uri(krb5_context context, const krb5_data *realm,
         }
 
         ret = add_host_to_list(serverlist, host, port, transport, AF_UNSPEC,
-                               path, master);
+                               path, primary);
         free(host);
         if (ret)
             break;
@@ -657,14 +657,14 @@ dns_locate_server_uri(krb5_context context, const krb5_data *realm,
     krb5_error_code ret;
     char *svcname;
     int def_port;
-    krb5_boolean find_master = FALSE;
+    krb5_boolean find_primary = FALSE;
 
     if (!_krb5_use_dns_kdc(context) || !use_dns_uri(context))
         return 0;
 
     switch (svc) {
     case locate_service_master_kdc:
-        find_master = TRUE;
+        find_primary = TRUE;
         /* Fall through */
     case locate_service_kdc:
         svcname = "_kerberos";
@@ -683,7 +683,7 @@ dns_locate_server_uri(krb5_context context, const krb5_data *realm,
     }
 
     ret = locate_uri(context, realm, svcname, serverlist, transport, def_port,
-                     find_master);
+                     find_primary);
 
     if (serverlist->nservers == 0)
         TRACE_DNS_URI_NOTFOUND(context);
@@ -819,24 +819,24 @@ k5_locate_server(krb5_context context, const krb5_data *realm,
 
 krb5_error_code
 k5_locate_kdc(krb5_context context, const krb5_data *realm,
-              struct serverlist *serverlist, krb5_boolean get_masters,
+              struct serverlist *serverlist, krb5_boolean get_primaries,
               krb5_boolean no_udp)
 {
     enum locate_service_type stype;
 
-    stype = get_masters ? locate_service_master_kdc : locate_service_kdc;
+    stype = get_primaries ? locate_service_master_kdc : locate_service_kdc;
     return k5_locate_server(context, realm, serverlist, stype, no_udp);
 }
 
 krb5_boolean
-k5_kdc_is_master(krb5_context context, const krb5_data *realm,
-                 struct server_entry *server)
+k5_kdc_is_primary(krb5_context context, const krb5_data *realm,
+                  struct server_entry *server)
 {
     struct serverlist list;
     krb5_boolean found;
 
-    if (server->master != -1)
-        return server->master;
+    if (server->primary != -1)
+        return server->primary;
 
     if (locate_server(context, realm, &list, locate_service_master_kdc,
                       server->transport) != 0)
diff --git a/src/lib/krb5/os/os-proto.h b/src/lib/krb5/os/os-proto.h
index f1aa60a..7d5e797 100644
--- a/src/lib/krb5/os/os-proto.h
+++ b/src/lib/krb5/os/os-proto.h
@@ -58,7 +58,7 @@ struct server_entry {
     k5_transport transport;     /* May be 0 for UDP/TCP if hostname set */
     char *uri_path;             /* Used only if transport is HTTPS */
     int family;                 /* May be 0 (aka AF_UNSPEC) if hostname set */
-    int master;                 /* True, false, or -1 for unknown. */
+    int primary;                /* True, false, or -1 for unknown. */
     size_t addrlen;
     struct sockaddr_storage addr;
 };
@@ -124,10 +124,10 @@ krb5_error_code k5_locate_server(krb5_context, const krb5_data *realm,
 
 krb5_error_code k5_locate_kdc(krb5_context context, const krb5_data *realm,
                               struct serverlist *serverlist,
-                              krb5_boolean get_masters, krb5_boolean no_udp);
+                              krb5_boolean get_primaries, krb5_boolean no_udp);
 
-krb5_boolean k5_kdc_is_master(krb5_context context, const krb5_data *realm,
-                              struct server_entry *server);
+krb5_boolean k5_kdc_is_primary(krb5_context context, const krb5_data *realm,
+                               struct server_entry *server);
 
 void k5_free_serverlist(struct serverlist *);
 
diff --git a/src/lib/krb5/os/sendto_kdc.c b/src/lib/krb5/os/sendto_kdc.c
index 82523c5..0eedec1 100644
--- a/src/lib/krb5/os/sendto_kdc.c
+++ b/src/lib/krb5/os/sendto_kdc.c
@@ -436,7 +436,7 @@ krb5_set_kdc_recv_hook(krb5_context context, krb5_post_recv_fn recv_hook,
 
 krb5_error_code
 krb5_sendto_kdc(krb5_context context, const krb5_data *message,
-                const krb5_data *realm, krb5_data *reply_out, int *use_master,
+                const krb5_data *realm, krb5_data *reply_out, int *use_primary,
                 int no_udp)
 {
     krb5_error_code retval, oldret, err;
@@ -460,7 +460,7 @@ krb5_sendto_kdc(krb5_context context, const krb5_data *message,
      * should probably be returned as well.
      */
 
-    TRACE_SENDTO_KDC(context, message->length, realm, *use_master, no_udp);
+    TRACE_SENDTO_KDC(context, message->length, realm, *use_primary, no_udp);
 
     if (!no_udp && context->udp_pref_limit < 0) {
         int tmp;
@@ -486,7 +486,7 @@ krb5_sendto_kdc(krb5_context context, const krb5_data *message,
     else
         strategy = UDP_LAST;
 
-    retval = k5_locate_kdc(context, realm, &servers, *use_master, no_udp);
+    retval = k5_locate_kdc(context, realm, &servers, *use_primary, no_udp);
     if (retval)
         return retval;
 
@@ -527,10 +527,13 @@ krb5_sendto_kdc(krb5_context context, const krb5_data *message,
                                         retval, realm, message, &reply,
                                         &hook_reply);
         if (oldret && !retval) {
-            /* The hook must set a reply if it overrides an error from
-             * k5_sendto().  Treat this reply as coming from the master KDC. */
+            /*
+             * The hook must set a reply if it overrides an error from
+             * k5_sendto().  Treat this reply as coming from the primary
+             * KDC.
+             */
             assert(hook_reply != NULL);
-            *use_master = 1;
+            *use_primary = 1;
         }
     }
     if (retval)
@@ -544,12 +547,12 @@ krb5_sendto_kdc(krb5_context context, const krb5_data *message,
         reply = empty_data();
     }
 
-    /* Set use_master to 1 if we ended up talking to a master when we didn't
+    /* Set use_primary to 1 if we ended up talking to a primary when we didn't
      * explicitly request to. */
-    if (*use_master == 0) {
-        *use_master = k5_kdc_is_master(context, realm,
-                                       &servers.servers[server_used]);
-        TRACE_SENDTO_KDC_MASTER(context, *use_master);
+    if (*use_primary == 0) {
+        *use_primary = k5_kdc_is_primary(context, realm,
+                                         &servers.servers[server_used]);
+        TRACE_SENDTO_KDC_PRIMARY(context, *use_primary);
     }
 
 cleanup:
diff --git a/src/lib/krb5/os/t_locate_kdc.c b/src/lib/krb5/os/t_locate_kdc.c
index 7a53c84..6da28eb 100644
--- a/src/lib/krb5/os/t_locate_kdc.c
+++ b/src/lib/krb5/os/t_locate_kdc.c
@@ -60,7 +60,7 @@ print_addrs (void)
         if (entry->hostname != NULL) {
             printf("%d: h:%s t:%s p:%d m:%d P:%s\n", (int)i,
                    entry->hostname, ttypename(entry->transport),
-                   entry->port, entry->master,
+                   entry->port, entry->primary,
                    entry->uri_path ? entry->uri_path : "");
             continue;
         }
@@ -84,7 +84,7 @@ main (int argc, char *argv[])
     krb5_data realm;
     krb5_context ctx;
     krb5_error_code err;
-    int master = 0;
+    int primary = 0;
 
     p = strrchr (argv[0], '/');
     if (p)
@@ -103,7 +103,7 @@ main (int argc, char *argv[])
         else if (!strcmp (argv[1], "-d"))
             how = LOOKUP_DNS;
         else if (!strcmp (argv[1], "-m"))
-            master = 1;
+            primary = 1;
         else
             goto usage;
         realmname = argv[2];
@@ -131,7 +131,7 @@ main (int argc, char *argv[])
         break;
 
     case LOOKUP_WHATEVER:
-        err = k5_locate_kdc(ctx, &realm, &sl, master, FALSE);
+        err = k5_locate_kdc(ctx, &realm, &sl, primary, FALSE);
         break;
     }
     if (err) kfatal (err);
diff --git a/src/lib/krb5/os/t_std_conf.c b/src/lib/krb5/os/t_std_conf.c
index 6f221ae..7052524 100644
--- a/src/lib/krb5/os/t_std_conf.c
+++ b/src/lib/krb5/os/t_std_conf.c
@@ -76,13 +76,13 @@ test_locate_kdc(krb5_context ctx, char *realm)
 {
     struct serverlist servers;
     size_t i;
-    int get_masters = FALSE;
+    int get_primaries = FALSE;
     krb5_data rlm;
     krb5_error_code retval;
 
     rlm.data = realm;
     rlm.length = strlen(realm);
-    retval = k5_locate_kdc(ctx, &rlm, &servers, get_masters, FALSE);
+    retval = k5_locate_kdc(ctx, &rlm, &servers, get_primaries, FALSE);
     if (retval) {
         com_err("krb5_locate_kdc", retval, 0);
         return;
diff --git a/src/tests/dejagnu/krb-standalone/kprop.exp b/src/tests/dejagnu/krb-standalone/kprop.exp
index f71ee86..661e3fd 100644
--- a/src/tests/dejagnu/krb-standalone/kprop.exp
+++ b/src/tests/dejagnu/krb-standalone/kprop.exp
@@ -88,7 +88,7 @@ proc doit { } {
 	return
     }
 
-    # Dump master database.
+    # Dump primary database.
     envstack_push
     setup_kerberos_env kdc
     spawn $KDB5_UTIL dump $tmppwd/replica_datatrans
diff --git a/src/tests/etinfo.c b/src/tests/etinfo.c
index f8f7d75..6b8a4f3 100644
--- a/src/tests/etinfo.c
+++ b/src/tests/etinfo.c
@@ -121,7 +121,7 @@ main(int argc, char **argv)
     krb5_pa_data **padata;
     krb5_preauthtype pa_type = KRB5_PADATA_NONE;
     unsigned int flags;
-    int master = 0;
+    int primary = 0;
 
     if (argc < 2 || argc > 3) {
         fprintf(stderr, "Usage: %s princname [patype]\n", argv[0]);
@@ -140,7 +140,7 @@ main(int argc, char **argv)
     reply = empty_data();
     check(krb5_init_creds_step(ctx, icc, &reply, &request, &realm, &flags));
     assert(flags == KRB5_INIT_CREDS_STEP_FLAG_CONTINUE);
-    check(krb5_sendto_kdc(ctx, &request, &realm, &reply, &master, 0));
+    check(krb5_sendto_kdc(ctx, &request, &realm, &reply, &primary, 0));
 
     if (decode_krb5_error(&reply, &error) == 0) {
         decode_krb5_padata_sequence(&error->e_data, &padata);
diff --git a/src/tests/icinterleave.c b/src/tests/icinterleave.c
index a1bdd35..bcc87c7 100644
--- a/src/tests/icinterleave.c
+++ b/src/tests/icinterleave.c
@@ -63,7 +63,7 @@ main(int argc, char **argv)
     krb5_init_creds_context *iccs;
     krb5_data req, *reps, realm;
     krb5_boolean any_left;
-    int i, nclients, master;
+    int i, nclients, primary;
     unsigned int flags;
 
     if (argc < 3) {
@@ -111,9 +111,9 @@ main(int argc, char **argv)
                 continue;
             }
 
-            master = 0;
+            primary = 0;
             krb5_free_data_contents(ctx, &reps[i]);
-            check(krb5_sendto_kdc(ctx, &req, &realm, &reps[i], &master, 0));
+            check(krb5_sendto_kdc(ctx, &req, &realm, &reps[i], &primary, 0));
             krb5_free_data_contents(ctx, &req);
             krb5_free_data_contents(ctx, &realm);
         }
diff --git a/src/tests/t_iprop.py b/src/tests/t_iprop.py
index 3bb0fd2..09ec249 100755
--- a/src/tests/t_iprop.py
+++ b/src/tests/t_iprop.py
@@ -57,7 +57,8 @@ def wait_for_prop(kpropd, full_expected, expected_old, expected_new):
             fail('iprop_get_updates failed')
         if 'permission denied' in line:
             fail('kadmind denied update')
-        if 'error from master' in line or 'error returned from master' in line:
+        if ('error from primary' in line or
+            'error returned from primary' in line):
             fail('kadmind reported error')
         if 'invalid return' in line:
             fail('kadmind returned invalid result')
@@ -117,11 +118,11 @@ def check_ulog(num, first, last, entries, env=None):
             if eprinc != None:
                 fail('Expected princ %s in update entry %d' % (eprinc, ser))
 
-# replica1 will receive updates from master, and replica2 will receive
-# updates from replica1.  Because of the awkward way iprop and kprop
-# port configuration currently works, we need separate config files
-# for the replica and master sides of replica1, but they use the same
-# DB and ulog file.
+# replica1 will receive updates from primary, and replica2 will
+# receive updates from replica1.  Because of the awkward way iprop and
+# kprop port configuration currently works, we need separate config
+# files for the replica and primary sides of replica1, but they use
+# the same DB and ulog file.
 conf = {'realms': {'$realm': {'iprop_enable': 'true',
                               'iprop_logfile': '$testdir/db.ulog'}}}
 conf_rep1 = {'realms': {'$realm': {'iprop_replica_poll': '600',
@@ -199,12 +200,12 @@ for realm in multidb_realms(kdc_conf=conf, create_user=False,
     realm.run([kdb5_util, '-r', realm.realm, 'load', dumpfile], replica3)
     realm.run([kdb5_util, 'load', dumpfile], replica4)
 
-    # Reinitialize the master ulog so we know exactly what to expect in
-    # it.
+    # Reinitialize the primary ulog so we know exactly what to expect
+    # in it.
     realm.run([kproplog, '-R'])
     check_ulog(1, 1, 1, [None])
 
-    # Make some changes to the master DB.
+    # Make some changes to the primary DB.
     realm.addprinc(pr1)
     realm.addprinc(pr3)
     realm.addprinc(pr2)
@@ -212,13 +213,13 @@ for realm in multidb_realms(kdc_conf=conf, create_user=False,
     realm.run([kadminl, 'modprinc', '+allow_tix', pr2])
     check_ulog(6, 1, 6, [None, pr1, pr3, pr2, pr2, pr2])
 
-    # Start kpropd for replica1 and get a full dump from master.
+    # Start kpropd for replica1 and get a full dump from primary.
     mark('propagate M->1 full')
     kpropd1 = realm.start_kpropd(replica1, ['-d'])
     wait_for_prop(kpropd1, True, 1, 6)
     out = realm.run([kadminl, 'listprincs'], env=replica1)
     if pr1 not in out or pr2 not in out or pr3 not in out:
-        fail('replica1 does not have all principals from master')
+        fail('replica1 does not have all principals from primary')
     check_ulog(1, 6, 6, [None], replica1)
 
     # Make a change and check that it propagates incrementally.
@@ -289,7 +290,7 @@ for realm in multidb_realms(kdc_conf=conf, create_user=False,
     stop_daemon(kpropd4)
 
     # Start kpropd for replica2.  The -A option isn't needed since
-    # we're talking to the same host as master (we specify it anyway
+    # we're talking to the same host as primary (we specify it anyway
     # to exercise the code), but replica2 defines iprop_port to $port8
     # so it will talk to replica1.  Get a full dump from replica1.
     mark('propagate 1->2 full')
@@ -320,7 +321,7 @@ for realm in multidb_realms(kdc_conf=conf, create_user=False,
     realm.run([kadminl, 'getprinc', pr1], env=replica2,
               expected_msg='Maximum renewable life: 0 days 22:00:00\n')
 
-    # Reset the ulog on replica1 to force a full resync from master.
+    # Reset the ulog on replica1 to force a full resync from primary.
     # The resync will use the old dump file and then propagate
     # changes.  replica2 should still be in sync with replica1 after
     # the resync, so make sure it doesn't take a full resync.
@@ -395,7 +396,7 @@ for realm in multidb_realms(kdc_conf=conf, create_user=False,
     realm.run([kadminl, 'getpol', 'testpol'], env=replica2, expected_code=1,
               expected_msg='Policy does not exist')
 
-    # Modify a principal on the master and test that it propagates
+    # Modify a principal on the primary and test that it propagates
     # incrementally.
     mark('propagate M->1->2 incremental (after policy changes)')
     realm.run([kadminl, 'modprinc', '-maxlife', '10 minutes', pr1])
@@ -446,7 +447,7 @@ for realm in multidb_realms(kdc_conf=conf, create_user=False,
 
     pr1 = renpr
 
-    # Reset the ulog on the master to force a full resync.
+    # Reset the ulog on the primary to force a full resync.
     mark('propagate M->1->2 full (ulog reset)')
     realm.run([kproplog, '-R'])
     check_ulog(1, 1, 1, [None])
@@ -469,7 +470,7 @@ for realm in multidb_realms(kdc_conf=conf, create_user=False,
         fail('Expected synchronized from kpropd -t')
     check_ulog(1, 1, 1, [None], replica1)
 
-    # Make a change on the master and fetch it incrementally.
+    # Make a change on the primary and fetch it incrementally.
     realm.run([kadminl, 'modprinc', '-maxlife', '5 minutes', pr1])
     check_ulog(2, 1, 2, [None, pr1])
     out = realm.run_kpropd_once(replica1, ['-d'])
diff --git a/src/tests/t_kprop.py b/src/tests/t_kprop.py
index c33e4fe..d96f7c5 100755
--- a/src/tests/t_kprop.py
+++ b/src/tests/t_kprop.py
@@ -32,7 +32,7 @@ for realm in multipass_realms(create_user=False):
     realm.run([kdb5_util, 'load', dumpfile], replica)
     realm.run([kdb5_util, 'stash', '-P', 'master'], replica)
 
-    # Make some changes to the master db.
+    # Make some changes to the primary db.
     realm.addprinc('wakawaka')
 
     # Start kpropd.
@@ -67,7 +67,7 @@ realm.run([kdb5_util, 'dump', dumpfile])
 realm.run([kdb5_util, '-r', realm.realm, 'load', dumpfile], replica2)
 realm.run([kdb5_util, 'load', dumpfile], replica3)
 
-# Make some changes to the master db.
+# Make some changes to the primary db.
 realm.addprinc('wakawaka')
 
 # Test override of default_realm with -r realm argument.
diff --git a/src/windows/include/loadfuncs-krb5.h b/src/windows/include/loadfuncs-krb5.h
index 39a3504..b6e6a0c 100644
--- a/src/windows/include/loadfuncs-krb5.h
+++ b/src/windows/include/loadfuncs-krb5.h
@@ -1728,7 +1728,7 @@ TYPEDEF_FUNC(
     krb5_locate_kdc,
     (krb5_context context, const krb5_data *realm,
       struct addrlist *addrlist,
-      int get_masters, int socktype, int family)
+      int get_primaries, int socktype, int family)
     );
 
 TYPEDEF_FUNC(