diff options
| author | Nalin Dahyabhai <nalin.dahyabhai@pobox.com> | 2008-06-03 16:02:14 -0400 |
|---|---|---|
| committer | Nalin Dahyabhai <nalin.dahyabhai@pobox.com> | 2008-06-03 16:02:14 -0400 |
| commit | 61e9b42612a010b55a7bdcf7d973e9fc7acbdea6 (patch) | |
| tree | 1f0c8818e08dfc64990267b9157800dddd1ec995 /src/defaults.c | |
| parent | 1932720c54774eb5078d704a9196e3f48a70fd15 (diff) | |
| download | slapi-nis-61e9b42612a010b55a7bdcf7d973e9fc7acbdea6.tar.gz slapi-nis-61e9b42612a010b55a7bdcf7d973e9fc7acbdea6.tar.xz slapi-nis-61e9b42612a010b55a7bdcf7d973e9fc7acbdea6.zip | |
- use %regsub() instead of %regmatch(), so that we can strip out the initial "{CRYPT}" in passwords
Diffstat (limited to 'src/defaults.c')
| -rw-r--r-- | src/defaults.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/defaults.c b/src/defaults.c index de4a30e..5788f9f 100644 --- a/src/defaults.c +++ b/src/defaults.c @@ -38,19 +38,19 @@ static struct configuration { {"passwd.byname", config_exact, "(objectClass=posixAccount)", "%{uid}", - "%{uid}:%regmatch(\"userPassword\",\"^{CRYPT}.............*\",\"*\"):%{uidNumber}:%{gidNumber}:%{gecos:-%{cn}}:%{homeDirectory:-/}:%{loginShell:-}"}, + "%{uid}:%regsub(\"userPassword\",\"^\\\\{CRYPT\\\\}(..*)\",\"%1\",\"*\"):%{uidNumber}:%{gidNumber}:%{gecos:-%{cn}}:%{homeDirectory:-/}:%{loginShell:-}"}, {"passwd.bynumber", config_exact, "(objectClass=posixAccount)", "%{uidNumber}", - "%{uid}:%regmatch(\"userPassword\",\"^{CRYPT}.............*\",\"*\"):%{uidNumber}:%{gidNumber}:%{gecos:-%{cn}}:%{homeDirectory:-/}:%{loginShell:-}"}, + "%{uid}:%regsub(\"userPassword\",\"^\\\\{CRYPT\\\\}(..*)\",\"%1\",\"*\"):%{uidNumber}:%{gidNumber}:%{gecos:-%{cn}}:%{homeDirectory:-/}:%{loginShell:-}"}, {"group.byname", config_exact, "(objectClass=posixGroup)", "%{cn}", - "%{cn}:%regmatch(\"userPassword\",\"^{CRYPT}.............*\",\"*\"):%{gidNumber}:%merge(\",\",\"%list(\\\",\\\",\\\"memberUid\\\")\",\"%deref(\\\",\\\",\\\"uniqueMember\\\",\\\"uid\\\")\")"}, + "%{cn}:%regsub(\"userPassword\",\"^\\\\{CRYPT\\\\}(..*)\",\"%1\",\"*\"):%{gidNumber}:%merge(\",\",\"%list(\\\",\\\",\\\"memberUid\\\")\",\"%deref(\\\",\\\",\\\"uniqueMember\\\",\\\"uid\\\")\")"}, {"group.bynumber", config_exact, "(objectClass=posixGroup)", "%{gidNumber}", - "%{cn}:%regmatch(\"userPassword\",\"^{CRYPT}.............*\",\"*\"):%{gidNumber}:%merge(\",\",\"%list(\\\",\\\",\\\"memberUid\\\")\",\"%deref(\\\",\\\",\\\"uniqueMember\\\",\\\"uid\\\")\")"}, + "%{cn}:%regsub(\"userPassword\",\"^\\\\{CRYPT\\\\}(..*)\",\"%1\",\"*\"):%{gidNumber}:%merge(\",\",\"%list(\\\",\\\",\\\"memberUid\\\")\",\"%deref(\\\",\\\",\\\"uniqueMember\\\",\\\"uid\\\")\")"}, {"auto.*", config_glob, "(objectClass=automount)", "%{automountKey}", |