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

diff --git a/src/clients/kpasswd/ChangeLog b/src/clients/kpasswd/ChangeLog
index 0f20c6a0d7b94969079db30c2c7b2efac0f97f39..000509787adf866cdab265fb11d233ea4e812bbd 100644 (file)
--- a/src/clients/kpasswd/ChangeLog
+++ b/src/clients/kpasswd/ChangeLog
@@ -1,3 +1,9 @@
+2004-05-30  Ken Raeburn  <raeburn@mit.edu>
+
+       * 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  <raeburn@mit.edu>
 
        * 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 e1fff87f3521666bbb49d95e3ecf8354492e77e8..aee81015fc02f2d8e80d86cd49434cb62cd9dfc3 100644 (file)
--- 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;