kuser: Avoid conflicting macro definitions

This avoids a conflict introduced in:

commit 78b3507131482d0a5d2c0b362a0970a6d0e4025d
Author: Nicolas Williams <nico@twosigma.com>
Date:   Wed Dec 15 16:17:52 2021 -0600

    kinit: Use optimistic anon PKINIT armored FAST

    Now that we can optimistically try FAST w/ anon PINIT armor, we should
    do so in kinit whenever it makes sense.

diff --git a/kuser/kuser_locl.h b/kuser/kuser_locl.h
index 8218a6f096fd91ebc396078713f74ad22430ad84..b1a097a8d6f7aea7e6ea062944fbc46dda119937 100644 (file)
--- a/kuser/kuser_locl.h
+++ b/kuser/kuser_locl.h
@@ -97,11 +97,15 @@
 
 #ifdef LIBINTL
 #include <libintl.h>
+#undef N_
 #define N_(x,y) gettext(x)
+#undef NP_
 #define NP_(x,y) (x)
 #define getarg_i18n gettext
 #else
+#undef N_
 #define N_(x,y) (x)
+#undef NP_
 #define NP_(x,y) (x)
 #define getarg_i18n NULL
 #define bindtextdomain(package, localedir)

diff --git a/lib/krb5/krb5_locl.h b/lib/krb5/krb5_locl.h
index 75ca24b667674799e447bdcbca32acf1a030c0d9..1b037cdcba3b52a940eb898ac36697c8607251f5 100644 (file)
--- a/lib/krb5/krb5_locl.h
+++ b/lib/krb5/krb5_locl.h
@@ -88,8 +88,10 @@ struct mbuf;
 
 #ifdef LIBINTL
 #include <libintl.h>
+#undef N_
 #define N_(x,y) dgettext(HEIMDAL_TEXTDOMAIN, x)
 #else
+#undef N_
 #define N_(x,y) (x)
 #define bindtextdomain(package, localedir)
 #endif