diff options
| author | Nalin Dahyabhai <nalin.dahyabhai@pobox.com> | 2008-07-15 16:41:01 -0400 |
|---|---|---|
| committer | Nalin Dahyabhai <nalin.dahyabhai@pobox.com> | 2008-07-15 16:41:01 -0400 |
| commit | d4c28dda836148878bb13bc29da84a4632884333 (patch) | |
| tree | 524edaf60d12a3de8fb77cdd8173be690fb1d39c | |
| parent | 4b895f60177bbc62f4f5c4ca1f366a3f7a141371 (diff) | |
| download | slapi-nis-d4c28dda836148878bb13bc29da84a4632884333.tar.gz slapi-nis-d4c28dda836148878bb13bc29da84a4632884333.tar.xz slapi-nis-d4c28dda836148878bb13bc29da84a4632884333.zip | |
- tweak some defaults
| -rw-r--r-- | src/defs-nis.c | 45 |
1 files changed, 26 insertions, 19 deletions
diff --git a/src/defs-nis.c b/src/defs-nis.c index fa4eb47..05ff043 100644 --- a/src/defs-nis.c +++ b/src/defs-nis.c @@ -73,7 +73,7 @@ static struct configuration { NULL}, {"auto.*", config_glob, FALSE, NULL, "(objectClass=automount)", - "%{automountKey}", NULL, + NULL, "%{automountKey}", "%{automountInformation}", NULL}, @@ -89,30 +89,30 @@ static struct configuration { NULL}, {"hosts.byaddr", config_exact, FALSE, NULL, "(&(ipHostNumber=*)(cn=*))", - "%{cn}", NULL, + "%{ipHostNumber}", NULL, "%first(\"%{cn}\")\t%{ipHostNumber} %merge(\" \",\"%{cn}\")", NULL}, {"hosts.byname", config_exact, FALSE, NULL, "(&(ipHostNumber=*)(cn=*))", - "%{cn}", NULL, + NULL, "%{cn}", "%first(\"%{cn}\")\t%{ipHostNumber} %merge(\" \",\"%{cn}\")", NULL}, - {"mail.byaddr", config_exact, FALSE, NULL, - "(objectClass=nisMailAlias)", - "%{rfc822MailMember}", NULL, - "%merge(\",\",\"%{cn}\")", - NULL}, {"mail.aliases", config_exact, FALSE, NULL, "(objectClass=nisMailAlias)", "%{cn}", NULL, "%merge(\",\",\"%{rfc822MailMember}\")", NULL}, - {"netgroup.byuser", config_exact, FALSE, NULL, + {"mail.byaddr", config_exact, FALSE, NULL, + "(objectClass=nisMailAlias)", + NULL, "%{rfc822MailMember}", + "%merge(\",\",\"%{cn}\")", + NULL}, + {"netgroup.byhost", config_exact, FALSE, NULL, "(objectClass=nisNetgroup)", NULL, NULL, NULL, NULL}, - {"netgroup.byhost", config_exact, FALSE, NULL, + {"netgroup.byuser", config_exact, FALSE, NULL, "(objectClass=nisNetgroup)", NULL, NULL, NULL, @@ -125,26 +125,26 @@ static struct configuration { {"networks.byaddr", config_exact, FALSE, NULL, "(objectClass=ipNetwork)", "%{ipNetworkNumber}", NULL, - "%{cn}", + "%merge(\"%{cn}\")", NULL}, {"networks.byname", config_exact, FALSE, NULL, "(objectClass=ipNetwork)", - "%{cn}", NULL, + NULL, "%{cn}", "%{ipNetworkNumber}", NULL}, {"protocols.byname", config_exact, FALSE, NULL, "(objectClass=ipProtocol)", - "%{cn}", NULL, + NULL, "%{cn}", "%first(\"%{cn}\")\t%{ipProtocolNumber}\t%merge(\" \",\"%{cn}\")", NULL}, {"protocols.bynumber", config_exact, FALSE, NULL, "(objectClass=ipProtocol)", - "%{cn}", NULL, + "%{ipProtocolNumber}", NULL, "%first(\"%{cn}\")\t%{ipProtocolNumber}\t%merge(\" \",\"%{cn}\")", NULL}, {"rpc.byname", config_exact, FALSE, NULL, "(objectClass=oncRpc)", - "%{cn}", NULL, + NULL, "%{cn}", "%first(\"%{cn}\")\t%{oncRpcNumber}\t%merge(\" \",\"%{cn}\")", NULL}, {"rpc.bynumber", config_exact, FALSE, NULL, @@ -154,13 +154,13 @@ static struct configuration { NULL}, {"services.byname", config_exact, FALSE, NULL, "(objectClass=ipService)", - NULL, NULL, - NULL, + NULL, "%{cn}", + "%{cn} %{ipServicePort}/%{ipServiceProtocol} %merge(\"%{cn}\")", NULL}, {"services.byservicename", config_exact, FALSE, NULL, "(objectClass=ipService)", - NULL, NULL, - NULL, + NULL, "%{cn}", + "%{cn} %{ipServicePort}/%{ipServiceProtocol} %merge(\"%{cn}\")", NULL}, {"ypservers", config_exact, FALSE, "cn=nis-servers, " DEFAULT_CONFIGURATION_SUFFIX, @@ -285,6 +285,13 @@ main(int argc, char **argv) if (fnmatch(map, config[i].map, 0) != 0) { continue; } + if ((config[i].key_format == NULL) && + (config[i].keys_format == NULL)) { + continue; + } + if (config[i].value_format == NULL) { + continue; + } printf("dn: " NIS_MAP_CONFIGURATION_DOMAIN_ATTR "=%s+" NIS_MAP_CONFIGURATION_MAP_ATTR "=%s, " |