diff options
| author | Nalin Dahyabhai <nalin.dahyabhai@pobox.com> | 2008-07-30 19:06:13 -0400 |
|---|---|---|
| committer | Nalin Dahyabhai <nalin.dahyabhai@pobox.com> | 2008-07-30 19:06:13 -0400 |
| commit | 8ccdc14f299c2f61546cc9a3e1f9bd6e72667580 (patch) | |
| tree | d08321f8bd46d2d72c6cad9600ccd987e62df213 /src/defs-nis.c | |
| parent | 6ce84971260d8a4c38540927deb40018cee488b1 (diff) | |
| download | slapi-nis-8ccdc14f299c2f61546cc9a3e1f9bd6e72667580.tar.gz slapi-nis-8ccdc14f299c2f61546cc9a3e1f9bd6e72667580.tar.xz slapi-nis-8ccdc14f299c2f61546cc9a3e1f9bd6e72667580.zip | |
- tweak defaults so that we can serve services maps
Diffstat (limited to 'src/defs-nis.c')
| -rw-r--r-- | src/defs-nis.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/defs-nis.c b/src/defs-nis.c index 80e4cb9..8e58e4b 100644 --- a/src/defs-nis.c +++ b/src/defs-nis.c @@ -156,13 +156,13 @@ static struct configuration { NULL}, {"services.byname", config_exact, FALSE, NULL, "(objectClass=ipService)", - NULL, "%{cn}", - "%{cn} %{ipServicePort}/%{ipServiceProtocol} %merge(\"%{cn}\")", NULL, + NULL, "%{ipServicePort}/%{ipServiceProtocol}", + NULL, "%first(\"%{cn}\") %{ipServicePort}/%{ipServiceProtocol} %merge(\" \",\"%{cn}\")", NULL}, {"services.byservicename", config_exact, FALSE, NULL, "(objectClass=ipService)", - NULL, "%{cn}", - "%{cn} %{ipServicePort}/%{ipServiceProtocol} %merge(\"%{cn}\")", NULL, + NULL, "%{cn}/%{ipServiceProtocol}", + NULL, "%{cn} %{ipServicePort}/%{ipServiceProtocol} %merge(\" \",\"%{cn}\")", NULL}, {"ypservers", config_exact, FALSE, "cn=nis-servers, " DEFAULT_CONFIGURATION_SUFFIX, @@ -298,7 +298,8 @@ main(int argc, char **argv) (config[i].keys_format == NULL)) { continue; } - if (config[i].value_format == NULL) { + if ((config[i].value_format == NULL) && + (config[i].values_format == NULL)) { continue; } printf("dn: " |