Merge remote-tracking branch 'upstream/master'

This commit is contained in:
fariouche
2018-03-28 21:11:36 +02:00
592 changed files with 5482 additions and 5667 deletions

View File

@@ -2365,7 +2365,7 @@ int main (int argc, char **argv)
/*
* tallylog_reset needs to be able to lookup
* a valid existing user name,
* so we canot call it before close_files()
* so we cannot call it before close_files()
*/
if (!lflg && getpwuid (user_id) != NULL) {
tallylog_reset (user_name);