summaryrefslogtreecommitdiff
path: root/modules/pam_unix/pam_unix_passwd.c
diff options
context:
space:
mode:
authorThorsten Kukuk <kukuk@thkukuk.de>2006-06-16 16:16:03 +0000
committerThorsten Kukuk <kukuk@thkukuk.de>2006-06-16 16:16:03 +0000
commit607a06e8e7db6e0171fa8b94e4859560a844ec24 (patch)
treee3e48efd9b7d4559b779869ee324d1471fd0aafb /modules/pam_unix/pam_unix_passwd.c
parent7a0f2068e46a27a527a94227a2f9b8038d152a83 (diff)
Relevant BUGIDs:
Purpose of commit: bugfix Commit summary: --------------- 2006-06-16 Thorsten Kukuk <kukuk@thkukuk.de> * modules/pam_unix/pam_unix_passwd.c (save_old_password): UIDs are unsigned on Linux, don't truncate them. (_do_setpass): err is of type clnt_stat, not int.
Diffstat (limited to 'modules/pam_unix/pam_unix_passwd.c')
-rw-r--r--modules/pam_unix/pam_unix_passwd.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/pam_unix/pam_unix_passwd.c b/modules/pam_unix/pam_unix_passwd.c
index a9d40281..da96d3df 100644
--- a/modules/pam_unix/pam_unix_passwd.c
+++ b/modules/pam_unix/pam_unix_passwd.c
@@ -470,8 +470,8 @@ static int save_old_password(pam_handle_t *pamh,
err = 1;
} else {
pass = crypt_md5_wrapper(oldpass);
- snprintf(nbuf, sizeof(nbuf), "%s:%d:1:%s\n",
- forwho, pwd->pw_uid, pass);
+ snprintf(nbuf, sizeof(nbuf), "%s:%lu:1:%s\n",
+ forwho, (unsigned long)pwd->pw_uid, pass);
_pam_delete(pass);
if (fputs(nbuf, pwfile) < 0) {
err = 1;
@@ -763,7 +763,7 @@ static int _do_setpass(pam_handle_t* pamh, const char *forwho,
struct yppasswd yppwd;
CLIENT *clnt;
int status;
- int err = 0;
+ enum clnt_stat err;
/* Unlock passwd file to avoid deadlock */
#ifdef USE_LCKPWDF