Module Name: src
Committed By: hauke
Date: Fri Jul 19 11:44:51 UTC 2013
Modified Files:
src/usr.sbin/ypserv/ypinit: Makefile.yp
Log Message:
Commit the patches in Wolfgang Stukenbrock's PR bin/41896.
(1) Do not serve UIDs below MINUID in master.passwd.* maps,
just like in passwd.* maps.
(2) Since stdethers(8) and stdhosts(8) strip comments, we do
not have to do it here, much less inconsistently.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/usr.sbin/ypserv/ypinit/Makefile.yp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/ypserv/ypinit/Makefile.yp
diff -u src/usr.sbin/ypserv/ypinit/Makefile.yp:1.21 src/usr.sbin/ypserv/ypinit/Makefile.yp:1.22
--- src/usr.sbin/ypserv/ypinit/Makefile.yp:1.21 Sat Oct 7 16:54:38 2006
+++ src/usr.sbin/ypserv/ypinit/Makefile.yp Fri Jul 19 11:44:51 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.yp,v 1.21 2006/10/07 16:54:38 elad Exp $
+# $NetBSD: Makefile.yp,v 1.22 2013/07/19 11:44:51 hauke Exp $
#
# This is the YP Makefile, used to create and push YP maps.
#
@@ -112,12 +112,14 @@ passwd.time: ${DIR}/master.passwd
${MAKEDBM} - passwd.byuid; \
fi; \
${CAT} ${.ALLSRC} | \
- ${AWK} 'BEGIN { FS=":"; OFS="\t"; } /^[a-zA-Z0-9_]/ \
- { print $$1, $$0 }' - | ${SORT} | \
+ ${AWK} -v minuid=${MINUID} \
+ 'BEGIN { FS=":"; OFS="\t"; } /^[a-zA-Z0-9_]/ \
+ { if (minuid <= $$3) print $$1, $$0 }' - | ${SORT} | \
${MAKEDBM_S} - master.passwd.byname; \
${CAT} ${.ALLSRC} | \
- ${AWK} 'BEGIN { FS=":"; OFS="\t"; } /^[a-zA-Z0-9_]/ \
- { print $$3, $$0 }' - | ${SORT} | \
+ ${AWK} -v minuid=${MINUID} \
+ 'BEGIN { FS=":"; OFS="\t"; } /^[a-zA-Z0-9_]/ \
+ { if (minuid <= $$3) print $$3, $$0 }' - | ${SORT} | \
${MAKEDBM_S} - master.passwd.byuid; \
${TOUCH} ${.TARGET}; \
${ECHO} "updated passwd"; \
@@ -198,7 +200,7 @@ ${MAP}.time: ${AMDDIR}/${MAP} __makedbme
ethers.time: ${DIR}/ethers
-@if [ -f ${.ALLSRC} ]; then \
- ${STDETHERS} ${.ALLSRC} | ${SED} -e s/#.*$$// | \
+ ${STDETHERS} ${.ALLSRC} | \
${AWK} 'BEGIN { FS="\t"; OFS="\t"; } { print $$1, $$0 }' | \
${SORT} | ${MAKEDBM} - ethers.byaddr; \
${STDETHERS} ${.ALLSRC} | \
@@ -257,7 +259,7 @@ group.time: ${DIR}/group
#
hosts.time: ${DIR}/hosts
-@if [ -f ${.ALLSRC} ]; then \
- ${STDHOSTS} ${.ALLSRC} | ${SED} -e s/#.*$$// | \
+ ${STDHOSTS} ${.ALLSRC} | \
${AWK} '{for (i = 2; i <= NF; i++) print $$i, $$0 }' | \
${SORT} | ${MAKEDBM} - hosts.byname; \
${STDHOSTS} ${.ALLSRC} | \
@@ -279,7 +281,7 @@ hosts.time: ${DIR}/hosts
ipnodes.time: ${DIR}/hosts
-@if [ -f ${.ALLSRC} ]; then \
- ${STDHOSTS} -n ${.ALLSRC} | ${SED} -e s/#.*$$// | \
+ ${STDHOSTS} -n ${.ALLSRC} | \
${AWK} '{for (i = 2; i <= NF; i++) print $$i, $$0 }' | \
${SORT} | ${MAKEDBM} - ipnodes.byname; \
${STDHOSTS} -n ${.ALLSRC} | \
