Deleted Added
sdiff udiff text old ( 20253 ) new ( 20267 )
full compact
pw_user.c (20253) pw_user.c (20267)
1/*-
2 * Copyright (c) 1996 by David L. Nugent <davidn@blaze.net.au>.
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 99 unchanged lines hidden (view full) ---

108 "",
109 "User &",
110 "/bin/sh",
111 0,
112 0
113 };
114
115 /*
1/*-
2 * Copyright (c) 1996 by David L. Nugent <davidn@blaze.net.au>.
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 99 unchanged lines hidden (view full) ---

108 "",
109 "User &",
110 "/bin/sh",
111 0,
112 0
113 };
114
115 /*
116 * With M_NEXT, we only need to return the
117 * next uid to stdout
118 */
119 if (mode == M_NEXT)
120 {
121 uid_t next = pw_uidpolicy(cnf, args);
122 if (getarg(args, 'q'))
123 return next;
124 printf("%ld:", (long)next);
125 pw_group(cnf, mode, args);
126 return EXIT_SUCCESS;
127 }
128
129 /*
116 * We can do all of the common legwork here
117 */
118
119 if ((arg = getarg(args, 'b')) != NULL) {
130 * We can do all of the common legwork here
131 */
132
133 if ((arg = getarg(args, 'b')) != NULL) {
120 if (stat(cnf->home = arg->val, &st) == -1 || S_ISDIR(st.st_mode))
121 cmderr(X_CMDERR, "root home `%s' is not a directory or does not exist\n", cnf->home);
134 cnf->home = arg->val;
135 if (stat(cnf->home, &st) == -1 || !S_ISDIR(st.st_mode))
136 cmderr(EX_OSFILE, "root home `%s' is not a directory or does not exist\n", cnf->home);
122 }
123 if ((arg = getarg(args, 'e')) != NULL)
124 cnf->expire_days = atoi(arg->val);
125
126 if ((arg = getarg(args, 'p')) != NULL && arg->val)
127 cnf->password_days = atoi(arg->val);
128
129 if ((arg = getarg(args, 'g')) != NULL) {
130 p = arg->val;
131 if ((grp = getgrnam(p)) == NULL) {
132 if (!isdigit(*p) || (grp = getgrgid((gid_t) atoi(p))) == NULL)
137 }
138 if ((arg = getarg(args, 'e')) != NULL)
139 cnf->expire_days = atoi(arg->val);
140
141 if ((arg = getarg(args, 'p')) != NULL && arg->val)
142 cnf->password_days = atoi(arg->val);
143
144 if ((arg = getarg(args, 'g')) != NULL) {
145 p = arg->val;
146 if ((grp = getgrnam(p)) == NULL) {
147 if (!isdigit(*p) || (grp = getgrgid((gid_t) atoi(p))) == NULL)
133 cmderr(X_NOTFOUND, "group `%s' does not exist\n", p);
148 cmderr(EX_NOUSER, "group `%s' does not exist\n", p);
134 }
135 cnf->default_group = newstr(grp->gr_name);
136 }
137 if ((arg = getarg(args, 'L')) != NULL)
138 cnf->default_class = pw_checkname(arg->val, 0);
139
140 if ((arg = getarg(args, 'G')) != NULL && arg->val) {
141 int i = 0;
142
143 for (p = strtok(arg->val, ", \t"); i < _UC_MAXGROUPS && p != NULL; p = strtok(NULL, ", \t")) {
144 if ((grp = getgrnam(p)) == NULL) {
145 if (!isdigit(*p) || (grp = getgrgid((gid_t) atoi(p))) == NULL)
149 }
150 cnf->default_group = newstr(grp->gr_name);
151 }
152 if ((arg = getarg(args, 'L')) != NULL)
153 cnf->default_class = pw_checkname(arg->val, 0);
154
155 if ((arg = getarg(args, 'G')) != NULL && arg->val) {
156 int i = 0;
157
158 for (p = strtok(arg->val, ", \t"); i < _UC_MAXGROUPS && p != NULL; p = strtok(NULL, ", \t")) {
159 if ((grp = getgrnam(p)) == NULL) {
160 if (!isdigit(*p) || (grp = getgrgid((gid_t) atoi(p))) == NULL)
146 cmderr(X_NOTFOUND, "group `%s' does not exist\n", p);
161 cmderr(EX_NOUSER, "group `%s' does not exist\n", p);
147 }
148 cnf->groups[i++] = newstr(grp->gr_name);
149 }
150 while (i < _UC_MAXGROUPS)
151 cnf->groups[i++] = NULL;
152 }
153 if ((arg = getarg(args, 'k')) != NULL) {
154 if (stat(cnf->dotdir = arg->val, &st) == -1 || S_ISDIR(st.st_mode))
162 }
163 cnf->groups[i++] = newstr(grp->gr_name);
164 }
165 while (i < _UC_MAXGROUPS)
166 cnf->groups[i++] = NULL;
167 }
168 if ((arg = getarg(args, 'k')) != NULL) {
169 if (stat(cnf->dotdir = arg->val, &st) == -1 || S_ISDIR(st.st_mode))
155 cmderr(X_CMDERR, "skeleton `%s' is not a directory or does not exist\n", cnf->dotdir);
170 cmderr(EX_OSFILE, "skeleton `%s' is not a directory or does not exist\n", cnf->dotdir);
156 }
157 if ((arg = getarg(args, 's')) != NULL)
158 cnf->shell_default = arg->val;
159
160 if (mode == M_ADD && getarg(args, 'D')) {
161 if (getarg(args, 'n') != NULL)
171 }
172 if ((arg = getarg(args, 's')) != NULL)
173 cnf->shell_default = arg->val;
174
175 if (mode == M_ADD && getarg(args, 'D')) {
176 if (getarg(args, 'n') != NULL)
162 cmderr(X_CMDERR, "can't combine `-D' with `-n name'\n");
177 cmderr(EX_DATAERR, "can't combine `-D' with `-n name'\n");
163 if ((arg = getarg(args, 'u')) != NULL && (p = strtok(arg->val, ", \t")) != NULL) {
164 if ((cnf->min_uid = (uid_t) atoi(p)) == 0)
165 cnf->min_uid = 1000;
166 if ((p = strtok(NULL, " ,\t")) == NULL || (cnf->max_uid = (uid_t) atoi(p)) < cnf->min_uid)
167 cnf->max_uid = 32000;
168 }
169 if ((arg = getarg(args, 'i')) != NULL && (p = strtok(arg->val, ", \t")) != NULL) {
170 if ((cnf->min_gid = (gid_t) atoi(p)) == 0)
171 cnf->min_gid = 1000;
172 if ((p = strtok(NULL, " ,\t")) == NULL || (cnf->max_gid = (gid_t) atoi(p)) < cnf->min_gid)
173 cnf->max_gid = 32000;
174 }
175 if ((arg = getarg(args, 'w')) != NULL)
176 cnf->default_password = boolean_val(arg->val, cnf->default_password);
177
178 arg = getarg(args, 'C');
179 if (write_userconfig(arg ? arg->val : NULL))
178 if ((arg = getarg(args, 'u')) != NULL && (p = strtok(arg->val, ", \t")) != NULL) {
179 if ((cnf->min_uid = (uid_t) atoi(p)) == 0)
180 cnf->min_uid = 1000;
181 if ((p = strtok(NULL, " ,\t")) == NULL || (cnf->max_uid = (uid_t) atoi(p)) < cnf->min_uid)
182 cnf->max_uid = 32000;
183 }
184 if ((arg = getarg(args, 'i')) != NULL && (p = strtok(arg->val, ", \t")) != NULL) {
185 if ((cnf->min_gid = (gid_t) atoi(p)) == 0)
186 cnf->min_gid = 1000;
187 if ((p = strtok(NULL, " ,\t")) == NULL || (cnf->max_gid = (gid_t) atoi(p)) < cnf->min_gid)
188 cnf->max_gid = 32000;
189 }
190 if ((arg = getarg(args, 'w')) != NULL)
191 cnf->default_password = boolean_val(arg->val, cnf->default_password);
192
193 arg = getarg(args, 'C');
194 if (write_userconfig(arg ? arg->val : NULL))
180 return X_ALLOK;
195 return EXIT_SUCCESS;
181 perror("config update");
196 perror("config update");
182 return X_UPDERROR;
197 return EX_IOERR;
183 }
184 if (mode == M_PRINT && getarg(args, 'a')) {
198 }
199 if (mode == M_PRINT && getarg(args, 'a')) {
185 int pretty = getarg(args, 'p') != NULL;
200 int pretty = getarg(args, 'P') != NULL;
186
187 setpwent();
188 while ((pwd = getpwent()) != NULL)
189 print_user(pwd, pretty);
190 endpwent();
201
202 setpwent();
203 while ((pwd = getpwent()) != NULL)
204 print_user(pwd, pretty);
205 endpwent();
191 return X_ALLOK;
206 return EXIT_SUCCESS;
192 }
193 if ((a_name = getarg(args, 'n')) != NULL)
194 pwd = getpwnam(pw_checkname(a_name->val, 0));
195 a_uid = getarg(args, 'u');
196
197 if (a_uid == NULL) {
198 if (a_name == NULL)
207 }
208 if ((a_name = getarg(args, 'n')) != NULL)
209 pwd = getpwnam(pw_checkname(a_name->val, 0));
210 a_uid = getarg(args, 'u');
211
212 if (a_uid == NULL) {
213 if (a_name == NULL)
199 cmderr(X_CMDERR, "user name or id required\n");
214 cmderr(EX_DATAERR, "user name or id required\n");
200
201 /*
202 * Determine whether 'n' switch is name or uid - we don't
203 * really don't really care which we have, but we need to
204 * know.
205 */
206 if (mode != M_ADD && pwd == NULL && isdigit(*a_name->val) && atoi(a_name->val) > 0) { /* Assume uid */
207 (a_uid = a_name)->ch = 'u';

--- 6 unchanged lines hidden (view full) ---

214 if (mode == M_UPDATE || mode == M_DELETE || mode == M_PRINT) {
215 if (a_name == NULL && pwd == NULL) /* Try harder */
216 pwd = getpwuid(atoi(a_uid->val));
217
218 if (pwd == NULL) {
219 if (mode == M_PRINT && getarg(args, 'F')) {
220 fakeuser.pw_name = a_name ? a_name->val : "nouser";
221 fakeuser.pw_uid = a_uid ? (uid_t) atol(a_uid->val) : -1;
215
216 /*
217 * Determine whether 'n' switch is name or uid - we don't
218 * really don't really care which we have, but we need to
219 * know.
220 */
221 if (mode != M_ADD && pwd == NULL && isdigit(*a_name->val) && atoi(a_name->val) > 0) { /* Assume uid */
222 (a_uid = a_name)->ch = 'u';

--- 6 unchanged lines hidden (view full) ---

229 if (mode == M_UPDATE || mode == M_DELETE || mode == M_PRINT) {
230 if (a_name == NULL && pwd == NULL) /* Try harder */
231 pwd = getpwuid(atoi(a_uid->val));
232
233 if (pwd == NULL) {
234 if (mode == M_PRINT && getarg(args, 'F')) {
235 fakeuser.pw_name = a_name ? a_name->val : "nouser";
236 fakeuser.pw_uid = a_uid ? (uid_t) atol(a_uid->val) : -1;
222 return print_user(&fakeuser, getarg(args, 'p') != NULL);
237 return print_user(&fakeuser, getarg(args, 'P') != NULL);
223 }
224 if (a_name == NULL)
238 }
239 if (a_name == NULL)
225 cmderr(X_NOTFOUND, "no such uid `%s'\n", a_uid->val);
226 cmderr(X_NOTFOUND, "no such user `%s'\n", a_name->val);
240 cmderr(EX_NOUSER, "no such uid `%s'\n", a_uid->val);
241 cmderr(EX_NOUSER, "no such user `%s'\n", a_name->val);
227 }
228 if (a_name == NULL) /* May be needed later */
229 a_name = addarg(args, 'n', newstr(pwd->pw_name));
230
231 /*
232 * Handle deletions now
233 */
234 if (mode == M_DELETE) {
235 char file[MAXPATHLEN];
236 char home[MAXPATHLEN];
237 uid_t uid = pwd->pw_uid;
238
239 if (strcmp(pwd->pw_name, "root") == 0)
242 }
243 if (a_name == NULL) /* May be needed later */
244 a_name = addarg(args, 'n', newstr(pwd->pw_name));
245
246 /*
247 * Handle deletions now
248 */
249 if (mode == M_DELETE) {
250 char file[MAXPATHLEN];
251 char home[MAXPATHLEN];
252 uid_t uid = pwd->pw_uid;
253
254 if (strcmp(pwd->pw_name, "root") == 0)
240 cmderr(X_CMDERR, "cannot remove user 'root'\n");
255 cmderr(EX_DATAERR, "cannot remove user 'root'\n");
241
242 /*
243 * Remove crontabs
244 */
245 sprintf(file, "/var/cron/tabs/%s", pwd->pw_name);
246 if (access(file, F_OK) == 0) {
247 sprintf(file, "crontab -u %s -r", pwd->pw_name);
248 system(file);
249 }
250 /*
251 * Save these for later, since contents of pwd may be
252 * invalidated by deletion
253 */
254 sprintf(file, "%s/%s", _PATH_MAILDIR, pwd->pw_name);
255 strncpy(home, pwd->pw_dir, sizeof home);
256 home[sizeof home - 1] = '\0';
257
258 if (!delpwent(pwd))
256
257 /*
258 * Remove crontabs
259 */
260 sprintf(file, "/var/cron/tabs/%s", pwd->pw_name);
261 if (access(file, F_OK) == 0) {
262 sprintf(file, "crontab -u %s -r", pwd->pw_name);
263 system(file);
264 }
265 /*
266 * Save these for later, since contents of pwd may be
267 * invalidated by deletion
268 */
269 sprintf(file, "%s/%s", _PATH_MAILDIR, pwd->pw_name);
270 strncpy(home, pwd->pw_dir, sizeof home);
271 home[sizeof home - 1] = '\0';
272
273 if (!delpwent(pwd))
259 cmderr(X_NOUPDATE, "Error updating passwd file: %s\n", strerror(errno));
274 cmderr(EX_IOERR, "Error updating passwd file: %s\n", strerror(errno));
260 editgroups(a_name->val, NULL);
261
262 pw_log(cnf, mode, W_USER, "%s(%ld) account removed", a_name->val, (long) uid);
263
264 /*
265 * Remove mail file
266 */
267 remove(file);

--- 10 unchanged lines hidden (view full) ---

278 if (getarg(args, 'r') != NULL && *home == '/' && getpwuid(uid) == NULL) {
279 if (stat(home, &st) != -1) {
280 rm_r(home, uid);
281 pw_log(cnf, mode, W_USER, "%s(%ld) home '%s' %sremoved",
282 a_name->val, (long) uid, home,
283 stat(home, &st) == -1 ? "" : "not completely ");
284 }
285 }
275 editgroups(a_name->val, NULL);
276
277 pw_log(cnf, mode, W_USER, "%s(%ld) account removed", a_name->val, (long) uid);
278
279 /*
280 * Remove mail file
281 */
282 remove(file);

--- 10 unchanged lines hidden (view full) ---

293 if (getarg(args, 'r') != NULL && *home == '/' && getpwuid(uid) == NULL) {
294 if (stat(home, &st) != -1) {
295 rm_r(home, uid);
296 pw_log(cnf, mode, W_USER, "%s(%ld) home '%s' %sremoved",
297 a_name->val, (long) uid, home,
298 stat(home, &st) == -1 ? "" : "not completely ");
299 }
300 }
286 return X_ALLOK;
301 return EXIT_SUCCESS;
287 } else if (mode == M_PRINT)
302 } else if (mode == M_PRINT)
288 return print_user(pwd, getarg(args, 'p') != NULL);
303 return print_user(pwd, getarg(args, 'P') != NULL);
289
290 /*
291 * The rest is edit code
292 */
293 if ((arg = getarg(args, 'l')) != NULL) {
294 if (strcmp(pwd->pw_name, "root") == 0)
304
305 /*
306 * The rest is edit code
307 */
308 if ((arg = getarg(args, 'l')) != NULL) {
309 if (strcmp(pwd->pw_name, "root") == 0)
295 cmderr(X_CMDERR, "can't rename `root' account\n");
310 cmderr(EX_DATAERR, "can't rename `root' account\n");
296 pwd->pw_name = pw_checkname(arg->val, 0);
297 }
298 if ((arg = getarg(args, 'u')) != NULL && isdigit(*arg->val)) {
299 pwd->pw_uid = (uid_t) atol(arg->val);
300 if (pwd->pw_uid != 0 && strcmp(pwd->pw_name, "root") == 0)
311 pwd->pw_name = pw_checkname(arg->val, 0);
312 }
313 if ((arg = getarg(args, 'u')) != NULL && isdigit(*arg->val)) {
314 pwd->pw_uid = (uid_t) atol(arg->val);
315 if (pwd->pw_uid != 0 && strcmp(pwd->pw_name, "root") == 0)
301 cmderr(X_CMDERR, "can't change uid of `root' account\n");
316 cmderr(EX_DATAERR, "can't change uid of `root' account\n");
302 if (pwd->pw_uid == 0 && strcmp(pwd->pw_name, "root") != 0)
303 fprintf(stderr, "WARNING: account `%s' will have a uid of 0 (superuser access!)\n", pwd->pw_name);
304 }
305 if ((arg = getarg(args, 'g')) != NULL && pwd->pw_uid != 0) /* Already checked this */
306 pwd->pw_gid = (gid_t) getgrnam(cnf->default_group)->gr_gid;
307
308 if ((arg = getarg(args, 'p')) != NULL) {
309 if (*arg->val == '\0' || strcmp(arg->val, "0") == 0)
310 pwd->pw_change = 0;
311 else {
312 time_t now = time(NULL);
313 time_t expire = parse_date(now, arg->val);
314
315 if (now == expire)
317 if (pwd->pw_uid == 0 && strcmp(pwd->pw_name, "root") != 0)
318 fprintf(stderr, "WARNING: account `%s' will have a uid of 0 (superuser access!)\n", pwd->pw_name);
319 }
320 if ((arg = getarg(args, 'g')) != NULL && pwd->pw_uid != 0) /* Already checked this */
321 pwd->pw_gid = (gid_t) getgrnam(cnf->default_group)->gr_gid;
322
323 if ((arg = getarg(args, 'p')) != NULL) {
324 if (*arg->val == '\0' || strcmp(arg->val, "0") == 0)
325 pwd->pw_change = 0;
326 else {
327 time_t now = time(NULL);
328 time_t expire = parse_date(now, arg->val);
329
330 if (now == expire)
316 cmderr(X_CMDERR, "Invalid password change date `%s'\n", arg->val);
331 cmderr(EX_DATAERR, "Invalid password change date `%s'\n", arg->val);
317 pwd->pw_change = expire;
318 }
319 }
332 pwd->pw_change = expire;
333 }
334 }
320 if ((arg = getarg(args, 'p')) != NULL) {
335 if ((arg = getarg(args, 'e')) != NULL) {
321 if (*arg->val == '\0' || strcmp(arg->val, "0") == 0)
322 pwd->pw_expire = 0;
323 else {
324 time_t now = time(NULL);
325 time_t expire = parse_date(now, arg->val);
326
327 if (now == expire)
336 if (*arg->val == '\0' || strcmp(arg->val, "0") == 0)
337 pwd->pw_expire = 0;
338 else {
339 time_t now = time(NULL);
340 time_t expire = parse_date(now, arg->val);
341
342 if (now == expire)
328 cmderr(X_CMDERR, "Invalid password change date `%s'\n", arg->val);
343 cmderr(EX_DATAERR, "Invalid account expiry date `%s'\n", arg->val);
329 pwd->pw_expire = expire;
330 }
331 }
332 if ((arg = getarg(args, 's')) != NULL)
333 pwd->pw_shell = shell_path(cnf->shelldir, cnf->shells, arg->val);
334
335 if (getarg(args, 'L'))
336 pwd->pw_class = cnf->default_class;
337
344 pwd->pw_expire = expire;
345 }
346 }
347 if ((arg = getarg(args, 's')) != NULL)
348 pwd->pw_shell = shell_path(cnf->shelldir, cnf->shells, arg->val);
349
350 if (getarg(args, 'L'))
351 pwd->pw_class = cnf->default_class;
352
353 if ((arg = getarg(args, 'w')) != NULL && getarg(args, 'h') == NULL)
354 pwd->pw_passwd = pw_password(cnf, args, pwd->pw_name);
355
338 } else {
339 if (a_name == NULL) /* Required */
356 } else {
357 if (a_name == NULL) /* Required */
340 cmderr(X_CMDERR, "login name required\n");
358 cmderr(EX_DATAERR, "login name required\n");
341 else if ((pwd = getpwnam(a_name->val)) != NULL) /* Exists */
359 else if ((pwd = getpwnam(a_name->val)) != NULL) /* Exists */
342 cmderr(X_EXISTS, "login name `%s' already exists\n", a_name->val);
360 cmderr(EX_DATAERR, "login name `%s' already exists\n", a_name->val);
343
344 /*
345 * Now, set up defaults for a new user
346 */
347 pwd = &fakeuser;
348 pwd->pw_name = a_name->val;
349 pwd->pw_class = cnf->default_class ? cnf->default_class : "";
350 pwd->pw_passwd = pw_password(cnf, args, pwd->pw_name);

--- 39 unchanged lines hidden (view full) ---

390 b = read(fd, line, sizeof(line) - 1);
391 if (istty) { /* Restore state */
392 tcsetattr(fd, TCSANOW, &t);
393 fputc('\n', stdout);
394 fflush(stdout);
395 }
396 if (b < 0) {
397 perror("-h file descriptor");
361
362 /*
363 * Now, set up defaults for a new user
364 */
365 pwd = &fakeuser;
366 pwd->pw_name = a_name->val;
367 pwd->pw_class = cnf->default_class ? cnf->default_class : "";
368 pwd->pw_passwd = pw_password(cnf, args, pwd->pw_name);

--- 39 unchanged lines hidden (view full) ---

408 b = read(fd, line, sizeof(line) - 1);
409 if (istty) { /* Restore state */
410 tcsetattr(fd, TCSANOW, &t);
411 fputc('\n', stdout);
412 fflush(stdout);
413 }
414 if (b < 0) {
415 perror("-h file descriptor");
398 return X_CMDERR;
416 return EX_IOERR;
399 }
400 line[b] = '\0';
401 if ((p = strpbrk(line, " \t\r\n")) != NULL)
402 *p = '\0';
403 if (!*line)
417 }
418 line[b] = '\0';
419 if ((p = strpbrk(line, " \t\r\n")) != NULL)
420 *p = '\0';
421 if (!*line)
404 cmderr(X_CMDERR, "empty password read on file descriptor %d\n", fd);
422 cmderr(EX_DATAERR, "empty password read on file descriptor %d\n", fd);
405 pwd->pw_passwd = pw_pwcrypt(line);
406 }
407 }
423 pwd->pw_passwd = pw_pwcrypt(line);
424 }
425 }
426
427 /*
428 * Special case: -N only displays & exits
429 */
430 if (getarg(args, 'N') != NULL)
431 return print_user(pwd, getarg(args, 'P') != NULL);
432
408 if ((mode == M_ADD && !addpwent(pwd)) ||
409 (mode == M_UPDATE && !chgpwent(a_name->val, pwd))) {
410 perror("password update");
433 if ((mode == M_ADD && !addpwent(pwd)) ||
434 (mode == M_UPDATE && !chgpwent(a_name->val, pwd))) {
435 perror("password update");
411 return X_NOUPDATE;
436 return EX_IOERR;
412 }
413 /*
414 * Ok, user is created or changed - now edit group file
415 */
416
417 if (mode == M_ADD || getarg(args, 'G') != NULL)
418 editgroups(pwd->pw_name, cnf->groups);
419
420 /* pwd may have been invalidated */
421 if ((pwd = getpwnam(a_name->val)) == NULL)
437 }
438 /*
439 * Ok, user is created or changed - now edit group file
440 */
441
442 if (mode == M_ADD || getarg(args, 'G') != NULL)
443 editgroups(pwd->pw_name, cnf->groups);
444
445 /* pwd may have been invalidated */
446 if ((pwd = getpwnam(a_name->val)) == NULL)
422 cmderr(X_NOTFOUND, "user '%s' disappeared during update\n", a_name->val);
447 cmderr(EX_NOUSER, "user '%s' disappeared during update\n", a_name->val);
423
424 grp = getgrgid(pwd->pw_gid);
425 pw_log(cnf, mode, W_USER, "%s(%ld):%s(%d):%s:%s:%s",
426 pwd->pw_name, (long) pwd->pw_uid,
427 grp ? grp->gr_name : "unknown", (long) (grp ? grp->gr_gid : -1),
428 pwd->pw_gecos, pwd->pw_dir, pwd->pw_shell);
429
430 /*

--- 35 unchanged lines hidden (view full) ---

466 * that this also `works' for editing users if -m is used, but
467 * existing files will *not* be overwritten.
468 */
469 if (getarg(args, 'm') != NULL && pwd->pw_dir && *pwd->pw_dir == '/' && pwd->pw_dir[1]) {
470 copymkdir(pwd->pw_dir, cnf->dotdir, 0755, pwd->pw_uid, pwd->pw_gid);
471 pw_log(cnf, mode, W_USER, "%s(%ld) home %s made",
472 pwd->pw_name, (long) pwd->pw_uid, pwd->pw_dir);
473 }
448
449 grp = getgrgid(pwd->pw_gid);
450 pw_log(cnf, mode, W_USER, "%s(%ld):%s(%d):%s:%s:%s",
451 pwd->pw_name, (long) pwd->pw_uid,
452 grp ? grp->gr_name : "unknown", (long) (grp ? grp->gr_gid : -1),
453 pwd->pw_gecos, pwd->pw_dir, pwd->pw_shell);
454
455 /*

--- 35 unchanged lines hidden (view full) ---

491 * that this also `works' for editing users if -m is used, but
492 * existing files will *not* be overwritten.
493 */
494 if (getarg(args, 'm') != NULL && pwd->pw_dir && *pwd->pw_dir == '/' && pwd->pw_dir[1]) {
495 copymkdir(pwd->pw_dir, cnf->dotdir, 0755, pwd->pw_uid, pwd->pw_gid);
496 pw_log(cnf, mode, W_USER, "%s(%ld) home %s made",
497 pwd->pw_name, (long) pwd->pw_uid, pwd->pw_dir);
498 }
474 return X_ALLOK;
499 return EXIT_SUCCESS;
475}
476
477
478static uid_t
479pw_uidpolicy(struct userconf * cnf, struct cargs * args)
480{
481 struct passwd *pwd;
482 uid_t uid = (uid_t) - 1;
483 struct carg *a_uid = getarg(args, 'u');
484
485 /*
486 * Check the given uid, if any
487 */
488 if (a_uid != NULL) {
489 uid = (uid_t) atol(a_uid->val);
490
491 if ((pwd = getpwuid(uid)) != NULL && getarg(args, 'o') == NULL)
500}
501
502
503static uid_t
504pw_uidpolicy(struct userconf * cnf, struct cargs * args)
505{
506 struct passwd *pwd;
507 uid_t uid = (uid_t) - 1;
508 struct carg *a_uid = getarg(args, 'u');
509
510 /*
511 * Check the given uid, if any
512 */
513 if (a_uid != NULL) {
514 uid = (uid_t) atol(a_uid->val);
515
516 if ((pwd = getpwuid(uid)) != NULL && getarg(args, 'o') == NULL)
492 cmderr(X_EXISTS, "uid `%ld' has already been allocated\n", (long) pwd->pw_uid);
517 cmderr(EX_DATAERR, "uid `%ld' has already been allocated\n", (long) pwd->pw_uid);
493 } else {
494 struct bitmap bm;
495
496 /*
497 * We need to allocate the next available uid under one of
498 * two policies a) Grab the first unused uid b) Grab the
499 * highest possible unused uid
500 */

--- 18 unchanged lines hidden (view full) ---

519 */
520 if (cnf->reuse_uids || (uid = (uid_t) (bm_lastset(&bm) + cnf->min_uid + 1)) > cnf->max_uid)
521 uid = (uid_t) (bm_firstunset(&bm) + cnf->min_uid);
522
523 /*
524 * Another sanity check
525 */
526 if (uid < cnf->min_uid || uid > cnf->max_uid)
518 } else {
519 struct bitmap bm;
520
521 /*
522 * We need to allocate the next available uid under one of
523 * two policies a) Grab the first unused uid b) Grab the
524 * highest possible unused uid
525 */

--- 18 unchanged lines hidden (view full) ---

544 */
545 if (cnf->reuse_uids || (uid = (uid_t) (bm_lastset(&bm) + cnf->min_uid + 1)) > cnf->max_uid)
546 uid = (uid_t) (bm_firstunset(&bm) + cnf->min_uid);
547
548 /*
549 * Another sanity check
550 */
551 if (uid < cnf->min_uid || uid > cnf->max_uid)
527 cmderr(X_EXISTS, "unable to allocate a new uid - range fully used\n");
552 cmderr(EX_SOFTWARE, "unable to allocate a new uid - range fully used\n");
528 bm_dealloc(&bm);
529 }
530 return uid;
531}
532
533
534static uid_t
535pw_gidpolicy(struct userconf * cnf, struct cargs * args, char *nam, gid_t prefer)

--- 6 unchanged lines hidden (view full) ---

542 * If no arg given, see if default can help out
543 */
544 if (a_gid == NULL && cnf->default_group && *cnf->default_group)
545 a_gid = addarg(args, 'g', cnf->default_group);
546
547 /*
548 * Check the given gid, if any
549 */
553 bm_dealloc(&bm);
554 }
555 return uid;
556}
557
558
559static uid_t
560pw_gidpolicy(struct userconf * cnf, struct cargs * args, char *nam, gid_t prefer)

