diff options
author | Tomas Mraz <tm@t8m.info> | 2008-12-01 11:26:59 +0000 |
---|---|---|
committer | Tomas Mraz <tm@t8m.info> | 2008-12-01 11:26:59 +0000 |
commit | 1395ff30321ce605ab2ca79b1301cd93f51a5ca1 (patch) | |
tree | 817f4cb6862aece7c12edef26af84c172c7d8562 /modules | |
parent | e7ce957e4efd094cdfaac8908cc95042b47260a3 (diff) | |
download | pam-1395ff30321ce605ab2ca79b1301cd93f51a5ca1.tar.gz pam-1395ff30321ce605ab2ca79b1301cd93f51a5ca1.tar.bz2 pam-1395ff30321ce605ab2ca79b1301cd93f51a5ca1.zip |
Relevant BUGIDs:
Purpose of commit: bugfix
Commit summary:
---------------
2008-12-01 Tomas Mraz <t8m@centrum.cz>
* modules/pam_access/pam_access.8.xml: Fix description of nodefgroup
option.
* modules/pam_group/pam_group.c (is_same): Fix check for correct
string length.
Diffstat (limited to 'modules')
-rw-r--r-- | modules/pam_access/pam_access.8.xml | 6 | ||||
-rw-r--r-- | modules/pam_group/pam_group.c | 8 |
2 files changed, 8 insertions, 6 deletions
diff --git a/modules/pam_access/pam_access.8.xml b/modules/pam_access/pam_access.8.xml index ff048593..6b031d2e 100644 --- a/modules/pam_access/pam_access.8.xml +++ b/modules/pam_access/pam_access.8.xml @@ -150,8 +150,10 @@ </term> <listitem> <para> - The group database will not be used for tokens not - identified as account name. + User tokens which are not enclosed in parentheses will not be + matched against the group database. The backwards compatible default is + to try the group database match even for tokens not enclosed + in parentheses. </para> </listitem> </varlistentry> diff --git a/modules/pam_group/pam_group.c b/modules/pam_group/pam_group.c index bddcf1cb..4a931c4f 100644 --- a/modules/pam_group/pam_group.c +++ b/modules/pam_group/pam_group.c @@ -331,10 +331,10 @@ is_same (const pam_handle_t *pamh UNUSED, } /* Ok, we know that b is a substring from A and does not contain - wildcards, but now the length of both strings must be the same, - too. */ - if (strlen (a) != strlen(b)) - return FALSE; + wildcards, but now the length of both strings must be the same, + too. In this case it means, a[i] has to be the end of the string. */ + if (a[i] != '\0') + return FALSE; return ( !len ); } |