From 8321b0b4e8ae4d6b1f9e7032ad7810c98f99cc8d Mon Sep 17 00:00:00 2001 From: Ken Raeburn Date: Sun, 30 May 2004 06:05:54 +0000 Subject: [PATCH] Silence some gcc compilation warnings: * ksetpwd.c (verify_creds, get_init_creds_opt_init, userinitcontext, init_creds): Now static. (main): Remove one of two variables named "ccache". git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16375 dc483132-0cff-0310-8789-dd5450dbe970 --- src/clients/kpasswd/ChangeLog | 6 ++++++ src/clients/kpasswd/ksetpwd.c | 9 ++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/clients/kpasswd/ChangeLog b/src/clients/kpasswd/ChangeLog index 0f20c6a0d..000509787 100644 --- a/src/clients/kpasswd/ChangeLog +++ b/src/clients/kpasswd/ChangeLog @@ -1,3 +1,9 @@ +2004-05-30 Ken Raeburn + + * ksetpwd.c (verify_creds, get_init_creds_opt_init, + userinitcontext, init_creds): Now static. + (main): Remove one of two variables named "ccache". + 2003-04-28 Ken Raeburn * ksetpwd.c (init_creds): Let's use C comments for C code, shall diff --git a/src/clients/kpasswd/ksetpwd.c b/src/clients/kpasswd/ksetpwd.c index e1fff87f3..aee81015f 100644 --- a/src/clients/kpasswd/ksetpwd.c +++ b/src/clients/kpasswd/ksetpwd.c @@ -5,7 +5,7 @@ #define TKTTIMELEFT 60*10 /* ten minutes */ -int verify_creds() +static int verify_creds() { krb5_context kcontext; krb5_ccache ccache; @@ -29,7 +29,7 @@ int verify_creds() return kres; } -void get_init_creds_opt_init( krb5_get_init_creds_opt *outOptions ) +static void get_init_creds_opt_init( krb5_get_init_creds_opt *outOptions ) { krb5_preauthtype preauth[] = { KRB5_PADATA_ENC_TIMESTAMP }; krb5_enctype etypes[] = {ENCTYPE_DES_CBC_MD5, ENCTYPE_DES_CBC_CRC}; @@ -43,7 +43,7 @@ void get_init_creds_opt_init( krb5_get_init_creds_opt *outOptions ) typedef void * kbrccache_t; #define CCACHE_PREFIX_DEFAULT "MEMORY:C_" -kbrccache_t userinitcontext( +static kbrccache_t userinitcontext( const char * user, const char * domain, const char * passwd, const char * cachename, int initialize, int * outError ) { @@ -186,7 +186,7 @@ return_error: return pCacheName; } -int init_creds() +static int init_creds() { char user[512]; char * password = NULL; @@ -229,7 +229,6 @@ int main( int argc, char ** argv ) char * new_password = NULL; char * new_password2; krb5_context kcontext; - krb5_ccache ccache; krb5_error_code kerr; krb5_principal target_principal; -- 2.26.2