--- 6 unchanged lines hidden (view full) ---

567 * If no arg given, see if default can help out
568 */
569 if (a_gid == NULL && cnf->default_group && *cnf->default_group)
570 a_gid = addarg(args, 'g', cnf->default_group);
571
572 /*
573 * Check the given gid, if any
574 */
575 setgrent();
550 if (a_gid != NULL) {
576 if (a_gid != NULL) {
551 setgrent();
552 if ((grp = getgrnam(a_gid->val)) == NULL) {
553 gid = (gid_t) atol(a_gid->val);
554 if ((gid == 0 && !isdigit(*a_gid->val)) || (grp = getgrgid(gid)) == NULL)
577 if ((grp = getgrnam(a_gid->val)) == NULL) {
578 gid = (gid_t) atol(a_gid->val);
579 if ((gid == 0 && !isdigit(*a_gid->val)) || (grp = getgrgid(gid)) == NULL)
555 cmderr(X_NOTFOUND, "group `%s' is not defined\n", a_gid->val);
580 cmderr(EX_NOUSER, "group `%s' is not defined\n", a_gid->val);
556 }
581 }
557 endgrent();
558 gid = grp->gr_gid;
582 gid = grp->gr_gid;
583 } else if ((grp = getgrnam(nam)) != NULL && grp->gr_mem[0] == NULL) {
584 gid = grp->gr_gid; /* Already created? Use it anyway... */
559 } else {
560 struct cargs grpargs;
561 char tmp[32];
562
563 LIST_INIT(&grpargs);
564 addarg(&grpargs, 'n', nam);
565
566 /*

--- 4 unchanged lines hidden (view full) ---

571 * NOT check the gid range if we can force the sync. If the
572 * user's name dups an existing group, then the group add
573 * function will happily handle that case for us and exit.
574 */
575 if (getgrgid(prefer) == NULL) {
576 sprintf(tmp, "%lu", (unsigned long) prefer);
577 addarg(&grpargs, 'g', tmp);
578 }
585 } else {
586 struct cargs grpargs;
587 char tmp[32];
588
589 LIST_INIT(&grpargs);
590 addarg(&grpargs, 'n', nam);
591
592 /*

--- 4 unchanged lines hidden (view full) ---

597 * NOT check the gid range if we can force the sync. If the
598 * user's name dups an existing group, then the group add
599 * function will happily handle that case for us and exit.
600 */
601 if (getgrgid(prefer) == NULL) {
602 sprintf(tmp, "%lu", (unsigned long) prefer);
603 addarg(&grpargs, 'g', tmp);
604 }
579 endgrent();
580 pw_group(cnf, M_ADD, &grpargs);
605 if (getarg(args, 'N'))
606 {
607 addarg(&grpargs, 'N', NULL);
608 addarg(&grpargs, 'q', NULL);
609 gid = pw_group(cnf, M_NEXT, &grpargs);
610 }
611 else
612 {
613 pw_group(cnf, M_ADD, &grpargs);
614 if ((grp = getgrnam(nam)) != NULL)
615 gid = grp->gr_gid;
616 }
581 a_gid = grpargs.lh_first;
582 while (a_gid != NULL) {
583 struct carg *t = a_gid->list.le_next;
617 a_gid = grpargs.lh_first;
618 while (a_gid != NULL) {
619 struct carg *t = a_gid->list.le_next;
584
585 LIST_REMOVE(a_gid, list);
586 a_gid = t;
587 }
620 LIST_REMOVE(a_gid, list);
621 a_gid = t;
622 }
588 if ((grp = getgrnam(nam)) != NULL)
589 gid = grp->gr_gid;
590 }
623 }
624 endgrent();
591 return gid;
592}
593
594
595static time_t
596pw_pwdpolicy(struct userconf * cnf, struct cargs * args)
597{
598 time_t result = 0;
599 time_t now = time(NULL);
600 struct carg *arg = getarg(args, 'e');
601
602 if (arg != NULL) {
603 if ((result = parse_date(now, arg->val)) == now)
625 return gid;
626}
627
628
629static time_t
630pw_pwdpolicy(struct userconf * cnf, struct cargs * args)
631{
632 time_t result = 0;
633 time_t now = time(NULL);
634 struct carg *arg = getarg(args, 'e');
635
636 if (arg != NULL) {
637 if ((result = parse_date(now, arg->val)) == now)
604 cmderr(X_NOTFOUND, "invalid date/time `%s'\n", arg->val);
638 cmderr(EX_DATAERR, "invalid date/time `%s'\n", arg->val);
605 } else if (cnf->password_days > 0)
606 result = now + ((long) cnf->password_days * 86400L);
607 return result;
608}
609
610
611static time_t
612pw_exppolicy(struct userconf * cnf, struct cargs * args)
613{
614 time_t result = 0;
615 time_t now = time(NULL);
616 struct carg *arg = getarg(args, 'e');
617
618 if (arg != NULL) {
619 if ((result = parse_date(now, arg->val)) == now)
639 } else if (cnf->password_days > 0)
640 result = now + ((long) cnf->password_days * 86400L);
641 return result;
642}
643
644
645static time_t
646pw_exppolicy(struct userconf * cnf, struct cargs * args)
647{
648 time_t result = 0;
649 time_t now = time(NULL);
650 struct carg *arg = getarg(args, 'e');
651
652 if (arg != NULL) {
653 if ((result = parse_date(now, arg->val)) == now)
620 cmderr(X_NOTFOUND, "invalid date/time `%s'\n", arg->val);
654 cmderr(EX_DATAERR, "invalid date/time `%s'\n", arg->val);
621 } else if (cnf->expire_days > 0)
622 result = now + ((long) cnf->expire_days * 86400L);
623 return result;
624}
625
626
627static char *
628pw_homepolicy(struct userconf * cnf, struct cargs * args, char const * user)
629{
630 struct carg *arg = getarg(args, 'd');
631
632 if (arg)
633 return arg->val;
634 else {
635 static char home[128];
636
637 if (cnf->home == NULL || *cnf->home == '\0')
655 } else if (cnf->expire_days > 0)
656 result = now + ((long) cnf->expire_days * 86400L);
657 return result;
658}
659
660
661static char *
662pw_homepolicy(struct userconf * cnf, struct cargs * args, char const * user)
663{
664 struct carg *arg = getarg(args, 'd');
665
666 if (arg)
667 return arg->val;
668 else {
669 static char home[128];
670
671 if (cnf->home == NULL || *cnf->home == '\0')
638 cmderr(X_NOTFOUND, "no base home directory set\n");
672 cmderr(EX_CONFIG, "no base home directory set\n");
639 sprintf(home, "%s/%s", cnf->home, user);
640 return home;
641 }
642}
643
644static char *
645shell_path(char const * path, char *shells[], char *sh)
646{

--- 19 unchanged lines hidden (view full) ---

666 } else
667 for (i = 0; i < _UC_MAXSHELLS && shells[i] != NULL; i++) {
668 sprintf(shellpath, "%s/%s", p, shells[i]);
669 if (access(shellpath, X_OK) == 0)
670 return shellpath;
671 }
672 }
673 if (sh == NULL)
673 sprintf(home, "%s/%s", cnf->home, user);
674 return home;
675 }
676}
677
678static char *
679shell_path(char const * path, char *shells[], char *sh)
680{

--- 19 unchanged lines hidden (view full) ---

700 } else
701 for (i = 0; i < _UC_MAXSHELLS && shells[i] != NULL; i++) {
702 sprintf(shellpath, "%s/%s", p, shells[i]);
703 if (access(shellpath, X_OK) == 0)
704 return shellpath;
705 }
706 }
707 if (sh == NULL)
674 cmderr(X_CMDERR, "can't find shell `%s' in shell paths\n", sh);
675 cmderr(X_CMDERR, "no default shell available or defined\n");
708 cmderr(EX_OSFILE, "can't find shell `%s' in shell paths\n", sh);
709 cmderr(EX_CONFIG, "no default shell available or defined\n");
676 return NULL;
677 }
678}
679
680
681static char *
682pw_shellpolicy(struct userconf * cnf, struct cargs * args, char *newshell)
683{

--- 39 unchanged lines hidden (view full) ---

723 l = (random() % 8 + 8); /* 8 - 16 chars */
724 for (i = 0; i < l; i++)
725 pwbuf[i] = chars[random() % sizeof(chars)];
726 pwbuf[i] = '\0';
727
728 /*
729 * We give this information back to the user
730 */
710 return NULL;
711 }
712}
713
714
715static char *
716pw_shellpolicy(struct userconf * cnf, struct cargs * args, char *newshell)
717{

--- 39 unchanged lines hidden (view full) ---

757 l = (random() % 8 + 8); /* 8 - 16 chars */
758 for (i = 0; i < l; i++)
759 pwbuf[i] = chars[random() % sizeof(chars)];
760 pwbuf[i] = '\0';
761
762 /*
763 * We give this information back to the user
764 */
731 if (getarg(args, 'h') == NULL) {
765 if (getarg(args, 'h') == NULL && getarg(args, 'N') == NULL) {
732 if (isatty(0))
733 printf("Password is: ");
734 printf("%s\n", pwbuf);
735 fflush(stdout);
736 }
737 break;
738
739 case -2: /* No password at all! */

--- 16 unchanged lines hidden (view full) ---

756print_user(struct passwd * pwd, int pretty)
757{
758 if (!pretty) {
759 char buf[_UC_MAXLINE];
760
761 fmtpwent(buf, pwd);
762 fputs(buf, stdout);
763 } else {
766 if (isatty(0))
767 printf("Password is: ");
768 printf("%s\n", pwbuf);
769 fflush(stdout);
770 }
771 break;
772
773 case -2: /* No password at all! */

--- 16 unchanged lines hidden (view full) ---

790print_user(struct passwd * pwd, int pretty)
791{
792 if (!pretty) {
793 char buf[_UC_MAXLINE];
794
795 fmtpwent(buf, pwd);
796 fputs(buf, stdout);
797 } else {
798 int j;
764 char *p;
765 struct group *grp = getgrgid(pwd->pw_gid);
766 char uname[60] = "User &", office[60] = "[None]",
767 wphone[60] = "[None]", hphone[60] = "[None]";
768
769 if ((p = strtok(pwd->pw_gecos, ",")) != NULL) {
770 strncpy(uname, p, sizeof uname);
771 uname[sizeof uname - 1] = '\0';

--- 20 unchanged lines hidden (view full) ---

792 memmove(p + l, p + 1, m);
793 memmove(p, pwd->pw_name, l);
794 *p = (char) toupper(*p);
795 }
796 printf("Login Name : %-10s #%-22ld Group : %-10s #%ld\n"
797 " Full Name : %s\n"
798 " Home : %-32.32s Class : %s\n"
799 " Shell : %-32.32s Office : %s\n"
799 char *p;
800 struct group *grp = getgrgid(pwd->pw_gid);
801 char uname[60] = "User &", office[60] = "[None]",
802 wphone[60] = "[None]", hphone[60] = "[None]";
803
804 if ((p = strtok(pwd->pw_gecos, ",")) != NULL) {
805 strncpy(uname, p, sizeof uname);
806 uname[sizeof uname - 1] = '\0';

--- 20 unchanged lines hidden (view full) ---

827 memmove(p + l, p + 1, m);
828 memmove(p, pwd->pw_name, l);
829 *p = (char) toupper(*p);
830 }
831 printf("Login Name : %-10s #%-22ld Group : %-10s #%ld\n"
832 " Full Name : %s\n"
833 " Home : %-32.32s Class : %s\n"
834 " Shell : %-32.32s Office : %s\n"
800 "Work Phone : %-32.32s Home Phone : %s\n\n",
835 "Work Phone : %-32.32s Home Phone : %s\n",
836
801 pwd->pw_name, (long) pwd->pw_uid,
802 grp ? grp->gr_name : "(invalid)", (long) pwd->pw_gid,
803 uname, pwd->pw_dir, pwd->pw_class,
804 pwd->pw_shell, office, wphone, hphone);
837 pwd->pw_name, (long) pwd->pw_uid,
838 grp ? grp->gr_name : "(invalid)", (long) pwd->pw_gid,
839 uname, pwd->pw_dir, pwd->pw_class,
840 pwd->pw_shell, office, wphone, hphone);
841 setgrent();
842 j = 0;
843 while ((grp=getgrent()) != NULL)
844 {
845 int i = 0;
846 while (i < _UC_MAXGROUPS && grp->gr_mem[i] != NULL)
847 {
848 if (strcmp(grp->gr_mem[i], pwd->pw_name)==0)
849 {
850 printf(j++ == 0 ? " Groups : %s" : ",%s", grp->gr_name);
851 break;
852 }
853 ++i;
854 }
855 }
856 endgrent();
857 printf("%s\n", j ? "\n" : "");
805 }
858 }
806 return X_ALLOK;
859 return EXIT_SUCCESS;
807}
808
809static char *
810pw_checkname(char *name, int gecos)
811{
812 int l = 0;
813 char const *notch = gecos ? ":" : " :+-&#%$^()!@~*?<>=|\\/\"";
814
815 while (name[l]) {
816 if (strchr(notch, name[l]) != NULL || name[l] < ' ')
860}
861
862static char *
863pw_checkname(char *name, int gecos)
864{
865 int l = 0;
866 char const *notch = gecos ? ":" : " :+-&#%$^()!@~*?<>=|\\/\"";
867
868 while (name[l]) {
869 if (strchr(notch, name[l]) != NULL || name[l] < ' ')
817 cmderr(X_CMDERR, "invalid character `%c' in field\n", name[l]);
870 cmderr(EX_DATAERR, "invalid character `%c' in field\n", name[l]);
818 ++l;
819 }
820 if (!gecos && l > 8)
871 ++l;
872 }
873 if (!gecos && l > 8)
821 cmderr(X_CMDERR, "name too long `%s'\n", name);
874 cmderr(EX_DATAERR, "name too long `%s'\n", name);
822 return name;
823}
824
825
826static void
827rmat(uid_t uid)
828{
829 DIR *d = opendir("/var/at/jobs");

--- 20 unchanged lines hidden --- 		875 return name;
876}
877
878
879static void
880rmat(uid_t uid)
881{
882 DIR *d = opendir("/var/at/jobs");

--- 20 unchanged lines hidden ---