oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

kill krb4 support

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@24494 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2009-01-26 01:09:01 +00:00
parent 4f3c4eafaa
commit 3a2db6c8ea
1 changed files with 0 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
appl/afsutil/afslog.c
View File

@@ -39,9 +39,6 @@ RCSID("$Id$");
#ifdef KRB5 #ifdef KRB5
#include <krb5.h> #include <krb5.h>
#endif #endif
#ifdef KRB4
#include <krb.h>
#endif
#include <kafs.h> #include <kafs.h>
#include <roken.h> #include <roken.h>
#include <getarg.h> #include <getarg.h>
@@ -54,9 +51,6 @@ static char *realm;
static getarg_strings files; static getarg_strings files;
static int unlog_flag; static int unlog_flag;
static int verbose; static int verbose;
#ifdef KRB4
static int use_krb4 = 1;
#endif
#ifdef KRB5 #ifdef KRB5
static char *client_string; static char *client_string;
static char *cache_string; static char *cache_string;
@@ -68,9 +62,6 @@ struct getargs args[] = {
{ "file", 'p', arg_strings, &files, "files to get tokens for", "path" }, { "file", 'p', arg_strings, &files, "files to get tokens for", "path" },
{ "realm", 'k', arg_string, &realm, "realm for afs cell", "realm" }, { "realm", 'k', arg_string, &realm, "realm for afs cell", "realm" },
{ "unlog", 'u', arg_flag, &unlog_flag, "remove tokens" }, { "unlog", 'u', arg_flag, &unlog_flag, "remove tokens" },
#ifdef KRB4
{ "v4", 0, arg_negative_flag, &use_krb4, "don't use Kerberos 4" },
#endif
#ifdef KRB5 #ifdef KRB5
{ "principal",'P',arg_string,&client_string,"principal to use","principal"}, { "principal",'P',arg_string,&client_string,"principal to use","principal"},
{ "cache", 0, arg_string, &cache_string, "ccache to use", "cache"}, { "cache", 0, arg_string, &cache_string, "ccache to use", "cache"},
@@ -199,23 +190,12 @@ do_afslog(const char *cell)
if(k5ret == 0) if(k5ret == 0)
return 0; return 0;
} }
#endif
#if KRB4
if (use_krb4) {
k4ret = krb_afslog(cell, realm);
if(k4ret == 0)
return 0;
}
#endif #endif
if (cell == NULL) if (cell == NULL)
cell = "<default cell>"; cell = "<default cell>";
#ifdef KRB5 #ifdef KRB5
if (k5ret) if (k5ret)
warnx("krb5_afslog(%s): %s", cell, krb5_get_err_text(context, k5ret)); warnx("krb5_afslog(%s): %s", cell, krb5_get_err_text(context, k5ret));
#endif
#ifdef KRB4
if (k4ret)
warnx("krb_afslog(%s): %s", cell, krb_get_err_text(k4ret));
#endif #endif
if (k5ret || k4ret) if (k5ret || k4ret)
return 1; return 1;