|
 |
0d450f9 |
--- shadow-4.0.18.1/src/useradd.c.sysAccount 2007-03-12 10:49:14.000000000 +0100
|
|
|
0d450f9 |
+++ shadow-4.0.18.1/src/useradd.c 2007-03-12 12:15:57.000000000 +0100
|
|
|
0d450f9 |
@@ -854,6 +854,7 @@
|
|
|
0d450f9 |
{
|
|
|
0d450f9 |
const struct passwd *pwd;
|
|
|
0d450f9 |
uid_t uid_min, uid_max;
|
|
|
0d450f9 |
+ char * index;
|
|
|
0d450f9 |
|
|
|
0d450f9 |
if (!rflg) {
|
|
|
0d450f9 |
uid_min = getdef_unum ("UID_MIN", 500);
|
|
|
0d450f9 |
@@ -862,6 +863,8 @@
|
|
|
0d450f9 |
else {
|
|
|
0d450f9 |
uid_min = 1;
|
|
|
0d450f9 |
uid_max = getdef_unum ("UID_MIN", 500) - 1;
|
|
|
0d450f9 |
+ index = alloca (sizeof (char) * uid_max +1);
|
|
|
0d450f9 |
+ memset (index, 0, sizeof (char) * uid_max + 1);
|
|
|
0d450f9 |
}
|
|
|
0d450f9 |
|
|
|
0d450f9 |
/*
|
|
|
0d450f9 |
@@ -901,11 +904,24 @@
|
|
|
0d450f9 |
#endif
|
|
|
0d450f9 |
exit (E_UID_IN_USE);
|
|
|
0d450f9 |
}
|
|
|
0d450f9 |
- if (!uflg && pwd->pw_uid >= user_id) {
|
|
|
0d450f9 |
+ if (!uflg && !rflg && pwd->pw_uid >= user_id) {
|
|
|
0d450f9 |
if (pwd->pw_uid > uid_max)
|
|
|
0d450f9 |
continue;
|
|
|
0d450f9 |
user_id = pwd->pw_uid + 1;
|
|
|
0d450f9 |
}
|
|
|
0d450f9 |
+ /* create index of occupied system accounts UIDs */
|
|
|
0d450f9 |
+ if (!uflg && rflg && (pwd->pw_uid <= uid_max))
|
|
|
0d450f9 |
+ index[pwd->pw_uid] = 1;
|
|
|
0d450f9 |
+
|
|
|
0d450f9 |
+ }
|
|
|
0d450f9 |
+
|
|
|
0d450f9 |
+ /* find free system account */
|
|
|
0d450f9 |
+ if(!uflg && rflg) {
|
|
|
0d450f9 |
+ for( user_id = uid_max; (user_id >= uid_min) && index[user_id]; user_id--);
|
|
|
0d450f9 |
+ if ( user_id < uid_min ) {
|
|
|
0d450f9 |
+ fprintf (stderr, _("%s: can't get unique UID\n"), Prog);
|
|
|
0d450f9 |
+ fail_exit (E_UID_IN_USE);
|
|
|
0d450f9 |
+ }
|
|
|
0d450f9 |
}
|
|
|
0d450f9 |
|
|
|
0d450f9 |
/*
|
|
|
0d450f9 |
@@ -946,6 +962,7 @@
|
|
|
0d450f9 |
{
|
|
|
0d450f9 |
const struct group *grp;
|
|
|
0d450f9 |
gid_t gid_min, gid_max;
|
|
|
0d450f9 |
+ char * index;
|
|
|
0d450f9 |
|
|
|
0d450f9 |
if (!rflg) {
|
|
|
0d450f9 |
gid_min = getdef_unum ("GID_MIN", 500);
|
|
|
0d450f9 |
@@ -953,7 +970,9 @@
|
|
|
0d450f9 |
} else {
|
|
|
0d450f9 |
gid_min = 1;
|
|
|
0d450f9 |
gid_max = getdef_unum ("GID_MIN", 500) - 1;
|
|
|
0d450f9 |
- }
|
|
|
0d450f9 |
+ index = alloca (sizeof (char) * gid_max +1);
|
|
|
0d450f9 |
+ memset (index, 0, sizeof (char) * gid_max + 1);
|
|
|
0d450f9 |
+ }
|
|
|
0d450f9 |
|
|
|
0d450f9 |
/*
|
|
|
0d450f9 |
* Start with some GID value if the user didn't provide us with
|
|
|
0d450f9 |
@@ -978,12 +997,16 @@
|
|
|
0d450f9 |
user_gid = grp->gr_gid;
|
|
|
0d450f9 |
return;
|
|
|
0d450f9 |
}
|
|
|
0d450f9 |
- if (grp->gr_gid >= user_gid) {
|
|
|
0d450f9 |
+ if (!rflg && grp->gr_gid >= user_gid) {
|
|
|
0d450f9 |
if (grp->gr_gid > gid_max)
|
|
|
0d450f9 |
continue;
|
|
|
0d450f9 |
user_gid = grp->gr_gid + 1;
|
|
|
0d450f9 |
}
|
|
|
0d450f9 |
+ /* create index of occupied system accounts GIDs */
|
|
|
0d450f9 |
+ if (rflg && (grp->gr_gid <= gid_max))
|
|
|
0d450f9 |
+ index[grp->gr_gid] = 1;
|
|
|
0d450f9 |
}
|
|
|
0d450f9 |
+
|
|
|
0d450f9 |
#ifndef NO_GETGRENT /* glibc does have this, so ... */
|
|
|
0d450f9 |
/* A quick test gets here: if the UID is available
|
|
|
0d450f9 |
* as a GID, go ahead and use it */
|
|
|
0d450f9 |
@@ -992,6 +1015,18 @@
|
|
|
0d450f9 |
return;
|
|
|
0d450f9 |
}
|
|
|
0d450f9 |
#endif
|
|
|
0d450f9 |
+
|
|
|
0d450f9 |
+ /* find free system account */
|
|
|
0d450f9 |
+ if(rflg) {
|
|
|
0d450f9 |
+ for( user_gid = gid_max; (user_gid >= gid_min) && index[user_gid]; user_gid--);
|
|
|
0d450f9 |
+ if ( user_gid < gid_min ) {
|
|
|
0d450f9 |
+ fprintf (stderr,
|
|
|
0d450f9 |
+ "%s: can't get unique gid (run out of GIDs)\n",
|
|
|
0d450f9 |
+ Prog);
|
|
|
0d450f9 |
+ fail_exit (4);
|
|
|
0d450f9 |
+ }
|
|
|
0d450f9 |
+ }
|
|
|
0d450f9 |
+
|
|
|
0d450f9 |
if (user_gid == gid_max + 1) {
|
|
|
0d450f9 |
for (user_gid = gid_min; user_gid < gid_max; user_gid++) {
|
|
|
0d450f9 |
#ifdef NO_GETGRENT
|
|
|
0d450f9 |
--- shadow-4.0.18.1/src/groupadd.c.sysAccount 2007-03-12 10:49:14.000000000 +0100
|
|
|
0d450f9 |
+++ shadow-4.0.18.1/src/groupadd.c 2007-03-12 10:49:14.000000000 +0100
|
|
|
0d450f9 |
@@ -199,6 +199,7 @@
|
|
|
0d450f9 |
{
|
|
|
0d450f9 |
const struct group *grp;
|
|
|
0d450f9 |
gid_t gid_min, gid_max;
|
|
|
0d450f9 |
+ char * index;
|
|
|
0d450f9 |
|
|
|
0d450f9 |
if (!rflg) {
|
|
|
0d450f9 |
gid_min = getdef_unum ("GID_MIN", 500);
|
|
|
0d450f9 |
@@ -206,7 +207,9 @@
|
|
|
0d450f9 |
} else {
|
|
|
0d450f9 |
gid_min = 1;
|
|
|
0d450f9 |
gid_max = getdef_unum ("GID_MIN", 500) - 1;
|
|
|
0d450f9 |
- }
|
|
|
0d450f9 |
+ index = alloca (sizeof (char) * gid_max +1);
|
|
|
0d450f9 |
+ memset (index, 0, sizeof (char) * gid_max + 1);
|
|
|
0d450f9 |
+ }
|
|
|
0d450f9 |
|
|
|
0d450f9 |
/*
|
|
|
0d450f9 |
* Start with some GID value if the user didn't provide us with
|
|
|
0d450f9 |
@@ -251,12 +254,25 @@
|
|
|
0d450f9 |
Prog, (unsigned int) group_id);
|
|
|
0d450f9 |
fail_exit (E_GID_IN_USE);
|
|
|
0d450f9 |
}
|
|
|
0d450f9 |
- if (!gflg && grp->gr_gid >= group_id) {
|
|
|
0d450f9 |
+ if (!gflg && !rflg && grp->gr_gid >= group_id) {
|
|
|
0d450f9 |
if (grp->gr_gid > gid_max)
|
|
|
0d450f9 |
continue;
|
|
|
0d450f9 |
group_id = grp->gr_gid + 1;
|
|
|
0d450f9 |
}
|
|
|
0d450f9 |
+ /* create index of occupied system accounts UIDs */
|
|
|
0d450f9 |
+ if (!gflg && rflg && (grp->gr_gid <= gid_max))
|
|
|
0d450f9 |
+ index[grp->gr_gid] = 1;
|
|
|
0d450f9 |
+ }
|
|
|
0d450f9 |
+
|
|
|
0d450f9 |
+ /* find free system account */
|
|
|
0d450f9 |
+ if(!gflg && rflg) {
|
|
|
0d450f9 |
+ for( group_id = gid_max; (group_id >= gid_min) && index[group_id]; group_id--);
|
|
|
0d450f9 |
+ if ( group_id < gid_min ) {
|
|
|
0d450f9 |
+ fprintf (stderr, _("%s: can't get unique GID\n"), Prog);
|
|
|
0d450f9 |
+ fail_exit (E_GID_IN_USE);
|
|
|
0d450f9 |
+ }
|
|
|
0d450f9 |
}
|
|
|
0d450f9 |
+
|
|
|
0d450f9 |
if (!gflg && group_id == gid_max + 1) {
|
|
|
0d450f9 |
for (group_id = gid_min; group_id < gid_max; group_id++) {
|
|
|
0d450f9 |
#ifdef NO_GETGRENT
|