From: Günther Deschner <gd@samba.org>
Date: Mon, 1 Nov 2004 16:18:14 +0000 (+0000)
Subject: r3436: Fix build with recent heimdal-versions (0.6.3) as pointed out by Luke
X-Git-Tag: samba-misc-tags/initial-v3-0-unstable~5653
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=00598877dfb7aab48d1b5d58b3a69ed2dd8a36a8;p=thirdparty%2Fsamba.git

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 385c1f02aa9..a45bf236107 100644
--- 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