[Pkg-shadow-commits] r2160 - in upstream/trunk: . src
nekral-guest at alioth.debian.org
nekral-guest at alioth.debian.org
Fri Jun 13 21:16:02 UTC 2008
Author: nekral-guest
Date: 2008-06-13 21:16:01 +0000 (Fri, 13 Jun 2008)
New Revision: 2160
Modified:
upstream/trunk/ChangeLog
upstream/trunk/src/pwck.c
Log:
* src/pwck.c: Use a %lu format and cast group and user IDs to
unsigned long integers.
* src/pwck.c: Cast number of days to a long integer.
* src/pwck.c: Use the SCALE macro instead of (24L * 3600L)
for the values to be set in /etc/shadow.
* src/pwck.c: Use SHADOW_SP_FLAG_UNSET for the initial
value of spent.sp_flag.
Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog 2008-06-13 21:09:14 UTC (rev 2159)
+++ upstream/trunk/ChangeLog 2008-06-13 21:16:01 UTC (rev 2160)
@@ -1,5 +1,15 @@
2008-06-13 Nicolas François <nicolas.francois at centraliens.net>
+ * src/pwck.c: Use a %lu format and cast group and user IDs to
+ unsigned long integers.
+ * src/pwck.c: Cast number of days to a long integer.
+ * src/pwck.c: Use the SCALE macro instead of (24L * 3600L)
+ for the values to be set in /etc/shadow.
+ * src/pwck.c: Use SHADOW_SP_FLAG_UNSET for the initial
+ value of spent.sp_flag.
+
+2008-06-13 Nicolas François <nicolas.francois at centraliens.net>
+
* src/passwd.c: Ignore return value of time() when use with a
non NULL argument.
* src/passwd.c: Cast number of days to a long integer.
Modified: upstream/trunk/src/pwck.c
===================================================================
--- upstream/trunk/src/pwck.c 2008-06-13 21:09:14 UTC (rev 2159)
+++ upstream/trunk/src/pwck.c 2008-06-13 21:16:01 UTC (rev 2160)
@@ -369,8 +369,8 @@
* No primary group, just give a warning
*/
- printf (_("user %s: no group %u\n"),
- pwd->pw_name, pwd->pw_gid);
+ printf (_("user %s: no group %lu\n"),
+ pwd->pw_name, (unsigned long) pwd->pw_gid);
*errors += 1;
}
@@ -417,19 +417,18 @@
struct spwd sp;
struct passwd pw;
- sp.sp_namp = pwd->pw_name;
- sp.sp_pwdp = pwd->pw_passwd;
- sp.sp_min =
+ sp.sp_namp = pwd->pw_name;
+ sp.sp_pwdp = pwd->pw_passwd;
+ sp.sp_min =
getdef_num ("PASS_MIN_DAYS", -1);
- sp.sp_max =
+ sp.sp_max =
getdef_num ("PASS_MAX_DAYS", -1);
- sp.sp_warn =
+ sp.sp_warn =
getdef_num ("PASS_WARN_AGE", -1);
- sp.sp_inact = -1;
+ sp.sp_inact = -1;
sp.sp_expire = -1;
- sp.sp_flag = -1;
- sp.sp_lstchg =
- time ((time_t *) 0) / (24L * 3600L);
+ sp.sp_flag = SHADOW_SP_FLAG_UNSET;
+ sp.sp_lstchg = (long) time ((time_t *) 0) / SCALE;
*changed = true;
if (spw_update (&sp) == 0) {
@@ -588,7 +587,7 @@
* Warn if last password change in the future. --marekm
*/
if ( !quiet
- && (spw->sp_lstchg > time ((time_t *) 0) / SCALE)) {
+ && (spw->sp_lstchg > (long) time ((time_t *) 0) / SCALE)) {
printf (_("user %s: last password change in the future\n"),
spw->sp_namp);
*errors += 1;
More information about the Pkg-shadow-commits
mailing list