* configure.ac,src/krb5-auth-dialog.c: just test for the definitions of the

	flags directly.

git-svn-id: http://svn.gnome.org/svn/krb5-auth-dialog/trunk@43 517b70f8-ed25-0410-8bf6-f5db08f7b76e

diff --git a/ChangeLog b/ChangeLog
index 26ede3a0e5427f5a413937db208d8ed18aed627e..341e0191ac4ad032c287c1d4295b416d0b5efdf0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-02  Nalin Dahyabhai <nalin@redhat.com>
+
+       * configure.ac,src/krb5-auth-dialog.c: just test for the definitions
+       of the flags directly.
+
 2005-11-02  Nalin Dahyabhai <nalin@redhat.com>
 
        * etpo/lexer.l,etpo/grammar.y: silence a couple of compiler warnings

diff --git a/configure.ac b/configure.ac
index 52497b44bd48442b88edf060be2c4c7d3df99edc..242aa6c3cb94b0f8a3822b129c0569ad20ea51cb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -44,8 +44,6 @@ AC_CHECK_MEMBERS(krb5_creds.flags.b.forwardable,,,[#include <krb5.h>])
 AC_CHECK_MEMBERS(krb5_creds.flags.b.renewable,,,[#include <krb5.h>])
 AC_CHECK_MEMBERS(krb5_creds.flags.b.proxiable,,,[#include <krb5.h>])
 AC_CHECK_MEMBERS(krb5_creds.flags,,,[#include <krb5.h>])
-AC_CHECK_DECLS([KDC_OPT_FORWARDABLE,KDC_OPT_RENEWABLE,KDC_OPT_PROXIABLE])
-AC_CHECK_DECLS([TKT_FLG_FORWARDABLE,TKT_FLG_RENEWABLE,TKT_FLG_PROXIABLE])
 AC_MSG_CHECKING(if a krb5_principal->realm is a char*)
 AC_COMPILE_IFELSE([
 $ac_includes_default

diff --git a/src/krb5-auth-dialog.c b/src/krb5-auth-dialog.c
index 8852cc718d5c336dbaab91baecafc28d8283eb09..1b1b6f6715808fdf704e758b541689e7b6d97ba3 100644 (file)
--- a/src/krb5-auth-dialog.c
+++ b/src/krb5-auth-dialog.c
@@ -271,7 +271,7 @@ credentials_expiring (gpointer *data)
        return TRUE;
 }
 
-#if defined(HAVE_KRB5_CREDS_TICKET_FLAGS) && defined(HAVE_DECL_TKT_FLG_FORWARDABLE)
+#if defined(HAVE_KRB5_CREDS_TICKET_FLAGS) && defined(TKT_FLG_FORWARDABLE)
 static int
 get_cred_forwardable(krb5_creds *creds)
 {
@@ -283,7 +283,7 @@ get_cred_forwardable(krb5_creds *creds)
 {
        return creds->flags.b.forwardable;
 }
-#elif defined(HAVE_KRB5_CREDS_FLAGS) && defined(HAVE_DECL_KDC_OPT_FORWARDABLE)
+#elif defined(HAVE_KRB5_CREDS_FLAGS) && defined(KDC_OPT_FORWARDABLE)
 static int
 get_cred_forwardable(krb5_creds *creds)
 {
@@ -291,7 +291,7 @@ get_cred_forwardable(krb5_creds *creds)
 }
 #endif
 
-#if defined(HAVE_KRB5_CREDS_TICKET_FLAGS) && defined(HAVE_DECL_TKT_FLG_RENEWABLE)
+#if defined(HAVE_KRB5_CREDS_TICKET_FLAGS) && defined(TKT_FLG_RENEWABLE)
 static int
 get_cred_renewable(krb5_creds *creds)
 {
@@ -303,7 +303,7 @@ get_cred_renewable(krb5_creds *creds)
 {
        return creds->flags.b.renewable;
 }
-#elif defined(HAVE_KRB5_CREDS_FLAGS) && defined(HAVE_DECL_KDC_OPT_RENEWABLE)
+#elif defined(HAVE_KRB5_CREDS_FLAGS) && defined(KDC_OPT_RENEWABLE)
 static int
 get_cred_renewable(krb5_creds *creds)
 {
@@ -311,7 +311,7 @@ get_cred_renewable(krb5_creds *creds)
 }
 #endif
 
-#if defined(HAVE_KRB5_CREDS_TICKET_FLAGS) && defined(HAVE_DECL_TKT_FLG_PROXIABLE)
+#if defined(HAVE_KRB5_CREDS_TICKET_FLAGS) && defined(TKT_FLG_PROXIABLE)
 static int
 get_cred_proxiable(krb5_creds *creds)
 {
@@ -323,7 +323,7 @@ get_cred_proxiable(krb5_creds *creds)
 {
        return creds->flags.b.proxiable;
 }
-#elif defined(HAVE_KRB5_CREDS_FLAGS) && defined(HAVE_DECL_KDC_OPT_PROXIABLE)
+#elif defined(HAVE_KRB5_CREDS_FLAGS) && defined(KDC_OPT_PROXIABLE)
 static int
 get_cred_proxiable(krb5_creds *creds)
 {