From f499708fd653a15db23072f83dbaaa8a942976a7 Mon Sep 17 00:00:00 2001 From: Ezra Peisach Date: Sun, 1 Jul 2001 11:45:32 +0000 Subject: * kadm_server.h: Add prototypes for missing acl_ functions * admin_server.c, kadm_func.c: Declare functions static that are local to file. * acl_files.c: Include kadm_server.h for prototypes. Flush out static prototype for acl_abort. * kadm_supp.c: Include kadm_server.h for prototypes. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13539 dc483132-0cff-0310-8789-dd5450dbe970 --- src/kadmin/v4server/ChangeLog | 12 ++++++++++++ src/kadmin/v4server/acl_files.c | 4 ++-- src/kadmin/v4server/admin_server.c | 13 +++++++------ src/kadmin/v4server/kadm_funcs.c | 18 +++++++++--------- src/kadmin/v4server/kadm_server.h | 5 +++++ src/kadmin/v4server/kadm_supp.c | 1 + 6 files changed, 36 insertions(+), 17 deletions(-) (limited to 'src/kadmin/v4server') diff --git a/src/kadmin/v4server/ChangeLog b/src/kadmin/v4server/ChangeLog index 5735b8f..57811b8 100644 --- a/src/kadmin/v4server/ChangeLog +++ b/src/kadmin/v4server/ChangeLog @@ -1,3 +1,15 @@ +2001-07-01 Ezra Peisach + + * kadm_server.h: Add prototypes for missing acl_ functions. + + * admin_server.c, kadm_func.c: Declare functions static that are + local to file. + + * acl_files.c: Include kadm_server.h for prototypes. Flush out + static prototype for acl_abort. + + * kadm_supp.c: Include kadm_server.h for prototypes. + 2001-06-21 Ezra Peisach * kadm_supp.c (prin_vals): Pass time_t * to localtime instead of diff --git a/src/kadmin/v4server/acl_files.c b/src/kadmin/v4server/acl_files.c index 4e56268..8a6118c 100644 --- a/src/kadmin/v4server/acl_files.c +++ b/src/kadmin/v4server/acl_files.c @@ -26,6 +26,7 @@ #include #include #include "krb.h" +#include "kadm_server.h" #ifndef KRB_REALM #define KRB_REALM "ATHENA.MIT.EDU" @@ -58,7 +59,7 @@ extern char *malloc(), *calloc(); extern time_t time(); -static int acl_abort(); +static int acl_abort(char *, FILE *); /* Canonicalize a principal name */ /* If instance is missing, it becomes "" */ @@ -584,4 +585,3 @@ char *principal; } return(acl_commit(acl, new)); } - diff --git a/src/kadmin/v4server/admin_server.c b/src/kadmin/v4server/admin_server.c index b025bbc..a467f72 100644 --- a/src/kadmin/v4server/admin_server.c +++ b/src/kadmin/v4server/admin_server.c @@ -73,15 +73,17 @@ int debug; static void cleanexit(int); static int kadm_listen(void); +static void process_client(int, struct sockaddr_in *); +static void kill_children(void); /* close the system log file */ -void close_syslog() +static void close_syslog() { syslog(LOG_INFO, "Shutting down V4 admin server"); } -void byebye() /* say goodnight gracie */ +static void byebye() /* say goodnight gracie */ { printf("Admin Server (kadm server) has completed operation.\n"); } @@ -262,7 +264,7 @@ static void clear_secrets() static int exit_now = 0; -krb5_sigtype +static krb5_sigtype doexit(sig) int sig; { @@ -288,7 +290,6 @@ kadm_listen() fd_set mask, readfds; struct sockaddr_in peer; int addrlen; - void process_client(), kill_children(); int pid; krb5_sigtype do_child(); #ifdef POSIX_SIGNALS @@ -392,7 +393,7 @@ kadm_listen() /*NOTREACHED*/ } -void process_client(fd, who) +static void process_client(fd, who) int fd; struct sockaddr_in *who; { @@ -629,7 +630,7 @@ void cleanexit(val) exit(val); } -void +static void kill_children() { register int i; diff --git a/src/kadmin/v4server/kadm_funcs.c b/src/kadmin/v4server/kadm_funcs.c index f188e9c..46e4dd7 100644 --- a/src/kadmin/v4server/kadm_funcs.c +++ b/src/kadmin/v4server/kadm_funcs.c @@ -64,7 +64,7 @@ static char *dummypw() * Convert a kadm5_principal_ent_t to a Principal. Assumes that princ * is already allocated. */ -krb5_error_code +static krb5_error_code kadm_entry2princ(entry, princ) kadm5_principal_ent_t entry; Principal *princ; @@ -108,7 +108,7 @@ kadm_entry2princ(entry, princ) return 0; } -int check_access(pname, pinst, prealm, acltype) +static int check_access(pname, pinst, prealm, acltype) char *pname; char *pinst; char *prealm; @@ -140,7 +140,7 @@ int check_access(pname, pinst, prealm, acltype) return(acl_check(filename, checkname)); } -int wildcard(str) +static int wildcard(str) char *str; { if (!strcmp(str, WILDCARD_STR)) @@ -624,7 +624,7 @@ des_cblock newpw; #undef failchange #endif /* !KADM5 */ -int +static int check_pw(newpw, checkstr) des_cblock newpw; char *checkstr; @@ -639,7 +639,7 @@ check_pw(newpw, checkstr) #endif /* NOENCRYPTION */ } -char *reverse(str) +static char *reverse(str) char *str; { static char newstr[80]; @@ -658,7 +658,7 @@ char *reverse(str) return(newstr); } -int lower(str) +static int lower(str) char *str; { register char *cp; @@ -673,7 +673,7 @@ int lower(str) return(effect); } -int +static int des_check_gecos(gecos, newpw) char *gecos; des_cblock newpw; @@ -713,7 +713,7 @@ des_check_gecos(gecos, newpw) return(0); } -int +static int str_check_gecos(gecos, pwstr) char *gecos; char *pwstr; @@ -810,7 +810,7 @@ char *pwstring; * (relatively) reasonable assumption that both the name and the * instance will not contain '.' or '@'. */ -int kadm_check_srvtab(name, instance) +static int kadm_check_srvtab(name, instance) char *name; char *instance; { diff --git a/src/kadmin/v4server/kadm_server.h b/src/kadmin/v4server/kadm_server.h index cffea97..6476373 100644 --- a/src/kadmin/v4server/kadm_server.h +++ b/src/kadmin/v4server/kadm_server.h @@ -107,7 +107,12 @@ int vts_long(krb5_ui_4, u_char **, int); int vts_char(u_char, u_char **, int); /* acl_files.c */ +int acl_add(char *, char *); +int acl_delete(char *, char *); int acl_check(char *, char *); +void acl_canonicalize_principal(char *, char *); +int acl_exact_match(char *, char *); +int acl_initialize(char *, int); /* admin_server.c */ #ifdef KADM5 diff --git a/src/kadmin/v4server/kadm_supp.c b/src/kadmin/v4server/kadm_supp.c index d314422..040d9fd 100644 --- a/src/kadmin/v4server/kadm_supp.c +++ b/src/kadmin/v4server/kadm_supp.c @@ -30,6 +30,7 @@ #include "kadm.h" #include "krb_db.h" +#include "kadm_server.h" /* prin_vals: -- cgit v1.1