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

Collapse All | Expand All

(-)usr.sbin/pw/pw_user.c (-2 / +5 lines)
Lines 1177-1183 pw_user_add(int argc, char **argv, char Link Here
1177
	char line[_PASSWORD_LEN+1], path[MAXPATHLEN];
1177
	char line[_PASSWORD_LEN+1], path[MAXPATHLEN];
1178
	char *gecos, *homedir, *skel, *walk, *userid, *groupid, *grname;
1178
	char *gecos, *homedir, *skel, *walk, *userid, *groupid, *grname;
1179
	char *default_passwd, *name, *p;
1179
	char *default_passwd, *name, *p;
1180
	const char *cfg;
1180
	const char *cfg = NULL;
1181
	login_cap_t *lc;
1181
	login_cap_t *lc;
1182
	FILE *pfp, *fp;
1182
	FILE *pfp, *fp;
1183
	intmax_t id = -1;
1183
	intmax_t id = -1;
Lines 1356-1361 pw_user_add(int argc, char **argv, char Link Here
1356
	if (GETPWNAM(name) != NULL)
1356
	if (GETPWNAM(name) != NULL)
1357
		errx(EX_DATAERR, "login name `%s' already exists", name);
1357
		errx(EX_DATAERR, "login name `%s' already exists", name);
1358
1358
1359
	if (!grname)
1360
		grname = cmdcnf->default_group;
1361
1359
	pwd = &fakeuser;
1362
	pwd = &fakeuser;
1360
	pwd->pw_name = name;
1363
	pwd->pw_name = name;
1361
	pwd->pw_class = cmdcnf->default_class ? cmdcnf->default_class : "";
1364
	pwd->pw_class = cmdcnf->default_class ? cmdcnf->default_class : "";
Lines 1485-1491 pw_user_mod(int argc, char **argv, char Link Here
1485
	struct group *grp;
1488
	struct group *grp;
1486
	StringList *groups = NULL;
1489
	StringList *groups = NULL;
1487
	char args[] = "C:qn:u:c:d:e:p:g:G:mM:l:k:s:w:L:h:H:NPYy:";
1490
	char args[] = "C:qn:u:c:d:e:p:g:G:mM:l:k:s:w:L:h:H:NPYy:";
1488
	const char *cfg;
1491
	const char *cfg = NULL;
1489
	char *gecos, *homedir, *grname, *name, *newname, *walk, *skel, *shell;
1492
	char *gecos, *homedir, *grname, *name, *newname, *walk, *skel, *shell;
1490
	char *passwd, *class, *nispasswd;
1493
	char *passwd, *class, *nispasswd;
1491
	login_cap_t *lc;
1494
	login_cap_t *lc;

Return to bug 217934