1 |
diff -Naurp ypserv-2.19/scripts/ypMakefile.in ypserv-2.19.oden/scripts/ypMakefile.in |
2 |
--- ypserv-2.19/scripts/ypMakefile.in 2008-12-23 16:30:22.000000000 +0100 |
3 |
+++ ypserv-2.19.oden/scripts/ypMakefile.in 2008-12-23 16:30:38.000000000 +0100 |
4 |
@@ -32,6 +32,11 @@ NOPUSH=true |
5 |
MINUID=500 |
6 |
MINGID=500 |
7 |
|
8 |
+# Don't export this uid/guid (nfsnobody). |
9 |
+# Set to 0 if you want to |
10 |
+NFSNOBODYUID=65534 |
11 |
+NFSNOBODYGID=65534 |
12 |
+ |
13 |
# Should we merge the passwd file with the shadow file ? |
14 |
# MERGE_PASSWD=true|false |
15 |
MERGE_PASSWD=false |
16 |
@@ -286,7 +291,7 @@ passwd.byname: $(PASSWD) $(SHADOW) $(YPD |
17 |
@echo "Updating $@..." |
18 |
@$(UMASK); \ |
19 |
$(MERGER) -p $(PASSWD) $(SHADOW) | \ |
20 |
- $(AWK) -F: '!/^[-+#]/ { if ($$1 != "" && $$3 >= $(MINUID) ) \ |
21 |
+ $(AWK) -F: '!/^[-+#]/ { if ($$1 != "" && $$3 >= $(MINUID) && $$3 != $(NFSNOBODYUID) ) \ |
22 |
print $$1"\t"$$0 }' | $(DBLOAD) -i $(PASSWD) \ |
23 |
-o $(YPMAPDIR)/$@ - $@ |
24 |
-@$(NOPUSH) || $(YPPUSH) -d $(DOMAIN) $@ |
25 |
@@ -295,7 +300,7 @@ passwd.byuid: $(PASSWD) $(SHADOW) $(YPDI |
26 |
@echo "Updating $@..." |
27 |
@$(UMASK); \ |
28 |
$(MERGER) -p $(PASSWD) $(SHADOW) | \ |
29 |
- $(AWK) -F: '!/^[-+#]/ { if ($$1 != "" && $$3 >= $(MINUID) ) \ |
30 |
+ $(AWK) -F: '!/^[-+#]/ { if ($$1 != "" && $$3 >= $(MINUID) && $$3 != $(NFSNOBODYUID) ) \ |
31 |
print $$3"\t"$$0 }' | $(DBLOAD) -i $(PASSWD) \ |
32 |
-o $(YPMAPDIR)/$@ - $@ |
33 |
-@$(NOPUSH) || $(YPPUSH) -d $(DOMAIN) $@ |
34 |
@@ -309,7 +314,7 @@ else |
35 |
passwd.byname: $(PASSWD) $(YPDIR)/Makefile |
36 |
@echo "Updating $@..." |
37 |
@$(UMASK); \ |
38 |
- $(AWK) -F: '!/^[-+#]/ { if ($$1 != "" && $$3 >= $(MINUID) ) \ |
39 |
+ $(AWK) -F: '!/^[-+#]/ { if ($$1 != "" && $$3 >= $(MINUID) && $$3 != $(NFSNOBODYUID) ) \ |
40 |
print $$1"\t"$$0 }' $(PASSWD) | $(DBLOAD) -i $(PASSWD) \ |
41 |
-o $(YPMAPDIR)/$@ - $@ |
42 |
-@$(NOPUSH) || $(YPPUSH) -d $(DOMAIN) $@ |
43 |
@@ -317,7 +322,7 @@ passwd.byname: $(PASSWD) $(YPDIR)/Makefi |
44 |
passwd.byuid: $(PASSWD) $(YPDIR)/Makefile |
45 |
@echo "Updating $@..." |
46 |
@$(UMASK); \ |
47 |
- $(AWK) -F: '!/^[-+#]/ { if ($$1 != "" && $$3 >= $(MINUID) ) \ |
48 |
+ $(AWK) -F: '!/^[-+#]/ { if ($$1 != "" && $$3 >= $(MINUID) && $$3 != $(NFSNOBODYUID) ) \ |
49 |
print $$3"\t"$$0 }' $(PASSWD) | $(DBLOAD) -i $(PASSWD) \ |
50 |
-o $(YPMAPDIR)/$@ - $@ |
51 |
-@$(NOPUSH) || $(YPPUSH) -d $(DOMAIN) $@ |
52 |
@@ -326,7 +331,7 @@ shadow.byname: $(SHADOW) $(YPDIR)/Makefi |
53 |
@echo "Updating $@..." |
54 |
@$(UMASK); \ |
55 |
$(AWK) -F: '{ if (FILENAME ~ /shadow$$/) { \ |
56 |
- if (UID[$$1] >= $(MINUID) ) print $$1"\t"$$0; \ |
57 |
+ if (UID[$$1] >= $(MINUID) && UID[$$1] != $(NFSNOBODYUID)) print $$1"\t"$$0; \ |
58 |
} else UID[$$1] = $$3; }' $(PASSWD) $(SHADOW) \ |
59 |
| $(DBLOAD) -s -i $(SHADOW) -o $(YPMAPDIR)/$@ - $@ |
60 |
-@$(NOPUSH) || $(YPPUSH) -d $(DOMAIN) $@ |
61 |
@@ -345,7 +350,7 @@ group.byname: $(GROUP) $(GSHADOW) $(YPDI |
62 |
@echo "Updating $@..." |
63 |
@$(UMASK); \ |
64 |
$(MERGER) -g $(GROUP) $(GSHADOW) | \ |
65 |
- $(AWK) -F: '!/^[-+#]/ { if ($$1 != "" && $$3 >= $(MINGID) ) \ |
66 |
+ $(AWK) -F: '!/^[-+#]/ { if ($$1 != "" && $$3 >= $(MINGID) && $$3 != $(NFSNOBODYGID) ) \ |
67 |
print $$1"\t"$$0 }' | $(DBLOAD) -i $(GROUP) -o $(YPMAPDIR)/$@ - $@ |
68 |
-@$(NOPUSH) || $(YPPUSH) -d $(DOMAIN) $@ |
69 |
|
70 |
@@ -353,7 +358,7 @@ group.bygid: $(GROUP) $(GSHADOW) $(YPDIR |
71 |
@echo "Updating $@..." |
72 |
@$(UMASK); \ |
73 |
$(MERGER) -g $(GROUP) $(GSHADOW) | \ |
74 |
- $(AWK) -F: '!/^[-+#]/ { if ($$1 != "" && $$3 >= $(MINGID) ) \ |
75 |
+ $(AWK) -F: '!/^[-+#]/ { if ($$1 != "" && $$3 >= $(MINGID) && $$3 != $(NFSNOBODYGID) ) \ |
76 |
print $$3"\t"$$0 }' | $(DBLOAD) -i $(GROUP) -o $(YPMAPDIR)/$@ - $@ |
77 |
-@$(NOPUSH) || $(YPPUSH) -d $(DOMAIN) $@ |
78 |
|
79 |
@@ -362,7 +367,7 @@ else |
80 |
group.byname: $(GROUP) $(YPDIR)/Makefile |
81 |
@echo "Updating $@..." |
82 |
@$(UMASK); \ |
83 |
- $(AWK) -F: '!/^[-+#]/ { if ($$1 != "" && $$3 >= $(MINGID) ) \ |
84 |
+ $(AWK) -F: '!/^[-+#]/ { if ($$1 != "" && $$3 >= $(MINGID) && $$3 != $(NFSNOBODYGID) ) \ |
85 |
print $$1"\t"$$0 }' $(GROUP) \ |
86 |
| $(DBLOAD) -i $(GROUP) -o $(YPMAPDIR)/$@ - $@ |
87 |
-@$(NOPUSH) || $(YPPUSH) -d $(DOMAIN) $@ |
88 |
@@ -370,7 +375,7 @@ group.byname: $(GROUP) $(YPDIR)/Makefile |
89 |
group.bygid: $(GROUP) $(YPDIR)/Makefile |
90 |
@echo "Updating $@..." |
91 |
@$(UMASK); \ |
92 |
- $(AWK) -F: '!/^[-+#]/ { if ($$1 != "" && $$3 >= $(MINGID) ) \ |
93 |
+ $(AWK) -F: '!/^[-+#]/ { if ($$1 != "" && $$3 >= $(MINGID) && $$3 != $(NFSNOBODYGID) ) \ |
94 |
print $$3"\t"$$0 }' $(GROUP) \ |
95 |
| $(DBLOAD) -i $(GROUP) -o $(YPMAPDIR)/$@ - $@ |
96 |
-@$(NOPUSH) || $(YPPUSH) -d $(DOMAIN) $@ |