--- Makefile.orig	Wed Jul 23 14:31:01 2003
+++ Makefile	Wed Jul 23 14:37:11 2003
@@ -105,7 +105,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
@@ -485,11 +487,11 @@ $(PASSWD): $(MASTER)
 		> $(PASSWD) ; fi
 
 
-passwd.byname: $(PASSWD)
+passwd.byname: $(MASTER)
 	@echo "Updating $@..."
-	$(CAT) $(PASSWD) | \
+	$(CAT) $(MASTER) | \
 	$(AWK) -F: '{ if ($$1 != "" && $$1 !~ "^#.*" && $$1 != "+") \
-		print $$1"\t"$$0 }' $^ \
+		print $$1" "$$1":"$$2":"$$3":"$$4":"$$8":"$$9":"$$10}' $^ \
 		| $(DBLOAD) -f -i $(PASSWD) -o $(YPMAPDIR)/$@ - $(TMP); \
 		$(RMV) $(TMP) $@
 	@$(DBLOAD) -c
@@ -497,18 +499,17 @@ passwd.byname: $(PASSWD)
 	@if [ ! $(NOPUSH) ]; then echo "Pushed $@ map." ; fi
 
 
-passwd.byuid: $(PASSWD)
+passwd.byuid: $(MASTER)
 	@echo "Updating $@..."
-	$(CAT) $(PASSWD) | \
+	$(CAT) $(MASTER) | \
 	$(AWK) -F: '{ if ($$1 != "" && $$1 !~ "^#.*" && $$1 != "+") \
-		print $$3"\t"$$0 }' $^ \
+		print $$3" "$$1":"$$2":"$$3":"$$4":"$$8":"$$9":"$$10}' $^ \
 		| $(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
-
 
 group.byname: $(GROUP)
 	@echo "Updating $@..."