summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNalin Dahyabhai <nalin@dahyabhai.net>2014-04-21 23:48:33 -0400
committerNalin Dahyabhai <nalin@dahyabhai.net>2014-04-22 00:17:42 -0400
commit6262fd4ebc514b8c6ba80f25a21b8837e6a47ce2 (patch)
tree41fb882105e876111a4634e134897d2bffb10521
parent911f373ea9c745894c79fa7892db855a0f64a766 (diff)
downloadslapi-nis-6262fd4ebc514b8c6ba80f25a21b8837e6a47ce2.tar.gz
slapi-nis-6262fd4ebc514b8c6ba80f25a21b8837e6a47ce2.tar.xz
slapi-nis-6262fd4ebc514b8c6ba80f25a21b8837e6a47ce2.zip
Correct the NIS defaults for "hosts" maps
The values for NIS hosts.byname and hosts.byaddr maps should start with addresses, not names. Reported by Rik Megens.
-rw-r--r--src/defs-nis.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/defs-nis.c b/src/defs-nis.c
index efd9a37..3d2b9e9 100644
--- a/src/defs-nis.c
+++ b/src/defs-nis.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2008,2009,2011,2012 Red Hat, Inc.
+ * Copyright 2008,2009,2011,2012,2014 Red Hat, Inc.
*
* This Program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -106,13 +106,13 @@ static struct configuration {
NULL},
{"hosts.byaddr", config_exact, FALSE, NULL,
"(&(ipHostNumber=*)(cn=*))",
- "%{ipHostNumber}", NULL,
- "%first(\"%{cn}\") %{ipHostNumber} %merge(\" \",\"%{cn}\")", NULL,
+ NULL, "%{ipHostNumber}",
+ NULL, "%{ipHostNumber} %merge(\" \",\"%{cn}\")",
NULL},
{"hosts.byname", config_exact, FALSE, NULL,
"(&(ipHostNumber=*)(cn=*))",
NULL, "%{cn}",
- "%first(\"%{cn}\") %{ipHostNumber} %merge(\" \",\"%{cn}\")", NULL,
+ NULL, "%{ipHostNumber} %merge(\" \",\"%{cn}\")",
NULL},
{"mail.aliases", config_exact, FALSE, NULL,
"(objectClass=nisMailAlias)",