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

use struct kafs_data everywhere, don't mix with the typedef kafs_data

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@15342 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2005-06-02 07:38:22 +00:00
parent b8eb6ed9e6
commit 26719d30d9
4 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/kafs/afskrb.c
View File

@@ -42,7 +42,7 @@ struct krb_kafs_data {
}; };
static int static int
get_cred(kafs_data *data, const char *name, const char *inst, get_cred(struct kafs_data *data, const char *name, const char *inst,
const char *realm, uid_t uid, struct kafs_token *kt) const char *realm, uid_t uid, struct kafs_token *kt)
{ {
CREDENTIALS c; CREDENTIALS c;
@@ -60,7 +60,7 @@ get_cred(kafs_data *data, const char *name, const char *inst,
} }
static int static int
afslog_uid_int(kafs_data *data, afslog_uid_int(struct kafs_data *data,
const char *cell, const char *cell,
const char *realm_hint, const char *realm_hint,
uid_t uid, uid_t uid,
@@ -93,7 +93,7 @@ afslog_uid_int(kafs_data *data,
} }
static char * static char *
get_realm(kafs_data *data, const char *host) get_realm(struct kafs_data *data, const char *host)
{ {
char *r = krb_realmofhost(host); char *r = krb_realmofhost(host);
if(r != NULL) if(r != NULL)
@@ -106,7 +106,7 @@ int
krb_afslog_uid_home(const char *cell, const char *realm_hint, uid_t uid, krb_afslog_uid_home(const char *cell, const char *realm_hint, uid_t uid,
const char *homedir) const char *homedir)
{ {
kafs_data kd; struct kafs_data kd;
kd.name = "krb4"; kd.name = "krb4";
kd.afslog_uid = afslog_uid_int; kd.afslog_uid = afslog_uid_int;
@@ -141,7 +141,7 @@ krb_afslog_home(const char *cell, const char *realm_hint, const char *homedir)
int int
krb_realm_of_cell(const char *cell, char **realm) krb_realm_of_cell(const char *cell, char **realm)
{ {
kafs_data kd; struct kafs_data kd;
kd.name = "krb4"; kd.name = "krb4";
kd.get_realm = get_realm; kd.get_realm = get_realm;

12
lib/kafs/afskrb5.c
View File

@@ -159,7 +159,7 @@ v5_convert(krb5_context context, krb5_ccache id,
*/ */
static int static int
get_cred(kafs_data *data, const char *name, const char *inst, get_cred(struct kafs_data *data, const char *name, const char *inst,
const char *realm, uid_t uid, struct kafs_token *kt) const char *realm, uid_t uid, struct kafs_token *kt)
{ {
krb5_error_code ret; krb5_error_code ret;
@@ -191,8 +191,8 @@ get_cred(kafs_data *data, const char *name, const char *inst,
} }
static krb5_error_code static krb5_error_code
afslog_uid_int(kafs_data *data, const char *cell, const char *rh, uid_t uid, afslog_uid_int(struct kafs_data *data, const char *cell, const char *rh,
const char *homedir) uid_t uid, const char *homedir)
{ {
krb5_error_code ret; krb5_error_code ret;
struct kafs_token kt; struct kafs_token kt;
@@ -221,7 +221,7 @@ afslog_uid_int(kafs_data *data, const char *cell, const char *rh, uid_t uid,
} }
static char * static char *
get_realm(kafs_data *data, const char *host) get_realm(struct kafs_data *data, const char *host)
{ {
struct krb5_kafs_data *d = data->data; struct krb5_kafs_data *d = data->data;
krb5_realm *realms; krb5_realm *realms;
@@ -241,7 +241,7 @@ krb5_afslog_uid_home(krb5_context context,
uid_t uid, uid_t uid,
const char *homedir) const char *homedir)
{ {
kafs_data kd; struct kafs_data kd;
struct krb5_kafs_data d; struct krb5_kafs_data d;
krb5_error_code ret; krb5_error_code ret;
@@ -308,7 +308,7 @@ krb5_afslog_home(krb5_context context,
krb5_error_code krb5_error_code
krb5_realm_of_cell(const char *cell, char **realm) krb5_realm_of_cell(const char *cell, char **realm)
{ {
kafs_data kd; struct kafs_data kd;
kd.name = "krb5"; kd.name = "krb5";
kd.get_realm = get_realm; kd.get_realm = get_realm;

15
lib/kafs/common.c
View File

@@ -242,7 +242,7 @@ find_cells(const char *file, char ***cells, int *index)
* Get tokens for all cells[] * Get tokens for all cells[]
*/ */
static int static int
afslog_cells(kafs_data *data, char **cells, int max, uid_t uid, afslog_cells(struct kafs_data *data, char **cells, int max, uid_t uid,
const char *homedir) const char *homedir)
{ {
int ret = 0; int ret = 0;
@@ -256,7 +256,8 @@ afslog_cells(kafs_data *data, char **cells, int max, uid_t uid,
} }
int int
_kafs_afslog_all_local_cells(kafs_data *data, uid_t uid, const char *homedir) _kafs_afslog_all_local_cells(struct kafs_data *data,
uid_t uid, const char *homedir)
{ {
int ret; int ret;
char **cells = NULL; char **cells = NULL;
@@ -291,7 +292,8 @@ _kafs_afslog_all_local_cells(kafs_data *data, uid_t uid, const char *homedir)
static int static int
file_find_cell(kafs_data *data, const char *cell, char **realm, int exact) file_find_cell(struct kafs_data *data,
const char *cell, char **realm, int exact)
{ {
FILE *F; FILE *F;
char buf[1024]; char buf[1024];
@@ -351,7 +353,8 @@ file_find_cell(kafs_data *data, const char *cell, char **realm, int exact)
*/ */
int int
_kafs_realm_of_cell(kafs_data *data, const char *cell, char **realm) _kafs_realm_of_cell(struct kafs_data *data,
const char *cell, char **realm)
{ {
char buf[1024]; char buf[1024];
int ret; int ret;
@@ -368,7 +371,7 @@ _kafs_realm_of_cell(kafs_data *data, const char *cell, char **realm)
} }
static int static int
_kafs_try_get_cred(kafs_data *data, const char *user, const char *cell, _kafs_try_get_cred(struct kafs_data *data, const char *user, const char *cell,
const char *realm, uid_t uid, struct kafs_token *kt) const char *realm, uid_t uid, struct kafs_token *kt)
{ {
int ret; int ret;
@@ -388,7 +391,7 @@ _kafs_try_get_cred(kafs_data *data, const char *user, const char *cell,
int int
_kafs_get_cred(kafs_data *data, _kafs_get_cred(struct kafs_data *data,
const char *cell, const char *cell,
const char *realm_hint, const char *realm_hint,
const char *realm, const char *realm,

10
lib/kafs/kafs_locl.h
View File

@@ -119,13 +119,13 @@ typedef int (*get_cred_func_t)(struct kafs_data*, const char*, const char*,
typedef char* (*get_realm_func_t)(struct kafs_data*, const char*); typedef char* (*get_realm_func_t)(struct kafs_data*, const char*);
typedef struct kafs_data { struct kafs_data {
const char *name; const char *name;
afslog_uid_func_t afslog_uid; afslog_uid_func_t afslog_uid;
get_cred_func_t get_cred; get_cred_func_t get_cred;
get_realm_func_t get_realm; get_realm_func_t get_realm;
void *data; void *data;
} kafs_data; };
struct kafs_token { struct kafs_token {
struct ClearToken ct; struct ClearToken ct;
@@ -135,13 +135,13 @@ struct kafs_token {
void _kafs_foldup(char *, const char *); void _kafs_foldup(char *, const char *);
int _kafs_afslog_all_local_cells(kafs_data*, uid_t, const char*); int _kafs_afslog_all_local_cells(struct kafs_data*, uid_t, const char*);
int _kafs_get_cred(kafs_data*, const char*, const char*, const char *, int _kafs_get_cred(struct kafs_data*, const char*, const char*, const char *,
uid_t, struct kafs_token *); uid_t, struct kafs_token *);
int int
_kafs_realm_of_cell(kafs_data *, const char *, char **); _kafs_realm_of_cell(struct kafs_data *, const char *, char **);
int int
_kafs_v4_to_kt(CREDENTIALS *, uid_t, struct kafs_token *); _kafs_v4_to_kt(CREDENTIALS *, uid_t, struct kafs_token *);