* admin.h (KADM5_PW_FIRST_PROMPT): Get rid of casts from

	error_message to char * - leave them as const char *.
	(kadm5_chpass_principal_util): Argument msg_len is unsigned int.

	* admin_internal.h (_kadm5_chpass_principal_util): msg_len is
	unsigned int.

	* chpass_util.c (_kadm5_chpass_principal_util): Change msg_len to
	unsigned int. Arhument to krb5_read_password is unsigned int.

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

diff --git a/src/lib/kadm5/ChangeLog b/src/lib/kadm5/ChangeLog
index 0e2982b764dbd2a620dfb2c1af439b05ed917288..9ae8fc8692975d2b5529ccf3bfec9f0a868d4f1c 100644 (file)
--- a/src/lib/kadm5/ChangeLog
+++ b/src/lib/kadm5/ChangeLog
@@ -1,3 +1,15 @@
+2000-10-17  Ezra Peisach  <epeisach@mit.edu>
+
+       * admin.h (KADM5_PW_FIRST_PROMPT): Get rid of casts from
+       error_message to char * - leave them as const char *.
+       (kadm5_chpass_principal_util): Argument msg_len is unsigned int.
+
+       * admin_internal.h (_kadm5_chpass_principal_util): msg_len is
+       unsigned int.
+
+       * chpass_util.c (_kadm5_chpass_principal_util): Change msg_len to
+       unsigned int. Arhument to krb5_read_password is unsigned int. 
+
 2000-07-03  Ezra Peisach  <epeisach@mit.edu>
 
        * admin.h: Add kadm5_free_name_list prototype.

diff --git a/src/lib/kadm5/admin.h b/src/lib/kadm5/admin.h
index fee95635f137b1c8c7b2f78c3bdb5dfc03602221..c2fd1601fb80a16a88517df7acbba6c77e39e980 100644 (file)
--- a/src/lib/kadm5/admin.h
+++ b/src/lib/kadm5/admin.h
@@ -29,9 +29,9 @@ typedef       char            *kadm5_policy_t;
 typedef long           kadm5_ret_t;
 
 #define KADM5_PW_FIRST_PROMPT \
-       ((char *) error_message(CHPASS_UTIL_NEW_PASSWORD_PROMPT))
+       (error_message(CHPASS_UTIL_NEW_PASSWORD_PROMPT))
 #define KADM5_PW_SECOND_PROMPT \
-       ((char *) error_message(CHPASS_UTIL_NEW_PASSWORD_AGAIN_PROMPT))
+       (error_message(CHPASS_UTIL_NEW_PASSWORD_AGAIN_PROMPT))
 
 /*
  * Succsessfull return code
@@ -412,7 +412,7 @@ kadm5_ret_t    kadm5_chpass_principal_util(void *server_handle,
                                           char *new_pw, 
                                           char **ret_pw,
                                           char *msg_ret,
-                                          int msg_len);
+                                          unsigned int msg_len);
 
 kadm5_ret_t    kadm5_free_principal_ent(void *server_handle,
                                        kadm5_principal_ent_t

diff --git a/src/lib/kadm5/admin_internal.h b/src/lib/kadm5/admin_internal.h
index 97cb5e52e22564b11c03c2e6d1712e4d9d63ca42..15db18e2a31ac2fd1c9707409538aae1896245ff 100644 (file)
--- a/src/lib/kadm5/admin_internal.h
+++ b/src/lib/kadm5/admin_internal.h
@@ -63,7 +63,7 @@ kadm5_ret_t _kadm5_chpass_principal_util(void *server_handle,
                                         char *new_pw, 
                                         char **ret_pw,
                                         char *msg_ret,
-                                        int msg_len);
+                                        unsigned int msg_len);
 
 /* this is needed by the alt_prof code I stole.  The functions
    maybe shouldn't be named krb5_*, but they are. */

diff --git a/src/lib/kadm5/chpass_util.c b/src/lib/kadm5/chpass_util.c
index a991ca00a6f69e531b544e42b1646bd5e9602586..a3c42bfe1f954461a4a636133bb909f212803c8a 100644 (file)
--- a/src/lib/kadm5/chpass_util.c
+++ b/src/lib/kadm5/chpass_util.c
@@ -60,9 +60,10 @@ kadm5_ret_t _kadm5_chpass_principal_util(void *server_handle,
                                         char *new_pw, 
                                         char **ret_pw,
                                         char *msg_ret,
-                                        int msg_len)
+                                        unsigned int msg_len)
 {
-  int code, code2, pwsize;
+  int code, code2;
+  unsigned int pwsize;
   static char buffer[255];
   char *new_password;
   kadm5_principal_ent_rec princ_ent;