the arg is now a const *

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@1296 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/krb5/krb/in_tkt_pwd.c b/src/lib/krb5/krb/in_tkt_pwd.c
index 3e9a3abcd569a5552ba7afcc637d2f79696de770..8c610e937f6e39205bd9eaafe238e0e52e1e3c71 100644 (file)
--- a/src/lib/krb5/krb/in_tkt_pwd.c
+++ b/src/lib/krb5/krb/in_tkt_pwd.c
@@ -34,13 +34,13 @@ extern char *krb5_default_pwd_prompt1;
 static krb5_error_code
 pwd_keyproc(DECLARG(const krb5_keytype, type),
            DECLARG(krb5_keyblock **, key),
-           DECLARG(krb5_pointer, keyseed))
+           DECLARG(krb5_const_pointer, keyseed))
 OLDDECLARG(const krb5_keytype, type)
 OLDDECLARG(krb5_keyblock **, key)
-OLDDECLARG(krb5_pointer, keyseed)
+OLDDECLARG(krb5_const_pointer, keyseed)
 {
     krb5_error_code retval;
-    struct pwd_keyproc_arg *arg;
+    struct pwd_keyproc_arg *arg, arg2;
     char pwdbuf[BUFSIZ];
     int pwsize = sizeof(pwdbuf);
 
@@ -53,6 +53,8 @@ OLDDECLARG(krb5_pointer, keyseed)
                                        0,
                                        pwdbuf, &pwsize))
            return retval;
+       arg2 = *arg;
+       arg = &arg2;
        arg->password.length = pwsize;
        arg->password.data = pwdbuf;
     }

diff --git a/src/lib/krb5/krb/in_tkt_sky.c b/src/lib/krb5/krb/in_tkt_sky.c
index 3049f4007cae0196d70c02b743f6c169ed414918..136188d7eeedbac2ec4d9373efe785198f1a53fd 100644 (file)
--- a/src/lib/krb5/krb/in_tkt_sky.c
+++ b/src/lib/krb5/krb/in_tkt_sky.c
@@ -34,18 +34,18 @@ struct skey_keyproc_arg {
 static krb5_error_code
 skey_keyproc(DECLARG(const krb5_keytype, type),
             DECLARG(krb5_keyblock **, key),
-            DECLARG(krb5_pointer, keyseed))
+            DECLARG(krb5_const_pointer, keyseed))
 OLDDECLARG(const krb5_keytype, type)
 OLDDECLARG(krb5_keyblock **, key)
-OLDDECLARG(krb5_pointer, keyseed)
+OLDDECLARG(krb5_const_pointer, keyseed)
 {
     krb5_keyblock *realkey;
-    struct skey_keyproc_arg *arg;
+    const struct skey_keyproc_arg *arg;
     krb5_error_code retval;
     krb5_keytab kt_id;
     krb5_keytab_entry kt_ent;
 
-    arg = (struct skey_keyproc_arg *)keyseed;
+    arg = (const struct skey_keyproc_arg *)keyseed;
 
     if (!valid_keytype(type))
        return KRB5_PROG_ETYPE_NOSUPP;