D17575.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D17575.diff
View Options

	Index: head/usr.sbin/pw/pw.h
	===================================================================
	--- head/usr.sbin/pw/pw.h
	+++ head/usr.sbin/pw/pw.h
	@@ -65,7 +65,6 @@

	#define _DEF_DIRMODE (S_IRWXU \| S_IRWXG \| S_IRWXO)
	#define _PW_CONF "pw.conf"
	-#define _PATH_PW_CONF "/etc/pw.conf"
	#define _UC_MAXLINE 1024
	#define _UC_MAXSHELLS 32

	Index: head/usr.sbin/pw/pw.c
	===================================================================
	--- head/usr.sbin/pw/pw.c
	+++ head/usr.sbin/pw/pw.c
	@@ -162,7 +162,8 @@
	PWF._altdir = PWF_ROOTDIR;
	}
	snprintf(conf.etcpath, sizeof(conf.etcpath),
	- "%s%s", optarg, arg == 'R' ? "/etc" : "");
	+ "%s%s", optarg, arg == 'R' ?
	+ _PATH_PWD : "");
	} else
	break;
	}
	Index: head/usr.sbin/pw/pw_conf.c
	===================================================================
	--- head/usr.sbin/pw/pw_conf.c
	+++ head/usr.sbin/pw/pw_conf.c
	@@ -255,9 +255,6 @@
	buf = NULL;
	linecap = 0;

	- if (file == NULL)
	- file = _PATH_PW_CONF;
	-
	if ((fp = fopen(file, "r")) == NULL)
	return (&config);