summaryrefslogtreecommitdiff
path: root/usr.sbin/user
diff options
context:
space:
mode:
authorTed Unangst <tedu@cvs.openbsd.org>2007-04-05 01:34:58 +0000
committerTed Unangst <tedu@cvs.openbsd.org>2007-04-05 01:34:58 +0000
commitb9b8eae41707c17c9f1c76f3f05fba53c279fdc2 (patch)
tree312f4d9120ebc03f20cb6851bc4f4b52e1b4a032 /usr.sbin/user
parent6a06dc131895752830f4dbffcb4260e47d387917 (diff)
remove some extra tests, from charles longeau
Diffstat (limited to 'usr.sbin/user')
-rw-r--r--usr.sbin/user/user.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/usr.sbin/user/user.c b/usr.sbin/user/user.c
index b9c71a7459f..9da1dfc431b 100644
--- a/usr.sbin/user/user.c
+++ b/usr.sbin/user/user.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: user.c,v 1.70 2007/03/02 04:27:11 ray Exp $ */
+/* $OpenBSD: user.c,v 1.71 2007/04/05 01:34:57 tedu Exp $ */
/* $NetBSD: user.c,v 1.69 2003/04/14 17:40:07 agc Exp $ */
/*
@@ -768,33 +768,33 @@ read_defaults(user_t *up)
if (fp != NULL) {
while ((s = fparseln(fp, &len, &lineno, NULL, 0)) != NULL) {
if (strncmp(s, "group", 5) == 0) {
- for (cp = s + 5 ; *cp && isspace(*cp) ; cp++) {
+ for (cp = s + 5 ; isspace(*cp) ; cp++) {
}
memsave(&up->u_primgrp, cp, strlen(cp));
} else if (strncmp(s, "base_dir", 8) == 0) {
- for (cp = s + 8 ; *cp && isspace(*cp) ; cp++) {
+ for (cp = s + 8 ; isspace(*cp) ; cp++) {
}
memsave(&up->u_basedir, cp, strlen(cp));
} else if (strncmp(s, "skel_dir", 8) == 0) {
- for (cp = s + 8 ; *cp && isspace(*cp) ; cp++) {
+ for (cp = s + 8 ; isspace(*cp) ; cp++) {
}
memsave(&up->u_skeldir, cp, strlen(cp));
} else if (strncmp(s, "shell", 5) == 0) {
- for (cp = s + 5 ; *cp && isspace(*cp) ; cp++) {
+ for (cp = s + 5 ; isspace(*cp) ; cp++) {
}
memsave(&up->u_shell, cp, strlen(cp));
} else if (strncmp(s, "password", 8) == 0) {
- for (cp = s + 8 ; *cp && isspace(*cp) ; cp++) {
+ for (cp = s + 8 ; isspace(*cp) ; cp++) {
}
memsave(&up->u_password, cp, strlen(cp));
#ifdef EXTENSIONS
} else if (strncmp(s, "class", 5) == 0) {
- for (cp = s + 5 ; *cp && isspace(*cp) ; cp++) {
+ for (cp = s + 5 ; isspace(*cp) ; cp++) {
}
memsave(&up->u_class, cp, strlen(cp));
#endif
} else if (strncmp(s, "inactive", 8) == 0) {
- for (cp = s + 8 ; *cp && isspace(*cp) ; cp++) {
+ for (cp = s + 8 ; isspace(*cp) ; cp++) {
}
if (strcmp(cp, UNSET_INACTIVE) == 0) {
if (up->u_inactive) {
@@ -806,20 +806,20 @@ read_defaults(user_t *up)
}
#ifdef EXTENSIONS
} else if (strncmp(s, "range", 5) == 0) {
- for (cp = s + 5 ; *cp && isspace(*cp) ; cp++) {
+ for (cp = s + 5 ; isspace(*cp) ; cp++) {
}
(void) save_range(up, cp);
#endif
#ifdef EXTENSIONS
} else if (strncmp(s, "preserve", 8) == 0) {
- for (cp = s + 8 ; *cp && isspace(*cp) ; cp++) {
+ for (cp = s + 8 ; isspace(*cp) ; cp++) {
}
up->u_preserve = (strncmp(cp, "true", 4) == 0) ? 1 :
(strncmp(cp, "yes", 3) == 0) ? 1 :
atoi(cp);
#endif
} else if (strncmp(s, "expire", 6) == 0) {
- for (cp = s + 6 ; *cp && isspace(*cp) ; cp++) {
+ for (cp = s + 6 ; isspace(*cp) ; cp++) {
}
if (strcmp(cp, UNSET_EXPIRY) == 0) {
if (up->u_expire) {