diff options
| author | Nalin Dahyabhai <nalin@dahyabhai.net> | 2012-01-06 15:21:53 -0500 |
|---|---|---|
| committer | Nalin Dahyabhai <nalin@dahyabhai.net> | 2012-01-06 15:21:53 -0500 |
| commit | d361fe8707d3558a9bad59c61b1f124d2de17772 (patch) | |
| tree | 34b50e96d40f0bc5445011a88456ab8b67da6149 | |
| parent | 1f2bf271d31d3c654187cb0812f11c7d13478227 (diff) | |
| download | slapi-nis-d361fe8707d3558a9bad59c61b1f124d2de17772.tar.gz slapi-nis-d361fe8707d3558a9bad59c61b1f124d2de17772.tar.xz slapi-nis-d361fe8707d3558a9bad59c61b1f124d2de17772.zip | |
- remove use of 'memberOf' for computing members of the group.byname and
group.bygid maps; in IPA, the memberOf plugin ensures that it's only
ever going to have redundant data, so there's nothing to be gained by
examining the relationships from that end
| -rw-r--r-- | src/defs-nis.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/defs-nis.c b/src/defs-nis.c index b984956..9ef8e97 100644 --- a/src/defs-nis.c +++ b/src/defs-nis.c @@ -1,5 +1,5 @@ /* - * Copyright 2008,2009,2011 Red Hat, Inc. + * Copyright 2008,2009,2011,2012 Red Hat, Inc. * * This Program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -61,12 +61,12 @@ static struct configuration { {"group.byname", config_exact, FALSE, NULL, "(objectClass=posixGroup)", "%{cn}", NULL, - "%{cn}:%regsubi(\"%{userPassword}\",\"^\\\\{CRYPT\\\\}(..*)\",\"%1\",\"*\"):%regmatch(\"%{gidNumber}\",\"[0-9]+\"):%merge(\",\",\"%{memberUid}\",\"%deref_r(\\\"member\\\",\\\"uid\\\")\",\"%deref_r(\\\"uniqueMember\\\",\\\"uid\\\")\",\"%referred_r(\\\"group.byname\\\,\\\"memberOf\\\",\\\"passwd.byname\\\",\\\"memberOf\\\",\\\"uid\\\")\")", NULL, + "%{cn}:%regsubi(\"%{userPassword}\",\"^\\\\{CRYPT\\\\}(..*)\",\"%1\",\"*\"):%regmatch(\"%{gidNumber}\",\"[0-9]+\"):%merge(\",\",\"%{memberUid}\",\"%deref_r(\\\"member\\\",\\\"uid\\\")\",\"%deref_r(\\\"uniqueMember\\\",\\\"uid\\\")\")", NULL, ":,\r\n"}, {"group.bygid", config_exact, FALSE, NULL, "(objectClass=posixGroup)", "%{gidNumber}", NULL, - "%{cn}:%regsubi(\"%{userPassword}\",\"^\\\\{CRYPT\\\\}(..*)\",\"%1\",\"*\"):%{gidNumber}:%merge(\",\",\"%{memberUid}\",\"%deref_r(\\\"member\\\",\\\"uid\\\")\",\"%deref_r(\\\"uniqueMember\\\",\\\"uid\\\")\",\"%referred_r(\\\"group.bygid\\\,\\\"memberOf\\\",\\\"passwd.byname\\\",\\\"memberOf\\\",\\\"uid\\\")\")", NULL, + "%{cn}:%regsubi(\"%{userPassword}\",\"^\\\\{CRYPT\\\\}(..*)\",\"%1\",\"*\"):%{gidNumber}:%merge(\",\",\"%{memberUid}\",\"%deref_r(\\\"member\\\",\\\"uid\\\")\",\"%deref_r(\\\"uniqueMember\\\",\\\"uid\\\")\")", NULL, ":,\r\n"}, {"netgroup", config_exact, FALSE, NULL, "(objectClass=nisNetgroup)", |