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

(kafs_set_verbose): add function that (re)sets the logging function

Browse Source 
(_kafs_try_get_cred): add function that does (krb_data->get_cred) to
make logging easier (that is now done in this function)
(*): use _kafs_try_get_cred


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@11997 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2003-04-14 08:37:28 +00:00
parent ce4b5021cd
commit 1d8be89915
1 changed files with 51 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
lib/kafs/common.c
View File

@@ -45,8 +45,11 @@ RCSID("$Id$");
#define ToAsciiUpper(c) ((c) - 'a' + 'A') #define ToAsciiUpper(c) ((c) - 'a' + 'A')
static void static void (*kafs_verbose)(void *, const char *, int);
foldup(char *a, const char *b) static void *kafs_verbose_ctx;
void
_kafs_foldup(char *a, const char *b)
{ {
for (; *b; a++, b++) for (; *b; a++, b++)
if (IsAsciiLower(*b)) if (IsAsciiLower(*b))
@@ -56,6 +59,15 @@ foldup(char *a, const char *b)
*a = '\0'; *a = '\0';
} }
void
kafs_set_verbose(void (*f)(void *, const char *, int), void *ctx)
{
if (f) {
kafs_verbose = f;
kafs_verbose_ctx = ctx;
}
}
int int
kafs_settoken_rxkad(const char *cell, struct ClearToken *ct, kafs_settoken_rxkad(const char *cell, struct ClearToken *ct,
void *ticket, size_t ticket_len) void *ticket, size_t ticket_len)
@@ -350,6 +362,26 @@ _kafs_realm_of_cell(kafs_data *data, const char *cell, char **realm)
return file_find_cell(data, cell, realm, 0); return file_find_cell(data, cell, realm, 0);
} }
static int
_kafs_try_get_cred(kafs_data *data, const char *user, const char *cell,
const char *realm, uid_t uid, struct kafs_token *kt)
{
int ret;
ret = (*data->get_cred)(data, user, cell, realm, uid, kt);
if (kafs_verbose) {
char *str;
asprintf(&str, "%s tried afs%s%s@%s -> %d",
data->name, cell[0] == '\0' ? "" : "/",
cell, realm, ret);
(*kafs_verbose)(kafs_verbose_ctx, str, ret);
free(str);
}
return ret;
}
int int
_kafs_get_cred(kafs_data *data, _kafs_get_cred(kafs_data *data,
const char *cell, const char *cell,
@@ -387,23 +419,23 @@ _kafs_get_cred(kafs_data *data,
*/ */
if (realm_hint) { if (realm_hint) {
ret = (*data->get_cred)(data, AUTH_SUPERUSER, ret = _kafs_try_get_cred(data, AUTH_SUPERUSER,
cell, realm_hint, uid, kt); cell, realm_hint, uid, kt);
if (ret == 0) return 0; if (ret == 0) return 0;
ret = (*data->get_cred)(data, AUTH_SUPERUSER, ret = _kafs_try_get_cred(data, AUTH_SUPERUSER,
"", realm_hint, uid, kt); "", realm_hint, uid, kt);
if (ret == 0) return 0; if (ret == 0) return 0;
} }
foldup(CELL, cell); _kafs_foldup(CELL, cell);
/* /*
* If cell == realm we don't need no cross-cell authentication. * If cell == realm we don't need no cross-cell authentication.
* Try afs@REALM. * Try afs@REALM.
*/ */
if (strcmp(CELL, realm) == 0) { if (strcmp(CELL, realm) == 0) {
ret = (*data->get_cred)(data, AUTH_SUPERUSER, ret = _kafs_try_get_cred(data, AUTH_SUPERUSER,
"", realm, uid, kt); "", realm, uid, kt);
if (ret == 0) return 0; if (ret == 0) return 0;
/* Try afs.cell@REALM below. */ /* Try afs.cell@REALM below. */
} }
@@ -413,8 +445,8 @@ _kafs_get_cred(kafs_data *data,
* REALM we still don't have to resort to cross-cell authentication. * REALM we still don't have to resort to cross-cell authentication.
* Try afs.cell@REALM. * Try afs.cell@REALM.
*/ */
ret = (*data->get_cred)(data, AUTH_SUPERUSER, ret = _kafs_try_get_cred(data, AUTH_SUPERUSER,
cell, realm, uid, kt); cell, realm, uid, kt);
if (ret == 0) return 0; if (ret == 0) return 0;
/* /*
@@ -423,11 +455,11 @@ _kafs_get_cred(kafs_data *data,
* Try afs@CELL. * Try afs@CELL.
* Try afs.cell@CELL. * Try afs.cell@CELL.
*/ */
ret = (*data->get_cred)(data, AUTH_SUPERUSER, ret = _kafs_try_get_cred(data, AUTH_SUPERUSER,
"", CELL, uid, kt); "", CELL, uid, kt);
if (ret == 0) return 0; if (ret == 0) return 0;
ret = (*data->get_cred)(data, AUTH_SUPERUSER, ret = _kafs_try_get_cred(data, AUTH_SUPERUSER,
cell, CELL, uid, kt); cell, CELL, uid, kt);
if (ret == 0) return 0; if (ret == 0) return 0;
/* /*
@@ -439,11 +471,11 @@ _kafs_get_cred(kafs_data *data,
if (_kafs_realm_of_cell(data, cell, &vl_realm) == 0 if (_kafs_realm_of_cell(data, cell, &vl_realm) == 0
&& strcmp(vl_realm, realm) != 0 && strcmp(vl_realm, realm) != 0
&& strcmp(vl_realm, CELL) != 0) { && strcmp(vl_realm, CELL) != 0) {
ret = (*data->get_cred)(data, AUTH_SUPERUSER, ret = _kafs_try_get_cred(data, AUTH_SUPERUSER,
cell, vl_realm, uid, kt); cell, vl_realm, uid, kt);
if (ret) if (ret)
ret = (*data->get_cred)(data, AUTH_SUPERUSER, ret = _kafs_try_get_cred(data, AUTH_SUPERUSER,
"", vl_realm, uid, kt); "", vl_realm, uid, kt);
free(vl_realm); free(vl_realm);
if (ret == 0) return 0; if (ret == 0) return 0;
} }