r3436: Fix build with recent heimdal-versions (0.6.3) as pointed out by Luke

Mewburn <lukem@NetBSD.org> and close Bugzilla #1661.

Leaving the old define for KRB5_KPASSWD_VERS_SETPW (added by Antti
Andreimann) as fallback when the library does not provide one.

Guenther

diff --git a/source/libads/krb5_setpw.c b/source/libads/krb5_setpw.c
index 385c1f02aa9c02285b1f000dba98cb77a4effa9f..a45bf23610746e4c5fb863dbee84cb27532982b1 100644 (file)
--- a/source/libads/krb5_setpw.c
+++ b/source/libads/krb5_setpw.c
@@ -25,7 +25,9 @@
 
 #define DEFAULT_KPASSWD_PORT   464
 #define KRB5_KPASSWD_VERS_CHANGEPW             1
+#ifndef KRB5_KPASSWD_VERS_SETPW
 #define KRB5_KPASSWD_VERS_SETPW                        2
+#endif
 #define KRB5_KPASSWD_VERS_SETPW_MS             0xff80
 #define KRB5_KPASSWD_ACCESSDENIED              5
 #define KRB5_KPASSWD_BAD_VERSION               6