View | Details | Raw Unified | Return to bug 223431 | Differences between
and this patch

Collapse All | Expand All

(-)b/usr.sbin/pw/pw_user.c (-3 / +13 lines)
Lines 22-28 Link Here
22
 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
22
 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
23
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24
 * SUCH DAMAGE.
24
 * SUCH DAMAGE.
25
 * 
25
 *
26
 */
26
 */
27
27
28
#ifndef lint
28
#ifndef lint
Lines 1182-1187 pw_user_add(int argc, char **argv, char *arg1) Link Here
1182
	char *gecos, *homedir, *skel, *walk, *userid, *groupid, *grname;
1182
	char *gecos, *homedir, *skel, *walk, *userid, *groupid, *grname;
1183
	char *default_passwd, *name, *p;
1183
	char *default_passwd, *name, *p;
1184
	const char *cfg = NULL;
1184
	const char *cfg = NULL;
1185
	const char *errstr;
1185
	login_cap_t *lc;
1186
	login_cap_t *lc;
1186
	FILE *pfp, *fp;
1187
	FILE *pfp, *fp;
1187
	intmax_t id = -1;
1188
	intmax_t id = -1;
Lines 1226-1233 pw_user_add(int argc, char **argv, char *arg1) Link Here
1226
			homedir = optarg;
1227
			homedir = optarg;
1227
			break;
1228
			break;
1228
		case 'e':
1229
		case 'e':
1229
			now = time(NULL);
1230
			if (genconf) {
1230
			cmdcnf->expire_days = parse_date(now, optarg);
1231
				cmdcnf->expire_days = strtonum(optarg, 1,
1232
				    INT_MAX, &errstr);
1233
				if (cmdcnf->expire_days < 0 || errstr != NULL) {
1234
					errx(EX_USAGE, "argument to -e must be "
1235
					    "numeric if -D is specified");
1236
				}
1237
			} else {
1238
				now = time(NULL);
1239
				cmdcnf->expire_days = parse_date(now, optarg);
1240
			}
1231
			break;
1241
			break;
1232
		case 'p':
1242
		case 'p':
1233
			now = time(NULL);
1243
			now = time(NULL);

Return to bug 223431