X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/blobdiff_plain/1c15e88899094343f75aeba04122cd96a96b428e..af359dea2e5ab3e937b62107ecd6a51d78189ed7:/usr/src/usr.bin/chpass/field.c

diff --git a/usr/src/usr.bin/chpass/field.c b/usr/src/usr.bin/chpass/field.c
index 1e3d94afef..1ca1dbfd17 100644
--- a/usr/src/usr.bin/chpass/field.c
+++ b/usr/src/usr.bin/chpass/field.c
@@ -2,23 +2,37 @@
  * Copyright (c) 1988 The Regents of the University of California.
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms are permitted
- * provided that: (1) source distributions retain this entire copyright
- * notice and comment, and (2) distributions including binaries display
- * the following acknowledgement:  ``This product includes software
- * developed by the University of California, Berkeley and its contributors''
- * in the documentation or other materials provided with the distribution
- * and in all advertising materials mentioning features or use of this
- * software. Neither the name of the University nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)field.c	5.12 (Berkeley) 6/1/90";
+static char sccsid[] = "@(#)field.c	5.13 (Berkeley) 2/12/91";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -34,7 +48,7 @@ static char sccsid[] = "@(#)field.c	5.12 (Berkeley) 6/1/90";
 p_login(p, pw, ep)
 	char *p;
 	struct passwd *pw;
-	struct entry *ep;
+	ENTRY *ep;
 {
 	if (!*p) {
 		(void)fprintf(stderr, "chpass: empty login field.\n");
@@ -65,7 +79,7 @@ p_login(p, pw, ep)
 p_passwd(p, pw, ep)
 	char *p;
 	struct passwd *pw;
-	struct entry *ep;
+	ENTRY *ep;
 {
 	if (!*p)
 		pw->pw_passwd = "";	/* "NOLOGIN"; */
@@ -81,7 +95,7 @@ p_passwd(p, pw, ep)
 p_uid(p, pw, ep)
 	register char *p;
 	struct passwd *pw;
-	struct entry *ep;
+	ENTRY *ep;
 {
 	int id;
 
@@ -107,7 +121,7 @@ p_uid(p, pw, ep)
 p_gid(p, pw, ep)
 	register char *p;
 	struct passwd *pw;
-	struct entry *ep;
+	ENTRY *ep;
 {
 	struct group *gr;
 	int id;
@@ -139,7 +153,7 @@ p_gid(p, pw, ep)
 p_class(p, pw, ep)
 	char *p;
 	struct passwd *pw;
-	struct entry *ep;
+	ENTRY *ep;
 {
 	if (!*p)
 		pw->pw_class = "";
@@ -155,7 +169,7 @@ p_class(p, pw, ep)
 p_change(p, pw, ep)
 	char *p;
 	struct passwd *pw;
-	struct entry *ep;
+	ENTRY *ep;
 {
 	if (!atot(p, &pw->pw_change))
 		return(0);
@@ -167,7 +181,7 @@ p_change(p, pw, ep)
 p_expire(p, pw, ep)
 	char *p;
 	struct passwd *pw;
-	struct entry *ep;
+	ENTRY *ep;
 {
 	if (!atot(p, &pw->pw_expire))
 		return(0);
@@ -179,7 +193,7 @@ p_expire(p, pw, ep)
 p_gecos(p, pw, ep)
 	char *p;
 	struct passwd *pw;
-	struct entry *ep;
+	ENTRY *ep;
 {
 	if (!*p)
 		ep->save = "";
@@ -194,7 +208,7 @@ p_gecos(p, pw, ep)
 p_hdir(p, pw, ep)
 	char *p;
 	struct passwd *pw;
-	struct entry *ep;
+	ENTRY *ep;
 {
 	if (!*p) {
 		(void)fprintf(stderr, "chpass: empty home directory field.\n");
@@ -211,7 +225,7 @@ p_hdir(p, pw, ep)
 p_shell(p, pw, ep)
 	register char *p;
 	struct passwd *pw;
-	struct entry *ep;
+	ENTRY *ep;
 {
 	char *t, *ok_shell();