diff options
| author | Nalin Dahyabhai <nalin.dahyabhai@pobox.com> | 2008-07-31 15:56:45 -0400 |
|---|---|---|
| committer | Nalin Dahyabhai <nalin.dahyabhai@pobox.com> | 2008-07-31 15:56:45 -0400 |
| commit | 3b74fa012de55b781a5b88f1b71fa01a8f5f669b (patch) | |
| tree | 7d26484195a02d4f7f077d6af9c261f8d922ee50 /src | |
| parent | 860ea1285e2d51ba04be41cc94f3c30cda655f72 (diff) | |
- fix ethers defaults
- note that defaults for mail, netgroup, and networks still need work
Diffstat (limited to 'src')
| -rw-r--r-- | src/defs-nis.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/defs-nis.c b/src/defs-nis.c index 8e58e4b..1b64012 100644 --- a/src/defs-nis.c +++ b/src/defs-nis.c @@ -82,12 +82,12 @@ static struct configuration { {"ethers.byaddr", config_exact, FALSE, NULL, "(&(ipHostNumber=*)(macAddress=*))", "%{macAddress}", NULL, - "%{ipHostNumber}", NULL, + "%{macAddress} %{ipHostNumber}", NULL, NULL}, {"ethers.byname", config_exact, FALSE, NULL, "(&(ipHostNumber=*)(macAddress=*))", "%{ipHostNumber}", NULL, - "%{macAddress}", NULL, + "%{macAddress} %{ipHostNumber}", NULL, NULL}, {"hosts.byaddr", config_exact, FALSE, NULL, "(&(ipHostNumber=*)(cn=*))", @@ -99,22 +99,22 @@ static struct configuration { NULL, "%{cn}", "%first(\"%{cn}\")\t%{ipHostNumber} %merge(\" \",\"%{cn}\")", NULL, NULL}, - {"mail.aliases", config_exact, FALSE, NULL, + {"mail.aliases", config_exact, FALSE, NULL, /* XXX */ "(objectClass=nisMailAlias)", "%{cn}", NULL, "%merge(\",\",\"%{rfc822MailMember}\")", NULL, NULL}, - {"mail.byaddr", config_exact, FALSE, NULL, + {"mail.byaddr", config_exact, FALSE, NULL, /* XXX */ "(objectClass=nisMailAlias)", NULL, "%{rfc822MailMember}", "%merge(\",\",\"%{cn}\")", NULL, NULL}, - {"netgroup.byhost", config_exact, FALSE, NULL, + {"netgroup.byhost", config_exact, FALSE, NULL, /* XXX */ "(objectClass=nisNetgroup)", NULL, NULL, NULL, NULL, NULL}, - {"netgroup.byuser", config_exact, FALSE, NULL, + {"netgroup.byuser", config_exact, FALSE, NULL, /* XXX */ "(objectClass=nisNetgroup)", NULL, NULL, NULL, NULL, @@ -124,12 +124,12 @@ static struct configuration { "unix.%{uidNumber}", NULL, "%{uidNumber}:%merge(\",\",\"%{gidNumber}\",\"%deref(\\\"memberOf\\\",\\\"gidNumber\\\")\",\"%referred(\\\"group.byname\\\",\\\"member\\\",\\\"gidNumber\\\")\",\"%referred(\\\"group.byname\\\",\\\"uniqueMember\\\",\\\"gidNumber\\\")\")", NULL, NULL}, - {"networks.byaddr", config_exact, FALSE, NULL, + {"networks.byaddr", config_exact, FALSE, NULL, /* XXX */ "(objectClass=ipNetwork)", "%{ipNetworkNumber}", NULL, "%merge(\"%{cn}\")", NULL, NULL}, - {"networks.byname", config_exact, FALSE, NULL, + {"networks.byname", config_exact, FALSE, NULL, /* XXX */ "(objectClass=ipNetwork)", NULL, "%{cn}", "%{ipNetworkNumber}", NULL, |