summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2002-03-05 17:30:16 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2002-03-05 17:30:16 +0000
commita6dd6612bee7a21dbe93542e20e9d482d88ae5a4 (patch)
tree5cdbbfac2f61d3b93c070535952048d689a7e512
parent96495af16ab9fe12e249c317dc4de675ecb784ad (diff)
'user -D -k path' was not actually changing the default values unless another
option to change was specified. Also fix man page formatting mistake. From Brian Poole
-rw-r--r--usr.sbin/user/user.c3
-rw-r--r--usr.sbin/user/useradd.84
2 files changed, 4 insertions, 3 deletions
diff --git a/usr.sbin/user/user.c b/usr.sbin/user/user.c
index 66ac590a9cc..9f2a59da66d 100644
--- a/usr.sbin/user/user.c
+++ b/usr.sbin/user/user.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: user.c,v 1.29 2001/12/05 18:23:55 millert Exp $ */
+/* $OpenBSD: user.c,v 1.30 2002/03/05 17:30:15 millert Exp $ */
/* $NetBSD: user.c,v 1.45 2001/08/17 08:29:00 joda Exp $ */
/*
@@ -1298,6 +1298,7 @@ useradd(int argc, char **argv)
memsave(&u.u_primgrp, optarg, strlen(optarg));
break;
case 'k':
+ defaultfield = 1;
memsave(&u.u_skeldir, optarg, strlen(optarg));
break;
#ifdef EXTENSIONS
diff --git a/usr.sbin/user/useradd.8 b/usr.sbin/user/useradd.8
index 0c9adc7db85..b2342cd9256 100644
--- a/usr.sbin/user/useradd.8
+++ b/usr.sbin/user/useradd.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: useradd.8,v 1.11 2001/09/18 01:50:44 millert Exp $
+.\" $OpenBSD: useradd.8,v 1.12 2002/03/05 17:30:15 millert Exp $
.\" $NetBSD: useradd.8,v 1.10 2001/02/21 12:16:07 agc Exp $
.\"
.\" Copyright (c) 1999 Alistair G. Crooks. All rights reserved.
@@ -46,8 +46,8 @@
.Oo
.Fl g Ar gid | name | Li =uid Oc
.Op Fl L Ar login-class
-.Oo
.Op Fl k Ar skel-dir
+.Oo
.Fl r Ar low Ns Li .. Ns Ar high
.Oc
.Op Fl s Ar shell