diff options
| author | Nalin Dahyabhai <nalin@dahyabhai.net> | 2012-01-04 16:29:24 -0500 |
|---|---|---|
| committer | Nalin Dahyabhai <nalin@dahyabhai.net> | 2012-01-04 16:29:24 -0500 |
| commit | ca0cb965ac1b3dcd5e9737451019e10e9a9ca342 (patch) | |
| tree | b822640afcccb26e6be3fa15fe5959cbc0a67350 /src | |
| parent | 0eed348faf6533eaf9eebebfd64550176e6f239a (diff) | |
| download | slapi-nis-ca0cb965ac1b3dcd5e9737451019e10e9a9ca342.tar.gz slapi-nis-ca0cb965ac1b3dcd5e9737451019e10e9a9ca342.tar.xz slapi-nis-ca0cb965ac1b3dcd5e9737451019e10e9a9ca342.zip | |
- use regsubi() rather than regsub() to match {crypt} hashes
Diffstat (limited to 'src')
| -rw-r--r-- | src/defs-nis.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/defs-nis.c b/src/defs-nis.c index 8a39beb..b984956 100644 --- a/src/defs-nis.c +++ b/src/defs-nis.c @@ -51,22 +51,22 @@ static struct configuration { {"passwd.byname", config_exact, FALSE, NULL, "(objectClass=posixAccount)", "%{uid}", NULL, - "%{uid}:%regsub(\"%{userPassword}\",\"^\\\\{CRYPT\\\\}(..*)\",\"%1\",\"*\"):%regmatch(\"%{uidNumber}\",\"[0-9]+\"):%regmatch(\"%{gidNumber}\",\"[0-9]+\"):%{gecos:-%{cn:-}}:%{homeDirectory:-/}:%{loginShell:-" _PATH_BSHELL "}", NULL, + "%{uid}:%regsubi(\"%{userPassword}\",\"^\\\\{CRYPT\\\\}(..*)\",\"%1\",\"*\"):%regmatch(\"%{uidNumber}\",\"[0-9]+\"):%regmatch(\"%{gidNumber}\",\"[0-9]+\"):%{gecos:-%{cn:-}}:%{homeDirectory:-/}:%{loginShell:-" _PATH_BSHELL "}", NULL, ":\r\n"}, {"passwd.byuid", config_exact, FALSE, NULL, "(objectClass=posixAccount)", "%{uidNumber}", NULL, - "%{uid}:%regsub(\"%{userPassword}\",\"^\\\\{CRYPT\\\\}(..*)\",\"%1\",\"*\"):%regmatch(\"%{uidNumber}\",\"[0-9]+\"):%regmatch(\"%{gidNumber}\",\"[0-9]+\"):%{gecos:-%{cn:-}}:%{homeDirectory:-/}:%{loginShell:-" _PATH_BSHELL "}", NULL, + "%{uid}:%regsubi(\"%{userPassword}\",\"^\\\\{CRYPT\\\\}(..*)\",\"%1\",\"*\"):%regmatch(\"%{uidNumber}\",\"[0-9]+\"):%regmatch(\"%{gidNumber}\",\"[0-9]+\"):%{gecos:-%{cn:-}}:%{homeDirectory:-/}:%{loginShell:-" _PATH_BSHELL "}", NULL, ":\r\n"}, {"group.byname", config_exact, FALSE, NULL, "(objectClass=posixGroup)", "%{cn}", NULL, - "%{cn}:%regsub(\"%{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\\\")\",\"%referred_r(\\\"group.byname\\\,\\\"memberOf\\\",\\\"passwd.byname\\\",\\\"memberOf\\\",\\\"uid\\\")\")", NULL, ":,\r\n"}, {"group.bygid", config_exact, FALSE, NULL, "(objectClass=posixGroup)", "%{gidNumber}", NULL, - "%{cn}:%regsub(\"%{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\\\")\",\"%referred_r(\\\"group.bygid\\\,\\\"memberOf\\\",\\\"passwd.byname\\\",\\\"memberOf\\\",\\\"uid\\\")\")", NULL, ":,\r\n"}, {"netgroup", config_exact, FALSE, NULL, "(objectClass=nisNetgroup)", |