2004-08-28 Diego Gonzalez <diego@pemas.net>

	* configure.ac: add --with-heimdal
	* krb5-auth-dialog: modify to support heimdal if enabled
	* krb5-auth-dialog.glade: center the dialog

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

diff --git a/ChangeLog b/ChangeLog
index 7da96d893fad4e9c722d73dcb7f31affb3cdd2d7..76da25ee9255afb64d76e57edabf1c68df8907c3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,14 @@
+2004-08-28  Diego Gonzalez  <diego@pemas.net>
+
+       * configure.ac: add --with-heimdal
+       * krb5-auth-dialog: modify to support heimdal if enabled
+       * krb5-auth-dialog.glade: center the dialog
+
 2004-08-19  Kjartan Maraas  <kmaraas@gnome.org>
 
        * configure.ac: Added «nb» and «no» to ALL_LINGUAS.
 
-2004-08-18    <caillon@redhat.com>
+2004-08-18  Christopher Aillon  <caillon@redhat.com>
 
        * configure.ac: New version
 

diff --git a/configure.ac b/configure.ac
index 99ac8a08264faac6fa1e11aafd15fd52e2607110..efb5895c8980875ed9f580eb95b1b84a2f204b35 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -28,6 +28,11 @@ PKG_CHECK_MODULES(GNOME,
        libgnomeui-2.0 >= 2.4.0
 ])
 
+AC_ARG_WITH(heimdal, [ --with-heimdal ], with_heimdal="$withval", with_heimdal="no" )
+if test "x$with_heimdal" != "xno"; then
+       AC_DEFINE_UNQUOTED(HEIMDAL, "", "")
+fi
+
 AC_PATH_PROG([KRB5_CONFIG], krb5-config, none, $PATH:/usr/kerberos/bin)
 if test "x$KRB5_CONFIG" != "xnone"; then
    KRB5_LIBS="`${KRB5_CONFIG} --libs krb5`"

diff --git a/src/krb5-auth-dialog.c b/src/krb5-auth-dialog.c
index 807fe0f2aaa0f64c02882ebb06db02fff2994707..0b0c5acbc005fb2e264f4acecf005038e5b6a138 100644 (file)
--- a/src/krb5-auth-dialog.c
+++ b/src/krb5-auth-dialog.c
@@ -117,7 +117,6 @@ setup_dialog (GladeXML    *xml,
 }
 
 static krb5_error_code
-KRB5_CALLCONV
 krb5_gtk_prompter (krb5_context ctx,
                   void *data,
                   const char *name,
@@ -230,7 +229,9 @@ credentials_expiring_real (void)
     {
       if ((code = krb5_cc_end_seq_get(kcontext, cache, &cur)))
        exit(1);
+#ifndef HEIMDAL
       flags = KRB5_TC_OPENCLOSE;  /* turns on OPENCLOSE mode, from klist.c */
+#endif
       if ((code = krb5_cc_set_flags(kcontext, cache, flags)))
         exit(1);
 #ifdef KRB5_KRB4_COMPAT

diff --git a/src/krb5-auth-dialog.glade b/src/krb5-auth-dialog.glade
index c385131e43fb2301e3938d75c29ffaaf9425a351..2cf3e2c82cdf0fe1445883e6bf31bcb6a5866614 100644 (file)
--- a/src/krb5-auth-dialog.glade
+++ b/src/krb5-auth-dialog.glade
@@ -9,7 +9,7 @@
   <property name="visible">False</property>
   <property name="title" translatable="yes">Network Authentication</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
+  <property name="window_position">GTK_WIN_POS_CENTER</property>
   <property name="modal">False</property>
   <property name="resizable">False</property>
   <property name="destroy_with_parent">False</property>