diff options
| author | Igor Sobrado <sobrado@cvs.openbsd.org> | 2011-04-16 07:41:09 +0000 |
|---|---|---|
| committer | Igor Sobrado <sobrado@cvs.openbsd.org> | 2011-04-16 07:41:09 +0000 |
| commit | 8449d9a2cb53cbf612e43a66d6d442632fd4ecb5 (patch) | |
| tree | 3c4183eb69b363892523d152c845ebcbd8a4ae91 | |
| parent | cfb6b7c3f6b4ea3a0d3724c5524f5e930f4f0b3c (diff) | |
remove trailing whitespace, no binary change.
| -rw-r--r-- | usr.sbin/user/Makefile | 4 | ||||
| -rw-r--r-- | usr.sbin/user/user.c | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/usr.sbin/user/Makefile b/usr.sbin/user/Makefile index 373c45273bd..41a71e87ce1 100644 --- a/usr.sbin/user/Makefile +++ b/usr.sbin/user/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.3 2003/06/08 23:05:10 millert Exp $ +# $OpenBSD: Makefile,v 1.4 2011/04/16 07:41:08 sobrado Exp $ PROG= user SRCS= user.c main.c CFLAGS+= -DEXTENSIONS -LDADD+= -lutil +LDADD+= -lutil DPADD+= ${LIBUTIL} LINKS+= ${BINDIR}/user ${BINDIR}/useradd diff --git a/usr.sbin/user/user.c b/usr.sbin/user/user.c index 3327f75ef4a..b75d7b0469e 100644 --- a/usr.sbin/user/user.c +++ b/usr.sbin/user/user.c @@ -1,4 +1,4 @@ -/* $OpenBSD: user.c,v 1.80 2011/04/08 18:13:53 jmc Exp $ */ +/* $OpenBSD: user.c,v 1.81 2011/04/16 07:41:08 sobrado Exp $ */ /* $NetBSD: user.c,v 1.69 2003/04/14 17:40:07 agc Exp $ */ /* @@ -304,7 +304,7 @@ copydotfiles(char *skeldir, uid_t uid, gid_t gid, char *dir) if (n == 0) { warnx("No \"dot\" initialisation files found"); } else { - (void) asystem("cd %s && %s -rw -pe %s . %s", + (void) asystem("cd %s && %s -rw -pe %s . %s", skeldir, PAX, (verbose) ? "-v" : "", dir); } (void) asystem("%s -R -P %u:%u %s", CHOWN, uid, gid, dir); @@ -1025,7 +1025,7 @@ adduser(char *login_name, user_t *up) * Look for a free UID in the command line ranges (if any). * These start after the ranges specified in the config file. */ - for (i = up->u_defrc; got_id == 0 && i < up->u_rc ; i++) { + for (i = up->u_defrc; got_id == 0 && i < up->u_rc ; i++) { got_id = getnextuid(sync_uid_gid, &up->u_uid, up->u_rv[i].r_from, up->u_rv[i].r_to); } @@ -1035,7 +1035,7 @@ adduser(char *login_name, user_t *up) * be at least one default). */ if (got_id == 0) { - for (i = 0; got_id == 0 && i < up->u_defrc; i++) { + for (i = 0; got_id == 0 && i < up->u_defrc; i++) { got_id = getnextuid(sync_uid_gid, &up->u_uid, up->u_rv[i].r_from, up->u_rv[i].r_to); } @@ -1557,10 +1557,10 @@ moduser(char *login_name, char *newlogin, user_t *up) if (up == NULL) { syslog(LOG_INFO, "user removed: name=%s", login_name); } else if (strcmp(login_name, newlogin) == 0) { - syslog(LOG_INFO, "user information modified: name=%s, uid=%d, gid=%d, home=%s, shell=%s", + syslog(LOG_INFO, "user information modified: name=%s, uid=%d, gid=%d, home=%s, shell=%s", login_name, pwp->pw_uid, pwp->pw_gid, pwp->pw_dir, pwp->pw_shell); } else { - syslog(LOG_INFO, "user information modified: name=%s, new name=%s, uid=%d, gid=%d, home=%s, shell=%s", + syslog(LOG_INFO, "user information modified: name=%s, new name=%s, uid=%d, gid=%d, home=%s, shell=%s", login_name, newlogin, pwp->pw_uid, pwp->pw_gid, pwp->pw_dir, pwp->pw_shell); } return 1; |