View | Details | Raw Unified | Return to bug 19538
Collapse All | Expand All

(-)Makefile.yp (-4 / +6 lines)
Lines 466-476 Link Here
466
	@echo "Creating new $@ file from $(MASTER)..."
466
	@echo "Creating new $@ file from $(MASTER)..."
467
	@if [ ! $(UNSECURE) ]; then \
467
	@if [ ! $(UNSECURE) ]; then \
468
	$(RCAT) $(MASTER) | \
468
	$(RCAT) $(MASTER) | \
469
	$(AWK) -F: '{if ($$1 != "+") \
469
	$(AWK) -F: '{if ($$1 != "" && $$1 !~ "^#.*" && $$1 != "+") \
470
		print $$1":*:"$$3":"$$4":"$$8":"$$9":"$$10}' $^ \
470
		print $$1":*:"$$3":"$$4":"$$8":"$$9":"$$10}' $^ \
471
		> $(PASSWD) ; \
471
		> $(PASSWD) ; \
472
	else $(RCAT) $(MASTER) | \
472
	else $(RCAT) $(MASTER) | \
473
	$(AWK) -F: '{if ($$1 != "+") \
473
	$(AWK) -F: '{if ($$1 != "" && $$1 !~ "^#.*" && $$1 != "+") \
474
		print $$1":"$$2":"$$3":"$$4":"$$8":"$$9":"$$10}' $^ \
474
		print $$1":"$$2":"$$3":"$$4":"$$8":"$$9":"$$10}' $^ \
475
		> $(PASSWD) ; fi
475
		> $(PASSWD) ; fi
476
476
Lines 541-547 Link Here
541
	@echo "Master.passwd source file not found -- skipping"
541
	@echo "Master.passwd source file not found -- skipping"
542
.else
542
.else
543
	$(CAT) $(MASTER) | \
543
	$(CAT) $(MASTER) | \
544
	$(AWK) -F: '{ if ($$1 != "+") print $$1"\t"$$0 }' $^ \
544
	$(AWK) -F: '{ if ($$1 != "" && $$1 !~ "^#.*" && $$1 != "+") \
545
		print $$1"\t"$$0 }' $^ \
545
		| $(DBLOAD) ${S} -f -i $(MASTER) -o $(YPMAPDIR)/$@ - $(TMP); \
546
		| $(DBLOAD) ${S} -f -i $(MASTER) -o $(YPMAPDIR)/$@ - $(TMP); \
546
		$(RMV) $(TMP) $@
547
		$(RMV) $(TMP) $@
547
	@$(DBLOAD) -c
548
	@$(DBLOAD) -c
Lines 556-562 Link Here
556
	@echo "Master.passwd source file not found -- skipping"
557
	@echo "Master.passwd source file not found -- skipping"
557
.else
558
.else
558
	$(CAT) $(MASTER) | \
559
	$(CAT) $(MASTER) | \
559
	$(AWK) -F: '{ if ($$1 != "+") print $$3"\t"$$0 }' $^ \
560
	$(AWK) -F: '{ if ($$1 != "" && $$1 !~ "^#.*" && $$1 != "+") \
561
		print $$3"\t"$$0 }' $^ \
560
		| $(DBLOAD) ${S} -f -i $(MASTER) -o $(YPMAPDIR)/$@ - $(TMP); \
562
		| $(DBLOAD) ${S} -f -i $(MASTER) -o $(YPMAPDIR)/$@ - $(TMP); \
561
		$(RMV) $(TMP) $@
563
		$(RMV) $(TMP) $@
562
	@$(DBLOAD) -c
564
	@$(DBLOAD) -c

Return to bug 19538