diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.in | 4 | ||||
| -rw-r--r-- | src/ka-dialog.c | 5 | ||||
| -rw-r--r-- | src/krb5-auth-dialog.1.in | 15 |
3 files changed, 11 insertions, 13 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index f2e9f97..b67314b 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -164,6 +164,7 @@ DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ +DLLTOOL = @DLLTOOL@ DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ @@ -220,6 +221,7 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ @@ -269,6 +271,7 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ am__include = @am__include@ @@ -302,7 +305,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ minimum_lifetime = @minimum_lifetime@ mkdir_p = @mkdir_p@ diff --git a/src/ka-dialog.c b/src/ka-dialog.c index 5bc8678..fffd2fd 100644 --- a/src/ka-dialog.c +++ b/src/ka-dialog.c @@ -1076,7 +1076,7 @@ main (int argc, char *argv[]) GOptionContext *context; GError *error = NULL; - gboolean run_auto = FALSE, run_always = FALSE; + gboolean run_auto = FALSE; const char *help_msg = "Run '" PACKAGE @@ -1084,9 +1084,6 @@ main (int argc, char *argv[]) const GOptionEntry options[] = { {"auto", 'a', 0, G_OPTION_ARG_NONE, &run_auto, "Only run if an initialized ccache is found", NULL}, - /* accepted for compatibility only */ - {"always", 'A', 0, G_OPTION_ARG_NONE, &run_always, - "Always run (default)", NULL}, {NULL, 0, 0, G_OPTION_ARG_NONE, NULL, NULL, NULL} }; GFileMonitor *monitor = NULL; diff --git a/src/krb5-auth-dialog.1.in b/src/krb5-auth-dialog.1.in index b0e7b38..2a9867e 100644 --- a/src/krb5-auth-dialog.1.in +++ b/src/krb5-auth-dialog.1.in @@ -4,7 +4,7 @@ krb5-auth-dialog \- Kerberos 5 credential checking .SH SYNOPSIS -.B krb5-auth-dialog [--always|--auto] +.B krb5-auth-dialog [--auto] .SH DESCRIPTION The krb5-auth-dialog application will periodically check (every @@ -15,13 +15,10 @@ credentials, prompting the user for whatever information is necessary. .SH ARGUMENTS -.IP --always -By default, krb5-auth-dialog will exit if it finds that the user has no -Kerberos credentials. If this option is specified, then it will instead -attempt to get credentials. - -.IP --auto -Overrides the --always option, restoring the default behavior. +.TP +\fB--auto\fR +If this option is specified, \fBkrb5-auth-dialog\fR will exit if it finds that the +user has no Kerberos credentials. .SH "SEE ALSO" .BR krb5.conf (5) @@ -35,3 +32,5 @@ bug database at http://bugzilla.gnome.org/ against the Christopher Aillon <caillon@redhat.com> .br Jonathan Blandford <jrb@redhat.com> +.br +Guido Günther <agx@sigxcpu.org> |