From e572c072a93162b0e73b83f1408bc1889a0347ab Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Fri, 21 May 2010 05:24:18 +0000 Subject: [PATCH] - corrected 'last password change' calculation in libnss-configurations, fixes #244 --- .../configfiles/debian_etch/libnss/etc_nss-mysql-root.conf | 6 +++--- .../configfiles/debian_lenny/libnss/etc_nss-mysql-root.conf | 6 +++--- .../misc/configfiles/gentoo/libnss/etc_libnss-mysql.cfg | 4 ++-- .../configfiles/ubuntu_hardy/libnss/etc_nss-mysql-root.conf | 6 +++--- .../configfiles/ubuntu_lucid/libnss/etc_nss-mysql-root.conf | 6 +++--- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/templates/misc/configfiles/debian_etch/libnss/etc_nss-mysql-root.conf b/templates/misc/configfiles/debian_etch/libnss/etc_nss-mysql-root.conf index 305499f3..1dce2f60 100644 --- a/templates/misc/configfiles/debian_etch/libnss/etc_nss-mysql-root.conf +++ b/templates/misc/configfiles/debian_etch/libnss/etc_nss-mysql-root.conf @@ -8,9 +8,9 @@ shadow.where_clause = ; shadow.userid_column = u.id; shadow.user_column = u.username; shadow.password_column = u.password; -shadow.lastchange_column = UNIX_TIMESTAMP()-10; -shadow.min_column = 1; -shadow.max_column = 2; +shadow.lastchange_column = FLOOR(UNIX_TIMESTAMP()/86400-1); +shadow.min_column = 0; +shadow.max_column = 99999; shadow.warn_column = 7; shadow.inact_column = -1; shadow.expire_column = -1; diff --git a/templates/misc/configfiles/debian_lenny/libnss/etc_nss-mysql-root.conf b/templates/misc/configfiles/debian_lenny/libnss/etc_nss-mysql-root.conf index 305499f3..1dce2f60 100644 --- a/templates/misc/configfiles/debian_lenny/libnss/etc_nss-mysql-root.conf +++ b/templates/misc/configfiles/debian_lenny/libnss/etc_nss-mysql-root.conf @@ -8,9 +8,9 @@ shadow.where_clause = ; shadow.userid_column = u.id; shadow.user_column = u.username; shadow.password_column = u.password; -shadow.lastchange_column = UNIX_TIMESTAMP()-10; -shadow.min_column = 1; -shadow.max_column = 2; +shadow.lastchange_column = FLOOR(UNIX_TIMESTAMP()/86400-1); +shadow.min_column = 0; +shadow.max_column = 99999; shadow.warn_column = 7; shadow.inact_column = -1; shadow.expire_column = -1; diff --git a/templates/misc/configfiles/gentoo/libnss/etc_libnss-mysql.cfg b/templates/misc/configfiles/gentoo/libnss/etc_libnss-mysql.cfg index 1cb105b1..361bf1ba 100644 --- a/templates/misc/configfiles/gentoo/libnss/etc_libnss-mysql.cfg +++ b/templates/misc/configfiles/gentoo/libnss/etc_libnss-mysql.cfg @@ -8,14 +8,14 @@ getpwuid SELECT username,'x',uid,gid,'MySQL User',homedir,shell \ WHERE uid='%1$u' \ AND login_enabled = 'Y' \ LIMIT 1 -getspnam SELECT username,password,UNIX_TIMESTAMP()-10,'1','2','7','-1','-1','0' \ +getspnam SELECT username,password,FLOOR(UNIX_TIMESTAMP()/86400-1),'1','99999','7','-1','-1','0' \ FROM ftp_users \ WHERE username='%1$s' \ AND login_enabled = 'Y' \ LIMIT 1 getpwent SELECT username,'x',uid,gid,'MySQL User',homedir,shell \ FROM ftp_users -getspent SELECT username,password,UNIX_TIMESTAMP()-10,'1','2','7','-1','-1','0' \ +getspent SELECT username,password,FLOOR(UNIX_TIMESTAMP()/86400-1),'1','99999','7','-1','-1','0' \ FROM ftp_users getgrnam SELECT groupname,'x',gid \ FROM ftp_groups \ diff --git a/templates/misc/configfiles/ubuntu_hardy/libnss/etc_nss-mysql-root.conf b/templates/misc/configfiles/ubuntu_hardy/libnss/etc_nss-mysql-root.conf index 305499f3..1dce2f60 100644 --- a/templates/misc/configfiles/ubuntu_hardy/libnss/etc_nss-mysql-root.conf +++ b/templates/misc/configfiles/ubuntu_hardy/libnss/etc_nss-mysql-root.conf @@ -8,9 +8,9 @@ shadow.where_clause = ; shadow.userid_column = u.id; shadow.user_column = u.username; shadow.password_column = u.password; -shadow.lastchange_column = UNIX_TIMESTAMP()-10; -shadow.min_column = 1; -shadow.max_column = 2; +shadow.lastchange_column = FLOOR(UNIX_TIMESTAMP()/86400-1); +shadow.min_column = 0; +shadow.max_column = 99999; shadow.warn_column = 7; shadow.inact_column = -1; shadow.expire_column = -1; diff --git a/templates/misc/configfiles/ubuntu_lucid/libnss/etc_nss-mysql-root.conf b/templates/misc/configfiles/ubuntu_lucid/libnss/etc_nss-mysql-root.conf index 305499f3..1dce2f60 100644 --- a/templates/misc/configfiles/ubuntu_lucid/libnss/etc_nss-mysql-root.conf +++ b/templates/misc/configfiles/ubuntu_lucid/libnss/etc_nss-mysql-root.conf @@ -8,9 +8,9 @@ shadow.where_clause = ; shadow.userid_column = u.id; shadow.user_column = u.username; shadow.password_column = u.password; -shadow.lastchange_column = UNIX_TIMESTAMP()-10; -shadow.min_column = 1; -shadow.max_column = 2; +shadow.lastchange_column = FLOOR(UNIX_TIMESTAMP()/86400-1); +shadow.min_column = 0; +shadow.max_column = 99999; shadow.warn_column = 7; shadow.inact_column = -1; shadow.expire_column = -1;