--- Makefile.orig	Wed Jul 23 15:30:31 2003
+++ Makefile	Wed Jul 23 17:19:29 2003
@@ -51,6 +51,7 @@ MV  = @/bin/mv -f
 RMV  = /bin/mv -f
 RCAT = /bin/cat
 CAT = @$(RCAT)
+SED = /usr/bin/sed
 
 MKDB = /usr/sbin/yp_mkdb
 DBLOAD = $(MKDB) -m `hostname`
@@ -105,7 +106,9 @@ PROTOCOLS = $(YPSRCDIR)/protocols
 RPC 	  = $(YPSRCDIR)/rpc
 SERVICES  = $(YPSRCDIR)/services
 SHELLS    = $(YPSRCDIR)/shells
-GROUP     = $(YPSRCDIR)/group
+# we want to use /var/yp/group as group file
+#GROUP     = $(YPSRCDIR)/group
+GROUP     = $(YPDIR)/group
 ALIASES   = $(YPSRCDIR)/mail/aliases
 NETGROUP  = $(YPDIR)/netgroup
 PASSWD    = $(YPDIR)/passwd
@@ -122,7 +125,7 @@ AMDHOST   = $(YPSRCDIR)/amd.map
 # List of maps that are always built.
 # If you want to omit some of them, feel free to comment
 # them out from this list.
-TARGETS= servers hosts networks protocols rpc services shells group
+TARGETS= servers hosts networks protocols rpc services shells group shadow
 #TARGETS+= aliases
 
 # Sanity checks: filter out targets we can't build
@@ -183,6 +186,7 @@ services:  services.byname
 shells:    shells.list
 passwd:    passwd.byname passwd.byuid
 group:     group.byname group.bygid
+shadow:    shadow.byname shadow.byuid
 netgrp:    netgroup
 netid:	   netid.byname
 servers:   ypservers
@@ -204,6 +208,8 @@ pushpw:
 	@if [ ! $(NOPUSH) ]; then $(YPPUSH) -d $(DOMAIN) master.passwd.byuid ; fi
 	@if [ ! $(NOPUSH) ]; then $(YPPUSH) -d $(DOMAIN) passwd.byname ; fi
 	@if [ ! $(NOPUSH) ]; then $(YPPUSH) -d $(DOMAIN) passwd.byuid ; fi
+	@if [ ! $(NOPUSH) ]; then $(YPPUSH) -d $(DOMAIN) shadow.byname ; fi
+	@if [ ! $(NOPUSH) ]; then $(YPPUSH) -d $(DOMAIN) shadow.byuid ; fi
 
 pushmap:
 	@if [ ! $(NOPUSH) ]; then $(YPPUSH) -d $(DOMAIN) $(PUSHMAP) ; fi
@@ -484,12 +490,12 @@ $(PASSWD): $(MASTER)
 		print $$1":"$$2":"$$3":"$$4":"$$8":"$$9":"$$10}' $^ \
 		> $(PASSWD) ; fi
 
-
 passwd.byname: $(PASSWD)
 	@echo "Updating $@..."
 	$(CAT) $(PASSWD) | \
 	$(AWK) -F: '{ if ($$1 != "" && $$1 !~ "^#.*" && $$1 != "+") \
 		print $$1"\t"$$0 }' $^ \
+		| $(SED) 's/^\([^:]*\):[^:]*:/\1:x:/' \
 		| $(DBLOAD) -f -i $(PASSWD) -o $(YPMAPDIR)/$@ - $(TMP); \
 		$(RMV) $(TMP) $@
 	@$(DBLOAD) -c
@@ -502,7 +508,33 @@ passwd.byuid: $(PASSWD)
 	$(CAT) $(PASSWD) | \
 	$(AWK) -F: '{ if ($$1 != "" && $$1 !~ "^#.*" && $$1 != "+") \
 		print $$3"\t"$$0 }' $^ \
+		| $(SED) 's/^\([^:]*\):[^:]*:/\1:x:/' \
 		| $(DBLOAD) -f -i $(PASSWD) -o $(YPMAPDIR)/$@ - $(TMP); \
+		$(RMV) $(TMP) $@
+	@$(DBLOAD) -c
+	@if [ ! $(NOPUSH) ]; then $(YPPUSH) -d $(DOMAIN) $@; fi
+	@if [ ! $(NOPUSH) ]; then echo "Pushed $@ map." ; fi
+	@$(MAKE) -f ../Makefile netid
+
+
+shadow.byname: $(MASTER)
+	@echo "Updating $@..."
+	$(CAT) $(MASTER) | \
+	$(AWK) -F: '{if ($$1 != "" && $$1 !~ "^#.*" && $$1 != "+") \
+		print $$1" "$$1":"$$2":12000:0:99999:7:::" }' $^ \
+		| $(DBLOAD) -s -f -i $(PASSWD) -o $(YPMAPDIR)/$@ - $(TMP); \
+		$(RMV) $(TMP) $@
+	@$(DBLOAD) -c
+	@if [ ! $(NOPUSH) ]; then $(YPPUSH) -d $(DOMAIN) $@; fi
+	@if [ ! $(NOPUSH) ]; then echo "Pushed $@ map." ; fi
+
+
+shadow.byuid: $(MASTER)
+	@echo "Updating $@..."
+	$(CAT) $(MASTER) | \
+	$(AWK) -F: '{if ($$1 != "" && $$1 !~ "^#.*" && $$1 != "+") \
+		print $$3" "$$1":"$$2":12000:0:99999:7:::" }' $^ \
+		| $(DBLOAD) -s -f -i $(PASSWD) -o $(YPMAPDIR)/$@ - $(TMP); \
 		$(RMV) $(TMP) $@
 	@$(DBLOAD) -c
 	@if [ ! $(NOPUSH) ]; then $(YPPUSH) -d $(DOMAIN) $@; fi