On Wed, Aug 15, Tomas Mraz wrote: To include linux/fs.h is a bad idea, I added now a define if it is not defined. Else I made some docu/comment changes. Ok to commit? Thorsten diff --git a/modules/pam_limits/limits.conf.5.xml b/modules/pam_limits/limits.conf.5.xml index 4b6b5ba..ecc6d5f 100644 --- a/modules/pam_limits/limits.conf.5.xml +++ b/modules/pam_limits/limits.conf.5.xml @@ -290,6 +290,9 @@ Also, please note that all limit settings are set <emphasis>per login</emphasis>. They are not global, nor are they permanent; existing only for the duration of the session. + One exception is the <emphasis>maxlogin</emphasis> option, this one + is system wide. But there is a race, concurrent logins at the same + time will not always be detect as such but only counted as one. </para> <para> In the <emphasis>limits</emphasis> configuration file, the diff --git a/modules/pam_namespace/pam_namespace.c b/modules/pam_namespace/pam_namespace.c index a40f05e..988d1c7 100644 --- a/modules/pam_namespace/pam_namespace.c +++ b/modules/pam_namespace/pam_namespace.c @@ -37,6 +37,11 @@ #include "pam_namespace.h" #include "argv_parse.h" +#ifndef MS_SLAVE +#define MS_SLAVE (1<<19) /* change to slave */ +#endif + + /* * Adds an entry for a polyinstantiated directory to the linked list of * polyinstantiated directories. It is called from process_line() while diff --git a/modules/pam_pwhistory/pam_pwhistory.c b/modules/pam_pwhistory/pam_pwhistory.c index e9b28eb..654edd3 100644 --- a/modules/pam_pwhistory/pam_pwhistory.c +++ b/modules/pam_pwhistory/pam_pwhistory.c @@ -1,6 +1,6 @@ /* - * Copyright (c) 2008 Thorsten Kukuk - * Author: Thorsten Kukuk <kukuk(a)suse.de&gt; + * Copyright (c) 2008, 2012 Thorsten Kukuk + * Author: Thorsten Kukuk <kukuk(a)thkukuk.de&gt; * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -103,6 +103,9 @@ parse_option (pam_handle_t *pamh, const char *argv, options_t *options) } +/* This module saves the current crypted password in /etc/security/opasswd + and then compares the new password with all entries in this file. */ + PAM_EXTERN int pam_sm_chauthtok (pam_handle_t *pamh, int flags, int argc, const char **argv) { diff --git a/modules/pam_unix/pam_unix.8.xml b/modules/pam_unix/pam_unix.8.xml index c272e3c..0a42d7a 100644 --- a/modules/pam_unix/pam_unix.8.xml +++ b/modules/pam_unix/pam_unix.8.xml @@ -223,6 +223,8 @@ user are saved in <filename>/etc/security/opasswd</filename> in order to force password change history and keep the user from alternating between the same password too frequently. + Instead of this option the <command>pam_pwhistory</command> + module should be used. </para> </listitem> </varlistentry> -- Thorsten Kukuk, Project Manager/Release Manager SLES SUSE LINUX Products GmbH, Maxfeldstr. 5, D-90409 Nuernberg GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer, HRB 16746 (AG Nürnberg)