* kpasswd.c (get_name_from_passwd_file): Do not cast return from

	getuid() to int as argument to getpwuid.

	* ksetpwd.c: Include time.h for time() prototype.
	(main): Return 0 on success.

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

diff --git a/src/clients/kpasswd/ChangeLog b/src/clients/kpasswd/ChangeLog
index 000509787adf866cdab265fb11d233ea4e812bbd..33448e72e70bb47f556fd4d6e3e3a898f41c0706 100644 (file)
--- a/src/clients/kpasswd/ChangeLog
+++ b/src/clients/kpasswd/ChangeLog
@@ -1,3 +1,11 @@
+2004-06-07  Ezra Peisach  <epeisach@mit.edu>
+
+       * kpasswd.c (get_name_from_passwd_file): Do not cast return from
+       getuid() to int as argument to getpwuid.
+
+       * ksetpwd.c: Include time.h for time() prototype.
+       (main): Return 0 on success.
+
 2004-05-30  Ken Raeburn  <raeburn@mit.edu>
 
        * ksetpwd.c (verify_creds, get_init_creds_opt_init,

diff --git a/src/clients/kpasswd/kpasswd.c b/src/clients/kpasswd/kpasswd.c
index b706874351dd0a2b75593606eda1e9b3f65325e0..b2d54f5fe0df96967d78e8eb80e0971a50c9f079 100644 (file)
--- a/src/clients/kpasswd/kpasswd.c
+++ b/src/clients/kpasswd/kpasswd.c
@@ -21,7 +21,7 @@ void get_name_from_passwd_file(program_name, kcontext, me)
 {
     struct passwd *pw;
     krb5_error_code code;
-    if ((pw = getpwuid((int) getuid()))) {
+    if ((pw = getpwuid(getuid()))) {
        if ((code = krb5_parse_name(kcontext, pw->pw_name, me))) {
            com_err (program_name, code, "when parsing name %s", pw->pw_name);
            exit(1);

diff --git a/src/clients/kpasswd/ksetpwd.c b/src/clients/kpasswd/ksetpwd.c
index aee81015fc02f2d8e80d86cd49434cb62cd9dfc3..148e6865165a00e4618716a93125265e70d4d2d5 100644 (file)
--- a/src/clients/kpasswd/ksetpwd.c
+++ b/src/clients/kpasswd/ksetpwd.c
@@ -2,6 +2,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <stdio.h>
+#include <time.h>
 
 #define TKTTIMELEFT     60*10   /* ten minutes */
 
@@ -308,4 +309,5 @@ int main( int argc, char ** argv )
                        }
                }
        }
+       return(0);
 }