Rename kname_unparse to avoid conflict with modern krb5. Fixes build on

9.3.

diff --git a/include/moira.h b/include/moira.h
index 658b67f596c0c20ec1698f408caf58711131bd90..9e916011384c667ed45327ef46df70f966d357cd 100644 (file)
--- a/include/moira.h
+++ b/include/moira.h
@@ -111,7 +111,7 @@ void hash_step(struct hash *h, void (*callback)(int, void *, void *),
 void hash_destroy(struct hash *h);
 
 /* prototypes from kname_unparse.c */
-char *kname_unparse(char *p, char *i, char *r);
+char *mr_kname_unparse(char *p, char *i, char *r);
 
 /* prototypes from nfsparttype.c */
 char *parse_filesys_type(char *fs_type_name);

diff --git a/lib/kname_unparse.c b/lib/kname_unparse.c
index 89be015dafddff3b92292a1cf3c5bbaebda9fca8..90ee2880be4183153d7d8050cbba5746fe5fff07 100644 (file)
--- a/lib/kname_unparse.c
+++ b/lib/kname_unparse.c
@@ -23,7 +23,7 @@ RCSID("$Header$");
  * to a static buffer, or NULL on error.
  */
 
-char *kname_unparse(char *p, char *i, char *r)
+char *mr_kname_unparse(char *p, char *i, char *r)
 {
   static char name[MAX_K_NAME_SZ];
   char *s;

diff --git a/server/mr_sauth.c b/server/mr_sauth.c
index 52431de14caffeaea99655e48f9c6c61cef48c6f..9f6a4d031be4b328bb3f6e055579a67807b6bb6e 100644 (file)
--- a/server/mr_sauth.c
+++ b/server/mr_sauth.c
@@ -79,7 +79,7 @@ void do_auth(client *cl)
          com_err(whoami, 0,
                  "Authenticator replay from %s using authenticator for %s",
                  inet_ntoa(cl->haddr.sin_addr),
-                 kname_unparse(ad.pname, ad.pinst, ad.prealm));
+                 mr_kname_unparse(ad.pname, ad.pinst, ad.prealm));
          com_err(whoami, KE_RD_AP_REPEAT, " (authentication failed)");
          client_reply(cl, KE_RD_AP_REPEAT);
          return;
@@ -107,7 +107,7 @@ void do_auth(client *cl)
        rc = rc->next;
     }
 
-  status = set_client(cl, kname_unparse(ad.pname, ad.pinst, ad.prealm),
+  status = set_client(cl, mr_kname_unparse(ad.pname, ad.pinst, ad.prealm),
                      ad.pname, ad.pinst, ad.prealm);
 
   strncpy(cl->entity, cl->req.mr_argv[1], sizeof(cl->entity) - 1);