From d911517dc2f9c4c3ce57529ac4d64c17185544e9 Mon Sep 17 00:00:00 2001 From: Guido Günther Date: Mon, 25 May 2009 18:39:27 +0200 Subject: Imported Upstream version 0.10 --- src/Makefile.am | 90 +++++--- src/Makefile.in | 277 ++++++++++++++++++------ src/dummy-strings.c | 453 ++++------------------------------------ src/krb5-auth-applet.c | 84 ++++++-- src/krb5-auth-applet.h | 3 +- src/krb5-auth-dialog.c | 38 +--- src/krb5-auth-dialog.glade | 138 ------------ src/krb5-auth-dialog.schemas.in | 87 +++++--- src/krb5-auth-dialog.xml | 155 ++++++++++++++ src/krb5-auth-gconf-tools.c | 30 ++- src/krb5-auth-gconf-tools.h | 4 + src/krb5-auth-gconf.c | 28 +-- src/krb5-auth-gconf.h | 3 +- src/krb5-auth-pwdialog.c | 16 +- src/krb5-auth-pwdialog.h | 3 +- 15 files changed, 667 insertions(+), 742 deletions(-) delete mode 100644 src/krb5-auth-dialog.glade create mode 100644 src/krb5-auth-dialog.xml (limited to 'src') diff --git a/src/Makefile.am b/src/Makefile.am index ac08e82..ed10e3f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,4 @@ -INCLUDES = \ - -DKA_DATA_DIR=\""$(pkgdatadir)"\" \ - -DLOCALE_DIR=\""$(localedir)/"\" +NULL = bin_PROGRAMS = krb5-auth-dialog man_MANS = krb5-auth-dialog.1 @@ -10,12 +8,10 @@ autostart_in_files = krb5-auth-dialog.desktop.in autostart_DATA = $(autostart_in_files:.desktop.in=.desktop) @INTLTOOL_DESKTOP_RULE@ -schemadir = $(sysconfdir)/gconf/schemas -schema_in_files = $(PACKAGE).schemas.in +schemadir = $(GCONF_SCHEMA_FILE_DIR) +schema_in_files = krb5-auth-dialog.schemas.in schema_DATA = $(schema_in_files:.schemas.in=.schemas) - -%.schemas: $(srcdir)/%.schemas.in - sed -e "s,::PACKAGE::,$(PACKAGE)," < $< > $@ +@INTLTOOL_SCHEMAS_RULE@ servicedir = $(datadir)/dbus-1/services service_in_files = org.gnome.KrbAuthDialog.service.in @@ -37,21 +33,44 @@ krb5_auth_dialog_SOURCES = \ krb5-auth-gconf-tools.h \ krb5-auth-dbus.c \ krb5-auth-dbus.h \ - dummy-strings.c + dummy-strings.c \ + $(NULL) + +krb5_auth_dialog_CPPFLAGS = \ + -I$(top_srcdir)/gtksecentry \ + -I$(top_srcdir)/secmem \ + -DKA_DATA_DIR=\""$(pkgdatadir)"\" \ + -DLOCALE_DIR=\""$(localedir)/"\" \ + $(AM_CPPFLAGS) \ + $(NULL) + +krb5_auth_dialog_CFLAGS = \ + $(GTK_CFLAGS) \ + $(DBUS_CFLAGS) \ + $(GCONF_CFLAGS) \ + $(KRB5_CFLAGS) \ + $(NETWORK_MANAGER_CFLAGS) \ + $(LIBNOTIFY_CFLAGS) \ + $(WARN_CFLAGS) \ + $(AM_CFLAGS) \ + $(NULL) krb5_auth_dialog_LDADD = \ - ../gtksecentry/libgtksecentry.a \ - ../secmem/libsecmem.a \ - @NETWORK_MANAGER_LIBS@ \ - @KRB5_LIBS@ \ - @LIBNOTIFY_LIBS@ \ - @DBUS_LIBS@ \ - @GCONF_LIBS@ \ - @GLADE_LIBS@ \ - @GTK_LIBS@ + $(top_builddir)/gtksecentry/libgtksecentry.a \ + $(top_builddir)/secmem/libsecmem.a \ + $(NETWORK_MANAGER_LIBS) \ + $(LIBCAP) \ + $(KRB5_LIBS) \ + $(LIBNOTIFY_LIBS) \ + $(DBUS_LIBS) \ + $(GCONF_LIBS) \ + $(GIO_LIBS) \ + $(GTK_LIBS) \ + $(NULL) BUILT_SOURCES = \ - krb5-auth-applet-dbus-glue.h + krb5-auth-applet-dbus-glue.h \ + $(NULL) krb5-auth-applet-dbus-glue.h: $(srcdir)/krb5-auth-applet-dbus.xml dbus-binding-tool \ @@ -59,21 +78,38 @@ krb5-auth-applet-dbus-glue.h: $(srcdir)/krb5-auth-applet-dbus.xml --prefix=krb5_auth_dialog \ $< > $@ -AM_CPPFLAGS = -I $(top_srcdir)/gtksecentry/ -I $(top_srcdir)/secmem/ +AM_CPPFLAGS = \ + -I $(top_srcdir)/gtksecentry/ \ + -I $(top_srcdir)/secmem/ \ + $(DISABLE_DEPRECATED) \ + $(NULL) pkgdatadir = $(datadir)/krb5-auth-dialog -pkgdata_DATA = \ - krb5-auth-dialog.glade +pkgdata_DATA = \ + krb5-auth-dialog.xml \ + $(NULL) -EXTRA_DIST = \ - $(pkgdata_DATA) \ +EXTRA_DIST = \ + $(pkgdata_DATA) \ $(schema_in_files) \ $(autostart_in_files) \ $(service_in_files) \ $(srcdir)/krb5-auth-applet-dbus.xml \ - krb5-auth-dialog.1.in + krb5-auth-dialog.1.in \ + $(NULL) CLEANFILES = $(schema_DATA) $(service_DATA) DISTCLEANFILES = \ - krb5-auth-dialog.desktop \ - krb5-auth-applet-dbus-glue.h + krb5-auth-dialog.desktop \ + krb5-auth-applet-dbus-glue.h \ + $(NULL) + +install-data-local: $(schema_DATA) +if GCONF_SCHEMAS_INSTALL + if test -z "$(DESTDIR)" ; then \ + for p in $^ ; do \ + GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p 2>&1 > /dev/null; \ + done \ + fi +endif + diff --git a/src/Makefile.in b/src/Makefile.in index f152fdf..ff0bf8c 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -49,13 +49,27 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \ "$(DESTDIR)$(schemadir)" "$(DESTDIR)$(servicedir)" binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) -am_krb5_auth_dialog_OBJECTS = krb5-auth-dialog.$(OBJEXT) \ - krb5-auth-applet.$(OBJEXT) krb5-auth-pwdialog.$(OBJEXT) \ - krb5-auth-gconf.$(OBJEXT) krb5-auth-gconf-tools.$(OBJEXT) \ - krb5-auth-dbus.$(OBJEXT) dummy-strings.$(OBJEXT) +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-dummy-strings.$(OBJEXT) $(am__objects_1) krb5_auth_dialog_OBJECTS = $(am_krb5_auth_dialog_OBJECTS) -krb5_auth_dialog_DEPENDENCIES = ../gtksecentry/libgtksecentry.a \ - ../secmem/libsecmem.a +am__DEPENDENCIES_1 = +krb5_auth_dialog_DEPENDENCIES = \ + $(top_builddir)/gtksecentry/libgtksecentry.a \ + $(top_builddir)/secmem/libsecmem.a $(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) +krb5_auth_dialog_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(krb5_auth_dialog_CFLAGS) \ + $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -105,10 +119,6 @@ CFLAGS = @CFLAGS@ COMPILER_FLAGS = @COMPILER_FLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ DATADIRNAME = @DATADIRNAME@ DBUS_CFLAGS = @DBUS_CFLAGS@ @@ -116,21 +126,23 @@ DBUS_LIBS = @DBUS_LIBS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DSYMUTIL = @DSYMUTIL@ -ECHO = @ECHO@ +DUMPBIN = @DUMPBIN@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ +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@ -GLADE_CFLAGS = @GLADE_CFLAGS@ -GLADE_LIBS = @GLADE_LIBS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ @@ -150,6 +162,7 @@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ KRB5_CFLAGS = @KRB5_CFLAGS@ KRB5_CONFIG = @KRB5_CONFIG@ KRB5_LIBS = @KRB5_LIBS@ +LD = @LD@ LDFLAGS = @LDFLAGS@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -160,6 +173,7 @@ LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ @@ -171,8 +185,12 @@ 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@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -203,8 +221,7 @@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -236,6 +253,7 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_ECHO = @lt_ECHO@ mandir = @mandir@ minimum_lifetime = @minimum_lifetime@ mkdir_p = @mkdir_p@ @@ -252,16 +270,13 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -INCLUDES = \ - -DKA_DATA_DIR=\""$(pkgdatadir)"\" \ - -DLOCALE_DIR=\""$(localedir)/"\" - +NULL = man_MANS = krb5-auth-dialog.1 autostartdir = $(sysconfdir)/xdg/autostart autostart_in_files = krb5-auth-dialog.desktop.in autostart_DATA = $(autostart_in_files:.desktop.in=.desktop) -schemadir = $(sysconfdir)/gconf/schemas -schema_in_files = $(PACKAGE).schemas.in +schemadir = $(GCONF_SCHEMA_FILE_DIR) +schema_in_files = krb5-auth-dialog.schemas.in schema_DATA = $(schema_in_files:.schemas.in=.schemas) servicedir = $(datadir)/dbus-1/services service_in_files = org.gnome.KrbAuthDialog.service.in @@ -279,38 +294,69 @@ krb5_auth_dialog_SOURCES = \ krb5-auth-gconf-tools.h \ krb5-auth-dbus.c \ krb5-auth-dbus.h \ - dummy-strings.c + dummy-strings.c \ + $(NULL) + +krb5_auth_dialog_CPPFLAGS = \ + -I$(top_srcdir)/gtksecentry \ + -I$(top_srcdir)/secmem \ + -DKA_DATA_DIR=\""$(pkgdatadir)"\" \ + -DLOCALE_DIR=\""$(localedir)/"\" \ + $(AM_CPPFLAGS) \ + $(NULL) + +krb5_auth_dialog_CFLAGS = \ + $(GTK_CFLAGS) \ + $(DBUS_CFLAGS) \ + $(GCONF_CFLAGS) \ + $(KRB5_CFLAGS) \ + $(NETWORK_MANAGER_CFLAGS) \ + $(LIBNOTIFY_CFLAGS) \ + $(WARN_CFLAGS) \ + $(AM_CFLAGS) \ + $(NULL) krb5_auth_dialog_LDADD = \ - ../gtksecentry/libgtksecentry.a \ - ../secmem/libsecmem.a \ - @NETWORK_MANAGER_LIBS@ \ - @KRB5_LIBS@ \ - @LIBNOTIFY_LIBS@ \ - @DBUS_LIBS@ \ - @GCONF_LIBS@ \ - @GLADE_LIBS@ \ - @GTK_LIBS@ + $(top_builddir)/gtksecentry/libgtksecentry.a \ + $(top_builddir)/secmem/libsecmem.a \ + $(NETWORK_MANAGER_LIBS) \ + $(LIBCAP) \ + $(KRB5_LIBS) \ + $(LIBNOTIFY_LIBS) \ + $(DBUS_LIBS) \ + $(GCONF_LIBS) \ + $(GIO_LIBS) \ + $(GTK_LIBS) \ + $(NULL) BUILT_SOURCES = \ - krb5-auth-applet-dbus-glue.h + krb5-auth-applet-dbus-glue.h \ + $(NULL) + +AM_CPPFLAGS = \ + -I $(top_srcdir)/gtksecentry/ \ + -I $(top_srcdir)/secmem/ \ + $(DISABLE_DEPRECATED) \ + $(NULL) -AM_CPPFLAGS = -I $(top_srcdir)/gtksecentry/ -I $(top_srcdir)/secmem/ pkgdata_DATA = \ - krb5-auth-dialog.glade + krb5-auth-dialog.xml \ + $(NULL) EXTRA_DIST = \ - $(pkgdata_DATA) \ + $(pkgdata_DATA) \ $(schema_in_files) \ $(autostart_in_files) \ $(service_in_files) \ $(srcdir)/krb5-auth-applet-dbus.xml \ - krb5-auth-dialog.1.in + krb5-auth-dialog.1.in \ + $(NULL) CLEANFILES = $(schema_DATA) $(service_DATA) DISTCLEANFILES = \ - krb5-auth-dialog.desktop \ - krb5-auth-applet-dbus-glue.h + krb5-auth-dialog.desktop \ + krb5-auth-applet-dbus-glue.h \ + $(NULL) all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am @@ -378,7 +424,7 @@ clean-binPROGRAMS: done krb5-auth-dialog$(EXEEXT): $(krb5_auth_dialog_OBJECTS) $(krb5_auth_dialog_DEPENDENCIES) @rm -f krb5-auth-dialog$(EXEEXT) - $(LINK) $(krb5_auth_dialog_OBJECTS) $(krb5_auth_dialog_LDADD) $(LIBS) + $(krb5_auth_dialog_LINK) $(krb5_auth_dialog_OBJECTS) $(krb5_auth_dialog_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -386,13 +432,13 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy-strings.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5-auth-applet.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5-auth-dbus.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5-auth-dialog.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5-auth-gconf-tools.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5-auth-gconf.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krb5-auth-pwdialog.Po@am__quote@ +@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@ .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -415,6 +461,104 @@ 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@ $(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@ mv -f $(DEPDIR)/krb5_auth_dialog-krb5-auth-dialog.Tpo $(DEPDIR)/krb5_auth_dialog-krb5-auth-dialog.Po +@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@ 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 + +krb5_auth_dialog-krb5-auth-dialog.obj: krb5-auth-dialog.c +@am__fastdepCC_TRUE@ $(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@ mv -f $(DEPDIR)/krb5_auth_dialog-krb5-auth-dialog.Tpo $(DEPDIR)/krb5_auth_dialog-krb5-auth-dialog.Po +@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@ 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` + +krb5_auth_dialog-krb5-auth-applet.o: krb5-auth-applet.c +@am__fastdepCC_TRUE@ $(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@ mv -f $(DEPDIR)/krb5_auth_dialog-krb5-auth-applet.Tpo $(DEPDIR)/krb5_auth_dialog-krb5-auth-applet.Po +@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@ 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 + +krb5_auth_dialog-krb5-auth-applet.obj: krb5-auth-applet.c +@am__fastdepCC_TRUE@ $(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@ mv -f $(DEPDIR)/krb5_auth_dialog-krb5-auth-applet.Tpo $(DEPDIR)/krb5_auth_dialog-krb5-auth-applet.Po +@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@ 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` + +krb5_auth_dialog-krb5-auth-pwdialog.o: krb5-auth-pwdialog.c +@am__fastdepCC_TRUE@ $(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@ mv -f $(DEPDIR)/krb5_auth_dialog-krb5-auth-pwdialog.Tpo $(DEPDIR)/krb5_auth_dialog-krb5-auth-pwdialog.Po +@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@ 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 + +krb5_auth_dialog-krb5-auth-pwdialog.obj: krb5-auth-pwdialog.c +@am__fastdepCC_TRUE@ $(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@ mv -f $(DEPDIR)/krb5_auth_dialog-krb5-auth-pwdialog.Tpo $(DEPDIR)/krb5_auth_dialog-krb5-auth-pwdialog.Po +@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@ 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` + +krb5_auth_dialog-krb5-auth-gconf.o: krb5-auth-gconf.c +@am__fastdepCC_TRUE@ $(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@ mv -f $(DEPDIR)/krb5_auth_dialog-krb5-auth-gconf.Tpo $(DEPDIR)/krb5_auth_dialog-krb5-auth-gconf.Po +@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@ 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 + +krb5_auth_dialog-krb5-auth-gconf.obj: krb5-auth-gconf.c +@am__fastdepCC_TRUE@ $(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@ mv -f $(DEPDIR)/krb5_auth_dialog-krb5-auth-gconf.Tpo $(DEPDIR)/krb5_auth_dialog-krb5-auth-gconf.Po +@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@ 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` + +krb5_auth_dialog-krb5-auth-gconf-tools.o: krb5-auth-gconf-tools.c +@am__fastdepCC_TRUE@ $(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@ mv -f $(DEPDIR)/krb5_auth_dialog-krb5-auth-gconf-tools.Tpo $(DEPDIR)/krb5_auth_dialog-krb5-auth-gconf-tools.Po +@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@ 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 + +krb5_auth_dialog-krb5-auth-gconf-tools.obj: krb5-auth-gconf-tools.c +@am__fastdepCC_TRUE@ $(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@ mv -f $(DEPDIR)/krb5_auth_dialog-krb5-auth-gconf-tools.Tpo $(DEPDIR)/krb5_auth_dialog-krb5-auth-gconf-tools.Po +@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@ 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` + +krb5_auth_dialog-krb5-auth-dbus.o: krb5-auth-dbus.c +@am__fastdepCC_TRUE@ $(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@ mv -f $(DEPDIR)/krb5_auth_dialog-krb5-auth-dbus.Tpo $(DEPDIR)/krb5_auth_dialog-krb5-auth-dbus.Po +@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@ 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 + +krb5_auth_dialog-krb5-auth-dbus.obj: krb5-auth-dbus.c +@am__fastdepCC_TRUE@ $(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@ mv -f $(DEPDIR)/krb5_auth_dialog-krb5-auth-dbus.Tpo $(DEPDIR)/krb5_auth_dialog-krb5-auth-dbus.Po +@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@ 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` + +krb5_auth_dialog-dummy-strings.o: dummy-strings.c +@am__fastdepCC_TRUE@ $(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 +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/krb5_auth_dialog-dummy-strings.Tpo $(DEPDIR)/krb5_auth_dialog-dummy-strings.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dummy-strings.c' object='krb5_auth_dialog-dummy-strings.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-dummy-strings.o `test -f 'dummy-strings.c' || echo '$(srcdir)/'`dummy-strings.c + +krb5_auth_dialog-dummy-strings.obj: dummy-strings.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(krb5_auth_dialog_CPPFLAGS) $(CPPFLAGS) $(krb5_auth_dialog_CFLAGS) $(CFLAGS) -MT krb5_auth_dialog-dummy-strings.obj -MD -MP -MF $(DEPDIR)/krb5_auth_dialog-dummy-strings.Tpo -c -o krb5_auth_dialog-dummy-strings.obj `if test -f 'dummy-strings.c'; then $(CYGPATH_W) 'dummy-strings.c'; else $(CYGPATH_W) '$(srcdir)/dummy-strings.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/krb5_auth_dialog-dummy-strings.Tpo $(DEPDIR)/krb5_auth_dialog-dummy-strings.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dummy-strings.c' object='krb5_auth_dialog-dummy-strings.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-dummy-strings.obj `if test -f 'dummy-strings.c'; then $(CYGPATH_W) 'dummy-strings.c'; else $(CYGPATH_W) '$(srcdir)/dummy-strings.c'; fi` + mostlyclean-libtool: -rm -f *.lo @@ -663,8 +807,8 @@ info: info-am info-am: -install-data-am: install-autostartDATA install-man install-pkgdataDATA \ - install-schemaDATA install-serviceDATA +install-data-am: install-autostartDATA install-data-local install-man \ + install-pkgdataDATA install-schemaDATA install-serviceDATA install-dvi: install-dvi-am @@ -713,23 +857,21 @@ uninstall-man: uninstall-man1 distclean-generic distclean-libtool distclean-tags distdir dvi \ dvi-am html html-am info info-am install install-am \ install-autostartDATA install-binPROGRAMS 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-man1 install-pdf \ - install-pdf-am install-pkgdataDATA install-ps install-ps-am \ - install-schemaDATA install-serviceDATA 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-autostartDATA \ - uninstall-binPROGRAMS uninstall-man uninstall-man1 \ - uninstall-pkgdataDATA uninstall-schemaDATA \ + install-data-am install-data-local install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-man1 \ + install-pdf install-pdf-am install-pkgdataDATA install-ps \ + install-ps-am install-schemaDATA install-serviceDATA \ + 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-autostartDATA uninstall-binPROGRAMS uninstall-man \ + uninstall-man1 uninstall-pkgdataDATA uninstall-schemaDATA \ uninstall-serviceDATA @INTLTOOL_DESKTOP_RULE@ - -%.schemas: $(srcdir)/%.schemas.in - sed -e "s,::PACKAGE::,$(PACKAGE)," < $< > $@ +@INTLTOOL_SCHEMAS_RULE@ $(service_DATA): $(service_in_files) Makefile sed -e "s|\@BINDIR\@|$(bindir)|" $< > $@ @@ -739,6 +881,13 @@ krb5-auth-applet-dbus-glue.h: $(srcdir)/krb5-auth-applet-dbus.xml --mode=glib-server \ --prefix=krb5_auth_dialog \ $< > $@ + +install-data-local: $(schema_DATA) +@GCONF_SCHEMAS_INSTALL_TRUE@ if test -z "$(DESTDIR)" ; then \ +@GCONF_SCHEMAS_INSTALL_TRUE@ for p in $^ ; do \ +@GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p 2>&1 > /dev/null; \ +@GCONF_SCHEMAS_INSTALL_TRUE@ done \ +@GCONF_SCHEMAS_INSTALL_TRUE@ fi # 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/src/dummy-strings.c b/src/dummy-strings.c index e107293..b5009ad 100644 --- a/src/dummy-strings.c +++ b/src/dummy-strings.c @@ -1,150 +1,20 @@ -/* This file is generated by hand from kerberos 1.3.4 by running - * - * ./etpo /path/to/krb5-1.3.4/ > dummy-strings.c - * - * It was then stripped of the meaningless messages (such as "Reserved - * error message [60-254]"). It is expected that not all these - * messages are translated. - */ - +/* Generated by hand via "cd etpo; make update-etpo" from /tmp/krb5-1.6.dfsg.4~beta1/ */ #include const char *dummy[] = { - N_("Can't read ticket file"), /* test1.et:krb:KRB_MK_AP_TKFIL */ - N_("Can't find ticket or TGT"), /* test1.et:krb:KRB_MK_AP_NOTKT */ - N_("TGT expired"), /* test1.et:krb:KRB_MK_AP_TGTEXP */ - N_("Can't decode authenticator"), /* test1.et:krb:KRB_RD_AP_UNDEC */ - N_("Ticket expired"), /* test1.et:krb:KRB_RD_AP_EXP */ - N_("Repeated request"), /* test1.et:krb:KRB_RD_AP_REPEAT */ - N_("The ticket isn't for us"), /* test1.et:krb:KRB_RD_AP_NOT_US */ - N_("Request is inconsistent"), /* test1.et:krb:KRB_RD_AP_INCON */ - N_("Delta-T too big"), /* test1.et:krb:KRB_RD_AP_TIME */ - N_("Incorrect net address"), /* test1.et:krb:KRB_RD_AP_BADD */ - N_("Protocol version mismatch"), /* test1.et:krb:KRB_RD_AP_VERSION */ - N_("Invalid message type"), /* test1.et:krb:KRB_RD_AP_MSG_TYPE */ - N_("Message stream modified"), /* test1.et:krb:KRB_RD_AP_MODIFIED */ - N_("Message out of order"), /* test1.et:krb:KRB_RD_AP_ORDER */ - N_("Unauthorized request"), /* test1.et:krb:KRB_RD_AP_UNAUTHOR */ - N_("Current password is null"), /* test1.et:krb:KRB_GT_PW_NULL */ - N_("Incorrect current password"), /* test1.et:krb:KRB_GT_PW_BADPW */ - N_("Protocol error"), /* test1.et:krb:KRB_GT_PW_PROT */ - N_("Error returned by KDC"), /* test1.et:krb:KRB_GT_PW_KDCERR */ - N_("Null ticket returned by KDC"), /* test1.et:krb:KRB_GT_PW_NULLTKT */ - N_("Retry count exceeded"), /* test1.et:krb:KRB_SKDC_RETRY */ - N_("Can't send request"), /* test1.et:krb:KRB_SKDC_CANT */ - N_("Subsystem aborted"), /* ss_err.et:ss:SS_ET_SUBSYSTEM_ABORTED */ - N_("Version mismatch"), /* ss_err.et:ss:SS_ET_VERSION_MISMATCH */ - N_("No current invocation"), /* ss_err.et:ss:SS_ET_NULL_INV */ - N_("No info directory"), /* ss_err.et:ss:SS_ET_NO_INFO_DIR */ - N_("Command not found"), /* ss_err.et:ss:SS_ET_COMMAND_NOT_FOUND */ - N_("Command line aborted"), /* ss_err.et:ss:SS_ET_LINE_ABORTED */ - N_("End-of-file reached"), /* ss_err.et:ss:SS_ET_EOF */ - N_("Permission denied"), /* ss_err.et:ss:SS_ET_PERMISSION_DENIED */ - N_("Request table not found"), /* ss_err.et:ss:SS_ET_TABLE_NOT_FOUND */ - N_("No info available"), /* ss_err.et:ss:SS_ET_NO_HELP_FILE */ - N_("Shell escapes are disabled"), /* ss_err.et:ss:SS_ET_ESCAPE_DISABLED */ - N_("Sorry, this request is not yet implemented"), /* ss_err.et:ss:SS_ET_UNIMPLEMENTED */ - N_("Profile version 0.0"), /* prof_err.et:prof:PROF_VERSION */ - N_("Bad magic value in profile_node"), /* prof_err.et:prof:PROF_MAGIC_NODE */ - N_("Profile section not found"), /* prof_err.et:prof:PROF_NO_SECTION */ - N_("Profile relation not found"), /* prof_err.et:prof:PROF_NO_RELATION */ - N_("Attempt to add a relation to node which is not a section"), /* prof_err.et:prof:PROF_ADD_NOT_SECTION */ - N_("A profile section header has a non-zero value"), /* prof_err.et:prof:PROF_SECTION_WITH_VALUE */ - N_("Bad linked list in profile structures"), /* prof_err.et:prof:PROF_BAD_LINK_LIST */ - N_("Bad group level in profile strctures"), /* prof_err.et:prof:PROF_BAD_GROUP_LVL */ - N_("Bad parent pointer in profile strctures"), /* prof_err.et:prof:PROF_BAD_PARENT_PTR */ - N_("Bad magic value in profile iterator"), /* prof_err.et:prof:PROF_MAGIC_ITERATOR */ - N_("Can't set value on section node"), /* prof_err.et:prof:PROF_SET_SECTION_VALUE */ - N_("Invalid argument passed to profile library"), /* prof_err.et:prof:PROF_EINVAL */ - N_("Attempt to modify read-only profile"), /* prof_err.et:prof:PROF_READ_ONLY */ - N_("Profile section header not at top level"), /* prof_err.et:prof:PROF_SECTION_NOTOP */ - N_("Syntax error in profile section header"), /* prof_err.et:prof:PROF_SECTION_SYNTAX */ - N_("Syntax error in profile relation"), /* prof_err.et:prof:PROF_RELATION_SYNTAX */ - N_("Extra closing brace in profile"), /* prof_err.et:prof:PROF_EXTRA_CBRACE */ - N_("Missing open brace in profile"), /* prof_err.et:prof:PROF_MISSING_OBRACE */ - N_("Bad magic value in profile_t"), /* prof_err.et:prof:PROF_MAGIC_PROFILE */ - N_("Bad magic value in profile_section_t"), /* prof_err.et:prof:PROF_MAGIC_SECTION */ - N_("Iteration through all top level section not supported"), /* prof_err.et:prof:PROF_TOPSECTION_ITER_NOSUPP */ - N_("Invalid profile_section object"), /* prof_err.et:prof:PROF_INVALID_SECTION */ - N_("No more sections"), /* prof_err.et:prof:PROF_END_OF_SECTIONS */ - N_("Bad nameset passed to query routine"), /* prof_err.et:prof:PROF_BAD_NAMESET */ - N_("No profile file open"), /* prof_err.et:prof:PROF_NO_PROFILE */ - N_("Bad magic value in profile_file_t"), /* prof_err.et:prof:PROF_MAGIC_FILE */ - N_("Couldn't open profile file"), /* prof_err.et:prof:PROF_FAIL_OPEN */ - N_("Section already exists"), /* prof_err.et:prof:PROF_EXISTS */ - N_("Invalid boolean value"), /* prof_err.et:prof:PROF_BAD_BOOLEAN */ - N_("Invalid integer value"), /* prof_err.et:prof:PROF_BAD_INTEGER */ - N_("Bad magic value in profile_file_data_t"), /* prof_err.et:prof:PROF_MAGIC_FILE_DATA */ - N_("Failed to unlock or grant streams pty."), /* pty_err.et:pty:PTY_GETPTY_STREAMS */ - N_("fstat of master pty failed"), /* pty_err.et:pty:PTY_GETPTY_FSTAT */ - N_("All terminal ports in use"), /* pty_err.et:pty:PTY_GETPTY_NOPTY */ - N_("buffer to hold slave pty name is too short"), /* pty_err.et:pty:PTY_GETPTY_SLAVE_TOOLONG */ - N_("Failed to open slave side of pty"), /* pty_err.et:pty:PTY_OPEN_SLAVE_OPENFAIL */ - N_("Failed to chmod slave side of pty"), /* pty_err.et:pty:PTY_OPEN_SLAVE_CHMODFAIL */ - N_("Unable to set controlling terminal"), /* pty_err.et:pty:PTY_OPEN_SLAVE_NOCTTY */ - N_("Failed to chown slave side of pty"), /* pty_err.et:pty:PTY_OPEN_SLAVE_CHOWNFAIL */ - N_("Call to line_push failed to push streams on slave pty"), /* pty_err.et:pty:PTY_OPEN_SLAVE_LINE_PUSHFAIL */ - N_("Failed to push stream on slave side of pty"), /* pty_err.et:pty:PTY_OPEN_SLAVE_PUSH_FAIL */ - N_("Failed to revoke slave side of pty"), /* pty_err.et:pty:PTY_OPEN_SLAVE_REVOKEFAIL */ - N_("bad process type passed to pty_update_utmp"), /* pty_err.et:pty:PTY_UPDATE_UTMP_PROCTYPE_INVALID */ - N_("Slave pty name is zero-length"), /* pty_err.et:pty:PTY_OPEN_SLAVE_TOOSHORT */ - N_("Usage: kpasswd [principal_name]."), /* kpasswd_strings.et:kpws:KPW_STR_USAGE */ - N_("Kerberos principal name %s is not recognized."), /* kpasswd_strings.et:kpws:KPW_STR_PRIN_UNKNOWN */ - N_("while reading principal name from credential cache."), /* kpasswd_strings.et:kpws:KPW_STR_WHILE_LOOKING_AT_CC */ - N_("Old Kerberos password is incorrect. Please try again."), /* kpasswd_strings.et:kpws:KPW_STR_OLD_PASSWORD_INCORRECT */ - N_("Cannot establish a session with the Kerberos administrative server for\n\ -realm %s. %s."), /* kpasswd_strings.et:kpws:KPW_STR_CANT_OPEN_ADMIN_SERVER */ - N_("New passwords do not match - password not changed.\n"), /* kpasswd_strings.et:kpws:KPW_STR_NEW_PASSWORD_MISMATCH */ - N_("Kerberos password changed.\n"), /* kpasswd_strings.et:kpws:KPW_STR_PASSWORD_CHANGED */ - N_("Password not changed."), /* kpasswd_strings.et:kpws:KPW_STR_PASSWORD_NOT_CHANGED */ - N_("when parsing name %s."), /* kpasswd_strings.et:kpws:KPW_STR_PARSE_NAME */ - N_("when unparsing name."), /* kpasswd_strings.et:kpws:KPW_STR_UNPARSE_NAME */ - N_("Unable to identify user from password file."), /* kpasswd_strings.et:kpws:KPW_STR_NOT_IN_PASSWD_FILE */ - N_("Changing password for %s."), /* kpasswd_strings.et:kpws:KPW_STR_CHANGING_PW_FOR */ - N_("Old password"), /* kpasswd_strings.et:kpws:KPW_STR_OLD_PASSWORD_PROMPT */ - N_("while reading new password."), /* kpasswd_strings.et:kpws:KPW_STR_WHILE_READING_PASSWORD */ - N_("You must type a password. Passwords must be at least one character long."), /* kpasswd_strings.et:kpws:KPW_STR_NO_PASSWORD_READ */ - N_("while trying to change password."), /* kpasswd_strings.et:kpws:KPW_STR_WHILE_TRYING_TO_CHANGE */ - N_("while closing session with admin server and destroying tickets."), /* kpasswd_strings.et:kpws:KPW_STR_WHILE_DESTROYING_ADMIN_SESSION */ - N_("while freeing admin principal entry"), /* kpasswd_strings.et:kpws:KPW_STR_WHILE_FREEING_PRINCIPAL */ - N_("while freeing admin policy entry"), /* kpasswd_strings.et:kpws:KPW_STR_WHILE_FREEING_POLICY */ - N_("Could not get password policy information for principal %s."), /* kpasswd_strings.et:kpws:KPW_STR_CANT_GET_POLICY_INFO */ - N_("%s's password is controlled by the policy %s, which\nrequires a minimum of %u characters from at least %u classes (the five classes\nare lowercase, uppercase, numbers, punctuation, and all other characters)."), /* kpasswd_strings.et:kpws:KPW_STR_POLICY_EXPLANATION */ - N_("Successfully imported %d record%s.\n"), /* import_err.et:imp:IMPORT_NO_ERR */ - N_("Input not recognized as database dump"), /* import_err.et:imp:IMPORT_BAD_FILE */ - N_("Bad token in dump file."), /* import_err.et:imp:IMPORT_BAD_TOKEN */ - N_("Bad version in dump file"), /* import_err.et:imp:IMPORT_BAD_VERSION */ - N_("Defective record encountered: "), /* import_err.et:imp:IMPORT_BAD_RECORD */ - N_("Truncated input file detected."), /* import_err.et:imp:IMPORT_BAD_FOOTER */ - N_("Import of dump failed"), /* import_err.et:imp:IMPORT_FAILED */ - N_("Mismatched record count: %d record%s indicated, %d record%s scanned.\n"), /* import_err.et:imp:IMPORT_COUNT_MESSAGE */ - N_("Number of records imported does not match count"), /* import_err.et:imp:IMPORT_MISMATCH_COUNT */ - N_("Unknown command line option.\nUsage: ovsec_adm_import [filename]"), /* import_err.et:imp:IMPORT_UNK_OPTION */ - N_("Warning -- continuing to import will overwrite existing databases!"), /* import_err.et:imp:IMPORT_WARN_DB */ - N_("Database rename Failed!!"), /* import_err.et:imp:IMPORT_RENAME_FAILED */ - N_("Extra data after footer is ignored."), /* import_err.et:imp:IMPORT_EXTRA_DATA */ - N_("Proceed ?"), /* import_err.et:imp:IMPORT_CONFIRM */ - N_("while opening input file"), /* import_err.et:imp:IMPORT_OPEN_DUMP */ - N_("while importing databases"), /* import_err.et:imp:IMPORT_IMPORT */ - N_("cannot open /dev/tty!!"), /* import_err.et:imp:IMPORT_TTY */ - N_("while opening databases"), /* import_err.et:imp:IMPORT_RENAME_OPEN */ - N_("while acquiring permanent lock"), /* import_err.et:imp:IMPORT_RENAME_LOCK */ - N_("while releasing permanent lock"), /* import_err.et:imp:IMPORT_RENAME_UNLOCK */ - N_("while closing databases"), /* import_err.et:imp:IMPORT_RENAME_CLOSE */ - N_("while retrieving configuration parameters"), /* import_err.et:imp:IMPORT_GET_PARAMS */ - N_("$Id$"), /* kdc5_err.et:kdc5:KDC5_RCSID */ - N_("No server port found"), /* kdc5_err.et:kdc5:KDC5_NOPORT */ - N_("Network not initialized"), /* kdc5_err.et:kdc5:KDC5_NONET */ - N_("Short write while sending response"), /* kdc5_err.et:kdc5:KDC5_IO_RESPONSE */ - N_("Cannot convert V5 keyblock"), /* krb524_err.et:k524:KRB524_BADKEY */ - N_("Cannot convert V5 address information"), /* krb524_err.et:k524:KRB524_BADADDR */ - N_("Cannot convert V5 principal"), /* krb524_err.et:k524:KRB524_BADPRINC */ - N_("V5 realm name longer than V4 maximum"), /* krb524_err.et:k524:KRB524_BADREALM */ - N_("Kerberos V4 error"), /* krb524_err.et:k524:KRB524_V4ERR */ - N_("Encoding too large"), /* krb524_err.et:k524:KRB524_ENCFULL */ - N_("Decoding out of data"), /* krb524_err.et:k524:KRB524_DECEMPTY */ - N_("Service not responding"), /* krb524_err.et:k524:KRB524_NOTRESP */ - N_("Kerberos version 4 support is disabled"), /* krb524_err.et:k524:KRB524_KRB4_DISABLED */ + N_("ASN.1 failed call to system time library"), /* asn1_err.et:asn1:ASN1_BAD_TIMEFORMAT */ + N_("ASN.1 structure is missing a required field"), /* asn1_err.et:asn1:ASN1_MISSING_FIELD */ + N_("ASN.1 unexpected field number"), /* asn1_err.et:asn1:ASN1_MISPLACED_FIELD */ + N_("ASN.1 type numbers are inconsistent"), /* asn1_err.et:asn1:ASN1_TYPE_MISMATCH */ + N_("ASN.1 value too large"), /* asn1_err.et:asn1:ASN1_OVERFLOW */ + N_("ASN.1 encoding ended unexpectedly"), /* asn1_err.et:asn1:ASN1_OVERRUN */ + N_("ASN.1 identifier doesn't match expected value"), /* asn1_err.et:asn1:ASN1_BAD_ID */ + N_("ASN.1 length doesn't match expected value"), /* asn1_err.et:asn1:ASN1_BAD_LENGTH */ + N_("ASN.1 badly-formatted encoding"), /* asn1_err.et:asn1:ASN1_BAD_FORMAT */ + N_("ASN.1 parse error"), /* asn1_err.et:asn1:ASN1_PARSE_ERROR */ + N_("ASN.1 bad return from gmtime"), /* asn1_err.et:asn1:ASN1_BAD_GMTIME */ + N_("ASN.1 non-constructed indefinite encoding"), /* asn1_err.et:asn1:ASN1_MISMATCH_INDEF */ + N_("ASN.1 missing expected EOC"), /* asn1_err.et:asn1:ASN1_MISSING_EOC */ N_("No error"), /* krb5_err.et:krb5:KRB5KDC_ERR_NONE */ N_("Client's entry in database has expired"), /* krb5_err.et:krb5:KRB5KDC_ERR_NAME_EXP */ N_("Server's entry in database has expired"), /* krb5_err.et:krb5:KRB5KDC_ERR_SERVICE_EXP */ @@ -172,6 +42,7 @@ realm %s. %s."), /* kpasswd_strings.et:kpws:KPW_STR_CANT_OPEN_ADMIN_SERVER */ N_("Preauthentication failed"), /* krb5_err.et:krb5:KRB5KDC_ERR_PREAUTH_FAILED */ N_("Additional pre-authentication required"), /* krb5_err.et:krb5:KRB5KDC_ERR_PREAUTH_REQUIRED */ N_("Requested server and ticket don't match"), /* krb5_err.et:krb5:KRB5KDC_ERR_SERVER_NOMATCH */ + N_("A service is not available that is required to process the request"), /* krb5_err.et:krb5:KRB5KDC_ERR_SVC_UNAVAILABLE */ N_("Decrypt integrity check failed"), /* krb5_err.et:krb5:KRB5KRB_AP_ERR_BAD_INTEGRITY */ N_("Ticket expired"), /* krb5_err.et:krb5:KRB5KRB_AP_ERR_TKT_EXPIRED */ N_("Ticket not yet valid"), /* krb5_err.et:krb5:KRB5KRB_AP_ERR_TKT_NYV */ @@ -196,6 +67,24 @@ realm %s. %s."), /* kpasswd_strings.et:kpws:KPW_STR_CANT_OPEN_ADMIN_SERVER */ N_("Response too big for UDP, retry with TCP"), /* krb5_err.et:krb5:KRB5KRB_ERR_RESPONSE_TOO_BIG */ N_("Generic error (see e-text)"), /* krb5_err.et:krb5:KRB5KRB_ERR_GENERIC */ N_("Field is too long for this implementation"), /* krb5_err.et:krb5:KRB5KRB_ERR_FIELD_TOOLONG */ + N_("Client not trusted"), /* krb5_err.et:krb5:KRB5KDC_ERR_CLIENT_NOT_TRUSTED */ + N_("KDC not trusted"), /* krb5_err.et:krb5:KRB5KDC_ERR_KDC_NOT_TRUSTED */ + N_("Invalid signature"), /* krb5_err.et:krb5:KRB5KDC_ERR_INVALID_SIG */ + N_("Key parameters not accepted"), /* krb5_err.et:krb5:KRB5KDC_ERR_DH_KEY_PARAMETERS_NOT_ACCEPTED */ + N_("Certificate mismatch"), /* krb5_err.et:krb5:KRB5KDC_ERR_CERTIFICATE_MISMATCH */ + N_("Can't verify certificate"), /* krb5_err.et:krb5:KRB5KDC_ERR_CANT_VERIFY_CERTIFICATE */ + N_("Invalid certificate"), /* krb5_err.et:krb5:KRB5KDC_ERR_INVALID_CERTIFICATE */ + N_("Revoked certificate"), /* krb5_err.et:krb5:KRB5KDC_ERR_REVOKED_CERTIFICATE */ + N_("Revocation status unknown"), /* krb5_err.et:krb5:KRB5KDC_ERR_REVOCATION_STATUS_UNKNOWN */ + N_("Revocation status unavailable"), /* krb5_err.et:krb5:KRB5KDC_ERR_REVOCATION_STATUS_UNAVAILABLE */ + N_("Client name mismatch"), /* krb5_err.et:krb5:KRB5KDC_ERR_CLIENT_NAME_MISMATCH */ + N_("KDC name mismatch"), /* krb5_err.et:krb5:KRB5KDC_ERR_KDC_NAME_MISMATCH */ + N_("Inconsistent key purpose"), /* krb5_err.et:krb5:KRB5KDC_ERR_INCONSISTENT_KEY_PURPOSE */ + N_("Digest in certificate not accepted"), /* krb5_err.et:krb5:KRB5KDC_ERR_DIGEST_IN_CERT_NOT_ACCEPTED */ + N_("Checksum must be included"), /* krb5_err.et:krb5:KRB5KDC_ERR_PA_CHECKSUM_MUST_BE_INCLUDED */ + N_("Digest in signed-data not accepted"), /* krb5_err.et:krb5:KRB5KDC_ERR_DIGEST_IN_SIGNED_DATA_NOT_ACCEPTED */ + N_("Public key encryption not supported"), /* krb5_err.et:krb5:KRB5KDC_ERR_PUBLIC_KEY_ENCRYPTION_NOT_SUPPORTED */ + N_("$Id: krb5_err.et 19934 2007-09-13 23:49:00Z tlyu $"), /* krb5_err.et:krb5:KRB5_ERR_RCSID */ N_("Invalid flag for file lock mode"), /* krb5_err.et:krb5:KRB5_LIBOS_BADLOCKFLAG */ N_("Cannot read password"), /* krb5_err.et:krb5:KRB5_LIBOS_CANTREADPWD */ N_("Password mismatch"), /* krb5_err.et:krb5:KRB5_LIBOS_BADPWDMATCH */ @@ -315,19 +204,9 @@ realm %s. %s."), /* kpasswd_strings.et:kpws:KPW_STR_CANT_OPEN_ADMIN_SERVER */ N_("service not available"), /* krb5_err.et:krb5:KRB5_ERR_NO_SERVICE */ N_("Ccache function not supported: read-only ccache type"), /* krb5_err.et:krb5:KRB5_CC_READONLY */ N_("Ccache function not supported: not implemented"), /* krb5_err.et:krb5:KRB5_CC_NOSUPP */ - N_("ASN.1 failed call to system time library"), /* asn1_err.et:asn1:ASN1_BAD_TIMEFORMAT */ - N_("ASN.1 structure is missing a required field"), /* asn1_err.et:asn1:ASN1_MISSING_FIELD */ - N_("ASN.1 unexpected field number"), /* asn1_err.et:asn1:ASN1_MISPLACED_FIELD */ - N_("ASN.1 type numbers are inconsistent"), /* asn1_err.et:asn1:ASN1_TYPE_MISMATCH */ - N_("ASN.1 value too large"), /* asn1_err.et:asn1:ASN1_OVERFLOW */ - N_("ASN.1 encoding ended unexpectedly"), /* asn1_err.et:asn1:ASN1_OVERRUN */ - N_("ASN.1 identifier doesn't match expected value"), /* asn1_err.et:asn1:ASN1_BAD_ID */ - N_("ASN.1 length doesn't match expected value"), /* asn1_err.et:asn1:ASN1_BAD_LENGTH */ - N_("ASN.1 badly-formatted encoding"), /* asn1_err.et:asn1:ASN1_BAD_FORMAT */ - N_("ASN.1 parse error"), /* asn1_err.et:asn1:ASN1_PARSE_ERROR */ - N_("ASN.1 bad return from gmtime"), /* asn1_err.et:asn1:ASN1_BAD_GMTIME */ - N_("ASN.1 non-constructed indefinite encoding"), /* asn1_err.et:asn1:ASN1_MISMATCH_INDEF */ - N_("ASN.1 missing expected EOC"), /* asn1_err.et:asn1:ASN1_MISSING_EOC */ + N_("Invalid format of Kerberos lifetime or clock skew string"), /* krb5_err.et:krb5:KRB5_DELTAT_BADFORMAT */ + N_("Supplied data not handled by this plugin"), /* krb5_err.et:krb5:KRB5_PLUGIN_NO_HANDLE */ + N_("Plugin does not support the operaton"), /* krb5_err.et:krb5:KRB5_PLUGIN_OP_NOTSUPP */ N_("Kerberos V5 magic number table"), /* kv5m_err.et:kv5m:KV5M_NONE */ N_("Bad magic number for krb5_principal structure"), /* kv5m_err.et:kv5m:KV5M_PRINCIPAL */ N_("Bad magic number for krb5_data structure"), /* kv5m_err.et:kv5m:KV5M_DATA */ @@ -385,265 +264,5 @@ realm %s. %s."), /* kpasswd_strings.et:kpws:KPW_STR_CANT_OPEN_ADMIN_SERVER */ N_("Bad magic number for passwd_phrase_element"), /* kv5m_err.et:kv5m:KV5M_PASSWD_PHRASE_ELEMENT */ N_("Bad magic number for GSSAPI OID"), /* kv5m_err.et:kv5m:KV5M_GSS_OID */ N_("Bad magic number for GSSAPI QUEUE"), /* kv5m_err.et:kv5m:KV5M_GSS_QUEUE */ - N_("$Id$"), /* kdb5_err.et:kdb5:KRB5_KDB_RCSID */ - N_("Entry already exists in database"), /* kdb5_err.et:kdb5:KRB5_KDB_INUSE */ - N_("Database store error"), /* kdb5_err.et:kdb5:KRB5_KDB_UK_SERROR */ - N_("Database read error"), /* kdb5_err.et:kdb5:KRB5_KDB_UK_RERROR */ - N_("Insufficient access to perform requested operation"), /* kdb5_err.et:kdb5:KRB5_KDB_UNAUTH */ - N_("No such entry in the database"), /* kdb5_err.et:kdb5:KRB5_KDB_NOENTRY */ - N_("Illegal use of wildcard"), /* kdb5_err.et:kdb5:KRB5_KDB_ILL_WILDCARD */ - N_("Database is locked or in use--try again later"), /* kdb5_err.et:kdb5:KRB5_KDB_DB_INUSE */ - N_("Database was modified during read"), /* kdb5_err.et:kdb5:KRB5_KDB_DB_CHANGED */ - N_("Database record is incomplete or corrupted"), /* kdb5_err.et:kdb5:KRB5_KDB_TRUNCATED_RECORD */ - N_("Attempt to lock database twice"), /* kdb5_err.et:kdb5:KRB5_KDB_RECURSIVELOCK */ - N_("Attempt to unlock database when not locked"), /* kdb5_err.et:kdb5:KRB5_KDB_NOTLOCKED */ - N_("Invalid kdb lock mode"), /* kdb5_err.et:kdb5:KRB5_KDB_BADLOCKMODE */ - N_("Database has not been initialized"), /* kdb5_err.et:kdb5:KRB5_KDB_DBNOTINITED */ - N_("Database has already been initialized"), /* kdb5_err.et:kdb5:KRB5_KDB_DBINITED */ - N_("Bad direction for converting keys"), /* kdb5_err.et:kdb5:KRB5_KDB_ILLDIRECTION */ - N_("Cannot find master key record in database"), /* kdb5_err.et:kdb5:KRB5_KDB_NOMASTERKEY */ - N_("Master key does not match database"), /* kdb5_err.et:kdb5:KRB5_KDB_BADMASTERKEY */ - N_("Key size in database is invalid"), /* kdb5_err.et:kdb5:KRB5_KDB_INVALIDKEYSIZE */ - N_("Cannot find/read stored master key"), /* kdb5_err.et:kdb5:KRB5_KDB_CANTREAD_STORED */ - N_("Stored master key is corrupted"), /* kdb5_err.et:kdb5:KRB5_KDB_BADSTORED_MKEY */ - N_("Insufficient access to lock database"), /* kdb5_err.et:kdb5:KRB5_KDB_CANTLOCK_DB */ - N_("Database format error"), /* kdb5_err.et:kdb5:KRB5_KDB_DB_CORRUPT */ - N_("Unsupported version in database entry"), /* kdb5_err.et:kdb5:KRB5_KDB_BAD_VERSION */ - N_("Unsupported salt type"), /* kdb5_err.et:kdb5:KRB5_KDB_BAD_SALTTYPE */ - N_("Unsupported encryption type"), /* kdb5_err.et:kdb5:KRB5_KDB_BAD_ENCTYPE */ - N_("Bad database creation flags"), /* kdb5_err.et:kdb5:KRB5_KDB_BAD_CREATEFLAGS */ - N_("No matching key in entry having a permitted enctype"), /* kdb5_err.et:kdb5:KRB5_KDB_NO_PERMITTED_KEY */ - N_("No matching key in entry"), /* kdb5_err.et:kdb5:KRB5_KDB_NO_MATCHING_KEY */ - N_("No Error"), /* adb_err.et:adb:OSA_ADB_NOERR */ - N_("Principal or policy already exists"), /* adb_err.et:adb:OSA_ADB_DUP */ - N_("Principal or policy does not exist"), /* adb_err.et:adb:OSA_ADB_NOENT */ - N_("Database not initialized"), /* adb_err.et:adb:OSA_ADB_DBINIT */ - N_("Invalid policy name"), /* adb_err.et:adb:OSA_ADB_BAD_POLICY */ - N_("Invalid principal name"), /* adb_err.et:adb:OSA_ADB_BAD_PRINC */ - N_("Database inconsistency detected"), /* adb_err.et:adb:OSA_ADB_BAD_DB */ - N_("XDR encoding error"), /* adb_err.et:adb:OSA_ADB_XDR_FAILURE */ - N_("Failure!"), /* adb_err.et:adb:OSA_ADB_FAILURE */ - N_("Bad lock mode"), /* adb_err.et:adb:OSA_ADB_BADLOCKMODE */ - N_("Cannot lock database"), /* adb_err.et:adb:OSA_ADB_CANTLOCK_DB */ - N_("Database not locked"), /* adb_err.et:adb:OSA_ADB_NOTLOCKED */ - N_("KADM5 administration database lock file missing"), /* adb_err.et:adb:OSA_ADB_NOLOCKFILE */ - N_("Insufficient permission to lock file"), /* adb_err.et:adb:OSA_ADB_NOEXCL_PERM */ - N_("Operation failed for unspecified reason"), /* kadm_err.et:ovk:KADM5_FAILURE */ - N_("Operation requires ``get'' privilege"), /* kadm_err.et:ovk:KADM5_AUTH_GET */ - N_("Operation requires ``add'' privilege"), /* kadm_err.et:ovk:KADM5_AUTH_ADD */ - N_("Operation requires ``modify'' privilege"), /* kadm_err.et:ovk:KADM5_AUTH_MODIFY */ - N_("Operation requires ``delete'' privilege"), /* kadm_err.et:ovk:KADM5_AUTH_DELETE */ - N_("Insufficient authorization for operation"), /* kadm_err.et:ovk:KADM5_AUTH_INSUFFICIENT */ - N_("Database inconsistency detected"), /* kadm_err.et:ovk:KADM5_BAD_DB */ - N_("Principal or policy already exists"), /* kadm_err.et:ovk:KADM5_DUP */ - N_("Communication failure with server"), /* kadm_err.et:ovk:KADM5_RPC_ERROR */ - N_("No administration server found for realm"), /* kadm_err.et:ovk:KADM5_NO_SRV */ - N_("Password history principal key version mismatch"), /* kadm_err.et:ovk:KADM5_BAD_HIST_KEY */ - N_("Connection to server not initialized"), /* kadm_err.et:ovk:KADM5_NOT_INIT */ - N_("Principal does not exist"), /* kadm_err.et:ovk:KADM5_UNK_PRINC */ - N_("Policy does not exist"), /* kadm_err.et:ovk:KADM5_UNK_POLICY */ - N_("Invalid field mask for operation"), /* kadm_err.et:ovk:KADM5_BAD_MASK */ - N_("Invalid number of character classes"), /* kadm_err.et:ovk:KADM5_BAD_CLASS */ - N_("Invalid password length"), /* kadm_err.et:ovk:KADM5_BAD_LENGTH */ - N_("Illegal policy name"), /* kadm_err.et:ovk:KADM5_BAD_POLICY */ - N_("Illegal principal name"), /* kadm_err.et:ovk:KADM5_BAD_PRINCIPAL */ - N_("Invalid auxillary attributes"), /* kadm_err.et:ovk:KADM5_BAD_AUX_ATTR */ - N_("Invalid password history count"), /* kadm_err.et:ovk:KADM5_BAD_HISTORY */ - N_("Password minimum life is greater than password maximum life"), /* kadm_err.et:ovk:KADM5_BAD_MIN_PASS_LIFE */ - N_("Password is too short"), /* kadm_err.et:ovk:KADM5_PASS_Q_TOOSHORT */ - N_("Password does not contain enough character classes"), /* kadm_err.et:ovk:KADM5_PASS_Q_CLASS */ - N_("Password is in the password dictionary"), /* kadm_err.et:ovk:KADM5_PASS_Q_DICT */ - N_("Cannot reuse password"), /* kadm_err.et:ovk:KADM5_PASS_REUSE */ - N_("Current password's minimum life has not expired"), /* kadm_err.et:ovk:KADM5_PASS_TOOSOON */ - N_("Policy is in use"), /* kadm_err.et:ovk:KADM5_POLICY_REF */ - N_("Connection to server already initialized"), /* kadm_err.et:ovk:KADM5_INIT */ - N_("Incorrect password"), /* kadm_err.et:ovk:KADM5_BAD_PASSWORD */ - N_("Cannot change protected principal"), /* kadm_err.et:ovk:KADM5_PROTECT_PRINCIPAL */ - N_("Programmer error! Bad Admin server handle"), /* kadm_err.et:ovk:KADM5_BAD_SERVER_HANDLE */ - N_("Programmer error! Bad API structure version"), /* kadm_err.et:ovk:KADM5_BAD_STRUCT_VERSION */ - N_("API structure version specified by application is no longer supported (to fix, recompile application against current KADM5 API header files and libraries)"), /* kadm_err.et:ovk:KADM5_OLD_STRUCT_VERSION */ - N_("API structure version specified by application is unknown to libraries (to fix, obtain current KADM5 API header files and libraries and recompile application)"), /* kadm_err.et:ovk:KADM5_NEW_STRUCT_VERSION */ - N_("Programmer error! Bad API version"), /* kadm_err.et:ovk:KADM5_BAD_API_VERSION */ - N_("API version specified by application is no longer supported by libraries (to fix, update application to adhere to current API version and recompile)"), /* kadm_err.et:ovk:KADM5_OLD_LIB_API_VERSION */ - N_("API version specified by application is no longer supported by server (to fix, update application to adhere to current API version and recompile)"), /* kadm_err.et:ovk:KADM5_OLD_SERVER_API_VERSION */ - N_("API version specified by application is unknown to libraries (to fix, obtain current KADM5 API header files and libraries and recompile application)"), /* kadm_err.et:ovk:KADM5_NEW_LIB_API_VERSION */ - N_("API version specified by application is unknown to server (to fix, obtain and install newest KADM5 Admin Server)"), /* kadm_err.et:ovk:KADM5_NEW_SERVER_API_VERSION */ - N_("Database error! Required KADM5 principal missing"), /* kadm_err.et:ovk:KADM5_SECURE_PRINC_MISSING */ - N_("The salt type of the specified principal does not support renaming"), /* kadm_err.et:ovk:KADM5_NO_RENAME_SALT */ - N_("Illegal configuration parameter for remote KADM5 client"), /* kadm_err.et:ovk:KADM5_BAD_CLIENT_PARAMS */ - N_("Illegal configuration parameter for local KADM5 client"), /* kadm_err.et:ovk:KADM5_BAD_SERVER_PARAMS */ - N_("Operation requires ``list'' privilege"), /* kadm_err.et:ovk:KADM5_AUTH_LIST */ - N_("Operation requires ``change-password'' privilege"), /* kadm_err.et:ovk:KADM5_AUTH_CHANGEPW */ - N_("GSS-API (or Kerberos) error"), /* kadm_err.et:ovk:KADM5_GSS_ERROR */ - N_("Programmer error! Illegal tagged data list type"), /* kadm_err.et:ovk:KADM5_BAD_TL_TYPE */ - N_("Required parameters in kdc.conf missing"), /* kadm_err.et:ovk:KADM5_MISSING_CONF_PARAMS */ - N_("Bad krb5 admin server hostname"), /* kadm_err.et:ovk:KADM5_BAD_SERVER_NAME */ - N_("Operation requires ``set-key'' privilege"), /* kadm_err.et:ovk:KADM5_AUTH_SETKEY */ - N_("Multiple values for single or folded enctype"), /* kadm_err.et:ovk:KADM5_SETKEY_DUP_ENCTYPES */ - N_("Invalid enctype for setv4key"), /* kadm_err.et:ovk:KADM5_SETV4KEY_INVAL_ENCTYPE */ - N_("Mismatched enctypes for setkey3"), /* kadm_err.et:ovk:KADM5_SETKEY3_ETYPE_MISMATCH */ - N_("Missing parameters in krb5.conf required for kadmin client"), /* kadm_err.et:ovk:KADM5_MISSING_KRB5_CONF_PARAMS */ - N_("while getting policy info."), /* chpass_util_strings.et:ovku:CHPASS_UTIL_GET_POLICY_INFO */ - N_("while getting principal info."), /* chpass_util_strings.et:ovku:CHPASS_UTIL_GET_PRINC_INFO */ - N_("New passwords do not match - password not changed.\n"), /* chpass_util_strings.et:ovku:CHPASS_UTIL_NEW_PASSWORD_MISMATCH */ - N_("New password"), /* chpass_util_strings.et:ovku:CHPASS_UTIL_NEW_PASSWORD_PROMPT */ - N_("New password (again)"), /* chpass_util_strings.et:ovku:CHPASS_UTIL_NEW_PASSWORD_AGAIN_PROMPT */ - N_("You must type a password. Passwords must be at least one character long.\n"), /* chpass_util_strings.et:ovku:CHPASS_UTIL_NO_PASSWORD_READ */ - N_("yet no policy set! Contact your system security administrator."), /* chpass_util_strings.et:ovku:CHPASS_UTIL_NO_POLICY_YET_Q_ERROR */ - N_("Password changed.\n"), /* chpass_util_strings.et:ovku:CHPASS_UTIL_PASSWORD_CHANGED */ - N_("New password was found in a dictionary of possible passwords and\n\ -therefore may be easily guessed. Please choose another password.\n\ -See the ovpasswd man page for help in choosing a good password."), /* chpass_util_strings.et:ovku:CHPASS_UTIL_PASSWORD_IN_DICTIONARY */ - N_("Password not changed."), /* chpass_util_strings.et:ovku:CHPASS_UTIL_PASSWORD_NOT_CHANGED */ - N_("New password is too short.\n\ -Please choose a password which is at least %d characters long."), /* chpass_util_strings.et:ovku:CHPASS_UTIL_PASSWORD_TOO_SHORT */ - N_("New password does not have enough character classes.\n\ -The character classes are:\n\ - - lower-case letters,\n\ - - upper-case letters,\n\ - - digits,\n\ - - punctuation, and\n\ - - all other characters (e.g., control characters).\n\ -Please choose a password with at least %d character classes."), /* chpass_util_strings.et:ovku:CHPASS_UTIL_TOO_FEW_CLASSES */ - N_("Password cannot be changed because it was changed too recently.\n\ -Please wait until %s before you change it.\n\ -If you need to change your password before then, contact your system\n\ -security administrator."), /* chpass_util_strings.et:ovku:CHPASS_UTIL_PASSWORD_TOO_SOON */ - N_("New password was used previously. Please choose a different password."), /* chpass_util_strings.et:ovku:CHPASS_UTIL_PASSWORD_REUSE */ - N_("while trying to change password."), /* chpass_util_strings.et:ovku:CHPASS_UTIL_WHILE_TRYING_TO_CHANGE */ - N_("while reading new password."), /* chpass_util_strings.et:ovku:CHPASS_UTIL_WHILE_READING_PASSWORD */ - N_("$Header$"), /* kadm_err.et:kadm:KADM_RCSID */ - N_("Cannot fetch local realm"), /* kadm_err.et:kadm:KADM_NO_REALM */ - N_("Unable to fetch credentials"), /* kadm_err.et:kadm:KADM_NO_CRED */ - N_("Bad key supplied"), /* kadm_err.et:kadm:KADM_BAD_KEY */ - N_("Can't encrypt data"), /* kadm_err.et:kadm:KADM_NO_ENCRYPT */ - N_("Cannot encode/decode authentication info"), /* kadm_err.et:kadm:KADM_NO_AUTH */ - N_("Principal attemping change is in wrong realm"), /* kadm_err.et:kadm:KADM_WRONG_REALM */ - N_("Packet is too large"), /* kadm_err.et:kadm:KADM_NO_ROOM */ - N_("Version number is incorrect"), /* kadm_err.et:kadm:KADM_BAD_VER */ - N_("Checksum does not match"), /* kadm_err.et:kadm:KADM_BAD_CHK */ - N_("Unsealing private data failed"), /* kadm_err.et:kadm:KADM_NO_READ */ - N_("Unsupported operation"), /* kadm_err.et:kadm:KADM_NO_OPCODE */ - N_("Could not find administrating host"), /* kadm_err.et:kadm:KADM_NO_HOST */ - N_("Administrating host name is unknown"), /* kadm_err.et:kadm:KADM_UNK_HOST */ - N_("Could not find service name in services database"), /* kadm_err.et:kadm:KADM_NO_SERV */ - N_("Could not create socket"), /* kadm_err.et:kadm:KADM_NO_SOCK */ - N_("Could not connect to server"), /* kadm_err.et:kadm:KADM_NO_CONN */ - N_("Could not fetch local socket address"), /* kadm_err.et:kadm:KADM_NO_HERE */ - N_("Could not fetch master key"), /* kadm_err.et:kadm:KADM_NO_MAST */ - N_("Could not verify master key"), /* kadm_err.et:kadm:KADM_NO_VERI */ - N_("Entry already exists in database"), /* kadm_err.et:kadm:KADM_INUSE */ - N_("Database store error"), /* kadm_err.et:kadm:KADM_UK_SERROR */ - N_("Database read error"), /* kadm_err.et:kadm:KADM_UK_RERROR */ - N_("Insufficient access to perform requested operation"), /* kadm_err.et:kadm:KADM_UNAUTH */ - N_("Data is available for return to client"), /* kadm_err.et:kadm:KADM_DATA */ - N_("No such entry in the database"), /* kadm_err.et:kadm:KADM_NOENTRY */ - N_("Memory exhausted"), /* kadm_err.et:kadm:KADM_NOMEM */ - N_("Could not fetch system hostname"), /* kadm_err.et:kadm:KADM_NO_HOSTNAME */ - N_("Could not bind port"), /* kadm_err.et:kadm:KADM_NO_BIND */ - N_("Length mismatch problem"), /* kadm_err.et:kadm:KADM_LENGTH_ERROR */ - N_("Illegal use of wildcard"), /* kadm_err.et:kadm:KADM_ILL_WILDCARD */ - N_("Database locked or in use"), /* kadm_err.et:kadm:KADM_DB_INUSE */ - N_("Insecure password rejected"), /* kadm_err.et:kadm:KADM_INSECURE_PW */ - N_("Cleartext password and DES key did not match"), /* kadm_err.et:kadm:KADM_PW_MISMATCH */ - N_("Invalid principal for change srvtab request"), /* kadm_err.et:kadm:KADM_NOT_SERV_PRINC */ - N_("Realm name too long"), /* kadm_err.et:kadm:KADM_REALM_TOO_LONG */ - N_("Kerberos successful"), /* krb_err.et:krb:KRBET_KSUCCESS */ - N_("Kerberos principal expired"), /* krb_err.et:krb:KRBET_KDC_NAME_EXP */ - N_("Kerberos service expired"), /* krb_err.et:krb:KRBET_KDC_SERVICE_EXP */ - N_("Kerberos auth expired"), /* krb_err.et:krb:KRBET_KDC_AUTH_EXP */ - N_("Unknown kerberos protocol version"), /* krb_err.et:krb:KRBET_KDC_PKT_VER */ - N_("Incorrect kerberos master key version for principal"), /* krb_err.et:krb:KRBET_KDC_P_MKEY_VER */ - N_("Incorrect kerberos master key version for service"), /* krb_err.et:krb:KRBET_KDC_S_MKEY_VER */ - N_("Bad byte order (kerberos)"), /* krb_err.et:krb:KRBET_KDC_BYTE_ORDER */ - N_("Kerberos principal unknown"), /* krb_err.et:krb:KRBET_KDC_PR_UNKNOWN */ - N_("Kerberos principal not unique"), /* krb_err.et:krb:KRBET_KDC_PR_N_UNIQUE */ - N_("Kerberos principal has null key"), /* krb_err.et:krb:KRBET_KDC_NULL_KEY */ - N_("Reserved error message 11 (kerberos)"), /* krb_err.et:krb:KRBET_KRB_RES11 */ - N_("Reserved error message 12 (kerberos)"), /* krb_err.et:krb:KRBET_KRB_RES12 */ - N_("Reserved error message 13 (kerberos)"), /* krb_err.et:krb:KRBET_KRB_RES13 */ - N_("Reserved error message 14 (kerberos)"), /* krb_err.et:krb:KRBET_KRB_RES14 */ - N_("Reserved error message 15 (kerberos)"), /* krb_err.et:krb:KRBET_KRB_RES15 */ - N_("Reserved error message 16 (kerberos)"), /* krb_err.et:krb:KRBET_KRB_RES16 */ - N_("Reserved error message 17 (kerberos)"), /* krb_err.et:krb:KRBET_KRB_RES17 */ - N_("Reserved error message 18 (kerberos)"), /* krb_err.et:krb:KRBET_KRB_RES18 */ - N_("Reserved error message 19 (kerberos)"), /* krb_err.et:krb:KRBET_KRB_RES19 */ - N_("Generic error from Kerberos KDC"), /* krb_err.et:krb:KRBET_KDC_GEN_ERR */ - N_("Can't read Kerberos ticket file"), /* krb_err.et:krb:KRBET_GC_TKFIL */ - N_("Can't find Kerberos ticket or TGT"), /* krb_err.et:krb:KRBET_GC_NOTKT */ - N_("Reserved error message 23 (krb_get_cred)"), /* krb_err.et:krb:KRBET_KRB_RES23 */ - N_("Reserved error message 24 (krb_get_cred)"), /* krb_err.et:krb:KRBET_KRB_RES24 */ - N_("Reserved error message 25 (krb_get_cred)"), /* krb_err.et:krb:KRBET_KRB_RES25 */ - N_("Kerberos TGT Expired"), /* krb_err.et:krb:KRBET_MK_AP_TGTEXP */ - N_("Reserved error message 27 (krb_mk_req)"), /* krb_err.et:krb:KRBET_KRB_RES27 */ - N_("Reserved error message 28 (krb_mk_req)"), /* krb_err.et:krb:KRBET_KRB_RES28 */ - N_("Reserved error message 29 (krb_mk_req)"), /* krb_err.et:krb:KRBET_KRB_RES29 */ - N_("Reserved error message 30 (krb_mk_req)"), /* krb_err.et:krb:KRBET_KRB_RES30 */ - N_("Can't decode authenticator (krb_rd_req)"), /* krb_err.et:krb:KRBET_RD_AP_UNDEC */ - N_("Kerberos ticket expired (krb_rd_req)"), /* krb_err.et:krb:KRBET_RD_AP_EXP */ - N_("Kerberos ticket not yet valid (krb_rd_req)"), /* krb_err.et:krb:KRBET_RD_AP_NYV */ - N_("Repeated request (krb_rd_req)"), /* krb_err.et:krb:KRBET_RD_AP_REPEAT */ - N_("Kerberos ticket is for wrong server (krb_rd_req)"), /* krb_err.et:krb:KRBET_RD_AP_NOT_US */ - N_("Kerberos request inconsistent"), /* krb_err.et:krb:KRBET_RD_AP_INCON */ - N_("Time is out of bounds (krb_rd_req)"), /* krb_err.et:krb:KRBET_RD_AP_TIME */ - N_("Incorrect net address (krb_rd_req)"), /* krb_err.et:krb:KRBET_RD_AP_BADD */ - N_("Kerberos protocol version mismatch (krb_rd_req)"), /* krb_err.et:krb:KRBET_RD_AP_VERSION */ - N_("Invalid msg type (krb_rd_req)"), /* krb_err.et:krb:KRBET_RD_AP_MSG_TYPE */ - N_("Message integrity error (krb_rd_req)"), /* krb_err.et:krb:KRBET_RD_AP_MODIFIED */ - N_("Message out of order (krb_rd_req)"), /* krb_err.et:krb:KRBET_RD_AP_ORDER */ - N_("Unauthorized request (krb_rd_req)"), /* krb_err.et:krb:KRBET_RD_AP_UNAUTHOR */ - N_("Current password is null (get_pw_tkt)"), /* krb_err.et:krb:KRBET_GT_PW_NULL */ - N_("Incorrect current password (get_pw_tkt)"), /* krb_err.et:krb:KRBET_GT_PW_BADPW */ - N_("Protocol error (get_pw_tkt)"), /* krb_err.et:krb:KRBET_GT_PW_PROT */ - N_("Error returned by KDC (get_pw_tkt)"), /* krb_err.et:krb:KRBET_GT_PW_KDCERR */ - N_("Null Kerberos ticket returned by KDC (get_pw_tkt)"), /* krb_err.et:krb:KRBET_GT_PW_NULLTKT */ - N_("Retry count exceeded (send_to_kdc)"), /* krb_err.et:krb:KRBET_SKDC_RETRY */ - N_("Can't send request (send_to_kdc)"), /* krb_err.et:krb:KRBET_SKDC_CANT */ - N_("Reserved error message 58 (send_to_kdc)"), /* krb_err.et:krb:KRBET_KRB_RES58 */ - N_("Reserved error message 59 (send_to_kdc)"), /* krb_err.et:krb:KRBET_KRB_RES59 */ - N_("Reserved error message 60 (send_to_kdc)"), /* krb_err.et:krb:KRBET_KRB_RES60 */ - N_("Kerberos error: not all tickets returned"), /* krb_err.et:krb:KRBET_INTK_W_NOTALL */ - N_("Incorrect password (get_in_tkt)"), /* krb_err.et:krb:KRBET_INTK_BADPW */ - N_("Protocol error (get_in_tkt)"), /* krb_err.et:krb:KRBET_INTK_PROT */ - N_("Other error (get_in_tkt)"), /* krb_err.et:krb:KRBET_INTK_ERR */ - N_("Don't have Kerberos ticket-granting ticket (get_ad_tkt)"), /* krb_err.et:krb:KRBET_AD_NOTGT */ - N_("You have no tickets cached"), /* krb_err.et:krb:KRBET_NO_TKT_FIL */ - N_("Couldn't access ticket file (tf_util)"), /* krb_err.et:krb:KRBET_TKT_FIL_ACC */ - N_("Couldn't lock ticket file (tf_util)"), /* krb_err.et:krb:KRBET_TKT_FIL_LCK */ - N_("Bad ticket file format (tf_util)"), /* krb_err.et:krb:KRBET_TKT_FIL_FMT */ - N_("tf_init not called before reading from ticket file (tf_util)"), /* krb_err.et:krb:KRBET_TKT_FIL_INI */ - N_("Bad Kerberos name format (kname_parse)"), /* krb_err.et:krb:KRBET_KNAME_FMT */ - N_("Generic kerberos error (kfailure)"), /* krb_err.et:krb:KRBET_KFAILURE */ - N_("Principal in credential cache does not match desired name"), /* gssapi_err_krb5.et:k5g:KG_CCACHE_NOMATCH */ - N_("No principal in keytab matches desired name"), /* gssapi_err_krb5.et:k5g:KG_KEYTAB_NOMATCH */ - N_("Credential cache has no TGT"), /* gssapi_err_krb5.et:k5g:KG_TGT_MISSING */ - N_("Authenticator has no subkey"), /* gssapi_err_krb5.et:k5g:KG_NO_SUBKEY */ - N_("Context is already fully established"), /* gssapi_err_krb5.et:k5g:KG_CONTEXT_ESTABLISHED */ - N_("Unknown signature type in token"), /* gssapi_err_krb5.et:k5g:KG_BAD_SIGN_TYPE */ - N_("Invalid field length in token"), /* gssapi_err_krb5.et:k5g:KG_BAD_LENGTH */ - N_("Attempt to use incomplete security context"), /* gssapi_err_krb5.et:k5g:KG_CTX_INCOMPLETE */ - N_("Bad magic number for krb5_gss_ctx_id_t"), /* gssapi_err_krb5.et:k5g:KG_CONTEXT */ - N_("Bad magic number for krb5_gss_cred_id_t"), /* gssapi_err_krb5.et:k5g:KG_CRED */ - N_("Bad magic number for krb5_gss_enc_desc"), /* gssapi_err_krb5.et:k5g:KG_ENC_DESC */ - N_("Sequence number in token is corrupt"), /* gssapi_err_krb5.et:k5g:KG_BAD_SEQ */ - N_("Credential cache is empty"), /* gssapi_err_krb5.et:k5g:KG_EMPTY_CCACHE */ - N_("Acceptor and Initiator share no checksum types"), /* gssapi_err_krb5.et:k5g:KG_NO_CTYPES */ - N_("No @ in SERVICE-NAME name string"), /* gssapi_err_generic.et:ggss:G_BAD_SERVICE_NAME */ - N_("STRING-UID-NAME contains nondigits"), /* gssapi_err_generic.et:ggss:G_BAD_STRING_UID */ - N_("UID does not resolve to username"), /* gssapi_err_generic.et:ggss:G_NOUSER */ - N_("Validation error"), /* gssapi_err_generic.et:ggss:G_VALIDATE_FAILED */ - N_("Couldn't allocate gss_buffer_t data"), /* gssapi_err_generic.et:ggss:G_BUFFER_ALLOC */ - N_("Message context invalid"), /* gssapi_err_generic.et:ggss:G_BAD_MSG_CTX */ - N_("Buffer is the wrong size"), /* gssapi_err_generic.et:ggss:G_WRONG_SIZE */ - N_("Credential usage type is unknown"), /* gssapi_err_generic.et:ggss:G_BAD_USAGE */ - N_("Unknown quality of protection specified"), /* gssapi_err_generic.et:ggss:G_UNKNOWN_QOP */ - N_("Local host name could not be determined"), /* gssapi_err_generic.et:ggss:G_NO_HOSTNAME */ - N_("Hostname in SERVICE-NAME string could not be canonicalized"), /* gssapi_err_generic.et:ggss:G_BAD_HOSTNAME */ - N_("Mechanism is incorrect"), /* gssapi_err_generic.et:ggss:G_WRONG_MECH */ - N_("Token header is malformed or corrupt"), /* gssapi_err_generic.et:ggss:G_BAD_TOK_HEADER */ - N_("Packet was replayed in wrong direction"), /* gssapi_err_generic.et:ggss:G_BAD_DIRECTION */ - N_("Token is missing data"), /* gssapi_err_generic.et:ggss:G_TOK_TRUNC */ - N_("Token was reflected"), /* gssapi_err_generic.et:ggss:G_REFLECT */ - N_("Received token ID does not match expected token ID"), /* gssapi_err_generic.et:ggss:G_WRONG_TOKID */ NULL }; diff --git a/src/krb5-auth-applet.c b/src/krb5-auth-applet.c index b528ae9..5a8975c 100644 --- a/src/krb5-auth-applet.c +++ b/src/krb5-auth-applet.c @@ -24,6 +24,8 @@ #include "krb5-auth-applet.h" #include "krb5-auth-dialog.h" +#include "krb5-auth-gconf-tools.h" +#include "krb5-auth-gconf.h" #ifdef HAVE_LIBNOTIFY #include #endif @@ -73,6 +75,7 @@ struct _KaAppletPrivate #ifdef HAVE_LIBNOTIFY NotifyNotification* notification;/* notification messages */ + const char* notify_gconf_key; /* disable notification gconf key */ #endif /* HAVE_LIBNOTIFY */ char* principal; /* the principal to request */ gboolean renewable; /* credentials renewable? */ @@ -81,6 +84,8 @@ struct _KaAppletPrivate gboolean tgt_forwardable; /* request a forwardable ticket */ gboolean tgt_renewable; /* request a renewable ticket */ gboolean tgt_proxiable; /* request a proxiable ticket */ + + GConfClient *gconf; /* gconf client */ }; static void @@ -373,23 +378,42 @@ ka_applet_select_icon(KaApplet* applet, int remaining) #ifdef HAVE_LIBNOTIFY static gboolean -show_notification (KaApplet *applet) +ka_show_notification (KaApplet *applet) { /* wait for the panel to be settled before showing a bubble */ if (gtk_status_icon_is_embedded (applet->priv->tray_icon)) { notify_notification_show (applet->priv->notification, NULL); } else { - g_timeout_add_seconds (5, (GSourceFunc)show_notification, applet); + g_timeout_add_seconds (5, (GSourceFunc)ka_show_notification, applet); } return FALSE; } +static void +ka_notify_action_cb (NotifyNotification *notification G_GNUC_UNUSED, + gchar *action, gpointer user_data) +{ + KaApplet *self = KA_APPLET (user_data); + + if (strcmp (action, "dont-show-again") == 0) { + KA_DEBUG ("turning of notification %s", self->priv->notify_gconf_key); + ka_gconf_set_bool (self->priv->gconf, + self->priv->notify_gconf_key, + FALSE); + self->priv->notify_gconf_key = NULL; + } else { + g_warning("unkonwn action for callback"); + } +} + + static void ka_send_event_notification (KaApplet *applet, const char *summary, const char *message, - const char *icon) + const char *icon, + const char *action) { const char *notify_icon; @@ -408,17 +432,26 @@ ka_send_event_notification (KaApplet *applet, notify_icon = icon ? icon : "gtk-dialog-authentication"; applet->priv->notification = \ - notify_notification_new_with_status_icon(summary, message, notify_icon, applet->priv->tray_icon); + notify_notification_new_with_status_icon(summary, + message, + notify_icon, + applet->priv->tray_icon); notify_notification_set_urgency (applet->priv->notification, NOTIFY_URGENCY_NORMAL); - show_notification (applet); + notify_notification_add_action (applet->priv->notification, + action, + _("Don't show me this again"), + (NotifyActionCallback) ka_notify_action_cb, + applet, NULL); + ka_show_notification (applet); } #else static void ka_send_event_notification (KaApplet *applet G_GNUC_UNUSED, const char *summary G_GNUC_UNUSED, const char *message G_GNUC_UNUSED, - const char *icon G_GNUC_UNUSED) + const char *icon G_GNUC_UNUSED, + const char *action G_GNUC_UNUSED) { } #endif /* ! HAVE_LIBNOTIFY */ @@ -432,27 +465,49 @@ ka_applet_update_status(KaApplet* applet, krb5_timestamp expiry) int remaining = expiry - now; static int last_warn = 0; static gboolean expiry_notified = FALSE; + 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_send_event_notification (applet, + ka_gconf_get_bool(applet->priv->gconf, + KA_GCONF_KEY_NOTIFY_VALID, + ¬ify); + if (notify) { + applet->priv->notify_gconf_key = KA_GCONF_KEY_NOTIFY_VALID; + ka_send_event_notification (applet, _("Network credentials valid"), - _("Your Kerberos credentials have been refreshed."), NULL); + _("You've refreshed your Kerberos credentials."), + NULL, "dont-show-again"); + } expiry_notified = FALSE; } else if (remaining < applet->priv->pw_prompt_secs && (now - last_warn) > NOTIFY_SECONDS && !applet->priv->renewable) { - ka_send_event_notification (applet, + 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, _("Network credentials expiring"), - tooltip_text, NULL); + tooltip_text, + NULL, "dont-show-again"); + } last_warn = now; } } else { if (!expiry_notified) { - ka_send_event_notification (applet, + ka_gconf_get_bool(applet->priv->gconf, + KA_GCONF_KEY_NOTIFY_EXPIRED, + ¬ify); + if (notify) { + applet->priv->notify_gconf_key = KA_GCONF_KEY_NOTIFY_EXPIRED; + ka_send_event_notification (applet, _("Network credentials expired"), - _("Your Kerberos credentails have expired."), NULL); + _("Your Kerberos credentails have expired."), + NULL, "dont-show-again"); + } expiry_notified = TRUE; last_warn = 0; } @@ -664,7 +719,7 @@ ka_applet_get_pwdialog(const KaApplet* applet) /* create the tray icon applet */ KaApplet* -ka_applet_create(GladeXML* xml) +ka_applet_create(GtkBuilder *xml) { KaApplet* applet = ka_applet_new(); @@ -681,6 +736,9 @@ ka_applet_create(GladeXML* xml) applet->priv->pwdialog = ka_pwdialog_create(xml); g_return_val_if_fail (applet->priv->pwdialog != NULL, NULL); + applet->priv->gconf = ka_gconf_init (applet); + g_return_val_if_fail (applet->priv->gconf != NULL, NULL); + return applet; } diff --git a/src/krb5-auth-applet.h b/src/krb5-auth-applet.h index 93830a5..9f2dcf1 100644 --- a/src/krb5-auth-applet.h +++ b/src/krb5-auth-applet.h @@ -23,7 +23,6 @@ #include #include -#include #include #include "config.h" @@ -57,7 +56,7 @@ guint ka_applet_get_pw_prompt_secs(const KaApplet* applet); KaPwDialog* ka_applet_get_pwdialog(const KaApplet* applet); /* create the applet */ -KaApplet* ka_applet_create(GladeXML* xml); +KaApplet* ka_applet_create(GtkBuilder* xml); /* update tooltip and icon */ int ka_applet_update_status(KaApplet* applet, krb5_timestamp expiry); diff --git a/src/krb5-auth-dialog.c b/src/krb5-auth-dialog.c index 08f1c12..56a3a8c 100644 --- a/src/krb5-auth-dialog.c +++ b/src/krb5-auth-dialog.c @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include "gtksecentry.h" #include "secmem-util.h" @@ -39,7 +39,6 @@ #include "krb5-auth-dialog.h" #include "krb5-auth-applet.h" #include "krb5-auth-pwdialog.h" -#include "krb5-auth-gconf.h" #include "krb5-auth-dbus.h" #ifdef ENABLE_NETWORK_MANAGER @@ -810,7 +809,7 @@ ka_error_dialog(int err) GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, - _("Couldn't acquire kerberos ticket: '%s'"), msg); + _("Couldn't acquire kerberos ticket: '%s'"), _(msg)); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); } @@ -934,36 +933,13 @@ ka_nm_init(void) } -static GtkWidget* -ka_create_gtk_secure_entry (GladeXML *xml G_GNUC_UNUSED, - gchar *func_name G_GNUC_UNUSED, - gchar *name, - gchar *s1 G_GNUC_UNUSED, - gchar *s2 G_GNUC_UNUSED, - gint i1 G_GNUC_UNUSED, - gint i2 G_GNUC_UNUSED, - gpointer user_data G_GNUC_UNUSED) -{ - GtkWidget* entry = NULL; - - if (!strcmp(name, "krb5_entry")) { - entry = gtk_secure_entry_new (); - gtk_secure_entry_set_activates_default(GTK_SECURE_ENTRY(entry), TRUE); - gtk_widget_show (entry); - } else { - g_warning("Don't know anything about widget %s", name); - } - return entry; -} - - int main (int argc, char *argv[]) { KaApplet *applet; GOptionContext *context; GError *error = NULL; - GladeXML *xml; + GtkBuilder *xml; guint status = 0; gboolean run_auto = FALSE, run_always = FALSE; @@ -1002,14 +978,12 @@ main (int argc, char *argv[]) if (using_krb5 () || always_run) { g_set_application_name (_("Network Authentication")); - glade_set_custom_handler (&ka_create_gtk_secure_entry, NULL); - xml = glade_xml_new (KA_DATA_DIR G_DIR_SEPARATOR_S - PACKAGE ".glade", NULL, NULL); + xml = gtk_builder_new(); + g_assert(gtk_builder_add_from_file(xml, KA_DATA_DIR G_DIR_SEPARATOR_S + PACKAGE ".xml", NULL)); applet = ka_applet_create (xml); if (!applet) return 1; - if (!ka_gconf_init (applet, argc, argv)) - return 1; ka_nm_init(); if (credentials_expiring ((gpointer)applet)) { diff --git a/src/krb5-auth-dialog.glade b/src/krb5-auth-dialog.glade deleted file mode 100644 index e252817..0000000 --- a/src/krb5-auth-dialog.glade +++ /dev/null @@ -1,138 +0,0 @@ - - - - - - 6 - Network Authentication - False - GTK_WIN_POS_CENTER - GDK_WINDOW_TYPE_HINT_NORMAL - False - - - True - - - True - 6 - 12 - - - True - 0 - gtk-dialog-authentication - 6 - - - False - - - - - True - 10 - - - True - 12 - - - True - - - True - 0 - True - - - False - False - - - - - - - True - 3 - - - True - 3 - - - True - True - - - - - - - True - 1 - <span size="smaller"> </span> - True - - - False - False - 1 - - - - - 1 - - - - - - - 1 - - - - - 1 - - - - - True - GTK_BUTTONBOX_END - - - True - True - True - gtk-cancel - True - -6 - - - - - True - True - True - True - _Renew Ticket - True - -5 - - - 1 - - - - - False - GTK_PACK_END - - - - - - diff --git a/src/krb5-auth-dialog.schemas.in b/src/krb5-auth-dialog.schemas.in index 4b7adb8..f8c7348 100644 --- a/src/krb5-auth-dialog.schemas.in +++ b/src/krb5-auth-dialog.schemas.in @@ -1,9 +1,9 @@ - /schemas/apps/::PACKAGE::/show_trayicon - /apps/::PACKAGE::/show_trayicon - ::PACKAGE:: + /schemas/apps/krb5-auth-dialog/show_trayicon + /apps/krb5-auth-dialog/show_trayicon + krb5-auth-dialog bool 1 @@ -14,9 +14,9 @@ - /schemas/apps/::PACKAGE::/principal - /apps/::PACKAGE::/principal - ::PACKAGE:: + /schemas/apps/krb5-auth-dialog/principal + /apps/krb5-auth-dialog/principal + krb5-auth-dialog string @@ -27,9 +27,9 @@ - /schemas/apps/::PACKAGE::/pk_userid - /apps/::PACKAGE::/pk_userid - ::PACKAGE:: + /schemas/apps/krb5-auth-dialog/pk_userid + /apps/krb5-auth-dialog/pk_userid + krb5-auth-dialog string @@ -40,9 +40,9 @@ - /schemas/apps/::PACKAGE::/pk_anchors - /apps/::PACKAGE::/pk_anchors - ::PACKAGE:: + /schemas/apps/krb5-auth-dialog/pk_anchors + /apps/krb5-auth-dialog/pk_anchors + krb5-auth-dialog string @@ -53,9 +53,9 @@ - /schemas/apps/::PACKAGE::/prompt_minutes - /apps/::PACKAGE::/prompt_minutes - ::PACKAGE:: + /schemas/apps/krb5-auth-dialog/prompt_minutes + /apps/krb5-auth-dialog/prompt_minutes + krb5-auth-dialog int 30 @@ -66,9 +66,9 @@ - /schemas/apps/::PACKAGE::/forwardable - /apps/::PACKAGE::/forwardable - ::PACKAGE:: + /schemas/apps/krb5-auth-dialog/forwardable + /apps/krb5-auth-dialog/forwardable + krb5-auth-dialog bool 0 @@ -79,9 +79,9 @@ - /schemas/apps/::PACKAGE::/renewable - /apps/::PACKAGE::/renewable - ::PACKAGE:: + /schemas/apps/krb5-auth-dialog/renewable + /apps/krb5-auth-dialog/renewable + krb5-auth-dialog bool 0 @@ -92,9 +92,9 @@ - /schemas/apps/::PACKAGE::/proxiable - /apps/::PACKAGE::/proxiable - ::PACKAGE:: + /schemas/apps/krb5-auth-dialog/proxiable + /apps/krb5-auth-dialog/proxiable + krb5-auth-dialog bool 0 @@ -103,5 +103,44 @@ Requested tickets should be proxiable + + + /schemas/apps/krb5-auth-dialog/notify/valid + /apps/krb5-auth-dialog/notify/valid + krb5-auth-dialog + bool + 1 + + + valid ticket notification + Notify user when ticket becomes valid + + + + + /schemas/apps/krb5-auth-dialog/notify/expiring + /apps/krb5-auth-dialog/notify/expiring + krb5-auth-dialog + bool + 1 + + + ticket expiring notification + Notify user when ticket is about to expire + + + + + /schemas/apps/krb5-auth-dialog/notify/expired + /apps/krb5-auth-dialog/notify/expired + krb5-auth-dialog + bool + 1 + + + ticket expired notification + Notify user when ticket has expired + + diff --git a/src/krb5-auth-dialog.xml b/src/krb5-auth-dialog.xml new file mode 100644 index 0000000..3f58588 --- /dev/null +++ b/src/krb5-auth-dialog.xml @@ -0,0 +1,155 @@ + + + + + + 6 + Network Authentication + False + center + normal + False + + + True + + + True + 6 + 12 + + + True + 0 + gtk-dialog-authentication + 6 + + + False + 0 + + + + + True + 10 + + + True + 12 + + + True + + + True + 0 + True + + + False + False + 0 + + + + + 0 + + + + + True + 3 + + + True + 3 + + + + + + 0 + + + + + True + 1 + <span size="smaller"> </span> + True + + + False + False + 1 + + + + + 1 + + + + + + + 1 + + + + + 1 + + + + + True + end + + + gtk-cancel + True + True + True + False + True + + + False + False + 0 + + + + + _Renew Ticket + True + True + True + True + False + True + + + False + False + 1 + + + + + False + end + 0 + + + + + + cancelbutton1 + krb5_renew_button + + + diff --git a/src/krb5-auth-gconf-tools.c b/src/krb5-auth-gconf-tools.c index fb67999..01f4d39 100644 --- a/src/krb5-auth-gconf-tools.c +++ b/src/krb5-auth-gconf-tools.c @@ -31,6 +31,7 @@ ka_gconf_get_string (GConfClient* client, gboolean success = FALSE; GConfValue* gc_value; + g_return_val_if_fail (client != NULL, FALSE); g_return_val_if_fail (key != NULL, FALSE); g_return_val_if_fail (*value == NULL, FALSE); @@ -39,7 +40,7 @@ ka_gconf_get_string (GConfClient* client, *value = g_strdup (gconf_value_get_string (gc_value)); success = TRUE; } else if (error) { - g_print (error->message); + g_print ("%s", error->message); g_error_free (error); } gconf_value_free (gc_value); @@ -57,6 +58,7 @@ ka_gconf_get_int (GConfClient* client, gboolean success = FALSE; GConfValue* gc_value; + g_return_val_if_fail (client != NULL, FALSE); g_return_val_if_fail (key != NULL, FALSE); g_return_val_if_fail (value != NULL, FALSE); @@ -66,7 +68,7 @@ ka_gconf_get_int (GConfClient* client, *value = gconf_value_get_int (gc_value); success = TRUE; } else if (error) { - g_print (error->message); + g_print ("%s", error->message); g_error_free (error); } gconf_value_free (gc_value); @@ -84,6 +86,7 @@ ka_gconf_get_bool (GConfClient* client, gboolean success = FALSE; GConfValue* gc_value; + g_return_val_if_fail (client != NULL, FALSE); g_return_val_if_fail (key != NULL, FALSE); g_return_val_if_fail (value != NULL, FALSE); @@ -92,7 +95,7 @@ ka_gconf_get_bool (GConfClient* client, *value = gconf_value_get_bool (gc_value); success = TRUE; } else if (error) { - g_print (error->message); + g_print ("%s", error->message); g_error_free (error); } gconf_value_free (gc_value); @@ -100,3 +103,24 @@ ka_gconf_get_bool (GConfClient* client, return success; } + +gboolean +ka_gconf_set_bool (GConfClient* client, + const char* key, + gboolean value) +{ + GError* error = NULL; + + g_return_val_if_fail (client != NULL, FALSE); + g_return_val_if_fail (key != NULL, FALSE); + + if(!gconf_client_set_bool (client, key, value, &error)) { + if (error) { + g_print ("%s", error->message); + g_error_free (error); + } + return FALSE; + } + return TRUE; +} + diff --git a/src/krb5-auth-gconf-tools.h b/src/krb5-auth-gconf-tools.h index 9f9020f..6d9f124 100644 --- a/src/krb5-auth-gconf-tools.h +++ b/src/krb5-auth-gconf-tools.h @@ -34,9 +34,13 @@ #define KA_GCONF_KEY_FORWARDABLE KA_GCONF_PATH "/forwardable" #define KA_GCONF_KEY_RENEWABLE KA_GCONF_PATH "/renewable" #define KA_GCONF_KEY_PROXIABLE KA_GCONF_PATH "/proxiable" +#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" gboolean ka_gconf_get_string (GConfClient* client, const char* key, char** value); 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); #endif diff --git a/src/krb5-auth-gconf.c b/src/krb5-auth-gconf.c index 497b1a7..5b9df35 100644 --- a/src/krb5-auth-gconf.c +++ b/src/krb5-auth-gconf.c @@ -86,7 +86,7 @@ ka_gconf_set_prompt_mins (GConfClient* client, KaApplet* applet) static gboolean ka_gconf_set_show_trayicon (GConfClient* client, KaApplet* applet) { - gboolean show_trayicon = FALSE; + gboolean show_trayicon = TRUE; if(!ka_gconf_get_bool(client, KA_GCONF_KEY_SHOW_TRAYICON, &show_trayicon)) { show_trayicon = TRUE; @@ -102,7 +102,7 @@ ka_gconf_set_tgt_forwardable (GConfClient* client, KaApplet* applet) gboolean forwardable = FALSE; if(!ka_gconf_get_bool(client, KA_GCONF_KEY_FORWARDABLE, &forwardable)) { - forwardable = TRUE; + forwardable = FALSE; } g_object_set(applet, "tgt-forwardable", forwardable, NULL); return TRUE; @@ -115,7 +115,7 @@ ka_gconf_set_tgt_renewable (GConfClient* client, KaApplet* applet) gboolean renewable = FALSE; if(!ka_gconf_get_bool(client, KA_GCONF_KEY_RENEWABLE, &renewable)) { - renewable = TRUE; + renewable = FALSE; } g_object_set(applet, "tgt-renewable", renewable, NULL); return TRUE; @@ -128,7 +128,7 @@ ka_gconf_set_tgt_proxiable (GConfClient* client, KaApplet* applet) gboolean proxiable = FALSE; if(!ka_gconf_get_bool(client, KA_GCONF_KEY_PROXIABLE, &proxiable)) { - proxiable = TRUE; + proxiable = FALSE; } g_object_set(applet, "tgt-proxiable", proxiable, NULL); return TRUE; @@ -165,20 +165,21 @@ ka_gconf_key_changed_callback (GConfClient* client, ka_gconf_set_tgt_renewable (client, applet); } 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)) { + /* nothing to do */ } else g_warning("Received notification for unknown gconf key %s", key); return; } -gboolean -ka_gconf_init (KaApplet* applet, - int argc G_GNUC_UNUSED, - char* argv[] G_GNUC_UNUSED) +GConfClient* +ka_gconf_init (KaApplet* applet) { GError *error = NULL; - GConfClient* client; - gboolean success = FALSE; + GConfClient *client; client = gconf_client_get_default (); gconf_client_add_dir (client, KA_GCONF_PATH, GCONF_CLIENT_PRELOAD_ONELEVEL, &error); @@ -199,12 +200,11 @@ ka_gconf_init (KaApplet* applet, ka_gconf_set_tgt_forwardable(client, applet); ka_gconf_set_tgt_renewable(client, applet); ka_gconf_set_tgt_proxiable(client, applet); - - success = TRUE; out: if(error) { - g_print (error->message); + client = NULL; + g_print ("%s", error->message); g_error_free (error); } - return success; + return client; } diff --git a/src/krb5-auth-gconf.h b/src/krb5-auth-gconf.h index 3d2baae..e4c3b5a 100644 --- a/src/krb5-auth-gconf.h +++ b/src/krb5-auth-gconf.h @@ -21,8 +21,9 @@ #ifndef KRB5_AUTH_GCONF_H #define KRB5_AUTH_GCONF_H +#include #include "krb5-auth-applet.h" -gboolean ka_gconf_init (KaApplet* applet, int argc, char* argv[]); +GConfClient* ka_gconf_init (KaApplet* applet); #endif diff --git a/src/krb5-auth-pwdialog.c b/src/krb5-auth-pwdialog.c index b3ed068..dd0270a 100644 --- a/src/krb5-auth-pwdialog.c +++ b/src/krb5-auth-pwdialog.c @@ -237,15 +237,21 @@ ka_pwdialog_setup (KaPwDialog* pwdialog, const gchar *krb5prompt, } KaPwDialog* -ka_pwdialog_create(GladeXML* xml) +ka_pwdialog_create(GtkBuilder* xml) { KaPwDialog *pwdialog = ka_pwdialog_new(); KaPwDialogPrivate *priv = pwdialog->priv; + GtkWidget *entry_hbox = NULL; - priv->dialog = glade_xml_get_widget (xml, "krb5_dialog"); - priv->status_label = glade_xml_get_widget (xml, "krb5_status_label"); - priv->pw_entry = glade_xml_get_widget (xml, "krb5_entry"); - priv->krb_label = glade_xml_get_widget (xml, "krb5_message_label"); + priv->dialog = GTK_WIDGET (gtk_builder_get_object (xml, "krb5_dialog")); + priv->status_label = GTK_WIDGET (gtk_builder_get_object (xml, "krb5_status_label")); + priv->krb_label = GTK_WIDGET (gtk_builder_get_object (xml, "krb5_message_label")); + priv->pw_entry = GTK_WIDGET (gtk_secure_entry_new ()); + + entry_hbox = GTK_WIDGET (gtk_builder_get_object (xml, "entry_hbox")); + gtk_container_add (GTK_CONTAINER (entry_hbox), priv->pw_entry); + gtk_secure_entry_set_activates_default (GTK_SECURE_ENTRY (priv->pw_entry), TRUE); + gtk_widget_show (priv->pw_entry); return pwdialog; } diff --git a/src/krb5-auth-pwdialog.h b/src/krb5-auth-pwdialog.h index efd73e6..1e5c93d 100644 --- a/src/krb5-auth-pwdialog.h +++ b/src/krb5-auth-pwdialog.h @@ -23,7 +23,6 @@ #include #include -#include #include "config.h" #include "gtksecentry.h" @@ -49,7 +48,7 @@ typedef struct _KaPwDialogPrivate KaPwDialogPrivate; GType ka_pwdialog_get_type (void); /* public functions */ -KaPwDialog* ka_pwdialog_create(GladeXML *xml); +KaPwDialog* ka_pwdialog_create(GtkBuilder *xml); /* setup everything for the next prompting */ void ka_pwdialog_setup (KaPwDialog* pwdialog, const gchar *krb5prompt, gboolean invalid_auth); -- cgit