From b9f6e3adc394ef53c340916d35e8fb49f16044eb Mon Sep 17 00:00:00 2001 From: Ezra Peisach Date: Mon, 23 Dec 2002 17:53:01 +0000 Subject: [PATCH] * authorization.c, heuristic.c, ksu.h: Use uid_t instead of int in arguments to fowner() and get_best_princ_for_target(). Signed vs. unsigned int cleanup. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15062 dc483132-0cff-0310-8789-dd5450dbe970 --- src/clients/ksu/ChangeLog | 6 ++++++ src/clients/ksu/authorization.c | 6 +++--- src/clients/ksu/heuristic.c | 10 +++++----- src/clients/ksu/ksu.h | 6 ++---- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/clients/ksu/ChangeLog b/src/clients/ksu/ChangeLog index 3fa80f47d..44415a033 100644 --- a/src/clients/ksu/ChangeLog +++ b/src/clients/ksu/ChangeLog @@ -1,3 +1,9 @@ +2002-12-23 Ezra Peisach + + * authorization.c, heuristic.c, ksu.h: Use uid_t instead of int in + arguments to fowner() and get_best_princ_for_target(). Signed + vs. unsigned int cleanup. + 2002-08-29 Ken Raeburn * Makefile.in: Revert $(S)=>/ change, for Windows support. diff --git a/src/clients/ksu/authorization.c b/src/clients/ksu/authorization.c index 8f6da689f..09a67b976 100644 --- a/src/clients/ksu/authorization.c +++ b/src/clients/ksu/authorization.c @@ -31,7 +31,7 @@ static void auth_cleanup (FILE *, FILE *, char *); krb5_boolean fowner(fp, uid) FILE *fp; - int uid; + uid_t uid; { struct stat sbuf; @@ -503,8 +503,8 @@ krb5_boolean find_first_cmd_that_exists(fcmd_arr, cmd_out, err_out) krb5_boolean retbool= FALSE; int j =0; char * err; - int max_ln=0; - int tln=0; + unsigned int max_ln=0; + unsigned int tln=0; while(fcmd_arr[i]){ tln = strlen(fcmd_arr[i]); diff --git a/src/clients/ksu/heuristic.c b/src/clients/ksu/heuristic.c index a17ef2845..c79f94369 100644 --- a/src/clients/ksu/heuristic.c +++ b/src/clients/ksu/heuristic.c @@ -97,7 +97,7 @@ krb5_error_code list_union(list1, list2, combined_list) char ***combined_list; { - int c1 =0, c2 = 0, i=0, j=0; + unsigned int c1 =0, c2 = 0, i=0, j=0; char ** tlist; if (! list1){ @@ -150,7 +150,7 @@ filter(fp, cmd, k5users_list, k5users_filt_list) krb5_error_code retval =0; krb5_boolean found = FALSE; char * out_cmd = NULL; - int i=0, j=0, found_count = 0, k=0; + unsigned int i=0, j=0, found_count = 0, k=0; char ** temp_filt_list; *k5users_filt_list = NULL; @@ -203,7 +203,7 @@ get_authorized_princ_names(luser, cmd, princ_list) struct passwd *pwd; int k5login_flag =0; int k5users_flag =0; - FILE * login_fp, * users_fp; + FILE * login_fp = NULL , * users_fp = NULL; char ** k5login_list = NULL, ** k5users_list = NULL; char ** k5users_filt_list = NULL; char ** combined_list = NULL; @@ -536,8 +536,8 @@ krb5_error_code get_best_princ_for_target(context, source_uid, target_uid, cc_source, options, cmd, hostname, client, path_out) krb5_context context; - int source_uid; - int target_uid; + uid_t source_uid; + uid_t target_uid; char *source_user; char *target_user; krb5_ccache cc_source; diff --git a/src/clients/ksu/ksu.h b/src/clients/ksu/ksu.h index 4c3f6afee..7b6bbebbe 100644 --- a/src/clients/ksu/ksu.h +++ b/src/clients/ksu/ksu.h @@ -159,7 +159,7 @@ extern krb5_error_code krb5_find_princ_in_cache extern void printtime (time_t); /* authorization.c */ -extern krb5_boolean fowner (FILE *, int); +extern krb5_boolean fowner (FILE *, uid_t); extern krb5_error_code krb5_authorization (krb5_context, krb5_principal, const char *, char *, @@ -192,8 +192,6 @@ extern char * get_first_token (char *, char **); extern char * get_next_token (char **); -extern krb5_boolean fowner (FILE *, int); - extern void init_auth_names (char *); /* main.c */ @@ -231,7 +229,7 @@ extern krb5_error_code find_princ_in_list (krb5_context, krb5_principal, char **, krb5_boolean *); extern krb5_error_code get_best_princ_for_target - (krb5_context, int, int, char *, char *, krb5_ccache, + (krb5_context, uid_t, uid_t, char *, char *, krb5_ccache, opt_info *, char *, char *, krb5_principal *, int *); extern krb5_error_code ksu_tgtname (krb5_context, const krb5_data *, -- 2.26.2