From 3850b5089f7de33ffbdbaf3de9b30c97dfc48285 Mon Sep 17 00:00:00 2001 From: John Kohl Date: Wed, 18 Apr 1990 17:15:39 +0000 Subject: [PATCH] add const where appropriate in function declarations. (cast assignments, as well) git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@491 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/krb5/krb/in_tkt_pwd.c | 22 +++++++++++----------- src/lib/krb5/krb/in_tkt_sky.c | 24 +++++++++++++----------- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/src/lib/krb5/krb/in_tkt_pwd.c b/src/lib/krb5/krb/in_tkt_pwd.c index 25a8b84cb..b3043a871 100644 --- a/src/lib/krb5/krb/in_tkt_pwd.c +++ b/src/lib/krb5/krb/in_tkt_pwd.c @@ -80,18 +80,18 @@ OLDDECLARG(krb5_pointer, keyseed) returns system errors, encryption errors */ krb5_error_code -krb5_get_in_tkt_with_password(DECLARG(krb5_flags, options), - DECLARG(krb5_address **, addrs), - DECLARG(krb5_enctype, etype), - DECLARG(krb5_keytype, keytype), - DECLARG(char *, password), +krb5_get_in_tkt_with_password(DECLARG(const krb5_flags, options), + DECLARG(const krb5_address **, addrs), + DECLARG(const krb5_enctype, etype), + DECLARG(const krb5_keytype, keytype), + DECLARG(const char *, password), DECLARG(krb5_ccache, ccache), DECLARG(krb5_creds *, creds)) -OLDDECLARG(krb5_flags, options) -OLDDECLARG(krb5_address **, addrs) -OLDDECLARG(krb5_enctype, etype) -OLDDECLARG(krb5_keytype, keytype) -OLDDECLARG(char *, password) +OLDDECLARG(const krb5_flags, options) +OLDDECLARG(const krb5_address **, addrs) +OLDDECLARG(const krb5_enctype, etype) +OLDDECLARG(const krb5_keytype, keytype) +OLDDECLARG(const char *, password) OLDDECLARG(krb5_ccache, ccache) OLDDECLARG(krb5_creds *, creds) { @@ -99,7 +99,7 @@ OLDDECLARG(krb5_creds *, creds) struct pwd_keyproc_arg keyseed; - keyseed.password.data = password; + keyseed.password.data = (char *)password; keyseed.password.length = strlen(password); keyseed.who = creds->client; diff --git a/src/lib/krb5/krb/in_tkt_sky.c b/src/lib/krb5/krb/in_tkt_sky.c index f8f55e9fa..ba20fb1f2 100644 --- a/src/lib/krb5/krb/in_tkt_sky.c +++ b/src/lib/krb5/krb/in_tkt_sky.c @@ -115,16 +115,16 @@ OLDDECLARG(krb5_pointer, keyseed) */ krb5_error_code -krb5_get_in_tkt_with_skey(DECLARG(krb5_flags, options), - DECLARG(krb5_address **, addrs), - DECLARG(krb5_enctype, etype), - DECLARG(krb5_keyblock *,key), +krb5_get_in_tkt_with_skey(DECLARG(const krb5_flags, options), + DECLARG(const krb5_address **, addrs), + DECLARG(const krb5_enctype, etype), + DECLARG(const krb5_keyblock *,key), DECLARG(krb5_ccache, ccache), DECLARG(krb5_creds *,creds)) -OLDDECLARG(krb5_flags, options) -OLDDECLARG(krb5_address **, addrs) -OLDDECLARG(krb5_enctype, etype) -OLDDECLARG(krb5_keyblock *,key) +OLDDECLARG(const krb5_flags, options) +OLDDECLARG(const krb5_address **, addrs) +OLDDECLARG(const krb5_enctype, etype) +OLDDECLARG(const krb5_keyblock *,key) OLDDECLARG(krb5_ccache, ccache) OLDDECLARG(krb5_creds *, creds) { @@ -132,7 +132,7 @@ OLDDECLARG(krb5_creds *, creds) krb5_keytype keytype; if (key) { - arg.key = key; + arg.key = (krb5_keyblock *)key; arg.server = 0; keytype = key->keytype; } else { @@ -145,6 +145,8 @@ OLDDECLARG(krb5_creds *, creds) } return (krb5_get_in_tkt(options, addrs, etype, keytype, skey_keyproc, (krb5_pointer) &arg, - krb5_kdc_rep_decrypt_proc, 0, - creds, ccache)); + krb5_kdc_rep_decrypt_proc, + 0, + creds, + ccache)); } -- 2.26.2