diff options
| -rw-r--r-- | ChangeLog | 387 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | Makefile.in | 6 | ||||
| -rw-r--r-- | README | 10 | ||||
| -rw-r--r-- | aclocal.m4 | 23 | ||||
| -rw-r--r-- | config.h.in | 7 | ||||
| -rwxr-xr-x | configure | 314 | ||||
| -rw-r--r-- | configure.ac | 60 | ||||
| -rw-r--r-- | etpo/Makefile.in | 4 | ||||
| -rw-r--r-- | examples/Makefile.am | 5 | ||||
| -rw-r--r-- | examples/Makefile.in | 8 | ||||
| -rw-r--r-- | gnome-doc-utils.make | 24 | ||||
| -rw-r--r-- | gtksecentry/Makefile.in | 4 | ||||
| -rw-r--r-- | help/Makefile.in | 25 | ||||
| -rw-r--r-- | icons/22x22/Makefile.in | 4 | ||||
| -rw-r--r-- | icons/48x48/Makefile.in | 4 | ||||
| -rw-r--r-- | icons/Makefile.in | 4 | ||||
| -rw-r--r-- | icons/scalable/Makefile.in | 4 | ||||
| -rw-r--r-- | krb5-auth-dialog.spec | 2 | ||||
| -rw-r--r-- | plugins/Makefile.am | 49 | ||||
| -rw-r--r-- | plugins/Makefile.in | 679 | ||||
| -rw-r--r-- | plugins/ka-plugin-dummy.c | 105 | ||||
| -rw-r--r-- | plugins/ka-plugin-dummy.h | 57 | ||||
| -rw-r--r-- | plugins/ka-plugin-pam.c | 128 | ||||
| -rw-r--r-- | plugins/ka-plugin-pam.h | 59 | ||||
| -rw-r--r-- | po/POTFILES.in | 12 | ||||
| -rw-r--r-- | po/de.po | 116 | ||||
| -rw-r--r-- | po/es.po | 131 | ||||
| -rw-r--r-- | po/sl.po | 126 | ||||
| -rw-r--r-- | preferences/Makefile.am | 10 | ||||
| -rw-r--r-- | preferences/Makefile.in | 87 | ||||
| -rw-r--r-- | preferences/ka-preferences.c (renamed from preferences/krb5-auth-dialog-preferences.c) | 6 | ||||
| -rw-r--r-- | secmem/Makefile.in | 4 | ||||
| -rw-r--r-- | src/Makefile.am | 50 | ||||
| -rw-r--r-- | src/Makefile.in | 304 | ||||
| -rw-r--r-- | src/ka-applet-priv.h (renamed from src/krb5-auth-applet.h) | 33 | ||||
| -rw-r--r-- | src/ka-applet.c (renamed from src/krb5-auth-applet.c) | 59 | ||||
| -rw-r--r-- | src/ka-applet.h | 48 | ||||
| -rw-r--r-- | src/ka-closures.c | 105 | ||||
| -rw-r--r-- | src/ka-closures.h | 38 | ||||
| -rw-r--r-- | src/ka-dbus.c (renamed from src/krb5-auth-dbus.c) | 9 | ||||
| -rw-r--r-- | src/ka-dbus.h (renamed from src/krb5-auth-dbus.h) | 8 | ||||
| -rw-r--r-- | src/ka-dbus.xml (renamed from src/krb5-auth-applet-dbus.xml) | 1 | ||||
| -rw-r--r-- | src/ka-dialog.c (renamed from src/krb5-auth-dialog.c) | 18 | ||||
| -rw-r--r-- | src/ka-dialog.h (renamed from src/krb5-auth-dialog.h) | 7 | ||||
| -rw-r--r-- | src/ka-gconf-tools.c (renamed from src/krb5-auth-gconf-tools.c) | 27 | ||||
| -rw-r--r-- | src/ka-gconf-tools.h (renamed from src/krb5-auth-gconf-tools.h) | 6 | ||||
| -rw-r--r-- | src/ka-gconf.c (renamed from src/krb5-auth-gconf.c) | 11 | ||||
| -rw-r--r-- | src/ka-gconf.h (renamed from src/krb5-auth-gconf.h) | 6 | ||||
| -rw-r--r-- | src/ka-plugin-loader.c | 204 | ||||
| -rw-r--r-- | src/ka-plugin-loader.h | 58 | ||||
| -rw-r--r-- | src/ka-plugin.c | 133 | ||||
| -rw-r--r-- | src/ka-plugin.h | 75 | ||||
| -rw-r--r-- | src/ka-pwdialog.c (renamed from src/krb5-auth-pwdialog.c) | 7 | ||||
| -rw-r--r-- | src/ka-pwdialog.h (renamed from src/krb5-auth-pwdialog.h) | 4 | ||||
| -rw-r--r-- | src/ka-tickets.c (renamed from src/krb5-auth-tickets.c) | 5 | ||||
| -rw-r--r-- | src/ka-tickets.h (renamed from src/krb5-auth-tickets.h) | 4 | ||||
| -rw-r--r-- | src/ka-tools.c (renamed from src/krb5-auth-tools.c) | 3 | ||||
| -rw-r--r-- | src/ka-tools.h (renamed from src/krb5-auth-tools.h) | 5 | ||||
| -rw-r--r-- | src/krb5-auth-dialog.schemas.in | 13 |
60 files changed, 3165 insertions, 542 deletions
@@ -1,5 +1,392 @@ # Generated by Makefile. Do not edit. +commit 9a1e5a769be82454c134ca189a274af13b561d79 +Author: Guido Günther <agx@sigxcpu.org> +Date: Tue May 4 07:30:38 2010 +0200 + + Check for PAM libs + + and auto enable PAM plugin if found. + + configure.ac | 31 +++++++++++++++++++------------ + 1 files changed, 19 insertions(+), 12 deletions(-) + +commit cc597ad513a935902830c1d25e282c202176d6ec +Author: Mario Blättermann <mariobl@gnome.org> +Date: Sun May 2 12:13:34 2010 +0200 + + Updated German translation + + po/de.po | 116 ++++++++++++++++++++++++++++++++------------------------------ + 1 files changed, 60 insertions(+), 56 deletions(-) + +commit c81ecf1285f1bd9c5a2688d071731ccbc5b30cc5 +Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com> +Date: Sun May 2 11:43:13 2010 +0200 + + Updated Slovenian translation + + po/sl.po | 126 +++++++++++++++++++++++++++++++++----------------------------- + 1 files changed, 67 insertions(+), 59 deletions(-) + +commit 0752fea0ab5ce01f50b2483f0d10ea61b324539b +Author: Guido Günther <agx@sigxcpu.org> +Date: Wed Apr 28 21:27:06 2010 +0200 + + Rename KRB5_AUTH_* to KA_* in headers + + src/ka-applet-priv.h | 4 ++-- + src/ka-dbus.h | 6 +++--- + src/ka-dialog.h | 4 ++-- + src/ka-gconf-tools.h | 4 ++-- + src/ka-gconf.h | 4 ++-- + src/ka-pwdialog.h | 4 ++-- + src/ka-tickets.h | 4 ++-- + src/ka-tools.h | 4 ++-- + 8 files changed, 17 insertions(+), 17 deletions(-) + +commit 5b57a60b197877630b4d3427f4337b11701e2e0a +Author: Guido Günther <agx@sigxcpu.org> +Date: Wed Apr 28 20:59:07 2010 +0200 + + Update potfile names too + + po/POTFILES.in | 12 ++++++------ + 1 files changed, 6 insertions(+), 6 deletions(-) + +commit 2a2b10c6d55ae13dbc4c0474005673950bf97f45 +Author: Guido Günther <agx@sigxcpu.org> +Date: Wed Apr 28 17:48:14 2010 +0200 + + Rename krb5-auth-applet.[ch] + + Rename krb5-auth-applet.h to ka-applet-priv.h since these parts + shouldn't be used by modules. + + src/Makefile.am | 4 +- + src/ka-applet-priv.h | 72 ++++ + src/ka-applet.c | 942 +++++++++++++++++++++++++++++++++++++++++++++++ + src/ka-dbus.c | 2 +- + src/ka-dbus.h | 2 +- + src/ka-dialog.c | 2 +- + src/ka-dialog.h | 2 +- + src/ka-gconf.c | 2 +- + src/ka-gconf.h | 2 +- + src/ka-plugin-loader.c | 2 +- + src/ka-pwdialog.c | 2 +- + src/krb5-auth-applet.c | 943 ------------------------------------------------ + src/krb5-auth-applet.h | 70 ---- + 13 files changed, 1024 insertions(+), 1023 deletions(-) + +commit 8ddcf3681b8a9a06a50b570497d9d49562cf9cfb +Author: Guido Günther <agx@sigxcpu.org> +Date: Wed Apr 28 17:45:06 2010 +0200 + + Rename krb5-auth-dialog.[ch] to ka-dialog.[ch] + + krb5-auth-dialog rename fix + + autogen.sh | 2 +- + configure.ac | 2 +- + src/Makefile.am | 4 +- + src/ka-dbus.c | 2 +- + src/ka-dialog.c | 1171 ++++++++++++++++++++++++++++++++++++++++++++++++ + src/ka-dialog.h | 32 ++ + src/ka-pwdialog.c | 2 +- + src/ka-tickets.c | 2 +- + src/krb5-auth-applet.c | 2 +- + src/krb5-auth-dialog.c | 1171 ------------------------------------------------ + src/krb5-auth-dialog.h | 33 -- + 11 files changed, 1211 insertions(+), 1212 deletions(-) + +commit 01f5263f9eb76a11fb1c1207a323973e3b7c5efe +Author: Guido Günther <agx@sigxcpu.org> +Date: Wed Apr 28 17:35:28 2010 +0200 + + Reneme krb5-auth-applet-dbus.xml to ka-dbus.xml + + src/.gitignore | 2 +- + src/Makefile.am | 8 ++++---- + src/ka-dbus.c | 2 +- + src/ka-dbus.xml | 30 ++++++++++++++++++++++++++++++ + src/krb5-auth-applet-dbus.xml | 31 ------------------------------- + 5 files changed, 36 insertions(+), 37 deletions(-) + +commit 26cfffab3ee5795c6216c31dd8030958fb20a01c +Author: Guido Günther <agx@sigxcpu.org> +Date: Wed Apr 28 17:30:13 2010 +0200 + + Rename krb5-auth-pwdialog.[ch] to ka-pwdialog.[ch] + + src/Makefile.am | 4 +- + src/ka-pwdialog.c | 309 +++++++++++++++++++++++++++++++++++++++++++++ + src/ka-pwdialog.h | 65 ++++++++++ + src/krb5-auth-applet.h | 2 +- + src/krb5-auth-dialog.c | 2 +- + src/krb5-auth-pwdialog.c | 310 ---------------------------------------------- + src/krb5-auth-pwdialog.h | 65 ---------- + 7 files changed, 378 insertions(+), 379 deletions(-) + +commit ef9bb4179fba5c7fb77a2908aa618b0a204e518a +Author: Guido Günther <agx@sigxcpu.org> +Date: Wed Apr 28 17:27:54 2010 +0200 + + Rename krb5-auth-gconf.[ch] to ka-gconf.[ch] + + src/Makefile.am | 4 +- + src/ka-gconf.c | 211 ++++++++++++++++++++++++++++++++++++++++++++++++ + src/ka-gconf.h | 29 +++++++ + src/krb5-auth-applet.c | 2 +- + src/krb5-auth-gconf.c | 211 ------------------------------------------------ + src/krb5-auth-gconf.h | 29 ------- + 6 files changed, 243 insertions(+), 243 deletions(-) + +commit 2e6c29f113947f03b096e5f15c609712eaa01f4d +Author: Guido Günther <agx@sigxcpu.org> +Date: Wed Apr 28 17:26:13 2010 +0200 + + Rename krb5-auth-dialog-preferences.[ch] to ka-preferences.[ch] + + preferences/Makefile.am | 2 +- + preferences/ka-preferences.c | 843 ++++++++++++++++++++++++++++ + preferences/krb5-auth-dialog-preferences.c | 843 ---------------------------- + 3 files changed, 844 insertions(+), 844 deletions(-) + +commit 26f51d8504f5ceaca538fbdb9dc0e94f74176a51 +Author: Guido Günther <agx@sigxcpu.org> +Date: Wed Apr 28 17:24:45 2010 +0200 + + Rename krb5-auth-gconf-tools.[ch] to ka-gconf-tools.[ch] + + preferences/Makefile.am | 4 +- + preferences/krb5-auth-dialog-preferences.c | 2 +- + src/Makefile.am | 4 +- + src/ka-gconf-tools.c | 149 +++++++++++++++++++++++++++ + src/ka-gconf-tools.h | 48 +++++++++ + src/ka-plugin-loader.c | 2 +- + src/krb5-auth-applet.c | 2 +- + src/krb5-auth-gconf-tools.c | 150 ---------------------------- + src/krb5-auth-gconf-tools.h | 48 --------- + src/krb5-auth-gconf.c | 2 +- + 10 files changed, 205 insertions(+), 206 deletions(-) + +commit 7a282065467e986c3d0483be9720ca863d93c8e5 +Author: Guido Günther <agx@sigxcpu.org> +Date: Wed Apr 28 17:12:13 2010 +0200 + + Rename krb5-auth-dbus.[ch] to ka-dbus.[ch] + + src/Makefile.am | 4 +- + src/ka-dbus.c | 119 +++++++++++++++++++++++++++++++++++++++++++++++ + src/ka-dbus.h | 37 +++++++++++++++ + src/krb5-auth-dbus.c | 120 ------------------------------------------------ + src/krb5-auth-dbus.h | 37 --------------- + src/krb5-auth-dialog.c | 2 +- + 6 files changed, 159 insertions(+), 160 deletions(-) + +commit 7b20693fbe233fa6832bfa734f603cc46c3a5a72 +Author: Guido Günther <agx@sigxcpu.org> +Date: Tue Apr 27 22:27:21 2010 +0200 + + Rename krb5-auth-tools.[ch] to ka-tools.[ch] + + preferences/Makefile.am | 4 +- + preferences/krb5-auth-dialog-preferences.c | 2 +- + src/Makefile.am | 4 +- + src/ka-tools.c | 57 +++++++++++++++++++++++++++ + src/ka-tools.h | 32 +++++++++++++++ + src/krb5-auth-applet.c | 2 +- + src/krb5-auth-dialog.c | 2 +- + src/krb5-auth-tools.c | 58 ---------------------------- + src/krb5-auth-tools.h | 33 ---------------- + 9 files changed, 96 insertions(+), 98 deletions(-) + +commit a437955775ad6d795ba206ec178a57255201399f +Author: Guido Günther <agx@sigxcpu.org> +Date: Tue Apr 27 22:23:21 2010 +0200 + + Rename krb5-auth-tickets.[ch] to ka-tickets.[ch] + + src/Makefile.am | 4 +- + src/ka-tickets.c | 115 ++++++++++++++++++++++++++++++++++++++++++++++ + src/ka-tickets.h | 39 ++++++++++++++++ + src/krb5-auth-applet.c | 2 +- + src/krb5-auth-dialog.c | 2 +- + src/krb5-auth-tickets.c | 116 ----------------------------------------------- + src/krb5-auth-tickets.h | 39 ---------------- + 7 files changed, 158 insertions(+), 159 deletions(-) + +commit a3189fbe66795304751520338bf4b8013f5928bf +Author: Jorge González <jorgegonz@svn.gnome.org> +Date: Wed Apr 28 08:26:55 2010 +0200 + + Updated Spanish translation + + po/es.po | 81 ++++++++++++++++++++++++++++++++++--------------------------- + 1 files changed, 45 insertions(+), 36 deletions(-) + +commit 2d268123bb3c69bae947cb2a9bae0d54e7af0e32 +Author: Guido Günther <agx@sigxcpu.org> +Date: Mon Apr 26 22:38:51 2010 +0200 + + Document plugin gconf keys + + README | 10 ++++++++++ + 1 files changed, 10 insertions(+), 0 deletions(-) + +commit 3501a11b57a3ea7d43282262ab6768c5a397dba0 +Author: Guido Günther <agx@sigxcpu.org> +Date: Sun Apr 25 09:43:42 2010 +0200 + + Load plugins from gconf + + and deactivate them on loader disposal. + + src/ka-plugin-loader.c | 85 +++++++++++++++++++++++++++++---------- + src/krb5-auth-dialog.schemas.in | 13 ++++++ + src/krb5-auth-gconf-tools.h | 1 + + src/krb5-auth-gconf.c | 5 +- + 4 files changed, 81 insertions(+), 23 deletions(-) + +commit 0c5190a9f2161ab25f6081d6e179b4e6317954fa +Author: Guido Günther <agx@sigxcpu.org> +Date: Tue Apr 20 22:23:01 2010 +0200 + + Add simple PAM plugin + + BZ: #347034 + + configure.ac | 28 ++++++++++- + plugins/Makefile.am | 26 ++++++++++ + plugins/ka-plugin-pam.c | 128 +++++++++++++++++++++++++++++++++++++++++++++++ + plugins/ka-plugin-pam.h | 59 ++++++++++++++++++++++ + 4 files changed, 239 insertions(+), 2 deletions(-) + +commit b2956aa5a9a2e7de4fe9844cba54427f2d53de4c +Author: Guido Günther <agx@sigxcpu.org> +Date: Tue Apr 20 22:23:30 2010 +0200 + + Add dummy plugin + + as example for new plugins. + + Makefile.am | 2 +- + configure.ac | 1 + + plugins/.gitignore | 3 + + plugins/Makefile.am | 23 ++++++++++ + plugins/ka-plugin-dummy.c | 105 +++++++++++++++++++++++++++++++++++++++++++++ + plugins/ka-plugin-dummy.h | 57 ++++++++++++++++++++++++ + 6 files changed, 190 insertions(+), 1 deletions(-) + +commit 69ce38151c7a08fe980d981108c782762bf72e81 +Author: Guido Günther <agx@sigxcpu.org> +Date: Tue Apr 20 22:21:54 2010 +0200 + + Add plugin infrastructure + + configure.ac | 10 +++- + src/Makefile.am | 7 ++ + src/ka-plugin-loader.c | 161 ++++++++++++++++++++++++++++++++++++++++++++++++ + src/ka-plugin-loader.h | 58 +++++++++++++++++ + src/ka-plugin.c | 133 +++++++++++++++++++++++++++++++++++++++ + src/ka-plugin.h | 75 ++++++++++++++++++++++ + src/krb5-auth-applet.c | 10 +++- + 7 files changed, 452 insertions(+), 2 deletions(-) + +commit a7f0bdf074c437f98dffd4541d4e6426202e1d69 +Author: Guido Günther <agx@sigxcpu.org> +Date: Sun Apr 25 09:42:54 2010 +0200 + + Add getter for gconf client + + src/krb5-auth-applet.c | 6 ++++++ + src/krb5-auth-applet.h | 2 ++ + 2 files changed, 8 insertions(+), 0 deletions(-) + +commit 14c574f60f33f03b5c92b902479bfd1cd3d95b12 +Author: Guido Günther <agx@sigxcpu.org> +Date: Sat Apr 24 22:28:29 2010 +0200 + + Add gconf helper to fetch a list of strings + + src/krb5-auth-gconf-tools.c | 24 ++++++++++++++++++++++++ + src/krb5-auth-gconf-tools.h | 1 + + 2 files changed, 25 insertions(+), 0 deletions(-) + +commit 07748e8cd58c014c4577806350b3d7c3e61647a8 +Author: Guido Günther <agx@sigxcpu.org> +Date: Sat Apr 10 10:26:00 2010 +0200 + + Move KaApplet into a separate header + + so the headers used by plugins are self contained. + + src/Makefile.am | 1 + + src/ka-applet.h | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ + src/krb5-auth-applet.h | 21 ++------------------- + 3 files changed, 51 insertions(+), 19 deletions(-) + +commit 92c76a9c50169a5b06129c8b2bba88a5d4853030 +Author: Guido Günther <agx@sigxcpu.org> +Date: Thu Apr 22 08:18:08 2010 +0200 + + Send a tgt-renewed signal if the ticket lifetime gets extended + + This way we also send a singal if the user extends the ticket liftetime + by reentering his password of by running kinit on the console. + + src/krb5-auth-applet.c | 23 ++++++++++++++++------- + 1 files changed, 16 insertions(+), 7 deletions(-) + +commit d81f5f55376ecc9b8a64c58122ab69a0142105a8 +Author: Guido Günther <agx@sigxcpu.org> +Date: Wed Apr 21 21:26:55 2010 +0200 + + Add correct closures for signals + + src/Makefile.am | 2 + + src/ka-closures.c | 105 ++++++++++++++++++++++++++++++++++++++++++++++++ + src/ka-closures.h | 38 +++++++++++++++++ + src/krb5-auth-applet.c | 3 +- + 4 files changed, 147 insertions(+), 1 deletions(-) + +commit 3e82c4e2113c3c9b1246fe56c4e1851c180e6d07 +Author: Guido Günther <agx@sigxcpu.org> +Date: Sat Apr 17 17:35:35 2010 +0200 + + Minor autoconf/automake cleanups + + configure.ac | 10 +++++----- + examples/Makefile.am | 5 ++++- + 2 files changed, 9 insertions(+), 6 deletions(-) + +commit 13f243879a2c4f77d5f48611461324f7338199a2 +Author: Olav Vitters <olav@vitters.nl> +Date: Sun Apr 18 12:12:05 2010 +0200 + + Fix doap file + + krb5-auth-dialog.doap | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 909f8e6b51ce70d07a26d9b7d4c8c6ab2ec1d66e +Author: Jorge González <jorgegonz@svn.gnome.org> +Date: Sun Apr 11 16:32:04 2010 +0200 + + Updated Spanish translation + + po/es.po | 64 +++++++++++++++++++++++++++++++------------------------------- + 1 files changed, 32 insertions(+), 32 deletions(-) + +commit 275ce728387cda5c2c32ed396b22de81586f4713 +Author: Jorge González <jorgegonz@svn.gnome.org> +Date: Sun Apr 11 16:01:01 2010 +0200 + + Updated Spanish translation + + po/es.po | 24 ++++++++++++++---------- + 1 files changed, 14 insertions(+), 10 deletions(-) + commit c69b7aed3f4a7801bdded38d3b3cc5d2ab33baad Author: Guido Günther <agx@sigxcpu.org> Date: Sat Apr 3 17:32:31 2010 +0200 diff --git a/Makefile.am b/Makefile.am index c6adefb..6a9ff8b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ NULL = -SUBDIRS = secmem gtksecentry src po etpo icons preferences help examples +SUBDIRS = secmem gtksecentry src po etpo icons preferences help examples plugins EXTRA_DIST = \ krb5-auth-dialog.spec \ diff --git a/Makefile.in b/Makefile.in index 4ac1689..c46f122 100644 --- a/Makefile.in +++ b/Makefile.in @@ -154,6 +154,8 @@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@ GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ +GMODULE_CFLAGS = @GMODULE_CFLAGS@ +GMODULE_LIBS = @GMODULE_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ @@ -171,6 +173,7 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +KA_PLUGINS_DIR = @KA_PLUGINS_DIR@ KRB5_CFLAGS = @KRB5_CFLAGS@ KRB5_CONFIG = @KRB5_CONFIG@ KRB5_LIBS = @KRB5_LIBS@ @@ -211,6 +214,7 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PAM_LIBS = @PAM_LIBS@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ @@ -286,7 +290,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ NULL = -SUBDIRS = secmem gtksecentry src po etpo icons preferences help examples +SUBDIRS = secmem gtksecentry src po etpo icons preferences help examples plugins EXTRA_DIST = \ krb5-auth-dialog.spec \ MAINTAINERS \ @@ -41,3 +41,13 @@ If the sent principal doesn't match the one currently in the ticket cache the request fails. To request a TGT for the "default" principal use string:''. See examples/tgt-signals.py for information about sent DBus signals. + +Plugins +======= +Plugins are currently disabled by default. To enable them you have to set the gconf key: + +Enable pam and dummy plugions: +gconftool-2 --set --list-type=string --type=list /apps/krb5-auth-dialog/plugins/enabled [pam,dummy] + +To list currently enabled plugins: +gconftool-2 --get --list-type=string /apps/krb5-auth-dialog/plugins/enabled @@ -648,7 +648,7 @@ IT_PO_SUBDIR([po]) AC_DEFUN([IT_PO_SUBDIR], [AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS. dnl -dnl The following CONFIG_COMMANDS should be exetuted at the very end +dnl The following CONFIG_COMMANDS should be executed at the very end dnl of config.status. AC_CONFIG_COMMANDS_PRE([ AC_CONFIG_COMMANDS([$1/stamp-it], [ @@ -9427,27 +9427,6 @@ fi rmdir .tst 2>/dev/null AC_SUBST([am__leading_dot])]) -# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 5 - -# AM_PROG_LEX -# ----------- -# Autoconf leaves LEX=: if lex or flex can't be found. Change that to a -# "missing" invocation, for better error output. -AC_DEFUN([AM_PROG_LEX], -[AC_PREREQ(2.50)dnl -AC_REQUIRE([AM_MISSING_HAS_RUN])dnl -AC_REQUIRE([AC_PROG_LEX])dnl -if test "$LEX" = :; then - LEX=${am_missing_run}flex -fi]) - # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering diff --git a/config.h.in b/config.h.in index ad4dcae..a95567b 100644 --- a/config.h.in +++ b/config.h.in @@ -96,6 +96,9 @@ /* use libnotify for status messages */ #undef HAVE_LIBNOTIFY +/* Define to 1 if you have the `pam' library (-lpam). */ +#undef HAVE_LIBPAM + /* Define to 1 if you have the `rt' library (-lrt). */ #undef HAVE_LIBRT @@ -151,8 +154,8 @@ */ #undef LT_OBJDIR -/* Define the to the minimum amount of time (m) a credential will have to be - valid before we'll ask the user to get fresh credentials. */ +/* Define to the minimum amount of time (m) a credential will have to be valid + before we will ask the user to get fresh credentials. */ #undef MINUTES_BEFORE_PROMPTING /* Define to 1 if your C compiler doesn't accept -c and -o together. */ @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for krb5-auth-dialog 0.15. +# Generated by GNU Autoconf 2.65 for krb5-auth-dialog 0.16. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -698,12 +698,12 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='krb5-auth-dialog' PACKAGE_TARNAME='krb5-auth-dialog' -PACKAGE_VERSION='0.15' -PACKAGE_STRING='krb5-auth-dialog 0.15' +PACKAGE_VERSION='0.16' +PACKAGE_STRING='krb5-auth-dialog 0.16' PACKAGE_BUGREPORT='' PACKAGE_URL='' -ac_unique_file="src/krb5-auth-dialog.c" +ac_unique_file="src/ka-dialog.c" # Factoring default headers for most tests. ac_includes_default="\ #include <stdio.h> @@ -744,6 +744,10 @@ ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS LIBOBJS +ENABLE_PAM_PLUGIN_FALSE +ENABLE_PAM_PLUGIN_TRUE +PAM_LIBS +KA_PLUGINS_DIR minimum_lifetime check_interval LIBCAP @@ -767,6 +771,8 @@ GCONF_SCHEMAS_INSTALL_FALSE GCONF_SCHEMAS_INSTALL_TRUE GCONF_SCHEMA_FILE_DIR GCONF_SCHEMA_CONFIG_SOURCE +GMODULE_LIBS +GMODULE_CFLAGS GIO_LIBS GIO_CFLAGS GIO_UNIX_LIBS @@ -974,6 +980,7 @@ enable_pkinit enable_network_manager with_libnotify with_libcap +with_pam ' ac_precious_vars='build_alias host_alias @@ -997,6 +1004,8 @@ GIO_UNIX_CFLAGS GIO_UNIX_LIBS GIO_CFLAGS GIO_LIBS +GMODULE_CFLAGS +GMODULE_LIBS NETWORK_MANAGER_CFLAGS NETWORK_MANAGER_LIBS LIBNOTIFY_CFLAGS @@ -1542,7 +1551,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures krb5-auth-dialog 0.15 to adapt to many kinds of systems. +\`configure' configures krb5-auth-dialog 0.16 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1613,7 +1622,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of krb5-auth-dialog 0.15:";; + short | recursive ) echo "Configuration of krb5-auth-dialog 0.16:";; esac cat <<\_ACEOF @@ -1663,6 +1672,7 @@ Optional Packages: [default=/usr/lib/opensc/opensc-pkcs11.so] --with-libnotify use libnotify for status messages --without-libcap Disable support for capabilities library + --with-pam use PAM [default=check] Some influential environment variables: CC C compiler command @@ -1692,6 +1702,10 @@ Some influential environment variables: linker flags for GIO_UNIX, overriding pkg-config GIO_CFLAGS C compiler flags for GIO, overriding pkg-config GIO_LIBS linker flags for GIO, overriding pkg-config + GMODULE_CFLAGS + C compiler flags for GMODULE, overriding pkg-config + GMODULE_LIBS + linker flags for GMODULE, overriding pkg-config NETWORK_MANAGER_CFLAGS C compiler flags for NETWORK_MANAGER, overriding pkg-config NETWORK_MANAGER_LIBS @@ -1767,7 +1781,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -krb5-auth-dialog configure 0.15 +krb5-auth-dialog configure 0.16 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -2189,7 +2203,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by krb5-auth-dialog $as_me 0.15, which was +It was created by krb5-auth-dialog $as_me 0.16, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -2998,7 +3012,7 @@ fi # Define the identity of the package. PACKAGE='krb5-auth-dialog' - VERSION='0.15' + VERSION='0.16' cat >>confdefs.h <<_ACEOF @@ -7113,13 +7127,13 @@ if test "${lt_cv_nm_interface+set}" = set; then : else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:7116: $ac_compile\"" >&5) + (eval echo "\"\$as_me:7130: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:7119: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:7133: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:7122: output\"" >&5) + (eval echo "\"\$as_me:7136: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -8324,7 +8338,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 8327 "configure"' > conftest.$ac_ext + echo '#line 8341 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -9582,11 +9596,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9585: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9599: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9589: \$? = $ac_status" >&5 + echo "$as_me:9603: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9921,11 +9935,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9924: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9938: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9928: \$? = $ac_status" >&5 + echo "$as_me:9942: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -10026,11 +10040,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10029: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10043: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10033: \$? = $ac_status" >&5 + echo "$as_me:10047: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10081,11 +10095,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10084: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10098: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10088: \$? = $ac_status" >&5 + echo "$as_me:10102: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12465,7 +12479,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12468 "configure" +#line 12482 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12561,7 +12575,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12564 "configure" +#line 12578 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12945,9 +12959,6 @@ fi rm -f conftest.l $LEX_OUTPUT_ROOT.c fi -if test "$LEX" = :; then - LEX=${am_missing_run}flex -fi for ac_prog in 'bison -y' byacc do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -13929,6 +13940,96 @@ $as_echo "yes" >&6; } : fi +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GMODULE" >&5 +$as_echo_n "checking for GMODULE... " >&6; } + +if test -n "$PKG_CONFIG"; then + if test -n "$GMODULE_CFLAGS"; then + pkg_cv_GMODULE_CFLAGS="$GMODULE_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmodule-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gmodule-2.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GMODULE_CFLAGS=`$PKG_CONFIG --cflags "gmodule-2.0" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$GMODULE_LIBS"; then + pkg_cv_GMODULE_LIBS="$GMODULE_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmodule-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gmodule-2.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GMODULE_LIBS=`$PKG_CONFIG --libs "gmodule-2.0" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + GMODULE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gmodule-2.0"` + else + GMODULE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gmodule-2.0"` + fi + # Put the nasty error message in config.log where it belongs + echo "$GMODULE_PKG_ERRORS" >&5 + + as_fn_error "Package requirements (gmodule-2.0) were not met: + +$GMODULE_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables GMODULE_CFLAGS +and GMODULE_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. +" "$LINENO" 5 +elif test $pkg_failed = untried; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables GMODULE_CFLAGS +and GMODULE_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see <http://pkg-config.freedesktop.org/>. +See \`config.log' for more details." "$LINENO" 5; } +else + GMODULE_CFLAGS=$pkg_cv_GMODULE_CFLAGS + GMODULE_LIBS=$pkg_cv_GMODULE_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + : +fi + if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` @@ -14925,7 +15026,131 @@ _ACEOF -ac_config_files="$ac_config_files Makefile krb5-auth-dialog.spec src/Makefile src/krb5-auth-dialog.1 secmem/Makefile gtksecentry/Makefile icons/Makefile icons/22x22/Makefile icons/48x48/Makefile icons/scalable/Makefile etpo/Makefile po/Makefile.in preferences/Makefile preferences/krb5-auth-dialog-preferences.1 help/Makefile examples/Makefile" +KA_PLUGINS_DIR="$libdir/krb5-auth-dialog/plugins" + + +PAM_LIBS= + +# Check whether --with-pam was given. +if test "${with_pam+set}" = set; then : + withval=$with_pam; +else + with_pam=check +fi + + +if test "$with_pam" != "no"; then + if test "$with_pam" = "check"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pam_start in -lpam" >&5 +$as_echo_n "checking for pam_start in -lpam... " >&6; } +if test "${ac_cv_lib_pam_pam_start+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lpam $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char pam_start (); +int +main () +{ +return pam_start (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_pam_pam_start=yes +else + ac_cv_lib_pam_pam_start=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pam_pam_start" >&5 +$as_echo "$ac_cv_lib_pam_pam_start" >&6; } +if test "x$ac_cv_lib_pam_pam_start" = x""yes; then : + with_pam=yes +else + with_pam=no +fi + + else + fail=0 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pam_start in -lpam" >&5 +$as_echo_n "checking for pam_start in -lpam... " >&6; } +if test "${ac_cv_lib_pam_pam_start+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lpam $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char pam_start (); +int +main () +{ +return pam_start (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_pam_pam_start=yes +else + ac_cv_lib_pam_pam_start=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pam_pam_start" >&5 +$as_echo "$ac_cv_lib_pam_pam_start" >&6; } +if test "x$ac_cv_lib_pam_pam_start" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBPAM 1 +_ACEOF + + LIBS="-lpam $LIBS" + +else + fail=1 +fi + + test $fail = 1 && + as_fn_error "You must install the PAM development package in order to compile krb5-auth-dialog" "$LINENO" 5 + fi +fi + +if test "$with_pam" = "yes"; then + PAM_LIBS="${PAM_LIBS} -lpam" +fi + + if test "$with_pam" = "yes"; then + ENABLE_PAM_PLUGIN_TRUE= + ENABLE_PAM_PLUGIN_FALSE='#' +else + ENABLE_PAM_PLUGIN_TRUE='#' + ENABLE_PAM_PLUGIN_FALSE= +fi + + +ac_config_files="$ac_config_files Makefile krb5-auth-dialog.spec src/Makefile src/krb5-auth-dialog.1 secmem/Makefile gtksecentry/Makefile icons/Makefile icons/22x22/Makefile icons/48x48/Makefile icons/scalable/Makefile etpo/Makefile po/Makefile.in preferences/Makefile preferences/krb5-auth-dialog-preferences.1 help/Makefile examples/Makefile plugins/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -15076,6 +15301,10 @@ if test -z "${HAVE_LIBNOTIFY_TRUE}" && test -z "${HAVE_LIBNOTIFY_FALSE}"; then as_fn_error "conditional \"HAVE_LIBNOTIFY\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${ENABLE_PAM_PLUGIN_TRUE}" && test -z "${ENABLE_PAM_PLUGIN_FALSE}"; then + as_fn_error "conditional \"ENABLE_PAM_PLUGIN\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi : ${CONFIG_STATUS=./config.status} ac_write_fail=0 @@ -15484,7 +15713,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by krb5-auth-dialog $as_me 0.15, which was +This file was extended by krb5-auth-dialog $as_me 0.16, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15550,7 +15779,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -krb5-auth-dialog config.status 0.15 +krb5-auth-dialog config.status 0.16 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" @@ -15949,6 +16178,7 @@ do "preferences/krb5-auth-dialog-preferences.1") CONFIG_FILES="$CONFIG_FILES preferences/krb5-auth-dialog-preferences.1" ;; "help/Makefile") CONFIG_FILES="$CONFIG_FILES help/Makefile" ;; "examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;; + "plugins/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/Makefile" ;; "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; @@ -17338,12 +17568,12 @@ $as_echo "$as_me: " >&6;} $as_echo "$as_me: Libraries" >&6;} { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5 $as_echo "$as_me: " >&6;} -{ $as_echo "$as_me:${as_lineno-$LINENO}: kerberos: $KRB5_CFLAGS $KRB5_LIBS" >&5 -$as_echo "$as_me: kerberos: $KRB5_CFLAGS $KRB5_LIBS" >&6;} -{ $as_echo "$as_me:${as_lineno-$LINENO}: gtk: $GTK_CFLAGS $GTK_LIBS" >&5 -$as_echo "$as_me: gtk: $GTK_CFLAGS $GTK_LIBS" >&6;} -{ $as_echo "$as_me:${as_lineno-$LINENO}: dbus: $DBUS_CFLAGS $DBUS_LIBS" >&5 -$as_echo "$as_me: dbus: $DBUS_CFLAGS $DBUS_LIBS" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: Kerberos: $KRB5_CFLAGS $KRB5_LIBS" >&5 +$as_echo "$as_me: Kerberos: $KRB5_CFLAGS $KRB5_LIBS" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: GTK: $GTK_CFLAGS $GTK_LIBS" >&5 +$as_echo "$as_me: GTK: $GTK_CFLAGS $GTK_LIBS" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: DBus: $DBUS_CFLAGS $DBUS_LIBS" >&5 +$as_echo "$as_me: DBus: $DBUS_CFLAGS $DBUS_LIBS" >&6;} { $as_echo "$as_me:${as_lineno-$LINENO}: gconf: $GCONF_CFLAGS $GCONF_LIBS" >&5 $as_echo "$as_me: gconf: $GCONF_CFLAGS $GCONF_LIBS" >&6;} { $as_echo "$as_me:${as_lineno-$LINENO}: gio-unix: $GIO_UNIX_CFLAGS $GIO_UNIX_LIBS $GIO_CFLAGS $GIO_LIBS" >&5 @@ -17378,4 +17608,16 @@ $as_echo "$as_me: Minimum Lifetime: $minimum_lifetime minutes" >&6;} $as_echo "$as_me: Check Interval: $check_interval seconds" >&6;} { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5 $as_echo "$as_me: " >&6;} - +{ $as_echo "$as_me:${as_lineno-$LINENO}: Plugins" >&5 +$as_echo "$as_me: Plugins" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: " >&5 +$as_echo "$as_me: " >&6;} +if test "$with_pam" = "yes" ; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: PAM plugin: $PAM_LIBS" >&5 +$as_echo "$as_me: PAM plugin: $PAM_LIBS" >&6;} +else +{ $as_echo "$as_me:${as_lineno-$LINENO}: PAM plugin: no" >&5 +$as_echo "$as_me: PAM plugin: no" >&6;} +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: " >&5 +$as_echo "$as_me: " >&6;} diff --git a/configure.ac b/configure.ac index 0c3911c..9d4f39b 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ -AC_INIT([krb5-auth-dialog], [0.15]) -AC_CONFIG_SRCDIR(src/krb5-auth-dialog.c) +AC_INIT([krb5-auth-dialog], [0.16]) +AC_CONFIG_SRCDIR(src/ka-dialog.c) dnl Make automake keep quiet about wildcards & other GNUmake-isms AM_INIT_AUTOMAKE([-Wno-portability]) AM_CONFIG_HEADER(config.h) @@ -18,8 +18,8 @@ AM_GLIB_GNU_GETTEXT AC_PROG_CC AC_ISC_POSIX AC_HEADER_STDC -AM_PROG_LIBTOOL -AM_PROG_LEX +AC_PROG_LIBTOOL +AC_PROG_LEX AC_PROG_YACC AM_PROG_CC_C_O @@ -42,6 +42,7 @@ PKG_CHECK_MODULES(DBUS, dbus-glib-1 >= $DBUS_REQUIRED) PKG_CHECK_MODULES(GCONF, gconf-2.0 >= $GCONF_REQUIRED) PKG_CHECK_MODULES(GIO_UNIX, gio-unix-2.0 >= $GIO_UNIX_REQUIRED) PKG_CHECK_MODULES(GIO, gio-2.0 >= $GIO_REQUIRED) +PKG_CHECK_MODULES(GMODULE, gmodule-2.0) AM_GCONF_SOURCE_2 @@ -217,11 +218,42 @@ AC_SUBST(check_interval) minimum_lifetime=30 AC_DEFINE_UNQUOTED(MINUTES_BEFORE_PROMPTING,[$minimum_lifetime], - [Define the to the minimum amount of time (m) a credential - will have to be valid before we'll ask the user to get + [Define to the minimum amount of time (m) a credential + will have to be valid before we will ask the user to get fresh credentials.]) AC_SUBST(minimum_lifetime) +dnl +dnl Plugins +dnl +KA_PLUGINS_DIR="$libdir/krb5-auth-dialog/plugins" +AC_SUBST(KA_PLUGINS_DIR) + +dnl PAM Plugin +PAM_LIBS= +AC_ARG_WITH([pam], + AC_HELP_STRING([--with-pam], [use PAM @<:@default=check@:>@]), + [], + [with_pam=check]) + +if test "$with_pam" != "no"; then + if test "$with_pam" = "check"; then + AC_CHECK_LIB([pam], [pam_start], [with_pam=yes], [with_pam=no]) + else + fail=0 + AC_CHECK_LIB([pam], [pam_start], [], [fail=1]) + test $fail = 1 && + AC_MSG_ERROR([You must install the PAM development package in order to compile krb5-auth-dialog]) + fi +fi + +if test "$with_pam" = "yes"; then + PAM_LIBS="${PAM_LIBS} -lpam" +fi +AC_SUBST(PAM_LIBS) +AM_CONDITIONAL([ENABLE_PAM_PLUGIN],[test "$with_pam" = "yes"]) + +dnl Final stage AC_OUTPUT([ Makefile krb5-auth-dialog.spec @@ -239,6 +271,7 @@ preferences/Makefile preferences/krb5-auth-dialog-preferences.1 help/Makefile examples/Makefile +plugins/Makefile ]) AC_MSG_NOTICE([]) @@ -247,9 +280,9 @@ AC_MSG_NOTICE([=====================]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([Libraries]) AC_MSG_NOTICE([]) -AC_MSG_NOTICE([ kerberos: $KRB5_CFLAGS $KRB5_LIBS]) -AC_MSG_NOTICE([ gtk: $GTK_CFLAGS $GTK_LIBS]) -AC_MSG_NOTICE([ dbus: $DBUS_CFLAGS $DBUS_LIBS]) +AC_MSG_NOTICE([ Kerberos: $KRB5_CFLAGS $KRB5_LIBS]) +AC_MSG_NOTICE([ GTK: $GTK_CFLAGS $GTK_LIBS]) +AC_MSG_NOTICE([ DBus: $DBUS_CFLAGS $DBUS_LIBS]) AC_MSG_NOTICE([ gconf: $GCONF_CFLAGS $GCONF_LIBS]) AC_MSG_NOTICE([ gio-unix: $GIO_UNIX_CFLAGS $GIO_UNIX_LIBS $GIO_CFLAGS $GIO_LIBS]) if test "$with_libnotify" = "yes" ; then @@ -270,4 +303,11 @@ AC_MSG_NOTICE([ Debug : $enable_debug]) AC_MSG_NOTICE([ Minimum Lifetime: $minimum_lifetime minutes]) AC_MSG_NOTICE([ Check Interval: $check_interval seconds]) AC_MSG_NOTICE([]) - +AC_MSG_NOTICE([Plugins]) +AC_MSG_NOTICE([]) +if test "$with_pam" = "yes" ; then +AC_MSG_NOTICE([ PAM plugin: $PAM_LIBS]) +else +AC_MSG_NOTICE([ PAM plugin: no]) +fi +AC_MSG_NOTICE([]) diff --git a/etpo/Makefile.in b/etpo/Makefile.in index 0ffe9e5..ec96b7b 100644 --- a/etpo/Makefile.in +++ b/etpo/Makefile.in @@ -144,6 +144,8 @@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@ GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ +GMODULE_CFLAGS = @GMODULE_CFLAGS@ +GMODULE_LIBS = @GMODULE_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ @@ -161,6 +163,7 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +KA_PLUGINS_DIR = @KA_PLUGINS_DIR@ KRB5_CFLAGS = @KRB5_CFLAGS@ KRB5_CONFIG = @KRB5_CONFIG@ KRB5_LIBS = @KRB5_LIBS@ @@ -201,6 +204,7 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PAM_LIBS = @PAM_LIBS@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ diff --git a/examples/Makefile.am b/examples/Makefile.am index ed8137b..c0d930a 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -1,2 +1,5 @@ +NULL = + EXTRA_DIST = \ - tgt-signals.py + tgt-signals.py \ + $(NULL) diff --git a/examples/Makefile.in b/examples/Makefile.in index 3e682a7..4c6785c 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -97,6 +97,8 @@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@ GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ +GMODULE_CFLAGS = @GMODULE_CFLAGS@ +GMODULE_LIBS = @GMODULE_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ @@ -114,6 +116,7 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +KA_PLUGINS_DIR = @KA_PLUGINS_DIR@ KRB5_CFLAGS = @KRB5_CFLAGS@ KRB5_CONFIG = @KRB5_CONFIG@ KRB5_LIBS = @KRB5_LIBS@ @@ -154,6 +157,7 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PAM_LIBS = @PAM_LIBS@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ @@ -228,8 +232,10 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +NULL = EXTRA_DIST = \ - tgt-signals.py + tgt-signals.py \ + $(NULL) all: all-am diff --git a/gnome-doc-utils.make b/gnome-doc-utils.make index ec8f698..97fd549 100644 --- a/gnome-doc-utils.make +++ b/gnome-doc-utils.make @@ -266,6 +266,13 @@ _DOC_POFILES = $(if $(DOC_MODULE)$(DOC_ID), \ .PHONY: po po: $(_DOC_POFILES) +## @ _DOC_MOFILES +## The .mo files used for translating the document +_DOC_MOFILES = $(patsubst %.po,%.mo,$(_DOC_POFILES)) + +.PHONY: mo +mo: $(_DOC_MOFILES) + ## @ _DOC_LC_MODULES ## The top-level documentation files in all other locales _DOC_LC_MODULES = $(if $(DOC_MODULE), \ @@ -332,16 +339,23 @@ $(_DOC_POFILES): $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs); \ fi +$(_DOC_MOFILES): %.mo: %.po + @if ! test -d $(dir $@); then \ + echo "mkdir $(dir $@)"; \ + mkdir "$(dir $@)"; \ + fi + msgfmt -o $@ $< + # FIXME: fix the dependancy # FIXME: hook xml2po up -$(_DOC_LC_DOCS) : $(_DOC_POFILES) +$(_DOC_LC_DOCS) : $(_DOC_MOFILES) $(_DOC_LC_DOCS) : $(_DOC_C_DOCS) if ! test -d $(dir $@); then mkdir $(dir $@); fi if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \ - po="$(dir $@)$(patsubst %/$(notdir $@),%,$@).po"; \ - if [ -f "$${po}" ]; then po="../$${po}"; else po="$(_DOC_ABS_SRCDIR)/$${po}"; fi; \ + mo="$(dir $@)$(patsubst %/$(notdir $@),%,$@).mo"; \ + if [ -f "$${mo}" ]; then mo="../$${mo}"; else mo="$(_DOC_ABS_SRCDIR)/$${mo}"; fi; \ (cd $(dir $@) && \ - $(_xml2po) -m $(_xml2po_mode) -e -p "$${po}" \ + $(_xml2po) -m $(_xml2po_mode) -e -t "$${mo}" \ "$${d}C/$(notdir $@)" > $(notdir $@).tmp && \ cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp) @@ -386,12 +400,14 @@ clean-doc-omf: ; rm -f $(_DOC_OMF_DB) $(_DOC_OMF_HTML) clean-doc-dsk: ; rm -f $(_DOC_DSK_DB) $(_DOC_DSK_HTML) clean-doc-lc: rm -f $(_DOC_LC_DOCS) + rm -f $(_DOC_MOFILES) @list='$(_DOC_POFILES)'; for po in $$list; do \ if ! test "$$po" -ef "$(srcdir)/$$po"; then \ echo "rm -f $$po"; \ rm -f "$$po"; \ fi; \ done +# .xml2.po.mo cleaning is obsolete as of 0.18.1 and could be removed in 0.20.x @for lc in C $(_DOC_REAL_LINGUAS); do \ if test -f "$$lc/.xml2po.mo"; then \ echo "rm -f $$lc/.xml2po.mo"; \ diff --git a/gtksecentry/Makefile.in b/gtksecentry/Makefile.in index 4ea70a7..5d13085 100644 --- a/gtksecentry/Makefile.in +++ b/gtksecentry/Makefile.in @@ -132,6 +132,8 @@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@ GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ +GMODULE_CFLAGS = @GMODULE_CFLAGS@ +GMODULE_LIBS = @GMODULE_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ @@ -149,6 +151,7 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +KA_PLUGINS_DIR = @KA_PLUGINS_DIR@ KRB5_CFLAGS = @KRB5_CFLAGS@ KRB5_CONFIG = @KRB5_CONFIG@ KRB5_LIBS = @KRB5_LIBS@ @@ -189,6 +192,7 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PAM_LIBS = @PAM_LIBS@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ diff --git a/help/Makefile.in b/help/Makefile.in index 2ec9b8a..d66e50a 100644 --- a/help/Makefile.in +++ b/help/Makefile.in @@ -122,6 +122,8 @@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@ GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ +GMODULE_CFLAGS = @GMODULE_CFLAGS@ +GMODULE_LIBS = @GMODULE_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ @@ -139,6 +141,7 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +KA_PLUGINS_DIR = @KA_PLUGINS_DIR@ KRB5_CFLAGS = @KRB5_CFLAGS@ KRB5_CONFIG = @KRB5_CONFIG@ KRB5_LIBS = @KRB5_LIBS@ @@ -179,6 +182,7 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PAM_LIBS = @PAM_LIBS@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ @@ -323,6 +327,7 @@ _DOC_C_HTML = $(foreach f, \ _DOC_POFILES = $(if $(DOC_MODULE)$(DOC_ID), \ $(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(lc).po)) +_DOC_MOFILES = $(patsubst %.po,%.mo,$(_DOC_POFILES)) _DOC_LC_MODULES = $(if $(DOC_MODULE), \ $(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xml)) @@ -678,6 +683,9 @@ omf: $(_DOC_OMF_ALL) .PHONY: po po: $(_DOC_POFILES) +.PHONY: mo +mo: $(_DOC_MOFILES) + $(_DOC_POFILES): @if ! test -d $(dir $@); then \ echo "mkdir $(dir $@)"; \ @@ -705,16 +713,23 @@ $(_DOC_POFILES): $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs); \ fi +$(_DOC_MOFILES): %.mo: %.po + @if ! test -d $(dir $@); then \ + echo "mkdir $(dir $@)"; \ + mkdir "$(dir $@)"; \ + fi + msgfmt -o $@ $< + # FIXME: fix the dependancy # FIXME: hook xml2po up -$(_DOC_LC_DOCS) : $(_DOC_POFILES) +$(_DOC_LC_DOCS) : $(_DOC_MOFILES) $(_DOC_LC_DOCS) : $(_DOC_C_DOCS) if ! test -d $(dir $@); then mkdir $(dir $@); fi if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \ - po="$(dir $@)$(patsubst %/$(notdir $@),%,$@).po"; \ - if [ -f "$${po}" ]; then po="../$${po}"; else po="$(_DOC_ABS_SRCDIR)/$${po}"; fi; \ + mo="$(dir $@)$(patsubst %/$(notdir $@),%,$@).mo"; \ + if [ -f "$${mo}" ]; then mo="../$${mo}"; else mo="$(_DOC_ABS_SRCDIR)/$${mo}"; fi; \ (cd $(dir $@) && \ - $(_xml2po) -m $(_xml2po_mode) -e -p "$${po}" \ + $(_xml2po) -m $(_xml2po_mode) -e -t "$${mo}" \ "$${d}C/$(notdir $@)" > $(notdir $@).tmp && \ cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp) .PHONY: pot @@ -740,12 +755,14 @@ clean-doc-omf: ; rm -f $(_DOC_OMF_DB) $(_DOC_OMF_HTML) clean-doc-dsk: ; rm -f $(_DOC_DSK_DB) $(_DOC_DSK_HTML) clean-doc-lc: rm -f $(_DOC_LC_DOCS) + rm -f $(_DOC_MOFILES) @list='$(_DOC_POFILES)'; for po in $$list; do \ if ! test "$$po" -ef "$(srcdir)/$$po"; then \ echo "rm -f $$po"; \ rm -f "$$po"; \ fi; \ done +# .xml2.po.mo cleaning is obsolete as of 0.18.1 and could be removed in 0.20.x @for lc in C $(_DOC_REAL_LINGUAS); do \ if test -f "$$lc/.xml2po.mo"; then \ echo "rm -f $$lc/.xml2po.mo"; \ diff --git a/icons/22x22/Makefile.in b/icons/22x22/Makefile.in index 5b0fba2..d23d014 100644 --- a/icons/22x22/Makefile.in +++ b/icons/22x22/Makefile.in @@ -121,6 +121,8 @@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@ GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ +GMODULE_CFLAGS = @GMODULE_CFLAGS@ +GMODULE_LIBS = @GMODULE_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ @@ -138,6 +140,7 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +KA_PLUGINS_DIR = @KA_PLUGINS_DIR@ KRB5_CFLAGS = @KRB5_CFLAGS@ KRB5_CONFIG = @KRB5_CONFIG@ KRB5_LIBS = @KRB5_LIBS@ @@ -178,6 +181,7 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PAM_LIBS = @PAM_LIBS@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ diff --git a/icons/48x48/Makefile.in b/icons/48x48/Makefile.in index 06fcf64..3cf1ae4 100644 --- a/icons/48x48/Makefile.in +++ b/icons/48x48/Makefile.in @@ -121,6 +121,8 @@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@ GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ +GMODULE_CFLAGS = @GMODULE_CFLAGS@ +GMODULE_LIBS = @GMODULE_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ @@ -138,6 +140,7 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +KA_PLUGINS_DIR = @KA_PLUGINS_DIR@ KRB5_CFLAGS = @KRB5_CFLAGS@ KRB5_CONFIG = @KRB5_CONFIG@ KRB5_LIBS = @KRB5_LIBS@ @@ -178,6 +181,7 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PAM_LIBS = @PAM_LIBS@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ diff --git a/icons/Makefile.in b/icons/Makefile.in index 40e6dde..4cd3dec 100644 --- a/icons/Makefile.in +++ b/icons/Makefile.in @@ -137,6 +137,8 @@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@ GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ +GMODULE_CFLAGS = @GMODULE_CFLAGS@ +GMODULE_LIBS = @GMODULE_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ @@ -154,6 +156,7 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +KA_PLUGINS_DIR = @KA_PLUGINS_DIR@ KRB5_CFLAGS = @KRB5_CFLAGS@ KRB5_CONFIG = @KRB5_CONFIG@ KRB5_LIBS = @KRB5_LIBS@ @@ -194,6 +197,7 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PAM_LIBS = @PAM_LIBS@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ diff --git a/icons/scalable/Makefile.in b/icons/scalable/Makefile.in index da379a8..2e56926 100644 --- a/icons/scalable/Makefile.in +++ b/icons/scalable/Makefile.in @@ -121,6 +121,8 @@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@ GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ +GMODULE_CFLAGS = @GMODULE_CFLAGS@ +GMODULE_LIBS = @GMODULE_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ @@ -138,6 +140,7 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +KA_PLUGINS_DIR = @KA_PLUGINS_DIR@ KRB5_CFLAGS = @KRB5_CFLAGS@ KRB5_CONFIG = @KRB5_CONFIG@ KRB5_LIBS = @KRB5_LIBS@ @@ -178,6 +181,7 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PAM_LIBS = @PAM_LIBS@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ diff --git a/krb5-auth-dialog.spec b/krb5-auth-dialog.spec index 696c2dd..a885a49 100644 --- a/krb5-auth-dialog.spec +++ b/krb5-auth-dialog.spec @@ -1,6 +1,6 @@ Summary: Kerberos 5 authentication dialog Name: krb5-auth-dialog -Version: 0.15 +Version: 0.16 Release: 1 License: GPL Group: User Interface/X diff --git a/plugins/Makefile.am b/plugins/Makefile.am new file mode 100644 index 0000000..8fecd5c --- /dev/null +++ b/plugins/Makefile.am @@ -0,0 +1,49 @@ +NULL = + +pkglibdir = $(KA_PLUGINS_DIR) + +if ENABLE_PAM_PLUGIN + PAM_PLUGIN = libka-plugin-pam.la +else + PAM_PLUGIN = +endif + +pkglib_LTLIBRARIES = \ + libka-plugin-dummy.la \ + $(PAM_PLUGIN) \ + $(NULL) + +# Dummy example plugin +libka_plugin_dummy_la_SOURCES = \ + ka-plugin-dummy.c \ + ka-plugin-dummy.h \ + $(NULL) + +libka_plugin_dummy_la_CPPFLAGS = \ + $(GTK_CFLAGS) \ + -I$(top_srcdir)/src \ + $(NULL) + +libka_plugin_dummy_la_LDFLAGS = \ + -module \ + -avoid-version \ + $(NULL) + +# PAM plugin +if ENABLE_PAM_PLUGIN +libka_plugin_pam_la_SOURCES = \ + ka-plugin-pam.c \ + ka-plugin-pam.h \ + $(NULL) + +libka_plugin_pam_la_CPPFLAGS = \ + $(GTK_CFLAGS) \ + -I$(top_srcdir)/src \ + $(NULL) + +libka_plugin_pam_la_LDFLAGS = \ + -module \ + -avoid-version \ + $(PAM_LIBS) \ + $(NULL) +endif diff --git a/plugins/Makefile.in b/plugins/Makefile.in new file mode 100644 index 0000000..a2ca6c5 --- /dev/null +++ b/plugins/Makefile.in @@ -0,0 +1,679 @@ +# Makefile.in generated by automake 1.11.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = plugins +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/m4/compiler-flags.m4 \ + $(top_srcdir)/m4/gnome-doc-utils.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__installdirs = "$(DESTDIR)$(pkglibdir)" +LTLIBRARIES = $(pkglib_LTLIBRARIES) +libka_plugin_dummy_la_LIBADD = +am__objects_1 = +am_libka_plugin_dummy_la_OBJECTS = \ + libka_plugin_dummy_la-ka-plugin-dummy.lo $(am__objects_1) +libka_plugin_dummy_la_OBJECTS = $(am_libka_plugin_dummy_la_OBJECTS) +AM_V_lt = $(am__v_lt_$(V)) +am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +am__v_lt_0 = --silent +libka_plugin_dummy_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(AM_CFLAGS) $(CFLAGS) $(libka_plugin_dummy_la_LDFLAGS) \ + $(LDFLAGS) -o $@ +libka_plugin_pam_la_LIBADD = +am__libka_plugin_pam_la_SOURCES_DIST = ka-plugin-pam.c ka-plugin-pam.h +@ENABLE_PAM_PLUGIN_TRUE@am_libka_plugin_pam_la_OBJECTS = \ +@ENABLE_PAM_PLUGIN_TRUE@ libka_plugin_pam_la-ka-plugin-pam.lo \ +@ENABLE_PAM_PLUGIN_TRUE@ $(am__objects_1) +libka_plugin_pam_la_OBJECTS = $(am_libka_plugin_pam_la_OBJECTS) +libka_plugin_pam_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(AM_CFLAGS) $(CFLAGS) $(libka_plugin_pam_la_LDFLAGS) \ + $(LDFLAGS) -o $@ +@ENABLE_PAM_PLUGIN_TRUE@am_libka_plugin_pam_la_rpath = -rpath \ +@ENABLE_PAM_PLUGIN_TRUE@ $(pkglibdir) +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +am__mv = mv -f +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_$(V)) +am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) +am__v_CC_0 = @echo " CC " $@; +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ +CCLD = $(CC) +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_$(V)) +am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) +am__v_CCLD_0 = @echo " CCLD " $@; +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; +SOURCES = $(libka_plugin_dummy_la_SOURCES) \ + $(libka_plugin_pam_la_SOURCES) +DIST_SOURCES = $(libka_plugin_dummy_la_SOURCES) \ + $(am__libka_plugin_pam_la_SOURCES_DIST) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +pkglibdir = $(KA_PLUGINS_DIR) +ACLOCAL = @ACLOCAL@ +ALL_LINGUAS = @ALL_LINGUAS@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +COMPILER_FLAGS = @COMPILER_FLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DBUS_CFLAGS = @DBUS_CFLAGS@ +DBUS_LIBS = @DBUS_LIBS@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ +DOC_USER_FORMATS = @DOC_USER_FORMATS@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GCONFTOOL = @GCONFTOOL@ +GCONF_CFLAGS = @GCONF_CFLAGS@ +GCONF_LIBS = @GCONF_LIBS@ +GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ +GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GIO_CFLAGS = @GIO_CFLAGS@ +GIO_LIBS = @GIO_LIBS@ +GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@ +GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ +GMODULE_CFLAGS = @GMODULE_CFLAGS@ +GMODULE_LIBS = @GMODULE_LIBS@ +GMOFILES = @GMOFILES@ +GMSGFMT = @GMSGFMT@ +GREP = @GREP@ +GTK_CFLAGS = @GTK_CFLAGS@ +GTK_LIBS = @GTK_LIBS@ +HELP_DIR = @HELP_DIR@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLLIBS = @INTLLIBS@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +INTLTOOL_MERGE = @INTLTOOL_MERGE@ +INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +KA_PLUGINS_DIR = @KA_PLUGINS_DIR@ +KRB5_CFLAGS = @KRB5_CFLAGS@ +KRB5_CONFIG = @KRB5_CONFIG@ +KRB5_LIBS = @KRB5_LIBS@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LEX = @LEX@ +LEXLIB = @LEXLIB@ +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBCAP = @LIBCAP@ +LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ +LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGMERGE = @MSGMERGE@ +NETWORK_MANAGER_CFLAGS = @NETWORK_MANAGER_CFLAGS@ +NETWORK_MANAGER_LIBS = @NETWORK_MANAGER_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OMF_DIR = @OMF_DIR@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PAM_LIBS = @PAM_LIBS@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +POFILES = @POFILES@ +POSUB = @POSUB@ +PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ +RANLIB = @RANLIB@ +SC_PKCS11 = @SC_PKCS11@ +SED = @SED@ +SETCAP = @SETCAP@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +WARN_CFLAGS = @WARN_CFLAGS@ +WARN_PYTHON_CFLAGS = @WARN_PYTHON_CFLAGS@ +XGETTEXT = @XGETTEXT@ +YACC = @YACC@ +YFLAGS = @YFLAGS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +check_interval = @check_interval@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ +mandir = @mandir@ +minimum_lifetime = @minimum_lifetime@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +NULL = +@ENABLE_PAM_PLUGIN_FALSE@PAM_PLUGIN = +@ENABLE_PAM_PLUGIN_TRUE@PAM_PLUGIN = libka-plugin-pam.la +pkglib_LTLIBRARIES = \ + libka-plugin-dummy.la \ + $(PAM_PLUGIN) \ + $(NULL) + + +# Dummy example plugin +libka_plugin_dummy_la_SOURCES = \ + ka-plugin-dummy.c \ + ka-plugin-dummy.h \ + $(NULL) + +libka_plugin_dummy_la_CPPFLAGS = \ + $(GTK_CFLAGS) \ + -I$(top_srcdir)/src \ + $(NULL) + +libka_plugin_dummy_la_LDFLAGS = \ + -module \ + -avoid-version \ + $(NULL) + + +# PAM plugin +@ENABLE_PAM_PLUGIN_TRUE@libka_plugin_pam_la_SOURCES = \ +@ENABLE_PAM_PLUGIN_TRUE@ ka-plugin-pam.c \ +@ENABLE_PAM_PLUGIN_TRUE@ ka-plugin-pam.h \ +@ENABLE_PAM_PLUGIN_TRUE@ $(NULL) + +@ENABLE_PAM_PLUGIN_TRUE@libka_plugin_pam_la_CPPFLAGS = \ +@ENABLE_PAM_PLUGIN_TRUE@ $(GTK_CFLAGS) \ +@ENABLE_PAM_PLUGIN_TRUE@ -I$(top_srcdir)/src \ +@ENABLE_PAM_PLUGIN_TRUE@ $(NULL) + +@ENABLE_PAM_PLUGIN_TRUE@libka_plugin_pam_la_LDFLAGS = \ +@ENABLE_PAM_PLUGIN_TRUE@ -module \ +@ENABLE_PAM_PLUGIN_TRUE@ -avoid-version \ +@ENABLE_PAM_PLUGIN_TRUE@ $(PAM_LIBS) \ +@ENABLE_PAM_PLUGIN_TRUE@ $(NULL) + +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .lo .o .obj +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu plugins/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): +install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) + @$(NORMAL_INSTALL) + test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" + @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ + } + +uninstall-pkglibLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \ + done + +clean-pkglibLTLIBRARIES: + -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) + @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done +libka-plugin-dummy.la: $(libka_plugin_dummy_la_OBJECTS) $(libka_plugin_dummy_la_DEPENDENCIES) + $(AM_V_CCLD)$(libka_plugin_dummy_la_LINK) -rpath $(pkglibdir) $(libka_plugin_dummy_la_OBJECTS) $(libka_plugin_dummy_la_LIBADD) $(LIBS) +libka-plugin-pam.la: $(libka_plugin_pam_la_OBJECTS) $(libka_plugin_pam_la_DEPENDENCIES) + $(AM_V_CCLD)$(libka_plugin_pam_la_LINK) $(am_libka_plugin_pam_la_rpath) $(libka_plugin_pam_la_OBJECTS) $(libka_plugin_pam_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libka_plugin_dummy_la-ka-plugin-dummy.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libka_plugin_pam_la-ka-plugin-pam.Plo@am__quote@ + +.c.o: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c $< + +.c.obj: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + +.c.lo: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + +libka_plugin_dummy_la-ka-plugin-dummy.lo: ka-plugin-dummy.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libka_plugin_dummy_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libka_plugin_dummy_la-ka-plugin-dummy.lo -MD -MP -MF $(DEPDIR)/libka_plugin_dummy_la-ka-plugin-dummy.Tpo -c -o libka_plugin_dummy_la-ka-plugin-dummy.lo `test -f 'ka-plugin-dummy.c' || echo '$(srcdir)/'`ka-plugin-dummy.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libka_plugin_dummy_la-ka-plugin-dummy.Tpo $(DEPDIR)/libka_plugin_dummy_la-ka-plugin-dummy.Plo +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ka-plugin-dummy.c' object='libka_plugin_dummy_la-ka-plugin-dummy.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libka_plugin_dummy_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libka_plugin_dummy_la-ka-plugin-dummy.lo `test -f 'ka-plugin-dummy.c' || echo '$(srcdir)/'`ka-plugin-dummy.c + +libka_plugin_pam_la-ka-plugin-pam.lo: ka-plugin-pam.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libka_plugin_pam_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libka_plugin_pam_la-ka-plugin-pam.lo -MD -MP -MF $(DEPDIR)/libka_plugin_pam_la-ka-plugin-pam.Tpo -c -o libka_plugin_pam_la-ka-plugin-pam.lo `test -f 'ka-plugin-pam.c' || echo '$(srcdir)/'`ka-plugin-pam.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libka_plugin_pam_la-ka-plugin-pam.Tpo $(DEPDIR)/libka_plugin_pam_la-ka-plugin-pam.Plo +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ka-plugin-pam.c' object='libka_plugin_pam_la-ka-plugin-pam.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libka_plugin_pam_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libka_plugin_pam_la-ka-plugin-pam.lo `test -f 'ka-plugin-pam.c' || echo '$(srcdir)/'`ka-plugin-pam.c + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + set x; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(LTLIBRARIES) +installdirs: + for dir in "$(DESTDIR)$(pkglibdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: install-pkglibLTLIBRARIES + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-pkglibLTLIBRARIES + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-pkglibLTLIBRARIES \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/plugins/ka-plugin-dummy.c b/plugins/ka-plugin-dummy.c new file mode 100644 index 0000000..6485c0d --- /dev/null +++ b/plugins/ka-plugin-dummy.c @@ -0,0 +1,105 @@ +/* + * Copyright (C) 2010 Guido Guenther <agx@sigxcpu.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#include "ka-plugin-dummy.h" +#include <gmodule.h> + +G_DEFINE_TYPE (KaPluginDummy, ka_plugin_dummy, KA_TYPE_PLUGIN) + +#define GET_PRIVATE(o) \ + (G_TYPE_INSTANCE_GET_PRIVATE ((o), KA_TYPE_PLUGIN_DUMMY, KaPluginDummyPrivate)) + +int ka_plugin_major_version = KA_PLUGIN_MAJOR_VERSION; +int ka_plugin_minor_version = KA_PLUGIN_MINOR_VERSION; + +G_MODULE_EXPORT KaPlugin* +ka_plugin_create (void) +{ + return KA_PLUGIN (ka_plugin_dummy_new()); +} + +typedef struct _KaPluginDummyPrivate KaPluginDummyPrivate; + +struct _KaPluginDummyPrivate { + gulong handlers[3]; +}; + +event_cb (gpointer* applet, gchar* princ, guint when, gpointer user_data) +{ + g_message("%s %s @%d", user_data, princ, when); +} + +static void +ka_plugin_dummy_finalize (GObject *object) +{ + G_OBJECT_CLASS (ka_plugin_dummy_parent_class)->finalize (object); +} + +static void +ka_plugin_dummy_activate (KaPlugin *self, KaApplet* applet) +{ + KaPluginDummyPrivate *priv = GET_PRIVATE (self); + + priv->handlers[0] = g_signal_connect (applet, + "krb-tgt-expired", + G_CALLBACK (event_cb), + "Expired"); + priv->handlers[1] = g_signal_connect (applet, + "krb-tgt-acquired", + G_CALLBACK (event_cb), + "Acquired"); + priv->handlers[2] = g_signal_connect (applet, + "krb-tgt-renewed", + G_CALLBACK (event_cb), + "Renewed"); +} + +static void +ka_plugin_dummy_deactivate (KaPlugin *self, KaApplet* applet) +{ + int i; + KaPluginDummyPrivate *priv = GET_PRIVATE (self); + + for (i = 0; i < G_N_ELEMENTS(priv->handlers); i++) + g_signal_handler_disconnect (applet, priv->handlers[i]); +} + +static void +ka_plugin_dummy_class_init (KaPluginDummyClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + KaPluginClass *plugin_class = KA_PLUGIN_CLASS (klass); + + g_type_class_add_private (klass, sizeof (KaPluginDummyPrivate)); + + plugin_class->activate = ka_plugin_dummy_activate; + plugin_class->deactivate = ka_plugin_dummy_deactivate; + object_class->finalize = ka_plugin_dummy_finalize; +} + +static void +ka_plugin_dummy_init (KaPluginDummy *self) +{ +} + +KaPluginDummy* +ka_plugin_dummy_new (void) +{ + return g_object_new (KA_TYPE_PLUGIN_DUMMY, KA_PLUGIN_PROP_NAME, + "dummy", NULL); +} diff --git a/plugins/ka-plugin-dummy.h b/plugins/ka-plugin-dummy.h new file mode 100644 index 0000000..311861a --- /dev/null +++ b/plugins/ka-plugin-dummy.h @@ -0,0 +1,57 @@ +/* + * Copyright (C) 2010 Guido Guenther <agx@sigxcpu.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifndef _KA_PLUGIN_DUMMY +#define _KA_PLUGIN_DUMMY + +#include "ka-plugin.h" + +G_BEGIN_DECLS + +#define KA_TYPE_PLUGIN_DUMMY ka_plugin_dummy_get_type() + +#define KA_PLUGIN_DUMMY(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), KA_TYPE_PLUGIN_DUMMY, KaPluginDummy)) + +#define KA_PLUGIN_DUMMY_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST ((klass), KA_TYPE_PLUGIN_DUMMY, KaPluginDummyClass)) + +#define KA_IS_PLUGIN_DUMMY(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), KA_TYPE_PLUGIN_DUMMY)) + +#define KA_IS_PLUGIN_DUMMY_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), KA_TYPE_PLUGIN_DUMMY)) + +#define KA_PLUGIN_DUMMY_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS ((obj), KA_TYPE_PLUGIN_DUMMY, KaPluginDummyClass)) + +typedef struct { + KaPlugin parent; +} KaPluginDummy; + +typedef struct { + KaPluginClass parent_class; +} KaPluginDummyClass; + +GType ka_plugin_dummy_get_type (void); + +KaPluginDummy* ka_plugin_dummy_new (void); + +G_END_DECLS + +#endif /* _KA_PLUGIN_DUMMY */ diff --git a/plugins/ka-plugin-pam.c b/plugins/ka-plugin-pam.c new file mode 100644 index 0000000..53d1f06 --- /dev/null +++ b/plugins/ka-plugin-pam.c @@ -0,0 +1,128 @@ +/* + * Copyright (C) 2010 Guido Guenther <agx@sigxcpu.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#include "ka-plugin-pam.h" +#include <gmodule.h> + +#include <security/pam_appl.h> + +G_DEFINE_TYPE (KaPluginPam, ka_plugin_pam, KA_TYPE_PLUGIN) + +#define GET_PRIVATE(o) \ + (G_TYPE_INSTANCE_GET_PRIVATE ((o), KA_TYPE_PLUGIN_PAM, KaPluginPamPrivate)) + +typedef struct _KaPluginPamPrivate KaPluginPamPrivate; + +int ka_plugin_major_version = KA_PLUGIN_MAJOR_VERSION; +int ka_plugin_minor_version = KA_PLUGIN_MINOR_VERSION; + +G_MODULE_EXPORT KaPlugin* +ka_plugin_create (void) +{ + return KA_PLUGIN (ka_plugin_pam_new()); +} + +struct _KaPluginPamPrivate { + gulong handlers[2]; +}; + +static void +ka_plugin_pam_finalize (GObject *object) +{ + G_OBJECT_CLASS (ka_plugin_pam_parent_class)->finalize (object); +} + +static int simple_conv( int n, const struct pam_message **msg, struct pam_response **resp, void *data) +{ + return (PAM_CONV_ERR); +} + +static struct pam_conv simplepamconv = { simple_conv, NULL }; + +static void +renewed_event_cb (gpointer* applet, gchar* princ, guint when, gpointer user_data) +{ + const char *user; + pam_handle_t *pamh = NULL; + int retval = 0; + + user = g_get_user_name (); + retval = pam_start("ka-plugin-pam", user, &simplepamconv, &pamh); + if (retval) + goto out; + + retval = pam_setcred(pamh, PAM_ESTABLISH_CRED); + if (retval) + goto out; + +out: + if (retval) + g_warning("PAM plugin: %s", pam_strerror(pamh, retval)); + + if (pamh) + pam_end(pamh, PAM_SUCCESS); +} + +static void +ka_plugin_pam_activate (KaPlugin *self, KaApplet* applet) +{ + KaPluginPamPrivate *priv = GET_PRIVATE (self); + + priv->handlers[1] = g_signal_connect (applet, + "krb-tgt-acquired", + G_CALLBACK (renewed_event_cb), + NULL); + priv->handlers[0] = g_signal_connect (applet, + "krb-tgt-renewed", + G_CALLBACK (renewed_event_cb), + NULL); +} + + +static void +ka_plugin_pam_deactivate (KaPlugin *self, KaApplet* applet) +{ + KaPluginPamPrivate *priv = GET_PRIVATE (self); + + g_signal_handler_disconnect (applet, priv->handlers[0]); + g_signal_handler_disconnect (applet, priv->handlers[1]); +} + +static void +ka_plugin_pam_class_init (KaPluginPamClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + KaPluginClass *plugin_class = KA_PLUGIN_CLASS (klass); + + g_type_class_add_private (klass, sizeof (KaPluginPamPrivate)); + + plugin_class->activate = ka_plugin_pam_activate; + plugin_class->deactivate = ka_plugin_pam_deactivate; + object_class->finalize = ka_plugin_pam_finalize; +} + +static void +ka_plugin_pam_init (KaPluginPam *self) +{ +} + +KaPluginPam* +ka_plugin_pam_new (void) +{ + return g_object_new (KA_TYPE_PLUGIN_PAM, KA_PLUGIN_PROP_NAME, "pam", NULL); +} diff --git a/plugins/ka-plugin-pam.h b/plugins/ka-plugin-pam.h new file mode 100644 index 0000000..c693121 --- /dev/null +++ b/plugins/ka-plugin-pam.h @@ -0,0 +1,59 @@ +/* + * Copyright (C) 2010 Guido Guenther <agx@sigxcpu.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifndef _KA_PLUGIN_PAM +#define _KA_PLUGIN_PAM + +#include <ka-plugin.h> + +G_BEGIN_DECLS + +#define KA_TYPE_PLUGIN_PAM ka_plugin_pam_get_type() + +#define KA_PLUGIN_PAM(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), KA_TYPE_PLUGIN_PAM, KaPluginPam)) + +#define KA_PLUGIN_PAM_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST ((klass), KA_TYPE_PLUGIN_PAM, KaPluginPamClass)) + +#define KA_IS_PLUGIN_PAM(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), KA_TYPE_PLUGIN_PAM)) + +#define KA_IS_PLUGIN_PAM_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), KA_TYPE_PLUGIN_PAM)) + +#define KA_PLUGIN_PAM_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS ((obj), KA_TYPE_PLUGIN_PAM, KaPluginPamClass)) + +typedef struct { + KaPlugin parent; +} KaPluginPam; + +typedef struct { + KaPluginClass parent_class; +} KaPluginPamClass; + +GType ka_plugin_pam_get_type (void); + +KaPluginPam* ka_plugin_pam_new (void); + +G_END_DECLS + +#endif /* _KA_PLUGIN_PAM */ + +/* ka-plugin-pam.c */ diff --git a/po/POTFILES.in b/po/POTFILES.in index 040ebc6..d2073d3 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,14 +1,14 @@ [type: gettext/glade]src/krb5-auth-dialog.xml -src/krb5-auth-dialog.c -src/krb5-auth-pwdialog.c +src/ka-dialog.c +src/ka-pwdialog.c src/dummy-strings.c -src/krb5-auth-applet.c -src/krb5-auth-tools.c -src/krb5-auth-tickets.c +src/ka-applet.c +src/ka-tools.c +src/ka-tickets.c src/krb5-auth-dialog.desktop.in src/krb5-auth-dialog.schemas.in gtksecentry/gtksecentry.c secmem/util.c -preferences/krb5-auth-dialog-preferences.c +preferences/ka-preferences.c preferences/krb5-auth-dialog-preferences.desktop.in [type: gettext/glade]preferences/krb5-auth-dialog-preferences.xml @@ -11,17 +11,17 @@ # dem Client und Server und verifiziert selbst deren Identität. # # Guido Günther <agx@sigxcpu.org>, 2009. -# Mario Blättermann <mariobl@gnome.org>, 2009. +# Mario Blättermann <mariobl@gnome.org>, 2009, 2010. # Christian Kirbach <Christian.Kirbach@googlemail.com>, 2009. # msgid "" msgstr "" -"Project-Id-Version: krb5-auth-dialog 0.8\n" +"Project-Id-Version: krb5-auth-dialog master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=krb5-" "auth-dialog&component=general\n" -"POT-Creation-Date: 2009-10-16 21:53+0000\n" -"PO-Revision-Date: 2009-10-18 15:48+0200\n" -"Last-Translator: Christian Kirbach <Christian.Kirbach@googlemail.com>\n" +"POT-Creation-Date: 2010-04-27 17:51+0000\n" +"PO-Revision-Date: 2010-05-02 12:11+0100\n" +"Last-Translator: Mario Blättermann <mariobl@gnome.org>\n" "Language-Team: German <gnome-de@gnome.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -51,36 +51,36 @@ msgstr "Unbekannter Fehler" msgid "Expired" msgstr "Abgelaufen" -#: ../src/krb5-auth-pwdialog.c:170 +#: ../src/krb5-auth-pwdialog.c:173 #, c-format msgid "Couldn't acquire kerberos ticket: '%s'" msgstr "Kerberos-Ticket konnte nicht erlangt werden: »%s«" -#: ../src/krb5-auth-pwdialog.c:207 ../src/krb5-auth-applet.c:359 +#: ../src/krb5-auth-pwdialog.c:210 ../src/krb5-auth-applet.c:390 #, c-format msgid "Your credentials expire in %d minute" msgid_plural "Your credentials expire in %d minutes" msgstr[0] "Ihre Anmeldeinformationen laufen in %d Minute ab" msgstr[1] "Ihre Anmeldeinformationen laufen in %d Minuten ab" -#: ../src/krb5-auth-pwdialog.c:212 ../src/krb5-auth-applet.c:364 +#: ../src/krb5-auth-pwdialog.c:215 ../src/krb5-auth-applet.c:395 msgid "Your credentials have expired" msgstr "Anmeldeinformationen abgelaufen" -#: ../src/krb5-auth-pwdialog.c:233 +#: ../src/krb5-auth-pwdialog.c:236 msgid "Please enter your Kerberos password:" msgstr "Bitte geben Sie ihr Kerberos-Passwort ein:" -#: ../src/krb5-auth-pwdialog.c:244 +#: ../src/krb5-auth-pwdialog.c:247 #, c-format msgid "Please enter the password for '%s':" msgstr "Bitte geben Sie das Passwort für »%s« ein:" -#: ../src/krb5-auth-pwdialog.c:264 +#: ../src/krb5-auth-pwdialog.c:267 msgid "The password you entered is invalid" msgstr "Das eingegebene Passwort ist nicht gültig" -#: ../src/krb5-auth-pwdialog.c:280 +#: ../src/krb5-auth-pwdialog.c:283 #, c-format msgid "%s Error" msgstr "%s-Fehler" @@ -650,8 +650,7 @@ msgstr "Kerberos-Dienst ist unbekannt" #: ../src/dummy-strings.c:120 msgid "Cannot contact any KDC for requested realm" msgstr "" -"Es kann kein KDC des angeforderten Administrationsbereiches kontaktiert " -"werden" +"Es kann kein KDC des angeforderten Administrationsbereiches kontaktiert werden" #. krb5_err.et:krb5:KRB5_KDC_UNREACH #: ../src/dummy-strings.c:121 @@ -951,8 +950,7 @@ msgstr "" #: ../src/dummy-strings.c:177 msgid "Unsupported key table format version number" msgstr "" -"Nicht unterstützte Formatversionsnummer des Schlüsseltabelle-" -"Zwischenspeichers" +"Nicht unterstützte Formatversionsnummer des Schlüsseltabelle-Zwischenspeichers" #. krb5_err.et:krb5:KRB5_KEYTAB_BADVNO #: ../src/dummy-strings.c:178 @@ -978,7 +976,7 @@ msgstr "Administrationsbereich kann nicht für den Rechner bestimmt werden" #. krb5_err.et:krb5:KRB5_ERR_HOST_REALM_UNKNOWN #: ../src/dummy-strings.c:182 msgid "Conversion to service principal undefined for name type" -msgstr "" +msgstr "Umwandlung des Dienst-Principals ist für den Namenstyp nicht definiert" #. krb5_err.et:krb5:KRB5_SNAME_UNSUPP_NAMETYPE #: ../src/dummy-strings.c:183 @@ -1023,19 +1021,16 @@ msgstr "Ungültige SAM-Flags in obtain_sam_padata" #. krb5_err.et:krb5:KRB5_SAM_UNSUPPORTED #: ../src/dummy-strings.c:190 -#, fuzzy msgid "Invalid encryption type in SAM challenge" msgstr "Ungültige Verschlüsselungsart in SAM-Challenge" #. krb5_err.et:krb5:KRB5_SAM_INVALID_ETYPE #: ../src/dummy-strings.c:191 -#, fuzzy msgid "Missing checksum in SAM challenge" msgstr "Fehlende Prüfsumme in SAM-Challenge" #. krb5_err.et:krb5:KRB5_SAM_NO_CHECKSUM #: ../src/dummy-strings.c:192 -#, fuzzy msgid "Bad checksum in SAM challenge" msgstr "Falsche Prüfsumme in SAM-Challenge" @@ -1048,6 +1043,7 @@ msgstr "Name der Schlüsseltabelle ist zu lang" #: ../src/dummy-strings.c:194 msgid "Key version number for principal in key table is incorrect" msgstr "" +"Versionsnummer des Schlüssels für Principal in Schlüsseltabelle ist fehlerhaft" #. krb5_err.et:krb5:KRB5_KT_KVNONOTFOUND #: ../src/dummy-strings.c:195 @@ -1435,41 +1431,41 @@ msgid "Bad magic number for GSSAPI QUEUE" msgstr "Falsche magische Zahl für GSSAPI QUEUE" #. Translators: First number is hours, second number is minutes -#: ../src/krb5-auth-applet.c:355 +#: ../src/krb5-auth-applet.c:386 #, c-format msgid "Your credentials expire in %.2d:%.2dh" msgstr "Anmeldeinformationen laufen in %.2d:%.2dh ab." -#: ../src/krb5-auth-applet.c:460 +#: ../src/krb5-auth-applet.c:491 msgid "Don't show me this again" msgstr "Dies nicht mehr anzeigen" -#: ../src/krb5-auth-applet.c:497 +#: ../src/krb5-auth-applet.c:533 msgid "Network credentials valid" msgstr "Anmeldeinformationen sind gültig" -#: ../src/krb5-auth-applet.c:498 +#: ../src/krb5-auth-applet.c:534 msgid "You've refreshed your Kerberos credentials." msgstr "Sie haben Ihre Kerberos-Anmeldeinformationen erneuert." -#: ../src/krb5-auth-applet.c:511 +#: ../src/krb5-auth-applet.c:550 msgid "Network credentials expiring" msgstr "Anmeldeinformationen laufen ab" -#: ../src/krb5-auth-applet.c:526 +#: ../src/krb5-auth-applet.c:569 msgid "Network credentials expired" msgstr "Anmeldeinformationen abgelaufen" -#: ../src/krb5-auth-applet.c:527 +#: ../src/krb5-auth-applet.c:570 msgid "Your Kerberos credentails have expired." msgstr "Ihre Kerberos-Anmeldeinformationen sind abgelaufen." -#: ../src/krb5-auth-applet.c:570 +#: ../src/krb5-auth-applet.c:615 #, c-format msgid "There was an error launching the preferences dialog: %s" msgstr "Fehler beim Öffnen des Einstellungsdialogs: %s" -#: ../src/krb5-auth-applet.c:611 +#: ../src/krb5-auth-applet.c:656 #, c-format msgid "" "There was an error displaying %s:\n" @@ -1479,7 +1475,7 @@ msgstr "" "%s" #. Translators: add the translators of your language here -#: ../src/krb5-auth-applet.c:647 +#: ../src/krb5-auth-applet.c:692 msgid "translator-credits" msgstr "" "Guido Günther <agx@sigxcpu.org>\n" @@ -1487,7 +1483,7 @@ msgstr "" "Christian Kirbach <Christian.Kirbach@googlemail.com>" #. kdestroy -#: ../src/krb5-auth-applet.c:689 +#: ../src/krb5-auth-applet.c:734 msgid "Remove Credentials _Cache" msgstr "_Anmeldeinformationen löschen" @@ -1533,93 +1529,101 @@ msgid "Kerberos Network Authentication Dialog" msgstr "Kerberos Netzwerkanmeldungsdialog" #: ../src/krb5-auth-dialog.schemas.in.h:1 +msgid "Enabled plugins" +msgstr "Aktivierte Plugins" + +#: ../src/krb5-auth-dialog.schemas.in.h:2 msgid "Forwardable ticket" msgstr "Weiterleitbares Ticket" -#: ../src/krb5-auth-dialog.schemas.in.h:2 +#: ../src/krb5-auth-dialog.schemas.in.h:3 msgid "Kerberos principal" msgstr "Kerberos-Principal" -#: ../src/krb5-auth-dialog.schemas.in.h:3 +#: ../src/krb5-auth-dialog.schemas.in.h:4 +msgid "List of plugins that should be loaded and activated on startup." +msgstr "" +"Liste der Plugins, welche beim Start geladen und aktiviert werden sollen." + +#: ../src/krb5-auth-dialog.schemas.in.h:5 msgid "Notify user when ticket becomes valid" msgstr "Nutzer benachrichtigen, wenn Ticket gültig wird" -#: ../src/krb5-auth-dialog.schemas.in.h:4 +#: ../src/krb5-auth-dialog.schemas.in.h:6 msgid "Notify user when ticket has expired" msgstr "Nutzer benachrichtigen, wenn Ticket abgelaufen ist" -#: ../src/krb5-auth-dialog.schemas.in.h:5 +#: ../src/krb5-auth-dialog.schemas.in.h:7 msgid "Notify user when ticket is about to expire" msgstr "Nutzer benachrichtigen, wenn Ticket kurz vor Ablauf ist" # Mit Protokollerweiterungen namens PKinit wurde die Verwendung von Zertifikaten in Kerberos integriert -#: ../src/krb5-auth-dialog.schemas.in.h:6 +#: ../src/krb5-auth-dialog.schemas.in.h:8 msgid "PKINIT CA certificates" msgstr "PKINIT-Zertifikate einer Zertifizierungsstelle" -#: ../src/krb5-auth-dialog.schemas.in.h:7 +#: ../src/krb5-auth-dialog.schemas.in.h:9 msgid "PKINIT identifier" msgstr "PKINIT-Bezeichner" -#: ../src/krb5-auth-dialog.schemas.in.h:8 +#: ../src/krb5-auth-dialog.schemas.in.h:10 msgid "PKINIT trust anchors" msgstr "" -#: ../src/krb5-auth-dialog.schemas.in.h:9 +#: ../src/krb5-auth-dialog.schemas.in.h:11 msgid "Prompt minutes before expiry" msgstr "Minuten vor Ablauf nachfragen" -#: ../src/krb5-auth-dialog.schemas.in.h:10 +#: ../src/krb5-auth-dialog.schemas.in.h:12 msgid "Proxiable ticket" msgstr "" -#: ../src/krb5-auth-dialog.schemas.in.h:11 +#: ../src/krb5-auth-dialog.schemas.in.h:13 msgid "Renewable ticket" msgstr "Erneuerbares Ticket" -#: ../src/krb5-auth-dialog.schemas.in.h:12 +#: ../src/krb5-auth-dialog.schemas.in.h:14 msgid "Requested tickets should be forwardable" msgstr "" -#: ../src/krb5-auth-dialog.schemas.in.h:13 +#: ../src/krb5-auth-dialog.schemas.in.h:15 msgid "Requested tickets should be proxiable" msgstr "" -#: ../src/krb5-auth-dialog.schemas.in.h:14 +#: ../src/krb5-auth-dialog.schemas.in.h:16 msgid "Requested tickets should be renewable" msgstr "" -#: ../src/krb5-auth-dialog.schemas.in.h:15 +#: ../src/krb5-auth-dialog.schemas.in.h:17 msgid "Show a trayicon in the status area of the panel" msgstr "Ein Symbol im Benachrichtigungsfeld des Panels anzeigen" -#: ../src/krb5-auth-dialog.schemas.in.h:16 +#: ../src/krb5-auth-dialog.schemas.in.h:18 msgid "Show trayicon" msgstr "Benachrichtigungssymbol anzeigen" -#: ../src/krb5-auth-dialog.schemas.in.h:17 -msgid "" -"Start prompting/displaying notifications that many minutes before expiry" +#: ../src/krb5-auth-dialog.schemas.in.h:19 +msgid "Start prompting/displaying notifications that many minutes before expiry" msgstr "So viele Minuten vor Ablauf benachrichtigen/anzeigen" -#: ../src/krb5-auth-dialog.schemas.in.h:18 +#: ../src/krb5-auth-dialog.schemas.in.h:20 msgid "The kerberos principal to acquire the ticket for" msgstr "Der Kerberos-Principal, für den das Ticket erlangt werden soll" -#: ../src/krb5-auth-dialog.schemas.in.h:19 +#: ../src/krb5-auth-dialog.schemas.in.h:21 msgid "The principal's public/private/certificate identifier when using PKINIT" msgstr "" "Die öffentliche/private/Zertifikatsbezeichnung bei Verwendung von PKINIT" -#: ../src/krb5-auth-dialog.schemas.in.h:20 +#: ../src/krb5-auth-dialog.schemas.in.h:22 msgid "ticket expired notification" msgstr "Benachrichtigung über abgelaufenes Ticket" -#: ../src/krb5-auth-dialog.schemas.in.h:21 +#: ../src/krb5-auth-dialog.schemas.in.h:23 msgid "ticket expiring notification" msgstr "Benachrichtigung über bald ablaufendes Ticket" -#: ../src/krb5-auth-dialog.schemas.in.h:22 +#: ../src/krb5-auth-dialog.schemas.in.h:24 msgid "valid ticket notification" msgstr "Benachrichtigung über gültiges Ticket" @@ -1675,8 +1679,8 @@ msgstr "Legt fest, ob erneuerbare Tickets angefordert werden sollen" #: ../preferences/krb5-auth-dialog-preferences.xml.h:8 msgid "If checked, use a security token (Smartcard) to authenticate." msgstr "" -"Legt fest, ob ein Sicherheits-Token (Smartcard) zur Identifizierung " -"verwendet wird" +"Legt fest, ob ein Sicherheits-Token (Smartcard) zur Identifizierung verwendet " +"wird" #: ../preferences/krb5-auth-dialog-preferences.xml.h:9 msgid "Kerberos" @@ -4,19 +4,20 @@ # # Daniel Mustieles <daniel.mustieles@gmail.com>, 2009. # Jorge González <jorgegonz@svn.gnome.org>, 2009, 2010. +# msgid "" msgstr "" "Project-Id-Version: krb5-auth-dialog.master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=krb5-" "auth-dialog&component=general\n" -"POT-Creation-Date: 2009-11-02 11:26+0000\n" -"PO-Revision-Date: 2010-02-20 09:48+0100\n" +"POT-Creation-Date: 2010-04-27 17:51+0000\n" +"PO-Revision-Date: 2010-04-28 08:26+0200\n" "Last-Translator: Jorge González <jorgegonz@svn.gnome.org>\n" "Language-Team: Español <gnome-es-list@gnome.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: KBabel 1.11.4\n" #: ../src/krb5-auth-dialog.xml.h:1 ../src/krb5-auth-dialog.desktop.in.h:2 @@ -40,36 +41,36 @@ msgstr "error desconocido" msgid "Expired" msgstr "Caducado" -#: ../src/krb5-auth-pwdialog.c:170 +#: ../src/krb5-auth-pwdialog.c:173 #, c-format msgid "Couldn't acquire kerberos ticket: '%s'" msgstr "No se pudo obtener el tique de Kerberos: «%s»" -#: ../src/krb5-auth-pwdialog.c:207 ../src/krb5-auth-applet.c:359 +#: ../src/krb5-auth-pwdialog.c:210 ../src/krb5-auth-applet.c:390 #, c-format msgid "Your credentials expire in %d minute" msgid_plural "Your credentials expire in %d minutes" msgstr[0] "Sus credenciales caducan en %d minuto" msgstr[1] "Sus credenciales caducan en %d minutos" -#: ../src/krb5-auth-pwdialog.c:212 ../src/krb5-auth-applet.c:364 +#: ../src/krb5-auth-pwdialog.c:215 ../src/krb5-auth-applet.c:395 msgid "Your credentials have expired" msgstr "Sus credenciales han caducado" -#: ../src/krb5-auth-pwdialog.c:233 +#: ../src/krb5-auth-pwdialog.c:236 msgid "Please enter your Kerberos password:" msgstr "Introduzca su contraseña de Kerberos:" -#: ../src/krb5-auth-pwdialog.c:244 +#: ../src/krb5-auth-pwdialog.c:247 #, c-format msgid "Please enter the password for '%s':" msgstr "Introduzca la contraseña para «%s»:" -#: ../src/krb5-auth-pwdialog.c:264 +#: ../src/krb5-auth-pwdialog.c:267 msgid "The password you entered is invalid" msgstr "La contraseña que ha introducido no es válida" -#: ../src/krb5-auth-pwdialog.c:280 +#: ../src/krb5-auth-pwdialog.c:283 #, c-format msgid "%s Error" msgstr "Error %s" @@ -813,12 +814,12 @@ msgstr "La caché de credenciales ya está registrada." #. krb5_err.et:krb5:KRB5_CC_TYPE_EXISTS #: ../src/dummy-strings.c:156 msgid "Key table type is already registered." -msgstr "" +msgstr "El tipo de tabla de claves ya está registrado." #. krb5_err.et:krb5:KRB5_KT_TYPE_EXISTS #: ../src/dummy-strings.c:157 msgid "Credentials cache I/O operation failed XXX" -msgstr "" +msgstr "Falló la operación XXX de credenciales de caché de E/S" #. krb5_err.et:krb5:KRB5_CC_IO #: ../src/dummy-strings.c:158 @@ -844,31 +845,32 @@ msgstr "Error al escribir en la caché de credenciales" #: ../src/dummy-strings.c:162 msgid "No more memory to allocate (in credentials cache code)" msgstr "" +"No hay más memoria para asignar (en el código de la caché de credenciales)" #. krb5_err.et:krb5:KRB5_CC_NOMEM #: ../src/dummy-strings.c:163 msgid "Bad format in credentials cache" -msgstr "" +msgstr "Formato erróneo en la caché de credenciales" #. krb5_err.et:krb5:KRB5_CC_FORMAT #: ../src/dummy-strings.c:164 msgid "No credentials found with supported encryption types" -msgstr "" +msgstr "No se encontraron credenciales con los tipos de cifrado soportados" #. krb5_err.et:krb5:KRB5_CC_NOT_KTYPE #: ../src/dummy-strings.c:165 msgid "Invalid KDC option combination (library internal error)" -msgstr "" +msgstr "Combinación de opción KDC no válida (error interno de la biblioteca)" #. krb5_err.et:krb5:KRB5_INVALID_FLAGS #: ../src/dummy-strings.c:166 msgid "Request missing second ticket" -msgstr "" +msgstr "Solicitar el segundo tique faltante" #. krb5_err.et:krb5:KRB5_NO_2ND_TKT #: ../src/dummy-strings.c:167 msgid "No credentials supplied to library routine" -msgstr "" +msgstr "No se proporcionaron credenciales a la rutina de la biblioteca" #. krb5_err.et:krb5:KRB5_NOCREDS_SUPPLIED #: ../src/dummy-strings.c:168 @@ -910,16 +912,19 @@ msgstr "Falló general de preautenticación" #: ../src/dummy-strings.c:175 msgid "Unsupported replay cache format version number" msgstr "" +"El número de versión de formato de la caché de repetición no está soportado" #. krb5_err.et:krb5:KRB5_RCACHE_BADVNO #: ../src/dummy-strings.c:176 msgid "Unsupported credentials cache format version number" msgstr "" +"El número de versión de formato de la caché de repetición no está soportado" #. krb5_err.et:krb5:KRB5_CCACHE_BADVNO #: ../src/dummy-strings.c:177 msgid "Unsupported key table format version number" msgstr "" +"El número de versión de formato de la tabla de claves no está soportado" #. krb5_err.et:krb5:KRB5_KEYTAB_BADVNO #: ../src/dummy-strings.c:178 @@ -1003,7 +1008,7 @@ msgstr "Suma de verificación errónea en el desafío SAM" #. krb5_err.et:krb5:KRB5_SAM_BAD_CHECKSUM #: ../src/dummy-strings.c:193 msgid "Keytab name too long" -msgstr "" +msgstr "El nombre de la tabla de claves es demasiado largo" #. krb5_err.et:krb5:KRB5_KT_NAME_TOOLONG #: ../src/dummy-strings.c:194 @@ -1035,7 +1040,7 @@ msgstr "Falló el cambio de contraseña" #. krb5_err.et:krb5:KRB5_CHPW_FAIL #: ../src/dummy-strings.c:199 msgid "Bad format in keytab" -msgstr "" +msgstr "Formato erróneo en la tabla de claves" #. krb5_err.et:krb5:KRB5_KT_FORMAT #: ../src/dummy-strings.c:200 @@ -1398,41 +1403,41 @@ msgid "Bad magic number for GSSAPI QUEUE" msgstr "Número mágico erróneo para GSSAPI QUEUE" #. Translators: First number is hours, second number is minutes -#: ../src/krb5-auth-applet.c:355 +#: ../src/krb5-auth-applet.c:386 #, c-format msgid "Your credentials expire in %.2d:%.2dh" msgstr "Sus credenciales caducan en %.2d:%.2dh" -#: ../src/krb5-auth-applet.c:460 +#: ../src/krb5-auth-applet.c:491 msgid "Don't show me this again" msgstr "No mostrar este mensaje de nuevo" -#: ../src/krb5-auth-applet.c:497 +#: ../src/krb5-auth-applet.c:533 msgid "Network credentials valid" msgstr "Credenciales de red válidas" -#: ../src/krb5-auth-applet.c:498 +#: ../src/krb5-auth-applet.c:534 msgid "You've refreshed your Kerberos credentials." msgstr "Ha actualizado sus credenciales de Kerberos." -#: ../src/krb5-auth-applet.c:511 +#: ../src/krb5-auth-applet.c:550 msgid "Network credentials expiring" msgstr "Las credenciales de red van a caducar" -#: ../src/krb5-auth-applet.c:526 +#: ../src/krb5-auth-applet.c:569 msgid "Network credentials expired" msgstr "Las credenciales de red han caducado" -#: ../src/krb5-auth-applet.c:527 +#: ../src/krb5-auth-applet.c:570 msgid "Your Kerberos credentails have expired." msgstr "Sus credenciales Kerberos han caducado" -#: ../src/krb5-auth-applet.c:570 +#: ../src/krb5-auth-applet.c:615 #, c-format msgid "There was an error launching the preferences dialog: %s" msgstr "Hubo un error al lanzar el diálogo de preferencias: %s" -#: ../src/krb5-auth-applet.c:611 +#: ../src/krb5-auth-applet.c:656 #, c-format msgid "" "There was an error displaying %s:\n" @@ -1442,14 +1447,14 @@ msgstr "" "%s" #. Translators: add the translators of your language here -#: ../src/krb5-auth-applet.c:647 +#: ../src/krb5-auth-applet.c:692 msgid "translator-credits" msgstr "" -"Jorge González <jorgegonz@svn.gnome.org>, 2009\n" +"Jorge González <jorgegonz@svn.gnome.org>, 2009-2010\n" "Daniel Mustieles <daniel.mustieles@gmail.com>, 2009" #. kdestroy -#: ../src/krb5-auth-applet.c:689 +#: ../src/krb5-auth-applet.c:734 msgid "Remove Credentials _Cache" msgstr "Quitar la _caché de credenciales" @@ -1464,123 +1469,131 @@ msgstr "" #: ../src/krb5-auth-tickets.c:54 msgid "Principal" -msgstr "" +msgstr "Principal" #: ../src/krb5-auth-tickets.c:60 msgid "Start Time" -msgstr "" +msgstr "Tiempo de inicio" #: ../src/krb5-auth-tickets.c:66 msgid "End Time" -msgstr "" +msgstr "Tiempo de finalización" #: ../src/krb5-auth-tickets.c:72 msgid "Fwd" -msgstr "" +msgstr "Rnv" #: ../src/krb5-auth-tickets.c:78 msgid "Proxy" -msgstr "" +msgstr "Proxy" #: ../src/krb5-auth-tickets.c:84 msgid "Renew" -msgstr "" +msgstr "Renovar" #: ../src/krb5-auth-tickets.c:107 msgid "Error displaying service ticket information" -msgstr "" +msgstr "Error al mostrar la información del tique de servicio" #: ../src/krb5-auth-dialog.desktop.in.h:1 msgid "Kerberos Network Authentication Dialog" msgstr "Diálogo de autenticación de red de Kerberos" #: ../src/krb5-auth-dialog.schemas.in.h:1 +msgid "Enabled plugins" +msgstr "Complementos activados" + +#: ../src/krb5-auth-dialog.schemas.in.h:2 msgid "Forwardable ticket" msgstr "Tique reenviable" -#: ../src/krb5-auth-dialog.schemas.in.h:2 +#: ../src/krb5-auth-dialog.schemas.in.h:3 msgid "Kerberos principal" msgstr "Principal de Kerberos" -#: ../src/krb5-auth-dialog.schemas.in.h:3 +#: ../src/krb5-auth-dialog.schemas.in.h:4 +msgid "List of plugins that should be loaded and activated on startup." +msgstr "Lista de complementos que se debería cargar y activar al inicio." + +#: ../src/krb5-auth-dialog.schemas.in.h:5 msgid "Notify user when ticket becomes valid" msgstr "Notificar al usuario cuando un tique se convierta en válido" -#: ../src/krb5-auth-dialog.schemas.in.h:4 +#: ../src/krb5-auth-dialog.schemas.in.h:6 msgid "Notify user when ticket has expired" msgstr "Notificar al usuario cuando un tique ha caducado" -#: ../src/krb5-auth-dialog.schemas.in.h:5 +#: ../src/krb5-auth-dialog.schemas.in.h:7 msgid "Notify user when ticket is about to expire" msgstr "Notificar al usuario cuando un tique va a caducar" -#: ../src/krb5-auth-dialog.schemas.in.h:6 +#: ../src/krb5-auth-dialog.schemas.in.h:8 msgid "PKINIT CA certificates" msgstr "Certificados PKINIT CA" -#: ../src/krb5-auth-dialog.schemas.in.h:7 +#: ../src/krb5-auth-dialog.schemas.in.h:9 msgid "PKINIT identifier" msgstr "Identificador PKINIT" -#: ../src/krb5-auth-dialog.schemas.in.h:8 +#: ../src/krb5-auth-dialog.schemas.in.h:10 msgid "PKINIT trust anchors" msgstr "Anclas de confianza de PKINIT" -#: ../src/krb5-auth-dialog.schemas.in.h:9 +#: ../src/krb5-auth-dialog.schemas.in.h:11 msgid "Prompt minutes before expiry" msgstr "Mostrar minutos antes de caducar" -#: ../src/krb5-auth-dialog.schemas.in.h:10 +#: ../src/krb5-auth-dialog.schemas.in.h:12 msgid "Proxiable ticket" msgstr "Tique vía proxy" -#: ../src/krb5-auth-dialog.schemas.in.h:11 +#: ../src/krb5-auth-dialog.schemas.in.h:13 msgid "Renewable ticket" msgstr "Tique renovable" -#: ../src/krb5-auth-dialog.schemas.in.h:12 +#: ../src/krb5-auth-dialog.schemas.in.h:14 msgid "Requested tickets should be forwardable" msgstr "Los tiques solicitados deberán ser reenviables" -#: ../src/krb5-auth-dialog.schemas.in.h:13 +#: ../src/krb5-auth-dialog.schemas.in.h:15 msgid "Requested tickets should be proxiable" msgstr "Los tiques solicitados deberán ser vía proxy" -#: ../src/krb5-auth-dialog.schemas.in.h:14 +#: ../src/krb5-auth-dialog.schemas.in.h:16 msgid "Requested tickets should be renewable" msgstr "Los tiques solicitados deberán ser renovables" -#: ../src/krb5-auth-dialog.schemas.in.h:15 +#: ../src/krb5-auth-dialog.schemas.in.h:17 msgid "Show a trayicon in the status area of the panel" msgstr "Mostrar un icono en la bandeja del sistema en el área del panel" -#: ../src/krb5-auth-dialog.schemas.in.h:16 +#: ../src/krb5-auth-dialog.schemas.in.h:18 msgid "Show trayicon" msgstr "Mostrar icono en la bandeja" -#: ../src/krb5-auth-dialog.schemas.in.h:17 +#: ../src/krb5-auth-dialog.schemas.in.h:19 msgid "" "Start prompting/displaying notifications that many minutes before expiry" msgstr "Dejar de mostrar notificaciones esos minutos antes de que caduque" -#: ../src/krb5-auth-dialog.schemas.in.h:18 +#: ../src/krb5-auth-dialog.schemas.in.h:20 msgid "The kerberos principal to acquire the ticket for" msgstr "El principal de Kerberos para el que adquirir el tique" -#: ../src/krb5-auth-dialog.schemas.in.h:19 +#: ../src/krb5-auth-dialog.schemas.in.h:21 msgid "The principal's public/private/certificate identifier when using PKINIT" msgstr "" "El identificador público/privado/certificado del principal al usar PKINIT" -#: ../src/krb5-auth-dialog.schemas.in.h:20 +#: ../src/krb5-auth-dialog.schemas.in.h:22 msgid "ticket expired notification" msgstr "notificación de tique caducado" -#: ../src/krb5-auth-dialog.schemas.in.h:21 +#: ../src/krb5-auth-dialog.schemas.in.h:23 msgid "ticket expiring notification" msgstr "notificación de caducidad de tique" -#: ../src/krb5-auth-dialog.schemas.in.h:22 +#: ../src/krb5-auth-dialog.schemas.in.h:24 msgid "valid ticket notification" msgstr "tique de notificación válido" @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: krb5-auth-dialog\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=krb5-auth-dialog&component=general\n" -"POT-Creation-Date: 2010-04-02 14:19+0000\n" -"PO-Revision-Date: 2010-04-03 10:01+0100\n" -"Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n" +"POT-Creation-Date: 2010-04-29 08:29+0000\n" +"PO-Revision-Date: 2010-05-01 09:34+0100\n" +"Last-Translator: Andrej Žnidaršič <andrej.znidarsic@gmail.com>\n" "Language-Team: Slovenian GNOME Translation Team <gnome-si@googlegroups.com>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -34,21 +34,21 @@ msgstr "Storitvene vstopnice" msgid "_Renew Ticket" msgstr "_Obnovi vstopnico" -#: ../src/krb5-auth-dialog.c:172 +#: ../src/ka-dialog.c:172 msgid "unknown error" msgstr "neznana napaka" -#: ../src/krb5-auth-dialog.c:328 +#: ../src/ka-dialog.c:328 msgid "Expired" msgstr "Pretečeno" -#: ../src/krb5-auth-pwdialog.c:173 +#: ../src/ka-pwdialog.c:173 #, c-format msgid "Couldn't acquire kerberos ticket: '%s'" msgstr "Ni mogoče pridobiti vstopnice kerberos: '%s'" -#: ../src/krb5-auth-pwdialog.c:210 -#: ../src/krb5-auth-applet.c:383 +#: ../src/ka-pwdialog.c:210 +#: ../src/ka-applet.c:390 #, c-format msgid "Your credentials expire in %d minute" msgid_plural "Your credentials expire in %d minutes" @@ -57,25 +57,25 @@ msgstr[1] "Vaša poverila potečejo v %d minuti" msgstr[2] "Vaša poverila potečejo v %d minutah" msgstr[3] "Vaša poverila potečejo v %d minutah" -#: ../src/krb5-auth-pwdialog.c:215 -#: ../src/krb5-auth-applet.c:388 +#: ../src/ka-pwdialog.c:215 +#: ../src/ka-applet.c:395 msgid "Your credentials have expired" msgstr "Vaša poverila so potekla" -#: ../src/krb5-auth-pwdialog.c:236 +#: ../src/ka-pwdialog.c:236 msgid "Please enter your Kerberos password:" msgstr "Vnesite svoje geslo Kerberos:" -#: ../src/krb5-auth-pwdialog.c:247 +#: ../src/ka-pwdialog.c:247 #, c-format msgid "Please enter the password for '%s':" msgstr "Vnesite geslo za '%s':" -#: ../src/krb5-auth-pwdialog.c:267 +#: ../src/ka-pwdialog.c:267 msgid "The password you entered is invalid" msgstr "Vneseno geslo je neveljavno" -#: ../src/krb5-auth-pwdialog.c:283 +#: ../src/ka-pwdialog.c:283 #, c-format msgid "%s Error" msgstr "%s napaka" @@ -291,7 +291,7 @@ msgstr "Storitev zahtevana za obdelavo zahteve ni na voljo" #. krb5_err.et:krb5:KRB5KDC_ERR_SVC_UNAVAILABLE #: ../src/dummy-strings.c:51 msgid "Decrypt integrity check failed" -msgstr "Preverjanje celovitosti dešifriranja je spodletlo" +msgstr "Preverjanje celovitosti dešifriranja je spodletelo" #. krb5_err.et:krb5:KRB5KRB_AP_ERR_BAD_INTEGRITY #: ../src/dummy-strings.c:52 @@ -316,7 +316,7 @@ msgstr "Vstopnica ni za nas" #. krb5_err.et:krb5:KRB5KRB_AP_ERR_NOT_US #: ../src/dummy-strings.c:56 msgid "Ticket/authenticator don't match" -msgstr "Vstopnica in overitelj se ne skladana" +msgstr "Vstopnica in pooblastitelj overitve se ne skladata" #. krb5_err.et:krb5:KRB5KRB_AP_ERR_BADMATCH #: ../src/dummy-strings.c:57 @@ -1388,41 +1388,41 @@ msgid "Bad magic number for GSSAPI QUEUE" msgstr "Slabo čarobno število od GSSAPI VRSTE" #. Translators: First number is hours, second number is minutes -#: ../src/krb5-auth-applet.c:379 +#: ../src/ka-applet.c:386 #, c-format msgid "Your credentials expire in %.2d:%.2dh" msgstr "Vaša poverila potečejo v %.2d%.2dh" -#: ../src/krb5-auth-applet.c:484 +#: ../src/ka-applet.c:491 msgid "Don't show me this again" msgstr "Tega ne prikaži več" -#: ../src/krb5-auth-applet.c:524 +#: ../src/ka-applet.c:533 msgid "Network credentials valid" msgstr "Omrežna varovala so veljavna" -#: ../src/krb5-auth-applet.c:525 +#: ../src/ka-applet.c:534 msgid "You've refreshed your Kerberos credentials." msgstr "Osvežili ste svoja poverila Kerberos" -#: ../src/krb5-auth-applet.c:539 +#: ../src/ka-applet.c:550 msgid "Network credentials expiring" msgstr "Omrežna varovala bodo potekla" -#: ../src/krb5-auth-applet.c:554 +#: ../src/ka-applet.c:569 msgid "Network credentials expired" msgstr "Omrežna varovala so potekla" -#: ../src/krb5-auth-applet.c:555 +#: ../src/ka-applet.c:570 msgid "Your Kerberos credentails have expired." msgstr "Vaša varovala Kerberos so potekla." -#: ../src/krb5-auth-applet.c:599 +#: ../src/ka-applet.c:615 #, c-format msgid "There was an error launching the preferences dialog: %s" msgstr "Prišlo je do napake med zagonom pogovornega okna možnosti: %s" -#: ../src/krb5-auth-applet.c:640 +#: ../src/ka-applet.c:656 #, c-format msgid "" "There was an error displaying %s:\n" @@ -1432,18 +1432,18 @@ msgstr "" "%s" #. Translators: add the translators of your language here -#: ../src/krb5-auth-applet.c:676 +#: ../src/ka-applet.c:692 msgid "translator-credits" msgstr "" "Andrej Žnidaršič\n" "Matej Urbančič" #. kdestroy -#: ../src/krb5-auth-applet.c:718 +#: ../src/ka-applet.c:734 msgid "Remove Credentials _Cache" msgstr "Odstrani _predpomnilnik varoval" -#: ../src/krb5-auth-tools.c:45 +#: ../src/ka-tools.c:45 #, c-format msgid "" "There was an error displaying help:\n" @@ -1452,31 +1452,31 @@ msgstr "" "Prišlo je do napake med prikazovanjem pomoči:\n" "%s" -#: ../src/krb5-auth-tickets.c:54 +#: ../src/ka-tickets.c:54 msgid "Principal" msgstr "Ravnatelj" -#: ../src/krb5-auth-tickets.c:60 +#: ../src/ka-tickets.c:60 msgid "Start Time" msgstr "Začetni čas" -#: ../src/krb5-auth-tickets.c:66 +#: ../src/ka-tickets.c:66 msgid "End Time" msgstr "Končni čas" -#: ../src/krb5-auth-tickets.c:72 +#: ../src/ka-tickets.c:72 msgid "Fwd" msgstr "Posreduj" -#: ../src/krb5-auth-tickets.c:78 +#: ../src/ka-tickets.c:78 msgid "Proxy" msgstr "Posredovalni strežnik" -#: ../src/krb5-auth-tickets.c:84 +#: ../src/ka-tickets.c:84 msgid "Renew" msgstr "Obnovi" -#: ../src/krb5-auth-tickets.c:107 +#: ../src/ka-tickets.c:107 msgid "Error displaying service ticket information" msgstr "Napaka med prikazovanjem podrobnosti storitvene vstopnice" @@ -1485,90 +1485,98 @@ msgid "Kerberos Network Authentication Dialog" msgstr "Pogovorno okno Kerberos omrežne overitve" #: ../src/krb5-auth-dialog.schemas.in.h:1 +msgid "Enabled plugins" +msgstr "Omogočeni vstavki" + +#: ../src/krb5-auth-dialog.schemas.in.h:2 msgid "Forwardable ticket" msgstr "Prenosljiva vstopnica" -#: ../src/krb5-auth-dialog.schemas.in.h:2 +#: ../src/krb5-auth-dialog.schemas.in.h:3 msgid "Kerberos principal" msgstr "Kerberos ravnatelj" -#: ../src/krb5-auth-dialog.schemas.in.h:3 +#: ../src/krb5-auth-dialog.schemas.in.h:4 +msgid "List of plugins that should be loaded and activated on startup." +msgstr "Seznam vstavkov, ki bodo naloženi in omogočeni ob zagonu." + +#: ../src/krb5-auth-dialog.schemas.in.h:5 msgid "Notify user when ticket becomes valid" msgstr "Obvesti uporabnika, ko vstopnica postane veljavna" -#: ../src/krb5-auth-dialog.schemas.in.h:4 +#: ../src/krb5-auth-dialog.schemas.in.h:6 msgid "Notify user when ticket has expired" msgstr "Obvesti uporabnika ob poteku vstopnice" -#: ../src/krb5-auth-dialog.schemas.in.h:5 +#: ../src/krb5-auth-dialog.schemas.in.h:7 msgid "Notify user when ticket is about to expire" msgstr "Obvesti uporabnika, ko bo vstopnica potekla" -#: ../src/krb5-auth-dialog.schemas.in.h:6 +#: ../src/krb5-auth-dialog.schemas.in.h:8 msgid "PKINIT CA certificates" msgstr "CA potrdila PKINIT" -#: ../src/krb5-auth-dialog.schemas.in.h:7 +#: ../src/krb5-auth-dialog.schemas.in.h:9 msgid "PKINIT identifier" msgstr "Določilnik PKINIT" -#: ../src/krb5-auth-dialog.schemas.in.h:8 +#: ../src/krb5-auth-dialog.schemas.in.h:10 msgid "PKINIT trust anchors" msgstr "Sidra zaupanja PKINIT" -#: ../src/krb5-auth-dialog.schemas.in.h:9 +#: ../src/krb5-auth-dialog.schemas.in.h:11 msgid "Prompt minutes before expiry" msgstr "Opozorilo pred potekom v minutah" -#: ../src/krb5-auth-dialog.schemas.in.h:10 +#: ../src/krb5-auth-dialog.schemas.in.h:12 msgid "Proxiable ticket" msgstr "Posredovalna vstopnica" -#: ../src/krb5-auth-dialog.schemas.in.h:11 +#: ../src/krb5-auth-dialog.schemas.in.h:13 msgid "Renewable ticket" msgstr "Obnovljiva vstopnica" -#: ../src/krb5-auth-dialog.schemas.in.h:12 +#: ../src/krb5-auth-dialog.schemas.in.h:14 msgid "Requested tickets should be forwardable" msgstr "Zahtevane vstopnice bi morale biti prenosljive" -#: ../src/krb5-auth-dialog.schemas.in.h:13 +#: ../src/krb5-auth-dialog.schemas.in.h:15 msgid "Requested tickets should be proxiable" msgstr "Zahtevano vstopnico bi moralo biti mogoče posredovati" -#: ../src/krb5-auth-dialog.schemas.in.h:14 +#: ../src/krb5-auth-dialog.schemas.in.h:16 msgid "Requested tickets should be renewable" msgstr "Zahtevane vstopnice bi morale biti obnovljive" -#: ../src/krb5-auth-dialog.schemas.in.h:15 +#: ../src/krb5-auth-dialog.schemas.in.h:17 msgid "Show a trayicon in the status area of the panel" msgstr "Prikaz ikone sistemske vrstice v področju stanja na pultu" -#: ../src/krb5-auth-dialog.schemas.in.h:16 +#: ../src/krb5-auth-dialog.schemas.in.h:18 msgid "Show trayicon" msgstr "Pokaži ikono sistemske vrstice" -#: ../src/krb5-auth-dialog.schemas.in.h:17 +#: ../src/krb5-auth-dialog.schemas.in.h:19 msgid "Start prompting/displaying notifications that many minutes before expiry" msgstr "Začetek prikazovanja obvestil toliko minut pred potekom" -#: ../src/krb5-auth-dialog.schemas.in.h:18 +#: ../src/krb5-auth-dialog.schemas.in.h:20 msgid "The kerberos principal to acquire the ticket for" msgstr "Kerberos ravnatelj za izdajo vstopnice" -#: ../src/krb5-auth-dialog.schemas.in.h:19 +#: ../src/krb5-auth-dialog.schemas.in.h:21 msgid "The principal's public/private/certificate identifier when using PKINIT" msgstr "Ravnateljevo javno/zasebno/potrdilno določilo ob uporabi PKINIT" -#: ../src/krb5-auth-dialog.schemas.in.h:20 +#: ../src/krb5-auth-dialog.schemas.in.h:22 msgid "ticket expired notification" msgstr "obvestilo potekle vstopnice" -#: ../src/krb5-auth-dialog.schemas.in.h:21 +#: ../src/krb5-auth-dialog.schemas.in.h:23 msgid "ticket expiring notification" msgstr "obvestilo o pretekanju vstopnice" -#: ../src/krb5-auth-dialog.schemas.in.h:22 +#: ../src/krb5-auth-dialog.schemas.in.h:24 msgid "valid ticket notification" msgstr "obvestilo veljavne vstopnice" @@ -1577,15 +1585,15 @@ msgstr "obvestilo veljavne vstopnice" msgid "Warning: running q-agent setuid on this system is dangerous\n" msgstr "Opozorilo: poganjanje q-agent setuid na tem sistemu je nevarno\n" -#: ../preferences/krb5-auth-dialog-preferences.c:345 +#: ../preferences/ka-preferences.c:345 msgid "Choose Certificate" msgstr "Izbor potrdila" -#: ../preferences/krb5-auth-dialog-preferences.c:361 +#: ../preferences/ka-preferences.c:361 msgid "X509 Certificates" msgstr "X509 potrdila" -#: ../preferences/krb5-auth-dialog-preferences.c:365 +#: ../preferences/ka-preferences.c:365 msgid "all files" msgstr "vse datoteke" diff --git a/preferences/Makefile.am b/preferences/Makefile.am index fafb357..8a7187d 100644 --- a/preferences/Makefile.am +++ b/preferences/Makefile.am @@ -4,11 +4,11 @@ bin_PROGRAMS = krb5-auth-dialog-preferences man_MANS = krb5-auth-dialog-preferences.1 krb5_auth_dialog_preferences_SOURCES = \ - krb5-auth-dialog-preferences.c \ - $(top_srcdir)/src/krb5-auth-gconf-tools.c \ - $(top_srcdir)/src/krb5-auth-gconf-tools.h \ - $(top_srcdir)/src/krb5-auth-tools.c \ - $(top_srcdir)/src/krb5-auth-tools.h \ + ka-preferences.c \ + $(top_srcdir)/src/ka-gconf-tools.c \ + $(top_srcdir)/src/ka-gconf-tools.h \ + $(top_srcdir)/src/ka-tools.c \ + $(top_srcdir)/src/ka-tools.h \ $(NULL) krb5_auth_dialog_preferences_CPPFLAGS = \ diff --git a/preferences/Makefile.in b/preferences/Makefile.in index 053e45a..a95522f 100644 --- a/preferences/Makefile.in +++ b/preferences/Makefile.in @@ -52,9 +52,10 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \ "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(pkgdatadir)" PROGRAMS = $(bin_PROGRAMS) am__objects_1 = -am_krb5_auth_dialog_preferences_OBJECTS = krb5_auth_dialog_preferences-krb5-auth-dialog-preferences.$(OBJEXT) \ - krb5_auth_dialog_preferences-krb5-auth-gconf-tools.$(OBJEXT) \ - krb5_auth_dialog_preferences-krb5-auth-tools.$(OBJEXT) \ +am_krb5_auth_dialog_preferences_OBJECTS = \ + krb5_auth_dialog_preferences-ka-preferences.$(OBJEXT) \ + krb5_auth_dialog_preferences-ka-gconf-tools.$(OBJEXT) \ + krb5_auth_dialog_preferences-ka-tools.$(OBJEXT) \ $(am__objects_1) krb5_auth_dialog_preferences_OBJECTS = \ $(am_krb5_auth_dialog_preferences_OBJECTS) @@ -168,6 +169,8 @@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@ GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ +GMODULE_CFLAGS = @GMODULE_CFLAGS@ +GMODULE_LIBS = @GMODULE_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ @@ -185,6 +188,7 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +KA_PLUGINS_DIR = @KA_PLUGINS_DIR@ KRB5_CFLAGS = @KRB5_CFLAGS@ KRB5_CONFIG = @KRB5_CONFIG@ KRB5_LIBS = @KRB5_LIBS@ @@ -225,6 +229,7 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PAM_LIBS = @PAM_LIBS@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ @@ -302,11 +307,11 @@ top_srcdir = @top_srcdir@ NULL = man_MANS = krb5-auth-dialog-preferences.1 krb5_auth_dialog_preferences_SOURCES = \ - krb5-auth-dialog-preferences.c \ - $(top_srcdir)/src/krb5-auth-gconf-tools.c \ - $(top_srcdir)/src/krb5-auth-gconf-tools.h \ - $(top_srcdir)/src/krb5-auth-tools.c \ - $(top_srcdir)/src/krb5-auth-tools.h \ + ka-preferences.c \ + $(top_srcdir)/src/ka-gconf-tools.c \ + $(top_srcdir)/src/ka-gconf-tools.h \ + $(top_srcdir)/src/ka-tools.c \ + $(top_srcdir)/src/ka-tools.h \ $(NULL) krb5_auth_dialog_preferences_CPPFLAGS = \ @@ -435,9 +440,9 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog_preferences-krb5-auth-dialog-preferences.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog_preferences-krb5-auth-gconf-tools.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog_preferences-krb5-auth-tools.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog_preferences-ka-gconf-tools.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog_preferences-ka-preferences.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog_preferences-ka-tools.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -463,53 +468,53 @@ distclean-compile: @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< -krb5_auth_dialog_preferences-krb5-auth-dialog-preferences.o: krb5-auth-dialog-preferences.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_preferences_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_preferences_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog_preferences-krb5-auth-dialog-preferences.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog_preferences-krb5-auth-dialog-preferences.Tpo -c -o krb5_auth_dialog_preferences-krb5-auth-dialog-preferences.o `test -f 'krb5-auth-dialog-preferences.c' || echo '$(srcdir)/'`krb5-auth-dialog-preferences.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog_preferences-krb5-auth-dialog-preferences.Tpo $(DEPDIR)/krb5_auth_dialog_preferences-krb5-auth-dialog-preferences.Po +krb5_auth_dialog_preferences-ka-preferences.o: ka-preferences.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_preferences_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_preferences_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog_preferences-ka-preferences.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog_preferences-ka-preferences.Tpo -c -o krb5_auth_dialog_preferences-ka-preferences.o `test -f 'ka-preferences.c' || echo '$(srcdir)/'`ka-preferences.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog_preferences-ka-preferences.Tpo $(DEPDIR)/krb5_auth_dialog_preferences-ka-preferences.Po @am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='krb5-auth-dialog-preferences.c' object='krb5_auth_dialog_preferences-krb5-auth-dialog-preferences.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ka-preferences.c' object='krb5_auth_dialog_preferences-ka-preferences.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_preferences_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_preferences_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog_preferences-krb5-auth-dialog-preferences.o `test -f 'krb5-auth-dialog-preferences.c' || echo '$(srcdir)/'`krb5-auth-dialog-preferences.c +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_preferences_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_preferences_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog_preferences-ka-preferences.o `test -f 'ka-preferences.c' || echo '$(srcdir)/'`ka-preferences.c -krb5_auth_dialog_preferences-krb5-auth-dialog-preferences.obj: krb5-auth-dialog-preferences.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_preferences_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_preferences_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog_preferences-krb5-auth-dialog-preferences.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog_preferences-krb5-auth-dialog-preferences.Tpo -c -o krb5_auth_dialog_preferences-krb5-auth-dialog-preferences.obj `if test -f 'krb5-auth-dialog-preferences.c'; then $(CYGPATH_W) 'krb5-auth-dialog-preferences.c'; else $(CYGPATH_W) '$(srcdir)/krb5-auth-dialog-preferences.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog_preferences-krb5-auth-dialog-preferences.Tpo $(DEPDIR)/krb5_auth_dialog_preferences-krb5-auth-dialog-preferences.Po +krb5_auth_dialog_preferences-ka-preferences.obj: ka-preferences.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_preferences_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_preferences_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog_preferences-ka-preferences.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog_preferences-ka-preferences.Tpo -c -o krb5_auth_dialog_preferences-ka-preferences.obj `if test -f 'ka-preferences.c'; then $(CYGPATH_W) 'ka-preferences.c'; else $(CYGPATH_W) '$(srcdir)/ka-preferences.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog_preferences-ka-preferences.Tpo $(DEPDIR)/krb5_auth_dialog_preferences-ka-preferences.Po @am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='krb5-auth-dialog-preferences.c' object='krb5_auth_dialog_preferences-krb5-auth-dialog-preferences.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ka-preferences.c' object='krb5_auth_dialog_preferences-ka-preferences.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_preferences_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_preferences_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog_preferences-krb5-auth-dialog-preferences.obj `if test -f 'krb5-auth-dialog-preferences.c'; then $(CYGPATH_W) 'krb5-auth-dialog-preferences.c'; else $(CYGPATH_W) '$(srcdir)/krb5-auth-dialog-preferences.c'; fi` +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_preferences_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_preferences_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog_preferences-ka-preferences.obj `if test -f 'ka-preferences.c'; then $(CYGPATH_W) 'ka-preferences.c'; else $(CYGPATH_W) '$(srcdir)/ka-preferences.c'; fi` -krb5_auth_dialog_preferences-krb5-auth-gconf-tools.o: $(top_srcdir)/src/krb5-auth-gconf-tools.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_preferences_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_preferences_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog_preferences-krb5-auth-gconf-tools.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog_preferences-krb5-auth-gconf-tools.Tpo -c -o krb5_auth_dialog_preferences-krb5-auth-gconf-tools.o `test -f '$(top_srcdir)/src/krb5-auth-gconf-tools.c' || echo '$(srcdir)/'`$(top_srcdir)/src/krb5-auth-gconf-tools.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog_preferences-krb5-auth-gconf-tools.Tpo $(DEPDIR)/krb5_auth_dialog_preferences-krb5-auth-gconf-tools.Po +krb5_auth_dialog_preferences-ka-gconf-tools.o: $(top_srcdir)/src/ka-gconf-tools.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_preferences_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_preferences_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog_preferences-ka-gconf-tools.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog_preferences-ka-gconf-tools.Tpo -c -o krb5_auth_dialog_preferences-ka-gconf-tools.o `test -f '$(top_srcdir)/src/ka-gconf-tools.c' || echo '$(srcdir)/'`$(top_srcdir)/src/ka-gconf-tools.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog_preferences-ka-gconf-tools.Tpo $(DEPDIR)/krb5_auth_dialog_preferences-ka-gconf-tools.Po @am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/src/krb5-auth-gconf-tools.c' object='krb5_auth_dialog_preferences-krb5-auth-gconf-tools.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/src/ka-gconf-tools.c' object='krb5_auth_dialog_preferences-ka-gconf-tools.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_preferences_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_preferences_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog_preferences-krb5-auth-gconf-tools.o `test -f '$(top_srcdir)/src/krb5-auth-gconf-tools.c' || echo '$(srcdir)/'`$(top_srcdir)/src/krb5-auth-gconf-tools.c +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_preferences_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_preferences_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog_preferences-ka-gconf-tools.o `test -f '$(top_srcdir)/src/ka-gconf-tools.c' || echo '$(srcdir)/'`$(top_srcdir)/src/ka-gconf-tools.c -krb5_auth_dialog_preferences-krb5-auth-gconf-tools.obj: $(top_srcdir)/src/krb5-auth-gconf-tools.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_preferences_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_preferences_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog_preferences-krb5-auth-gconf-tools.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog_preferences-krb5-auth-gconf-tools.Tpo -c -o krb5_auth_dialog_preferences-krb5-auth-gconf-tools.obj `if test -f '$(top_srcdir)/src/krb5-auth-gconf-tools.c'; then $(CYGPATH_W) '$(top_srcdir)/src/krb5-auth-gconf-tools.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/krb5-auth-gconf-tools.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog_preferences-krb5-auth-gconf-tools.Tpo $(DEPDIR)/krb5_auth_dialog_preferences-krb5-auth-gconf-tools.Po +krb5_auth_dialog_preferences-ka-gconf-tools.obj: $(top_srcdir)/src/ka-gconf-tools.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_preferences_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_preferences_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog_preferences-ka-gconf-tools.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog_preferences-ka-gconf-tools.Tpo -c -o krb5_auth_dialog_preferences-ka-gconf-tools.obj `if test -f '$(top_srcdir)/src/ka-gconf-tools.c'; then $(CYGPATH_W) '$(top_srcdir)/src/ka-gconf-tools.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/ka-gconf-tools.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog_preferences-ka-gconf-tools.Tpo $(DEPDIR)/krb5_auth_dialog_preferences-ka-gconf-tools.Po @am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/src/krb5-auth-gconf-tools.c' object='krb5_auth_dialog_preferences-krb5-auth-gconf-tools.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/src/ka-gconf-tools.c' object='krb5_auth_dialog_preferences-ka-gconf-tools.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_preferences_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_preferences_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog_preferences-krb5-auth-gconf-tools.obj `if test -f '$(top_srcdir)/src/krb5-auth-gconf-tools.c'; then $(CYGPATH_W) '$(top_srcdir)/src/krb5-auth-gconf-tools.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/krb5-auth-gconf-tools.c'; fi` +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_preferences_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_preferences_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog_preferences-ka-gconf-tools.obj `if test -f '$(top_srcdir)/src/ka-gconf-tools.c'; then $(CYGPATH_W) '$(top_srcdir)/src/ka-gconf-tools.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/ka-gconf-tools.c'; fi` -krb5_auth_dialog_preferences-krb5-auth-tools.o: $(top_srcdir)/src/krb5-auth-tools.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_preferences_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_preferences_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog_preferences-krb5-auth-tools.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog_preferences-krb5-auth-tools.Tpo -c -o krb5_auth_dialog_preferences-krb5-auth-tools.o `test -f '$(top_srcdir)/src/krb5-auth-tools.c' || echo '$(srcdir)/'`$(top_srcdir)/src/krb5-auth-tools.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog_preferences-krb5-auth-tools.Tpo $(DEPDIR)/krb5_auth_dialog_preferences-krb5-auth-tools.Po +krb5_auth_dialog_preferences-ka-tools.o: $(top_srcdir)/src/ka-tools.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_preferences_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_preferences_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog_preferences-ka-tools.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog_preferences-ka-tools.Tpo -c -o krb5_auth_dialog_preferences-ka-tools.o `test -f '$(top_srcdir)/src/ka-tools.c' || echo '$(srcdir)/'`$(top_srcdir)/src/ka-tools.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog_preferences-ka-tools.Tpo $(DEPDIR)/krb5_auth_dialog_preferences-ka-tools.Po @am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/src/krb5-auth-tools.c' object='krb5_auth_dialog_preferences-krb5-auth-tools.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/src/ka-tools.c' object='krb5_auth_dialog_preferences-ka-tools.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_preferences_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_preferences_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog_preferences-krb5-auth-tools.o `test -f '$(top_srcdir)/src/krb5-auth-tools.c' || echo '$(srcdir)/'`$(top_srcdir)/src/krb5-auth-tools.c +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_preferences_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_preferences_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog_preferences-ka-tools.o `test -f '$(top_srcdir)/src/ka-tools.c' || echo '$(srcdir)/'`$(top_srcdir)/src/ka-tools.c -krb5_auth_dialog_preferences-krb5-auth-tools.obj: $(top_srcdir)/src/krb5-auth-tools.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_preferences_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_preferences_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog_preferences-krb5-auth-tools.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog_preferences-krb5-auth-tools.Tpo -c -o krb5_auth_dialog_preferences-krb5-auth-tools.obj `if test -f '$(top_srcdir)/src/krb5-auth-tools.c'; then $(CYGPATH_W) '$(top_srcdir)/src/krb5-auth-tools.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/krb5-auth-tools.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog_preferences-krb5-auth-tools.Tpo $(DEPDIR)/krb5_auth_dialog_preferences-krb5-auth-tools.Po +krb5_auth_dialog_preferences-ka-tools.obj: $(top_srcdir)/src/ka-tools.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_preferences_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_preferences_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog_preferences-ka-tools.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog_preferences-ka-tools.Tpo -c -o krb5_auth_dialog_preferences-ka-tools.obj `if test -f '$(top_srcdir)/src/ka-tools.c'; then $(CYGPATH_W) '$(top_srcdir)/src/ka-tools.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/ka-tools.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog_preferences-ka-tools.Tpo $(DEPDIR)/krb5_auth_dialog_preferences-ka-tools.Po @am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/src/krb5-auth-tools.c' object='krb5_auth_dialog_preferences-krb5-auth-tools.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/src/ka-tools.c' object='krb5_auth_dialog_preferences-ka-tools.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_preferences_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_preferences_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog_preferences-krb5-auth-tools.obj `if test -f '$(top_srcdir)/src/krb5-auth-tools.c'; then $(CYGPATH_W) '$(top_srcdir)/src/krb5-auth-tools.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/krb5-auth-tools.c'; fi` +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_preferences_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_preferences_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog_preferences-ka-tools.obj `if test -f '$(top_srcdir)/src/ka-tools.c'; then $(CYGPATH_W) '$(top_srcdir)/src/ka-tools.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/ka-tools.c'; fi` mostlyclean-libtool: -rm -f *.lo diff --git a/preferences/krb5-auth-dialog-preferences.c b/preferences/ka-preferences.c index 0b5ff13..f925b7e 100644 --- a/preferences/krb5-auth-dialog-preferences.c +++ b/preferences/ka-preferences.c @@ -21,7 +21,7 @@ * based on the vino capplet which is: * * Copyright (C) 2003 Sun Microsystems, Inc. - * Copyright (C) 2006 Jonh Wendell <wendell@bani.com.br> + * Copyright (C) 2006 Jonh Wendell <wendell@bani.com.br> * * Authors: * Mark McLoughlin <mark@skynet.ie> @@ -33,8 +33,8 @@ #include <gtk/gtk.h> #include <glib/gi18n.h> -#include "krb5-auth-gconf-tools.h" -#include "krb5-auth-tools.h" +#include "ka-gconf-tools.h" +#include "ka-tools.h" #define PKINIT_SMARTCARD "PKCS11:" SC_PKCS11 #define PKINIT_FILE "FILE:" diff --git a/secmem/Makefile.in b/secmem/Makefile.in index 9ba08dd..8c13706 100644 --- a/secmem/Makefile.in +++ b/secmem/Makefile.in @@ -151,6 +151,8 @@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@ GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ +GMODULE_CFLAGS = @GMODULE_CFLAGS@ +GMODULE_LIBS = @GMODULE_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ @@ -168,6 +170,7 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +KA_PLUGINS_DIR = @KA_PLUGINS_DIR@ KRB5_CFLAGS = @KRB5_CFLAGS@ KRB5_CONFIG = @KRB5_CONFIG@ KRB5_LIBS = @KRB5_LIBS@ @@ -208,6 +211,7 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PAM_LIBS = @PAM_LIBS@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ diff --git a/src/Makefile.am b/src/Makefile.am index e0068fb..591c69f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -21,22 +21,29 @@ $(service_DATA): $(service_in_files) Makefile sed -e "s|\@BINDIR\@|$(bindir)|" $< > $@ krb5_auth_dialog_SOURCES = \ - krb5-auth-dialog.c \ - krb5-auth-dialog.h \ - krb5-auth-applet.c \ - krb5-auth-applet.h \ - krb5-auth-pwdialog.c \ - krb5-auth-pwdialog.h \ - krb5-auth-gconf.c \ - krb5-auth-gconf.h \ - krb5-auth-gconf-tools.c \ - krb5-auth-gconf-tools.h \ - krb5-auth-dbus.c \ - krb5-auth-dbus.h \ - krb5-auth-tools.c \ - krb5-auth-tools.h \ - krb5-auth-tickets.c \ - krb5-auth-tickets.h \ + ka-dialog.c \ + ka-dialog.h \ + ka-applet.c \ + ka-applet-priv.h \ + ka-applet.h \ + ka-pwdialog.c \ + ka-pwdialog.h \ + ka-gconf.c \ + ka-gconf.h \ + ka-gconf-tools.c \ + ka-gconf-tools.h \ + ka-dbus.c \ + ka-dbus.h \ + ka-tools.c \ + ka-tools.h \ + ka-tickets.c \ + ka-tickets.h \ + ka-plugin.c \ + ka-plugin.h \ + ka-plugin-loader.c \ + ka-plugin-loader.h \ + ka-closures.h \ + ka-closures.c \ dummy-strings.c \ $(NULL) @@ -47,10 +54,12 @@ krb5_auth_dialog_CPPFLAGS = \ -DDATA_DIR=\""$(datadir)"\" \ -DLOCALE_DIR=\""$(localedir)/"\" \ -DBIN_DIR=\""$(bindir)/"\" \ + -DKA_PLUGINS_DIR=\""$(KA_PLUGINS_DIR)"\" \ $(AM_CPPFLAGS) \ $(NULL) krb5_auth_dialog_CFLAGS = \ + $(GMODULE_CFLAGS) \ $(GTK_CFLAGS) \ $(DBUS_CFLAGS) \ $(GCONF_CFLAGS) \ @@ -71,14 +80,15 @@ krb5_auth_dialog_LDADD = \ $(DBUS_LIBS) \ $(GCONF_LIBS) \ $(GIO_LIBS) \ + $(GMODULE_LIBS) \ $(GTK_LIBS) \ $(NULL) BUILT_SOURCES = \ - krb5-auth-applet-dbus-glue.h \ + ka-dbus-glue.h \ $(NULL) -krb5-auth-applet-dbus-glue.h: $(srcdir)/krb5-auth-applet-dbus.xml +ka-dbus-glue.h: $(srcdir)/ka-dbus.xml dbus-binding-tool \ --mode=glib-server \ --prefix=krb5_auth_dialog \ @@ -100,14 +110,14 @@ EXTRA_DIST = \ $(schema_in_files) \ $(autostart_in_files) \ $(service_in_files) \ - $(srcdir)/krb5-auth-applet-dbus.xml \ + $(srcdir)/ka-dbus.xml \ krb5-auth-dialog.1.in \ $(NULL) CLEANFILES = $(schema_DATA) $(service_DATA) DISTCLEANFILES = \ krb5-auth-dialog.desktop \ - krb5-auth-applet-dbus-glue.h \ + ka-dbus-glue.h \ $(NULL) install-data-local: $(schema_DATA) diff --git a/src/Makefile.in b/src/Makefile.in index 89ddf2e..b812d80 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -53,15 +53,17 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \ "$(DESTDIR)$(schemadir)" "$(DESTDIR)$(servicedir)" PROGRAMS = $(bin_PROGRAMS) am__objects_1 = -am_krb5_auth_dialog_OBJECTS = \ - krb5_auth_dialog-krb5-auth-dialog.$(OBJEXT) \ - krb5_auth_dialog-krb5-auth-applet.$(OBJEXT) \ - krb5_auth_dialog-krb5-auth-pwdialog.$(OBJEXT) \ - krb5_auth_dialog-krb5-auth-gconf.$(OBJEXT) \ - krb5_auth_dialog-krb5-auth-gconf-tools.$(OBJEXT) \ - krb5_auth_dialog-krb5-auth-dbus.$(OBJEXT) \ - krb5_auth_dialog-krb5-auth-tools.$(OBJEXT) \ - krb5_auth_dialog-krb5-auth-tickets.$(OBJEXT) \ +am_krb5_auth_dialog_OBJECTS = krb5_auth_dialog-ka-dialog.$(OBJEXT) \ + krb5_auth_dialog-ka-applet.$(OBJEXT) \ + krb5_auth_dialog-ka-pwdialog.$(OBJEXT) \ + krb5_auth_dialog-ka-gconf.$(OBJEXT) \ + krb5_auth_dialog-ka-gconf-tools.$(OBJEXT) \ + krb5_auth_dialog-ka-dbus.$(OBJEXT) \ + krb5_auth_dialog-ka-tools.$(OBJEXT) \ + krb5_auth_dialog-ka-tickets.$(OBJEXT) \ + krb5_auth_dialog-ka-plugin.$(OBJEXT) \ + krb5_auth_dialog-ka-plugin-loader.$(OBJEXT) \ + krb5_auth_dialog-ka-closures.$(OBJEXT) \ krb5_auth_dialog-dummy-strings.$(OBJEXT) $(am__objects_1) krb5_auth_dialog_OBJECTS = $(am_krb5_auth_dialog_OBJECTS) am__DEPENDENCIES_1 = @@ -71,7 +73,8 @@ krb5_auth_dialog_DEPENDENCIES = \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) AM_V_lt = $(am__v_lt_$(V)) am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) am__v_lt_0 = --silent @@ -180,6 +183,8 @@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@ GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ +GMODULE_CFLAGS = @GMODULE_CFLAGS@ +GMODULE_LIBS = @GMODULE_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ @@ -197,6 +202,7 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +KA_PLUGINS_DIR = @KA_PLUGINS_DIR@ KRB5_CFLAGS = @KRB5_CFLAGS@ KRB5_CONFIG = @KRB5_CONFIG@ KRB5_LIBS = @KRB5_LIBS@ @@ -237,6 +243,7 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ +PAM_LIBS = @PAM_LIBS@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ POFILES = @POFILES@ @@ -323,22 +330,29 @@ servicedir = $(datadir)/dbus-1/services service_in_files = org.gnome.KrbAuthDialog.service.in service_DATA = $(service_in_files:.service.in=.service) krb5_auth_dialog_SOURCES = \ - krb5-auth-dialog.c \ - krb5-auth-dialog.h \ - krb5-auth-applet.c \ - krb5-auth-applet.h \ - krb5-auth-pwdialog.c \ - krb5-auth-pwdialog.h \ - krb5-auth-gconf.c \ - krb5-auth-gconf.h \ - krb5-auth-gconf-tools.c \ - krb5-auth-gconf-tools.h \ - krb5-auth-dbus.c \ - krb5-auth-dbus.h \ - krb5-auth-tools.c \ - krb5-auth-tools.h \ - krb5-auth-tickets.c \ - krb5-auth-tickets.h \ + ka-dialog.c \ + ka-dialog.h \ + ka-applet.c \ + ka-applet-priv.h \ + ka-applet.h \ + ka-pwdialog.c \ + ka-pwdialog.h \ + ka-gconf.c \ + ka-gconf.h \ + ka-gconf-tools.c \ + ka-gconf-tools.h \ + ka-dbus.c \ + ka-dbus.h \ + ka-tools.c \ + ka-tools.h \ + ka-tickets.c \ + ka-tickets.h \ + ka-plugin.c \ + ka-plugin.h \ + ka-plugin-loader.c \ + ka-plugin-loader.h \ + ka-closures.h \ + ka-closures.c \ dummy-strings.c \ $(NULL) @@ -349,10 +363,12 @@ krb5_auth_dialog_CPPFLAGS = \ -DDATA_DIR=\""$(datadir)"\" \ -DLOCALE_DIR=\""$(localedir)/"\" \ -DBIN_DIR=\""$(bindir)/"\" \ + -DKA_PLUGINS_DIR=\""$(KA_PLUGINS_DIR)"\" \ $(AM_CPPFLAGS) \ $(NULL) krb5_auth_dialog_CFLAGS = \ + $(GMODULE_CFLAGS) \ $(GTK_CFLAGS) \ $(DBUS_CFLAGS) \ $(GCONF_CFLAGS) \ @@ -373,11 +389,12 @@ krb5_auth_dialog_LDADD = \ $(DBUS_LIBS) \ $(GCONF_LIBS) \ $(GIO_LIBS) \ + $(GMODULE_LIBS) \ $(GTK_LIBS) \ $(NULL) BUILT_SOURCES = \ - krb5-auth-applet-dbus-glue.h \ + ka-dbus-glue.h \ $(NULL) AM_CPPFLAGS = \ @@ -395,14 +412,14 @@ EXTRA_DIST = \ $(schema_in_files) \ $(autostart_in_files) \ $(service_in_files) \ - $(srcdir)/krb5-auth-applet-dbus.xml \ + $(srcdir)/ka-dbus.xml \ krb5-auth-dialog.1.in \ $(NULL) CLEANFILES = $(schema_DATA) $(service_DATA) DISTCLEANFILES = \ krb5-auth-dialog.desktop \ - krb5-auth-applet-dbus-glue.h \ + ka-dbus-glue.h \ $(NULL) all: $(BUILT_SOURCES) @@ -496,14 +513,17 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog-dummy-strings.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog-krb5-auth-applet.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog-krb5-auth-dbus.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog-krb5-auth-dialog.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog-krb5-auth-gconf-tools.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog-krb5-auth-gconf.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog-krb5-auth-pwdialog.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog-krb5-auth-tickets.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog-krb5-auth-tools.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog-ka-applet.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog-ka-closures.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog-ka-dbus.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog-ka-dialog.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog-ka-gconf-tools.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog-ka-gconf.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog-ka-plugin-loader.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog-ka-plugin.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog-ka-pwdialog.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog-ka-tickets.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5_auth_dialog-ka-tools.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -529,133 +549,181 @@ distclean-compile: @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< -krb5_auth_dialog-krb5-auth-dialog.o: krb5-auth-dialog.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-krb5-auth-dialog.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-krb5-auth-dialog.Tpo -c -o krb5_auth_dialog-krb5-auth-dialog.o `test -f 'krb5-auth-dialog.c' || echo '$(srcdir)/'`krb5-auth-dialog.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-krb5-auth-dialog.Tpo $(DEPDIR)/krb5_auth_dialog-krb5-auth-dialog.Po +krb5_auth_dialog-ka-dialog.o: ka-dialog.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-dialog.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-dialog.Tpo -c -o krb5_auth_dialog-ka-dialog.o `test -f 'ka-dialog.c' || echo '$(srcdir)/'`ka-dialog.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-dialog.Tpo $(DEPDIR)/krb5_auth_dialog-ka-dialog.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ka-dialog.c' object='krb5_auth_dialog-ka-dialog.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-dialog.o `test -f 'ka-dialog.c' || echo '$(srcdir)/'`ka-dialog.c + +krb5_auth_dialog-ka-dialog.obj: ka-dialog.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-dialog.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-dialog.Tpo -c -o krb5_auth_dialog-ka-dialog.obj `if test -f 'ka-dialog.c'; then $(CYGPATH_W) 'ka-dialog.c'; else $(CYGPATH_W) '$(srcdir)/ka-dialog.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-dialog.Tpo $(DEPDIR)/krb5_auth_dialog-ka-dialog.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ka-dialog.c' object='krb5_auth_dialog-ka-dialog.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-dialog.obj `if test -f 'ka-dialog.c'; then $(CYGPATH_W) 'ka-dialog.c'; else $(CYGPATH_W) '$(srcdir)/ka-dialog.c'; fi` + +krb5_auth_dialog-ka-applet.o: ka-applet.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-applet.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-applet.Tpo -c -o krb5_auth_dialog-ka-applet.o `test -f 'ka-applet.c' || echo '$(srcdir)/'`ka-applet.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-applet.Tpo $(DEPDIR)/krb5_auth_dialog-ka-applet.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ka-applet.c' object='krb5_auth_dialog-ka-applet.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-applet.o `test -f 'ka-applet.c' || echo '$(srcdir)/'`ka-applet.c + +krb5_auth_dialog-ka-applet.obj: ka-applet.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-applet.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-applet.Tpo -c -o krb5_auth_dialog-ka-applet.obj `if test -f 'ka-applet.c'; then $(CYGPATH_W) 'ka-applet.c'; else $(CYGPATH_W) '$(srcdir)/ka-applet.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-applet.Tpo $(DEPDIR)/krb5_auth_dialog-ka-applet.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ka-applet.c' object='krb5_auth_dialog-ka-applet.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-applet.obj `if test -f 'ka-applet.c'; then $(CYGPATH_W) 'ka-applet.c'; else $(CYGPATH_W) '$(srcdir)/ka-applet.c'; fi` + +krb5_auth_dialog-ka-pwdialog.o: ka-pwdialog.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-pwdialog.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-pwdialog.Tpo -c -o krb5_auth_dialog-ka-pwdialog.o `test -f 'ka-pwdialog.c' || echo '$(srcdir)/'`ka-pwdialog.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-pwdialog.Tpo $(DEPDIR)/krb5_auth_dialog-ka-pwdialog.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ka-pwdialog.c' object='krb5_auth_dialog-ka-pwdialog.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-pwdialog.o `test -f 'ka-pwdialog.c' || echo '$(srcdir)/'`ka-pwdialog.c + +krb5_auth_dialog-ka-pwdialog.obj: ka-pwdialog.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-pwdialog.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-pwdialog.Tpo -c -o krb5_auth_dialog-ka-pwdialog.obj `if test -f 'ka-pwdialog.c'; then $(CYGPATH_W) 'ka-pwdialog.c'; else $(CYGPATH_W) '$(srcdir)/ka-pwdialog.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-pwdialog.Tpo $(DEPDIR)/krb5_auth_dialog-ka-pwdialog.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ka-pwdialog.c' object='krb5_auth_dialog-ka-pwdialog.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-pwdialog.obj `if test -f 'ka-pwdialog.c'; then $(CYGPATH_W) 'ka-pwdialog.c'; else $(CYGPATH_W) '$(srcdir)/ka-pwdialog.c'; fi` + +krb5_auth_dialog-ka-gconf.o: ka-gconf.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-gconf.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-gconf.Tpo -c -o krb5_auth_dialog-ka-gconf.o `test -f 'ka-gconf.c' || echo '$(srcdir)/'`ka-gconf.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-gconf.Tpo $(DEPDIR)/krb5_auth_dialog-ka-gconf.Po @am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='krb5-auth-dialog.c' object='krb5_auth_dialog-krb5-auth-dialog.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ka-gconf.c' object='krb5_auth_dialog-ka-gconf.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-krb5-auth-dialog.o `test -f 'krb5-auth-dialog.c' || echo '$(srcdir)/'`krb5-auth-dialog.c +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-gconf.o `test -f 'ka-gconf.c' || echo '$(srcdir)/'`ka-gconf.c -krb5_auth_dialog-krb5-auth-dialog.obj: krb5-auth-dialog.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-krb5-auth-dialog.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-krb5-auth-dialog.Tpo -c -o krb5_auth_dialog-krb5-auth-dialog.obj `if test -f 'krb5-auth-dialog.c'; then $(CYGPATH_W) 'krb5-auth-dialog.c'; else $(CYGPATH_W) '$(srcdir)/krb5-auth-dialog.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-krb5-auth-dialog.Tpo $(DEPDIR)/krb5_auth_dialog-krb5-auth-dialog.Po +krb5_auth_dialog-ka-gconf.obj: ka-gconf.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-gconf.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-gconf.Tpo -c -o krb5_auth_dialog-ka-gconf.obj `if test -f 'ka-gconf.c'; then $(CYGPATH_W) 'ka-gconf.c'; else $(CYGPATH_W) '$(srcdir)/ka-gconf.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-gconf.Tpo $(DEPDIR)/krb5_auth_dialog-ka-gconf.Po @am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='krb5-auth-dialog.c' object='krb5_auth_dialog-krb5-auth-dialog.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ka-gconf.c' object='krb5_auth_dialog-ka-gconf.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-krb5-auth-dialog.obj `if test -f 'krb5-auth-dialog.c'; then $(CYGPATH_W) 'krb5-auth-dialog.c'; else $(CYGPATH_W) '$(srcdir)/krb5-auth-dialog.c'; fi` +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-gconf.obj `if test -f 'ka-gconf.c'; then $(CYGPATH_W) 'ka-gconf.c'; else $(CYGPATH_W) '$(srcdir)/ka-gconf.c'; fi` -krb5_auth_dialog-krb5-auth-applet.o: krb5-auth-applet.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-krb5-auth-applet.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-krb5-auth-applet.Tpo -c -o krb5_auth_dialog-krb5-auth-applet.o `test -f 'krb5-auth-applet.c' || echo '$(srcdir)/'`krb5-auth-applet.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-krb5-auth-applet.Tpo $(DEPDIR)/krb5_auth_dialog-krb5-auth-applet.Po +krb5_auth_dialog-ka-gconf-tools.o: ka-gconf-tools.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-gconf-tools.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-gconf-tools.Tpo -c -o krb5_auth_dialog-ka-gconf-tools.o `test -f 'ka-gconf-tools.c' || echo '$(srcdir)/'`ka-gconf-tools.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-gconf-tools.Tpo $(DEPDIR)/krb5_auth_dialog-ka-gconf-tools.Po @am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='krb5-auth-applet.c' object='krb5_auth_dialog-krb5-auth-applet.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ka-gconf-tools.c' object='krb5_auth_dialog-ka-gconf-tools.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-krb5-auth-applet.o `test -f 'krb5-auth-applet.c' || echo '$(srcdir)/'`krb5-auth-applet.c +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-gconf-tools.o `test -f 'ka-gconf-tools.c' || echo '$(srcdir)/'`ka-gconf-tools.c -krb5_auth_dialog-krb5-auth-applet.obj: krb5-auth-applet.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-krb5-auth-applet.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-krb5-auth-applet.Tpo -c -o krb5_auth_dialog-krb5-auth-applet.obj `if test -f 'krb5-auth-applet.c'; then $(CYGPATH_W) 'krb5-auth-applet.c'; else $(CYGPATH_W) '$(srcdir)/krb5-auth-applet.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-krb5-auth-applet.Tpo $(DEPDIR)/krb5_auth_dialog-krb5-auth-applet.Po +krb5_auth_dialog-ka-gconf-tools.obj: ka-gconf-tools.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-gconf-tools.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-gconf-tools.Tpo -c -o krb5_auth_dialog-ka-gconf-tools.obj `if test -f 'ka-gconf-tools.c'; then $(CYGPATH_W) 'ka-gconf-tools.c'; else $(CYGPATH_W) '$(srcdir)/ka-gconf-tools.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-gconf-tools.Tpo $(DEPDIR)/krb5_auth_dialog-ka-gconf-tools.Po @am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='krb5-auth-applet.c' object='krb5_auth_dialog-krb5-auth-applet.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ka-gconf-tools.c' object='krb5_auth_dialog-ka-gconf-tools.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-krb5-auth-applet.obj `if test -f 'krb5-auth-applet.c'; then $(CYGPATH_W) 'krb5-auth-applet.c'; else $(CYGPATH_W) '$(srcdir)/krb5-auth-applet.c'; fi` +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-gconf-tools.obj `if test -f 'ka-gconf-tools.c'; then $(CYGPATH_W) 'ka-gconf-tools.c'; else $(CYGPATH_W) '$(srcdir)/ka-gconf-tools.c'; fi` -krb5_auth_dialog-krb5-auth-pwdialog.o: krb5-auth-pwdialog.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-krb5-auth-pwdialog.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-krb5-auth-pwdialog.Tpo -c -o krb5_auth_dialog-krb5-auth-pwdialog.o `test -f 'krb5-auth-pwdialog.c' || echo '$(srcdir)/'`krb5-auth-pwdialog.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-krb5-auth-pwdialog.Tpo $(DEPDIR)/krb5_auth_dialog-krb5-auth-pwdialog.Po +krb5_auth_dialog-ka-dbus.o: ka-dbus.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-dbus.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-dbus.Tpo -c -o krb5_auth_dialog-ka-dbus.o `test -f 'ka-dbus.c' || echo '$(srcdir)/'`ka-dbus.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-dbus.Tpo $(DEPDIR)/krb5_auth_dialog-ka-dbus.Po @am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='krb5-auth-pwdialog.c' object='krb5_auth_dialog-krb5-auth-pwdialog.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ka-dbus.c' object='krb5_auth_dialog-ka-dbus.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-krb5-auth-pwdialog.o `test -f 'krb5-auth-pwdialog.c' || echo '$(srcdir)/'`krb5-auth-pwdialog.c +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-dbus.o `test -f 'ka-dbus.c' || echo '$(srcdir)/'`ka-dbus.c -krb5_auth_dialog-krb5-auth-pwdialog.obj: krb5-auth-pwdialog.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-krb5-auth-pwdialog.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-krb5-auth-pwdialog.Tpo -c -o krb5_auth_dialog-krb5-auth-pwdialog.obj `if test -f 'krb5-auth-pwdialog.c'; then $(CYGPATH_W) 'krb5-auth-pwdialog.c'; else $(CYGPATH_W) '$(srcdir)/krb5-auth-pwdialog.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-krb5-auth-pwdialog.Tpo $(DEPDIR)/krb5_auth_dialog-krb5-auth-pwdialog.Po +krb5_auth_dialog-ka-dbus.obj: ka-dbus.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-dbus.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-dbus.Tpo -c -o krb5_auth_dialog-ka-dbus.obj `if test -f 'ka-dbus.c'; then $(CYGPATH_W) 'ka-dbus.c'; else $(CYGPATH_W) '$(srcdir)/ka-dbus.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-dbus.Tpo $(DEPDIR)/krb5_auth_dialog-ka-dbus.Po @am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='krb5-auth-pwdialog.c' object='krb5_auth_dialog-krb5-auth-pwdialog.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ka-dbus.c' object='krb5_auth_dialog-ka-dbus.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-krb5-auth-pwdialog.obj `if test -f 'krb5-auth-pwdialog.c'; then $(CYGPATH_W) 'krb5-auth-pwdialog.c'; else $(CYGPATH_W) '$(srcdir)/krb5-auth-pwdialog.c'; fi` +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-dbus.obj `if test -f 'ka-dbus.c'; then $(CYGPATH_W) 'ka-dbus.c'; else $(CYGPATH_W) '$(srcdir)/ka-dbus.c'; fi` -krb5_auth_dialog-krb5-auth-gconf.o: krb5-auth-gconf.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-krb5-auth-gconf.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-krb5-auth-gconf.Tpo -c -o krb5_auth_dialog-krb5-auth-gconf.o `test -f 'krb5-auth-gconf.c' || echo '$(srcdir)/'`krb5-auth-gconf.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-krb5-auth-gconf.Tpo $(DEPDIR)/krb5_auth_dialog-krb5-auth-gconf.Po +krb5_auth_dialog-ka-tools.o: ka-tools.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-tools.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-tools.Tpo -c -o krb5_auth_dialog-ka-tools.o `test -f 'ka-tools.c' || echo '$(srcdir)/'`ka-tools.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-tools.Tpo $(DEPDIR)/krb5_auth_dialog-ka-tools.Po @am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='krb5-auth-gconf.c' object='krb5_auth_dialog-krb5-auth-gconf.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ka-tools.c' object='krb5_auth_dialog-ka-tools.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-krb5-auth-gconf.o `test -f 'krb5-auth-gconf.c' || echo '$(srcdir)/'`krb5-auth-gconf.c +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-tools.o `test -f 'ka-tools.c' || echo '$(srcdir)/'`ka-tools.c -krb5_auth_dialog-krb5-auth-gconf.obj: krb5-auth-gconf.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-krb5-auth-gconf.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-krb5-auth-gconf.Tpo -c -o krb5_auth_dialog-krb5-auth-gconf.obj `if test -f 'krb5-auth-gconf.c'; then $(CYGPATH_W) 'krb5-auth-gconf.c'; else $(CYGPATH_W) '$(srcdir)/krb5-auth-gconf.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-krb5-auth-gconf.Tpo $(DEPDIR)/krb5_auth_dialog-krb5-auth-gconf.Po +krb5_auth_dialog-ka-tools.obj: ka-tools.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-tools.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-tools.Tpo -c -o krb5_auth_dialog-ka-tools.obj `if test -f 'ka-tools.c'; then $(CYGPATH_W) 'ka-tools.c'; else $(CYGPATH_W) '$(srcdir)/ka-tools.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-tools.Tpo $(DEPDIR)/krb5_auth_dialog-ka-tools.Po @am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='krb5-auth-gconf.c' object='krb5_auth_dialog-krb5-auth-gconf.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ka-tools.c' object='krb5_auth_dialog-ka-tools.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-krb5-auth-gconf.obj `if test -f 'krb5-auth-gconf.c'; then $(CYGPATH_W) 'krb5-auth-gconf.c'; else $(CYGPATH_W) '$(srcdir)/krb5-auth-gconf.c'; fi` +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-tools.obj `if test -f 'ka-tools.c'; then $(CYGPATH_W) 'ka-tools.c'; else $(CYGPATH_W) '$(srcdir)/ka-tools.c'; fi` -krb5_auth_dialog-krb5-auth-gconf-tools.o: krb5-auth-gconf-tools.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-krb5-auth-gconf-tools.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-krb5-auth-gconf-tools.Tpo -c -o krb5_auth_dialog-krb5-auth-gconf-tools.o `test -f 'krb5-auth-gconf-tools.c' || echo '$(srcdir)/'`krb5-auth-gconf-tools.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-krb5-auth-gconf-tools.Tpo $(DEPDIR)/krb5_auth_dialog-krb5-auth-gconf-tools.Po +krb5_auth_dialog-ka-tickets.o: ka-tickets.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-tickets.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-tickets.Tpo -c -o krb5_auth_dialog-ka-tickets.o `test -f 'ka-tickets.c' || echo '$(srcdir)/'`ka-tickets.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-tickets.Tpo $(DEPDIR)/krb5_auth_dialog-ka-tickets.Po @am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='krb5-auth-gconf-tools.c' object='krb5_auth_dialog-krb5-auth-gconf-tools.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ka-tickets.c' object='krb5_auth_dialog-ka-tickets.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-krb5-auth-gconf-tools.o `test -f 'krb5-auth-gconf-tools.c' || echo '$(srcdir)/'`krb5-auth-gconf-tools.c +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-tickets.o `test -f 'ka-tickets.c' || echo '$(srcdir)/'`ka-tickets.c -krb5_auth_dialog-krb5-auth-gconf-tools.obj: krb5-auth-gconf-tools.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-krb5-auth-gconf-tools.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-krb5-auth-gconf-tools.Tpo -c -o krb5_auth_dialog-krb5-auth-gconf-tools.obj `if test -f 'krb5-auth-gconf-tools.c'; then $(CYGPATH_W) 'krb5-auth-gconf-tools.c'; else $(CYGPATH_W) '$(srcdir)/krb5-auth-gconf-tools.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-krb5-auth-gconf-tools.Tpo $(DEPDIR)/krb5_auth_dialog-krb5-auth-gconf-tools.Po +krb5_auth_dialog-ka-tickets.obj: ka-tickets.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-tickets.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-tickets.Tpo -c -o krb5_auth_dialog-ka-tickets.obj `if test -f 'ka-tickets.c'; then $(CYGPATH_W) 'ka-tickets.c'; else $(CYGPATH_W) '$(srcdir)/ka-tickets.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-tickets.Tpo $(DEPDIR)/krb5_auth_dialog-ka-tickets.Po @am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='krb5-auth-gconf-tools.c' object='krb5_auth_dialog-krb5-auth-gconf-tools.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ka-tickets.c' object='krb5_auth_dialog-ka-tickets.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-krb5-auth-gconf-tools.obj `if test -f 'krb5-auth-gconf-tools.c'; then $(CYGPATH_W) 'krb5-auth-gconf-tools.c'; else $(CYGPATH_W) '$(srcdir)/krb5-auth-gconf-tools.c'; fi` +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-tickets.obj `if test -f 'ka-tickets.c'; then $(CYGPATH_W) 'ka-tickets.c'; else $(CYGPATH_W) '$(srcdir)/ka-tickets.c'; fi` -krb5_auth_dialog-krb5-auth-dbus.o: krb5-auth-dbus.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-krb5-auth-dbus.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-krb5-auth-dbus.Tpo -c -o krb5_auth_dialog-krb5-auth-dbus.o `test -f 'krb5-auth-dbus.c' || echo '$(srcdir)/'`krb5-auth-dbus.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-krb5-auth-dbus.Tpo $(DEPDIR)/krb5_auth_dialog-krb5-auth-dbus.Po +krb5_auth_dialog-ka-plugin.o: ka-plugin.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-plugin.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-plugin.Tpo -c -o krb5_auth_dialog-ka-plugin.o `test -f 'ka-plugin.c' || echo '$(srcdir)/'`ka-plugin.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-plugin.Tpo $(DEPDIR)/krb5_auth_dialog-ka-plugin.Po @am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='krb5-auth-dbus.c' object='krb5_auth_dialog-krb5-auth-dbus.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ka-plugin.c' object='krb5_auth_dialog-ka-plugin.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-krb5-auth-dbus.o `test -f 'krb5-auth-dbus.c' || echo '$(srcdir)/'`krb5-auth-dbus.c +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-plugin.o `test -f 'ka-plugin.c' || echo '$(srcdir)/'`ka-plugin.c -krb5_auth_dialog-krb5-auth-dbus.obj: krb5-auth-dbus.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-krb5-auth-dbus.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-krb5-auth-dbus.Tpo -c -o krb5_auth_dialog-krb5-auth-dbus.obj `if test -f 'krb5-auth-dbus.c'; then $(CYGPATH_W) 'krb5-auth-dbus.c'; else $(CYGPATH_W) '$(srcdir)/krb5-auth-dbus.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-krb5-auth-dbus.Tpo $(DEPDIR)/krb5_auth_dialog-krb5-auth-dbus.Po +krb5_auth_dialog-ka-plugin.obj: ka-plugin.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-plugin.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-plugin.Tpo -c -o krb5_auth_dialog-ka-plugin.obj `if test -f 'ka-plugin.c'; then $(CYGPATH_W) 'ka-plugin.c'; else $(CYGPATH_W) '$(srcdir)/ka-plugin.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-plugin.Tpo $(DEPDIR)/krb5_auth_dialog-ka-plugin.Po @am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='krb5-auth-dbus.c' object='krb5_auth_dialog-krb5-auth-dbus.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ka-plugin.c' object='krb5_auth_dialog-ka-plugin.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-krb5-auth-dbus.obj `if test -f 'krb5-auth-dbus.c'; then $(CYGPATH_W) 'krb5-auth-dbus.c'; else $(CYGPATH_W) '$(srcdir)/krb5-auth-dbus.c'; fi` +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-plugin.obj `if test -f 'ka-plugin.c'; then $(CYGPATH_W) 'ka-plugin.c'; else $(CYGPATH_W) '$(srcdir)/ka-plugin.c'; fi` -krb5_auth_dialog-krb5-auth-tools.o: krb5-auth-tools.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-krb5-auth-tools.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-krb5-auth-tools.Tpo -c -o krb5_auth_dialog-krb5-auth-tools.o `test -f 'krb5-auth-tools.c' || echo '$(srcdir)/'`krb5-auth-tools.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-krb5-auth-tools.Tpo $(DEPDIR)/krb5_auth_dialog-krb5-auth-tools.Po +krb5_auth_dialog-ka-plugin-loader.o: ka-plugin-loader.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-plugin-loader.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-plugin-loader.Tpo -c -o krb5_auth_dialog-ka-plugin-loader.o `test -f 'ka-plugin-loader.c' || echo '$(srcdir)/'`ka-plugin-loader.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-plugin-loader.Tpo $(DEPDIR)/krb5_auth_dialog-ka-plugin-loader.Po @am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='krb5-auth-tools.c' object='krb5_auth_dialog-krb5-auth-tools.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ka-plugin-loader.c' object='krb5_auth_dialog-ka-plugin-loader.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-krb5-auth-tools.o `test -f 'krb5-auth-tools.c' || echo '$(srcdir)/'`krb5-auth-tools.c +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-plugin-loader.o `test -f 'ka-plugin-loader.c' || echo '$(srcdir)/'`ka-plugin-loader.c -krb5_auth_dialog-krb5-auth-tools.obj: krb5-auth-tools.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-krb5-auth-tools.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-krb5-auth-tools.Tpo -c -o krb5_auth_dialog-krb5-auth-tools.obj `if test -f 'krb5-auth-tools.c'; then $(CYGPATH_W) 'krb5-auth-tools.c'; else $(CYGPATH_W) '$(srcdir)/krb5-auth-tools.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-krb5-auth-tools.Tpo $(DEPDIR)/krb5_auth_dialog-krb5-auth-tools.Po +krb5_auth_dialog-ka-plugin-loader.obj: ka-plugin-loader.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-plugin-loader.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-plugin-loader.Tpo -c -o krb5_auth_dialog-ka-plugin-loader.obj `if test -f 'ka-plugin-loader.c'; then $(CYGPATH_W) 'ka-plugin-loader.c'; else $(CYGPATH_W) '$(srcdir)/ka-plugin-loader.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-plugin-loader.Tpo $(DEPDIR)/krb5_auth_dialog-ka-plugin-loader.Po @am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='krb5-auth-tools.c' object='krb5_auth_dialog-krb5-auth-tools.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ka-plugin-loader.c' object='krb5_auth_dialog-ka-plugin-loader.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-krb5-auth-tools.obj `if test -f 'krb5-auth-tools.c'; then $(CYGPATH_W) 'krb5-auth-tools.c'; else $(CYGPATH_W) '$(srcdir)/krb5-auth-tools.c'; fi` +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-plugin-loader.obj `if test -f 'ka-plugin-loader.c'; then $(CYGPATH_W) 'ka-plugin-loader.c'; else $(CYGPATH_W) '$(srcdir)/ka-plugin-loader.c'; fi` -krb5_auth_dialog-krb5-auth-tickets.o: krb5-auth-tickets.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-krb5-auth-tickets.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-krb5-auth-tickets.Tpo -c -o krb5_auth_dialog-krb5-auth-tickets.o `test -f 'krb5-auth-tickets.c' || echo '$(srcdir)/'`krb5-auth-tickets.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-krb5-auth-tickets.Tpo $(DEPDIR)/krb5_auth_dialog-krb5-auth-tickets.Po +krb5_auth_dialog-ka-closures.o: ka-closures.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-closures.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-closures.Tpo -c -o krb5_auth_dialog-ka-closures.o `test -f 'ka-closures.c' || echo '$(srcdir)/'`ka-closures.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-closures.Tpo $(DEPDIR)/krb5_auth_dialog-ka-closures.Po @am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='krb5-auth-tickets.c' object='krb5_auth_dialog-krb5-auth-tickets.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ka-closures.c' object='krb5_auth_dialog-ka-closures.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-krb5-auth-tickets.o `test -f 'krb5-auth-tickets.c' || echo '$(srcdir)/'`krb5-auth-tickets.c +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-closures.o `test -f 'ka-closures.c' || echo '$(srcdir)/'`ka-closures.c -krb5_auth_dialog-krb5-auth-tickets.obj: krb5-auth-tickets.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-krb5-auth-tickets.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-krb5-auth-tickets.Tpo -c -o krb5_auth_dialog-krb5-auth-tickets.obj `if test -f 'krb5-auth-tickets.c'; then $(CYGPATH_W) 'krb5-auth-tickets.c'; else $(CYGPATH_W) '$(srcdir)/krb5-auth-tickets.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-krb5-auth-tickets.Tpo $(DEPDIR)/krb5_auth_dialog-krb5-auth-tickets.Po +krb5_auth_dialog-ka-closures.obj: ka-closures.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-ka-closures.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-ka-closures.Tpo -c -o krb5_auth_dialog-ka-closures.obj `if test -f 'ka-closures.c'; then $(CYGPATH_W) 'ka-closures.c'; else $(CYGPATH_W) '$(srcdir)/ka-closures.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/krb5_auth_dialog-ka-closures.Tpo $(DEPDIR)/krb5_auth_dialog-ka-closures.Po @am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='krb5-auth-tickets.c' object='krb5_auth_dialog-krb5-auth-tickets.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ka-closures.c' object='krb5_auth_dialog-ka-closures.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-krb5-auth-tickets.obj `if test -f 'krb5-auth-tickets.c'; then $(CYGPATH_W) 'krb5-auth-tickets.c'; else $(CYGPATH_W) '$(srcdir)/krb5-auth-tickets.c'; fi` +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -c -o krb5_auth_dialog-ka-closures.obj `if test -f 'ka-closures.c'; then $(CYGPATH_W) 'ka-closures.c'; else $(CYGPATH_W) '$(srcdir)/ka-closures.c'; fi` krb5_auth_dialog-dummy-strings.o: dummy-strings.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-dummy-strings.o -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-dummy-strings.Tpo -c -o krb5_auth_dialog-dummy-strings.o `test -f 'dummy-strings.c' || echo '$(srcdir)/'`dummy-strings.c @@ -1030,7 +1098,7 @@ uninstall-man: uninstall-man1 $(service_DATA): $(service_in_files) Makefile sed -e "s|\@BINDIR\@|$(bindir)|" $< > $@ -krb5-auth-applet-dbus-glue.h: $(srcdir)/krb5-auth-applet-dbus.xml +ka-dbus-glue.h: $(srcdir)/ka-dbus.xml dbus-binding-tool \ --mode=glib-server \ --prefix=krb5_auth_dialog \ diff --git a/src/krb5-auth-applet.h b/src/ka-applet-priv.h index e0f32e4..7e240a7 100644 --- a/src/krb5-auth-applet.h +++ b/src/ka-applet-priv.h @@ -1,6 +1,6 @@ /* Krb5 Auth Applet -- Acquire and release kerberos tickets * - * (C) 2008 Guido Guenther <agx@sigxcpu.org> + * (C) 2008,2010 Guido Guenther <agx@sigxcpu.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,37 +18,23 @@ * */ -#ifndef KRB5_AUTH_APPLET_H -#define KRB5_AUTH_APPLET_H +/* "Private" header - functions not exported to plugins */ + +#ifndef KA_APPLET_PRIV_H +#define KA_APPLET_PRIV_H #include <glib-object.h> #include <glib/gprintf.h> +#include <gconf/gconf-client.h> #include <krb5.h> #include "config.h" -#include "krb5-auth-pwdialog.h" - -#define KA_NAME _("Network Authentication") +#include "ka-applet.h" +#include "ka-pwdialog.h" G_BEGIN_DECLS -#define KA_TYPE_APPLET (ka_applet_get_type ()) -#define KA_APPLET(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST ((obj), KA_TYPE_APPLET, KaApplet)) -#define KA_APPLET_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST ((klass), KA_TYPE_APPLET, KaAppletClass)) -#define KA_IS_APPLET(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE ((obj), KA_TYPE_APPLET)) -#define KA_IS_APPLET_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE ((klass), KA_TYPE_APPLET)) -#define KA_APPLET_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS ((obj), KA_TYPE_APPLET, KaAppletClass)) - -typedef struct _KaApplet KaApplet; -typedef struct _KaAppletClass KaAppletClass; -typedef struct _KaAppletPrivate KaAppletPrivate; - -GType ka_applet_get_type (void); +#define KA_NAME _("Network Authentication") /* signals emitted by KaApplet */ typedef enum { @@ -64,6 +50,7 @@ void ka_applet_set_tgt_renewable(KaApplet* applet, gboolean renewable); gboolean ka_applet_get_tgt_renewable(const KaApplet* applet); guint ka_applet_get_pw_prompt_secs(const KaApplet* applet); KaPwDialog* ka_applet_get_pwdialog(const KaApplet* applet); +GConfClient* ka_applet_get_gconf_client(const KaApplet* applet); void ka_applet_signal_emit(KaApplet* applet, KaAppletSignalNumber signum, krb5_timestamp expiry); diff --git a/src/krb5-auth-applet.c b/src/ka-applet.c index dd621a0..472f4f5 100644 --- a/src/krb5-auth-applet.c +++ b/src/ka-applet.c @@ -22,12 +22,14 @@ #include <glib/gi18n.h> -#include "krb5-auth-applet.h" -#include "krb5-auth-dialog.h" -#include "krb5-auth-gconf-tools.h" -#include "krb5-auth-gconf.h" -#include "krb5-auth-tools.h" -#include "krb5-auth-tickets.h" +#include "ka-applet-priv.h" +#include "ka-dialog.h" +#include "ka-gconf-tools.h" +#include "ka-gconf.h" +#include "ka-tools.h" +#include "ka-tickets.h" +#include "ka-plugin-loader.h" +#include "ka-closures.h" #ifdef HAVE_LIBNOTIFY #include <libnotify/notify.h> #endif @@ -77,6 +79,7 @@ struct _KaAppletPrivate KaPwDialog *pwdialog; /* the password dialog */ int pw_prompt_secs; /* when to start prompting for a password */ + KaPluginLoader *loader; /* Plugin loader */ #ifdef HAVE_LIBNOTIFY NotifyNotification* notification;/* notification messages */ @@ -219,6 +222,10 @@ ka_applet_dispose(GObject* object) g_object_unref(applet->priv->uixml); applet->priv->uixml = NULL; } + if (applet->priv->loader) { + g_object_unref(applet->priv->loader); + applet->priv->loader = NULL; + } if (parent_class->dispose != NULL) parent_class->dispose (object); @@ -347,7 +354,7 @@ ka_applet_class_init(KaAppletClass *klass) 0, NULL, NULL, - g_cclosure_marshal_VOID__STRING, + ka_closure_VOID__STRING_UINT, G_TYPE_NONE, 2, /* number of parameters */ G_TYPE_STRING, @@ -399,8 +406,8 @@ ka_applet_select_icon(KaApplet* applet, int remaining) if (remaining > 0) { if (remaining < applet->priv->pw_prompt_secs && !applet->priv->renewable) - tray_icon = exp_icon; - else + tray_icon = exp_icon; + else tray_icon = val_icon; } @@ -509,10 +516,12 @@ ka_applet_update_status(KaApplet* applet, krb5_timestamp expiry) int remaining = expiry - now; static int last_warn = 0; static gboolean expiry_notified = FALSE; + static krb5_timestamp old_expiry = 0; gboolean notify = TRUE; const char* tray_icon = ka_applet_select_icon (applet, remaining); char* tooltip_text = ka_applet_tooltip_text (remaining); + if (remaining > 0) { if (expiry_notified) { ka_gconf_get_bool(applet->priv->gconf, @@ -528,20 +537,26 @@ ka_applet_update_status(KaApplet* applet, krb5_timestamp expiry) } ka_applet_signal_emit (applet, KA_SIGNAL_ACQUIRED_TGT, expiry); expiry_notified = FALSE; - } else if (remaining < applet->priv->pw_prompt_secs && (now - last_warn) > NOTIFY_SECONDS && - !applet->priv->renewable) { - ka_gconf_get_bool(applet->priv->gconf, + } else { + if (remaining < applet->priv->pw_prompt_secs + && (now - last_warn) > NOTIFY_SECONDS + && !applet->priv->renewable) { + ka_gconf_get_bool(applet->priv->gconf, KA_GCONF_KEY_NOTIFY_EXPIRING, ¬ify); - if (notify) { - applet->priv->notify_gconf_key = KA_GCONF_KEY_NOTIFY_EXPIRING; - ka_send_event_notification (applet, + if (notify) { + applet->priv->notify_gconf_key = KA_GCONF_KEY_NOTIFY_EXPIRING; + ka_send_event_notification (applet, _("Network credentials expiring"), tooltip_text, "krb-expiring-ticket", "dont-show-again"); + } + last_warn = now; } - last_warn = now; + /* ticket lifetime got longer e.g. by kinit -R */ + if (old_expiry && expiry > old_expiry) + ka_applet_signal_emit (applet, KA_SIGNAL_RENEWED_TGT, expiry); } } else { if (!expiry_notified) { @@ -562,6 +577,7 @@ ka_applet_update_status(KaApplet* applet, krb5_timestamp expiry) } } + old_expiry = expiry; gtk_status_icon_set_from_icon_name (applet->priv->tray_icon, tray_icon); gtk_status_icon_set_tooltip_text (applet->priv->tray_icon, tooltip_text); g_free(tooltip_text); @@ -864,6 +880,12 @@ ka_applet_get_pwdialog(const KaApplet* applet) return applet->priv->pwdialog; } +GConfClient* +ka_applet_get_gconf_client(const KaApplet* self) +{ + return self->priv->gconf; +} + void ka_applet_signal_emit (KaApplet* this, KaAppletSignalNumber signum, krb5_timestamp expiry) @@ -912,8 +934,9 @@ ka_applet_create() applet->priv->gconf = ka_gconf_init (applet); g_return_val_if_fail (applet->priv->gconf != NULL, NULL); - ka_tickets_dialog_create(applet->priv->uixml); + ka_tickets_dialog_create (applet->priv->uixml); + applet->priv->loader = ka_plugin_loader_create (applet); + g_return_val_if_fail (applet->priv->loader != NULL, NULL); return applet; } - diff --git a/src/ka-applet.h b/src/ka-applet.h new file mode 100644 index 0000000..e9af644 --- /dev/null +++ b/src/ka-applet.h @@ -0,0 +1,48 @@ +/* Krb5 Auth Applet -- Acquire and release kerberos tickets + * + * (C) 2008 Guido Guenther <agx@sigxcpu.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + */ + +#ifndef KA_APPLET_H +#define KA_APPLET_H + +#include <glib-object.h> + +G_BEGIN_DECLS + +#define KA_TYPE_APPLET (ka_applet_get_type ()) +#define KA_APPLET(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), KA_TYPE_APPLET, KaApplet)) +#define KA_APPLET_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST ((klass), KA_TYPE_APPLET, KaAppletClass)) +#define KA_IS_APPLET(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), KA_TYPE_APPLET)) +#define KA_IS_APPLET_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), KA_TYPE_APPLET)) +#define KA_APPLET_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS ((obj), KA_TYPE_APPLET, KaAppletClass)) + +typedef struct _KaApplet KaApplet; +typedef struct _KaAppletClass KaAppletClass; +typedef struct _KaAppletPrivate KaAppletPrivate; + +GType ka_applet_get_type (void); + +G_END_DECLS + +#endif diff --git a/src/ka-closures.c b/src/ka-closures.c new file mode 100644 index 0000000..a3c651b --- /dev/null +++ b/src/ka-closures.c @@ -0,0 +1,105 @@ +/* + * Copyright (C) 2010 Guido Guenther <agx@sigxcpu.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * This file was generated using glib-genmarshal + */ + +#include <glib-object.h> +#include "ka-closures.h" + + +#ifdef G_ENABLE_DEBUG +#define g_marshal_value_peek_boolean(v) g_value_get_boolean (v) +#define g_marshal_value_peek_char(v) g_value_get_char (v) +#define g_marshal_value_peek_uchar(v) g_value_get_uchar (v) +#define g_marshal_value_peek_int(v) g_value_get_int (v) +#define g_marshal_value_peek_uint(v) g_value_get_uint (v) +#define g_marshal_value_peek_long(v) g_value_get_long (v) +#define g_marshal_value_peek_ulong(v) g_value_get_ulong (v) +#define g_marshal_value_peek_int64(v) g_value_get_int64 (v) +#define g_marshal_value_peek_uint64(v) g_value_get_uint64 (v) +#define g_marshal_value_peek_enum(v) g_value_get_enum (v) +#define g_marshal_value_peek_flags(v) g_value_get_flags (v) +#define g_marshal_value_peek_float(v) g_value_get_float (v) +#define g_marshal_value_peek_double(v) g_value_get_double (v) +#define g_marshal_value_peek_string(v) (char*) g_value_get_string (v) +#define g_marshal_value_peek_param(v) g_value_get_param (v) +#define g_marshal_value_peek_boxed(v) g_value_get_boxed (v) +#define g_marshal_value_peek_pointer(v) g_value_get_pointer (v) +#define g_marshal_value_peek_object(v) g_value_get_object (v) +#else /* !G_ENABLE_DEBUG */ +/* WARNING: This code accesses GValues directly, which is UNSUPPORTED API. + * Do not access GValues directly in your code. Instead, use the + * g_value_get_*() functions + */ +#define g_marshal_value_peek_boolean(v) (v)->data[0].v_int +#define g_marshal_value_peek_char(v) (v)->data[0].v_int +#define g_marshal_value_peek_uchar(v) (v)->data[0].v_uint +#define g_marshal_value_peek_int(v) (v)->data[0].v_int +#define g_marshal_value_peek_uint(v) (v)->data[0].v_uint +#define g_marshal_value_peek_long(v) (v)->data[0].v_long +#define g_marshal_value_peek_ulong(v) (v)->data[0].v_ulong +#define g_marshal_value_peek_int64(v) (v)->data[0].v_int64 +#define g_marshal_value_peek_uint64(v) (v)->data[0].v_uint64 +#define g_marshal_value_peek_enum(v) (v)->data[0].v_long +#define g_marshal_value_peek_flags(v) (v)->data[0].v_ulong +#define g_marshal_value_peek_float(v) (v)->data[0].v_float +#define g_marshal_value_peek_double(v) (v)->data[0].v_double +#define g_marshal_value_peek_string(v) (v)->data[0].v_pointer +#define g_marshal_value_peek_param(v) (v)->data[0].v_pointer +#define g_marshal_value_peek_boxed(v) (v)->data[0].v_pointer +#define g_marshal_value_peek_pointer(v) (v)->data[0].v_pointer +#define g_marshal_value_peek_object(v) (v)->data[0].v_pointer +#endif /* !G_ENABLE_DEBUG */ + + +/* VOID:STRING,UINT (src/marshaller:1) */ +void +ka_closure_VOID__STRING_UINT (GClosure *closure, + GValue *return_value G_GNUC_UNUSED, + guint n_param_values, + const GValue *param_values, + gpointer invocation_hint G_GNUC_UNUSED, + gpointer marshal_data) +{ + typedef void (*GMarshalFunc_VOID__STRING_UINT) (gpointer data1, + gpointer arg_1, + guint arg_2, + gpointer data2); + register GMarshalFunc_VOID__STRING_UINT callback; + register GCClosure *cc = (GCClosure*) closure; + register gpointer data1, data2; + + g_return_if_fail (n_param_values == 3); + + if (G_CCLOSURE_SWAP_DATA (closure)) + { + data1 = closure->data; + data2 = g_value_peek_pointer (param_values + 0); + } + else + { + data1 = g_value_peek_pointer (param_values + 0); + data2 = closure->data; + } + callback = (GMarshalFunc_VOID__STRING_UINT) (marshal_data ? marshal_data : cc->callback); + + callback (data1, + g_marshal_value_peek_string (param_values + 1), + g_marshal_value_peek_uint (param_values + 2), + data2); +} diff --git a/src/ka-closures.h b/src/ka-closures.h new file mode 100644 index 0000000..37b0a7d --- /dev/null +++ b/src/ka-closures.h @@ -0,0 +1,38 @@ +/* + * Copyright (C) 2010 Guido Guenther <agx@sigxcpu.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * This file was generated using glib-genmarshal + */ + +#ifndef __ka_closure_MARSHAL_H__ +#define __ka_closure_MARSHAL_H__ + +#include <glib-object.h> + +G_BEGIN_DECLS + +/* VOID:STRING,UINT (marshaller:1) */ +extern void ka_closure_VOID__STRING_UINT (GClosure *closure, + GValue *return_value, + guint n_param_values, + const GValue *param_values, + gpointer invocation_hint, + gpointer marshal_data); + +G_END_DECLS + +#endif /* __ka_closure_MARSHAL_H__ */ diff --git a/src/krb5-auth-dbus.c b/src/ka-dbus.c index 94ab18d..f8a00d6 100644 --- a/src/krb5-auth-dbus.c +++ b/src/ka-dbus.c @@ -21,10 +21,10 @@ #include "config.h" #include <dbus/dbus-glib.h> -#include "krb5-auth-applet.h" -#include "krb5-auth-dialog.h" -#include "krb5-auth-dbus.h" -#include "krb5-auth-applet-dbus-glue.h" +#include "ka-applet-priv.h" +#include "ka-dialog.h" +#include "ka-dbus.h" +#include "ka-dbus-glue.h" static DBusGConnection *session; @@ -117,4 +117,3 @@ ka_dbus_connect(unsigned int* status) } return TRUE; } - diff --git a/src/krb5-auth-dbus.h b/src/ka-dbus.h index 0d3acd0..23828b7 100644 --- a/src/krb5-auth-dbus.h +++ b/src/ka-dbus.h @@ -18,13 +18,13 @@ * */ -#ifndef KRB5_AUTH_DBUS_H -#define KRB5_AUTH_DBUS_H +#ifndef KA_DBUS_H +#define KA_DBUS_H #include <glib.h> #include <dbus/dbus-glib.h> #include <dbus/dbus-glib-lowlevel.h> -#include "krb5-auth-applet.h" +#include "ka-applet-priv.h" gboolean ka_dbus_connect(unsigned int* status); gboolean ka_dbus_service(KaApplet* applet); @@ -34,4 +34,4 @@ gboolean ka_dbus_acquire_tgt (KaApplet *applet, gboolean ka_dbus_destroy_ccache(KaApplet* applet, DBusGMethodInvocation *context); -#endif /* KRB5_AUTH_DBUS_H */ +#endif /* KA_DBUS_H */ diff --git a/src/krb5-auth-applet-dbus.xml b/src/ka-dbus.xml index 0908ec6..9d6b1a4 100644 --- a/src/krb5-auth-applet-dbus.xml +++ b/src/ka-dbus.xml @@ -28,4 +28,3 @@ </signal> </interface> </node> - diff --git a/src/krb5-auth-dialog.c b/src/ka-dialog.c index 7b2933b..f8d0fea 100644 --- a/src/krb5-auth-dialog.c +++ b/src/ka-dialog.c @@ -36,12 +36,12 @@ #include "secmem-util.h" #include "memory.h" -#include "krb5-auth-dialog.h" -#include "krb5-auth-applet.h" -#include "krb5-auth-pwdialog.h" -#include "krb5-auth-dbus.h" -#include "krb5-auth-tools.h" -#include "krb5-auth-tickets.h" +#include "ka-dialog.h" +#include "ka-applet-priv.h" +#include "ka-pwdialog.h" +#include "ka-dbus.h" +#include "ka-tools.h" +#include "ka-tickets.h" #ifdef ENABLE_NETWORK_MANAGER #include <libnm_glib.h> @@ -1119,10 +1119,10 @@ main (int argc, char *argv[]) const char *help_msg = "Run '" PACKAGE " --help' to see a full list of available command line options"; const GOptionEntry options [] = { {"auto", 'a', 0, G_OPTION_ARG_NONE, &run_auto, - "Only run if an initialized ccache is found (default)", NULL}, + "Only run if an initialized ccache is found (default)", NULL}, {"always", 'A', 0, G_OPTION_ARG_NONE, &run_always, - "Always run", NULL}, - { NULL, 0, 0, G_OPTION_ARG_NONE, NULL, NULL, NULL } + "Always run", NULL}, + { NULL, 0, 0, G_OPTION_ARG_NONE, NULL, NULL, NULL } }; context = g_option_context_new ("- Kerberos 5 credential checking"); diff --git a/src/krb5-auth-dialog.h b/src/ka-dialog.h index 48cd0b0..c62acb3 100644 --- a/src/krb5-auth-dialog.h +++ b/src/ka-dialog.h @@ -18,10 +18,10 @@ * */ -#ifndef KRB5_AUTH_DIALOG -#define KRB5_AUTH_DIALOG +#ifndef KA_DIALOG +#define KA_DIALOG -#include "krb5-auth-applet.h" +#include "ka-applet-priv.h" gboolean ka_destroy_ccache (KaApplet* applet); gboolean ka_grab_credentials(KaApplet* applet); @@ -30,4 +30,3 @@ gboolean ka_get_service_tickets(GtkListStore *tickets); char* ka_unparse_name(void); int ka_tgt_valid_seconds(void); #endif - diff --git a/src/krb5-auth-gconf-tools.c b/src/ka-gconf-tools.c index 01f4d39..60fd567 100644 --- a/src/krb5-auth-gconf-tools.c +++ b/src/ka-gconf-tools.c @@ -20,7 +20,7 @@ #include "config.h" #include <gconf/gconf-client.h> -#include <krb5-auth-gconf-tools.h> +#include <ka-gconf-tools.h> gboolean ka_gconf_get_string (GConfClient* client, @@ -50,6 +50,30 @@ ka_gconf_get_string (GConfClient* client, gboolean +ka_gconf_get_string_list (GConfClient* client, + const char* key, + GSList** list) +{ + GError* error = NULL; + gboolean success = FALSE; + + g_return_val_if_fail (client != NULL, FALSE); + g_return_val_if_fail (key != NULL, FALSE); + g_return_val_if_fail (*list == NULL, FALSE); + + if ((*list = gconf_client_get_list (client, key, + GCONF_VALUE_STRING, &error))) { + if (error) { + g_print ("%s", error->message); + g_error_free (error); + } else + success = TRUE; + } + return success; +} + + +gboolean ka_gconf_get_int (GConfClient* client, const char* key, int* value) @@ -123,4 +147,3 @@ ka_gconf_set_bool (GConfClient* client, } return TRUE; } - diff --git a/src/krb5-auth-gconf-tools.h b/src/ka-gconf-tools.h index 6d9f124..1d8151d 100644 --- a/src/krb5-auth-gconf-tools.h +++ b/src/ka-gconf-tools.h @@ -18,8 +18,8 @@ * */ -#ifndef KRB5_AUTH_GCONF_TOOLS_H -#define KRB5_AUTH_GCONF_TOOLS_H +#ifndef KA_GCONF_TOOLS_H +#define KA_GCONF_TOOLS_H #include "config.h" @@ -37,8 +37,10 @@ #define KA_GCONF_KEY_NOTIFY_VALID KA_GCONF_PATH "/notify/valid" #define KA_GCONF_KEY_NOTIFY_EXPIRED KA_GCONF_PATH "/notify/expired" #define KA_GCONF_KEY_NOTIFY_EXPIRING KA_GCONF_PATH "/notify/expiring" +#define KA_GCONF_KEY_PLUGINS_ENABLED KA_GCONF_PATH "/plugins/enabled" gboolean ka_gconf_get_string (GConfClient* client, const char* key, char** value); +gboolean ka_gconf_get_string_list (GConfClient* client, const char* key, GSList** list); gboolean ka_gconf_get_int (GConfClient* client, const char* key, int* value); gboolean ka_gconf_get_bool (GConfClient* client, const char* key, gboolean* value); gboolean ka_gconf_set_bool (GConfClient* client, const char* key, gboolean value); diff --git a/src/krb5-auth-gconf.c b/src/ka-gconf.c index 5b9df35..10ef703 100644 --- a/src/krb5-auth-gconf.c +++ b/src/ka-gconf.c @@ -22,9 +22,9 @@ #include <gconf/gconf-client.h> #include <string.h> -#include "krb5-auth-applet.h" -#include "krb5-auth-gconf-tools.h" -#include "krb5-auth-gconf.h" +#include "ka-applet-priv.h" +#include "ka-gconf-tools.h" +#include "ka-gconf.h" static gboolean ka_gconf_set_principal (GConfClient* client, KaApplet* applet) @@ -166,8 +166,9 @@ ka_gconf_key_changed_callback (GConfClient* client, } else if (g_strcmp0 (key, KA_GCONF_KEY_PROXIABLE) == 0) { ka_gconf_set_tgt_proxiable (client, applet); } else if (g_strcmp0 (key, KA_GCONF_KEY_NOTIFY_VALID) - || g_strcmp0 (key,KA_GCONF_KEY_NOTIFY_EXPIRING) - || g_strcmp0 (key,KA_GCONF_KEY_NOTIFY_EXPIRED)) { + || g_strcmp0 (key, KA_GCONF_KEY_NOTIFY_EXPIRING) + || g_strcmp0 (key, KA_GCONF_KEY_NOTIFY_EXPIRED) + || g_strcmp0 (key, KA_GCONF_KEY_PLUGINS_ENABLED)) { /* nothing to do */ } else g_warning("Received notification for unknown gconf key %s", key); diff --git a/src/krb5-auth-gconf.h b/src/ka-gconf.h index e4c3b5a..a6b3872 100644 --- a/src/krb5-auth-gconf.h +++ b/src/ka-gconf.h @@ -18,11 +18,11 @@ * */ -#ifndef KRB5_AUTH_GCONF_H -#define KRB5_AUTH_GCONF_H +#ifndef KA_GCONF_H +#define KA_GCONF_H #include <gconf/gconf-client.h> -#include "krb5-auth-applet.h" +#include "ka-applet-priv.h" GConfClient* ka_gconf_init (KaApplet* applet); diff --git a/src/ka-plugin-loader.c b/src/ka-plugin-loader.c new file mode 100644 index 0000000..2321215 --- /dev/null +++ b/src/ka-plugin-loader.c @@ -0,0 +1,204 @@ +/* + * Copyright (C) 2010 Guido Guenther <agx@sigxcpu.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#include <gconf/gconf-client.h> + +#include "ka-plugin-loader.h" +#include "ka-plugin.h" +#include "ka-applet-priv.h" +#include "ka-gconf-tools.h" + +#include <gmodule.h> + +G_DEFINE_TYPE (KaPluginLoader, ka_plugin_loader, G_TYPE_OBJECT) + +#define GET_PRIVATE(o) \ + (G_TYPE_INSTANCE_GET_PRIVATE ((o), KA_TYPE_PLUGIN_LOADER, KaPluginLoaderPrivate)) + +typedef struct _KaPluginLoaderPrivate KaPluginLoaderPrivate; + +struct _KaPluginLoaderPrivate { + KaApplet *applet; + GSList *active_plugins; +}; + + +static KaPlugin* +load_plugin (const char *path) +{ + KaPlugin *plugin = NULL; + GModule *module; + KaPluginCreateFunc plugin_create_func; + int *major_plugin_version, *minor_plugin_version; + + module = g_module_open (path, G_MODULE_BIND_LAZY); + if (!module) { + g_warning ("Could not load plugin %s: %s", path, g_module_error ()); + return NULL; + } + + if (!g_module_symbol (module, "ka_plugin_major_version",(gpointer *) &major_plugin_version)) { + g_warning ("Could not load plugin %s: Missing major version info", path); + goto out; + } + + if (*major_plugin_version != KA_PLUGIN_MAJOR_VERSION) { + g_warning ("Could not load plugin %s: Plugin major version %d, %d is required", + path, *major_plugin_version, KA_PLUGIN_MAJOR_VERSION); + goto out; + } + + if (!g_module_symbol (module, "ka_plugin_minor_version", (gpointer *) &minor_plugin_version)) { + g_warning ("Could not load plugin %s: Missing minor version info", path); + goto out; + } + + if (*minor_plugin_version != KA_PLUGIN_MINOR_VERSION) { + g_warning ("Could not load plugin %s: Plugin minor version %d, %d is required", + path, *minor_plugin_version, KA_PLUGIN_MINOR_VERSION); + goto out; + } + + if (!g_module_symbol (module, "ka_plugin_create", (gpointer *) &plugin_create_func)) { + g_warning ("Could not load plugin %s: %s", path, g_module_error ()); + goto out; + } + + plugin = (*plugin_create_func) (); + if (plugin) { + g_object_weak_ref (G_OBJECT (plugin), (GWeakNotify) g_module_close, module); + g_message ("Loaded plugin %s", ka_plugin_get_name (plugin)); + } else + g_warning ("Could not load plugin %s: initialization failed", path); +out: + if (!plugin) + g_module_close (module); + + return plugin; +} + + +static void +load_plugins (KaPluginLoader *self) +{ + int i; + KaPluginLoaderPrivate *priv = GET_PRIVATE (self); + const char *pname; + GConfClient *gconf; + GSList *plugins = NULL; + + if (!g_module_supported ()) { + g_warning ("GModules are not supported on your platform!"); + return; + } + gconf = ka_applet_get_gconf_client (priv->applet); + + /* For now we only load the plugins on program startup */ + ka_gconf_get_string_list(gconf, KA_GCONF_KEY_PLUGINS_ENABLED, &plugins); + if (!plugins) { + g_message ("No plugins to load"); + return ; + } + + for (i=0; (pname = g_slist_nth_data (plugins, i)) != NULL; i++) { + char *path; + char *fname; + KaPlugin *plugin; + + fname = g_strdup_printf("libka-plugin-%s.%s", pname, G_MODULE_SUFFIX); + path = g_module_build_path (KA_PLUGINS_DIR, fname); + + plugin = load_plugin (path); + if (plugin) { + ka_plugin_activate(plugin, priv->applet); + priv->active_plugins = g_slist_prepend (priv->active_plugins, plugin); + } + g_free (fname); + g_free (path); + } + g_slist_free (plugins); +} + + +static void +deactivate_plugin(gpointer plugin, gpointer user_data) +{ + KaApplet *applet = KA_APPLET (user_data); + + KA_DEBUG ("Deactivating plugin %s", ka_plugin_get_name (plugin)); + ka_plugin_deactivate (plugin, applet); +} + + +static void +ka_plugin_loader_dispose(GObject *object) +{ + KaPluginLoader *self = KA_PLUGIN_LOADER(object); + KaPluginLoaderPrivate *priv = GET_PRIVATE (self); + GObjectClass *parent_class = G_OBJECT_CLASS (ka_plugin_loader_parent_class); + + /* We need to do this before dropping the ref on applet */ + g_slist_foreach (priv->active_plugins, deactivate_plugin, priv->applet); + g_slist_free (priv->active_plugins); + + if (priv->applet) + priv->applet = NULL; + + if (parent_class->dispose != NULL) + parent_class->dispose (object); +} + + +static void +ka_plugin_loader_class_init (KaPluginLoaderClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS(klass); + + object_class->dispose = ka_plugin_loader_dispose; + g_type_class_add_private (klass, sizeof (KaPluginLoaderPrivate)); +} + + +static void +ka_plugin_loader_init (KaPluginLoader *self) +{ + KaPluginLoaderPrivate *priv = GET_PRIVATE (self); + priv->active_plugins = NULL; +} + + +static KaPluginLoader* +ka_plugin_loader_new (void) +{ + return g_object_new (KA_TYPE_PLUGIN_LOADER, NULL); +} + + +KaPluginLoader* +ka_plugin_loader_create (KaApplet* applet) +{ + KaPluginLoader *loader; + KaPluginLoaderPrivate *priv; + + loader = ka_plugin_loader_new(); + priv = GET_PRIVATE (loader); + priv->applet = applet; + load_plugins (loader); + + return loader; +} diff --git a/src/ka-plugin-loader.h b/src/ka-plugin-loader.h new file mode 100644 index 0000000..6f0560a --- /dev/null +++ b/src/ka-plugin-loader.h @@ -0,0 +1,58 @@ +/* + * Copyright (C) 2010 Guido Guenther <agx@sigxcpu.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifndef _KA_PLUGIN_LOADER +#define _KA_PLUGIN_LOADER + +#include <glib-object.h> +#include "ka-applet.h" + +G_BEGIN_DECLS + +#define KA_TYPE_PLUGIN_LOADER ka_plugin_loader_get_type() + +#define KA_PLUGIN_LOADER(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), KA_TYPE_PLUGIN_LOADER, KaPluginLoader)) + +#define KA_PLUGIN_LOADER_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST ((klass), KA_TYPE_PLUGIN_LOADER, KaPluginLoaderClass)) + +#define KA_IS_PLUGIN_LOADER(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), KA_TYPE_PLUGIN_LOADER)) + +#define KA_IS_PLUGIN_LOADER_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), KA_TYPE_PLUGIN_LOADER)) + +#define KA_PLUGIN_LOADER_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS ((obj), KA_TYPE_PLUGIN_LOADER, KaPluginLoaderClass)) + +typedef struct { + GObject parent; +} KaPluginLoader; + +typedef struct { + GObjectClass parent_class; +} KaPluginLoaderClass; + +GType ka_plugin_loader_get_type (void); + +KaPluginLoader* ka_plugin_loader_create (KaApplet *applet); + +G_END_DECLS + +#endif /* _KA_PLUGIN_LOADER */ diff --git a/src/ka-plugin.c b/src/ka-plugin.c new file mode 100644 index 0000000..88fec34 --- /dev/null +++ b/src/ka-plugin.c @@ -0,0 +1,133 @@ +/* + * Copyright (C) 2010 Guido Guenther <agx@sigxcpu.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#include "ka-plugin.h" + +G_DEFINE_TYPE (KaPlugin, ka_plugin, G_TYPE_OBJECT) + +#define GET_PRIVATE(o) \ + (G_TYPE_INSTANCE_GET_PRIVATE ((o), KA_TYPE_PLUGIN, KaPluginPrivate)) + +enum { + PROP_0, + PROP_NAME, + LAST_PROP +}; + +typedef struct _KaPluginPrivate KaPluginPrivate; +struct _KaPluginPrivate { + char *name; +}; + +const char* +ka_plugin_get_name (KaPlugin *self) +{ + g_return_val_if_fail (KA_IS_PLUGIN (self), NULL); + KaPluginPrivate *priv = GET_PRIVATE (self); + + return priv->name; +} + + +static void +set_property (GObject *object, guint prop_id, + const GValue *value, GParamSpec *pspec) +{ + KaPluginPrivate *priv = GET_PRIVATE (object); + + switch (prop_id) { + case PROP_NAME: + /* construct only */ + priv->name = g_value_dup_string (value); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + + +static void +get_property (GObject *object, guint prop_id, + GValue *value, GParamSpec *pspec) +{ + KaPluginPrivate *priv = GET_PRIVATE (object); + + switch (prop_id) { + case PROP_NAME: + g_value_set_string (value, priv->name); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + + +static void +finalize (GObject *object) +{ + KaPluginPrivate *priv = GET_PRIVATE (object); + + g_free (priv->name); +} + + +void +ka_plugin_activate (KaPlugin *self, KaApplet *applet) +{ + g_return_if_fail (KA_IS_PLUGIN (self)); + + KA_PLUGIN_GET_CLASS (self)->activate (self, applet); +} + + +void +ka_plugin_deactivate (KaPlugin *self, KaApplet *applet) +{ + g_return_if_fail (KA_IS_PLUGIN (self)); + + KA_PLUGIN_GET_CLASS (self)->deactivate (self, applet); +} + + +static void +ka_plugin_class_init (KaPluginClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + + g_type_class_add_private (klass, sizeof (KaPluginPrivate)); + + object_class->get_property = get_property; + object_class->set_property = set_property; + object_class->finalize = finalize; + + g_object_class_install_property + (object_class, PROP_NAME, + g_param_spec_string (KA_PLUGIN_PROP_NAME, + "Name", + "Plugin Name", + NULL, + G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); +} + + +static void +ka_plugin_init (KaPlugin *self G_GNUC_UNUSED) +{ +} diff --git a/src/ka-plugin.h b/src/ka-plugin.h new file mode 100644 index 0000000..ead9b96 --- /dev/null +++ b/src/ka-plugin.h @@ -0,0 +1,75 @@ +/* + * Copyright (C) 2010 Guido Guenther <agx@sigxcpu.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifndef _KA_PLUGIN +#define _KA_PLUGIN + +#include <glib-object.h> +#include "ka-applet.h" + +G_BEGIN_DECLS + +#define KA_PLUGIN_MAJOR_VERSION 0 +#define KA_PLUGIN_MINOR_VERSION 0 + +#define KA_TYPE_PLUGIN ka_plugin_get_type() + +#define KA_PLUGIN(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), KA_TYPE_PLUGIN, KaPlugin)) + +#define KA_PLUGIN_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST ((klass), KA_TYPE_PLUGIN, KaPluginClass)) + +#define KA_IS_PLUGIN(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), KA_TYPE_PLUGIN)) + +#define KA_IS_PLUGIN_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), KA_TYPE_PLUGIN)) + +#define KA_PLUGIN_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS ((obj), KA_TYPE_PLUGIN, KaPluginClass)) + +#define KA_PLUGIN_PROP_NAME "name" + +typedef struct { + GObject parent; +} KaPlugin; + +typedef struct { + GObjectClass parent_class; + + void (*activate) (KaPlugin *self, KaApplet* applet); + void (*deactivate) (KaPlugin *self, KaApplet* applet); + + /* we'll add functions for prefs handling later */ + void (*dummy1) (KaPlugin *self, KaApplet* applet); + void (*dummy2) (KaPlugin *self, KaApplet* applet); +} KaPluginClass; + +GType ka_plugin_get_type (void); + +KaPlugin* ka_plugin_new (void); + +typedef KaPlugin *(*KaPluginCreateFunc) (void); +const char* ka_plugin_get_name (KaPlugin *self); +void ka_plugin_activate (KaPlugin *self, KaApplet *applet); +void ka_plugin_deactivate (KaPlugin *self, KaApplet *applet); + +G_END_DECLS + +#endif /* _KA_PLUGIN */ diff --git a/src/krb5-auth-pwdialog.c b/src/ka-pwdialog.c index 54fc292..2f8463c 100644 --- a/src/krb5-auth-pwdialog.c +++ b/src/ka-pwdialog.c @@ -22,9 +22,9 @@ #include <glib/gi18n.h> -#include "krb5-auth-applet.h" -#include "krb5-auth-dialog.h" -#include "krb5-auth-pwdialog.h" +#include "ka-applet-priv.h" +#include "ka-dialog.h" +#include "ka-pwdialog.h" struct _KaPwDialog { GObject parent; @@ -307,4 +307,3 @@ ka_pwdialog_create(GtkBuilder* xml) return pwdialog; } - diff --git a/src/krb5-auth-pwdialog.h b/src/ka-pwdialog.h index a02d3fb..8b39402 100644 --- a/src/krb5-auth-pwdialog.h +++ b/src/ka-pwdialog.h @@ -18,8 +18,8 @@ * */ -#ifndef KRB5_AUTH_PWDIALOG_H -#define KRB5_AUTH_PWDIALOG_H +#ifndef KA_PWDIALOG_H +#define KA_PWDIALOG_H #include <glib.h> #include <glib-object.h> diff --git a/src/krb5-auth-tickets.c b/src/ka-tickets.c index 7c177a9..8734546 100644 --- a/src/krb5-auth-tickets.c +++ b/src/ka-tickets.c @@ -23,8 +23,8 @@ #include <glib/gi18n.h> #include <gtk/gtk.h> -#include "krb5-auth-tickets.h" -#include "krb5-auth-dialog.h" +#include "ka-tickets.h" +#include "ka-dialog.h" static GtkListStore *tickets; static GtkWidget *tickets_dialog; @@ -113,4 +113,3 @@ ka_tickets_dialog_run() gtk_widget_show (message_dialog); } } - diff --git a/src/krb5-auth-tickets.h b/src/ka-tickets.h index 02d67b3..a1002f5 100644 --- a/src/krb5-auth-tickets.h +++ b/src/ka-tickets.h @@ -18,8 +18,8 @@ * */ -#ifndef KRB5_AUTH_TICKETS_H -#define KRB5_AUTH_TICKETS_H +#ifndef KA_TICKETS_H +#define KA_TICKETS_H enum ticket_columns { PRINCIPAL_COLUMN, diff --git a/src/krb5-auth-tools.c b/src/ka-tools.c index bd72afb..177e64e 100644 --- a/src/krb5-auth-tools.c +++ b/src/ka-tools.c @@ -19,7 +19,7 @@ #include "config.h" #include <glib/gi18n.h> -#include "krb5-auth-tools.h" +#include "ka-tools.h" void ka_show_help (GdkScreen* screen, const char* chapter, GtkWindow* window) @@ -55,4 +55,3 @@ ka_show_help (GdkScreen* screen, const char* chapter, GtkWindow* window) } g_free (url); } - diff --git a/src/krb5-auth-tools.h b/src/ka-tools.h index ef777e6..f97791b 100644 --- a/src/krb5-auth-tools.h +++ b/src/ka-tools.h @@ -18,8 +18,8 @@ * */ -#ifndef KRB5_AUTH_TOOLS -#define KRB5_AUTH_TOOLS +#ifndef KA_TOOLS +#define KA_TOOLS #include <gtk/gtk.h> @@ -30,4 +30,3 @@ void ka_show_help (GdkScreen* screen, const char* section, GtkWindow* window); G_END_DECLS #endif - diff --git a/src/krb5-auth-dialog.schemas.in b/src/krb5-auth-dialog.schemas.in index f8c7348..bb59f8e 100644 --- a/src/krb5-auth-dialog.schemas.in +++ b/src/krb5-auth-dialog.schemas.in @@ -142,5 +142,18 @@ <long>Notify user when ticket has expired</long> </locale> </schema> + + <schema> + <key>/schemas/apps/krb5-auth-dialog/plugins/enabled</key> + <applyto>/apps/krb5-auth-dialog/plugins/enabled</applyto> + <owner>krb5-auth-dialog</owner> + <type>list</type> + <list_type>string</list_type> + + <locale name="C"> + <short>Enabled plugins</short> + <long>List of plugins that should be loaded and activated on startup.</long> + </locale> + </schema> </schemalist> </gconfschemafile> |