mirror of
https://github.com/sheumann/hush.git
synced 2024-09-12 00:55:11 +00:00
Apply a patch from Brent Priddy <brent.priddy@adtran.com> to add
'id -n' support. -Erik
This commit is contained in:
parent
155c89b0c3
commit
c1b8f1224c
@ -532,6 +532,7 @@ const char id_usage[] =
|
||||
"Options:\n"
|
||||
"\t-g\tprints only the group ID\n"
|
||||
"\t-u\tprints only the user ID\n"
|
||||
"\t-n\tprint a name instead of a number (with for -ug)\n"
|
||||
"\t-r\tprints the real user ID instead of the effective ID (with -ug)"
|
||||
#endif
|
||||
;
|
||||
|
@ -31,6 +31,7 @@
|
||||
extern int id_main(int argc, char **argv)
|
||||
{
|
||||
int no_user = 0, no_group = 0, print_real = 0;
|
||||
int name_not_number = 0;
|
||||
char user[9], group[9];
|
||||
long gid;
|
||||
long pwnam, grnam;
|
||||
@ -38,7 +39,7 @@ extern int id_main(int argc, char **argv)
|
||||
|
||||
gid = 0;
|
||||
|
||||
while ((opt = getopt(argc, argv, "ugr")) > 0) {
|
||||
while ((opt = getopt(argc, argv, "ugrn")) > 0) {
|
||||
switch (opt) {
|
||||
case 'u':
|
||||
no_group++;
|
||||
@ -49,6 +50,9 @@ extern int id_main(int argc, char **argv)
|
||||
case 'r':
|
||||
print_real++;
|
||||
break;
|
||||
case 'n':
|
||||
name_not_number++;
|
||||
break;
|
||||
default:
|
||||
usage(id_usage);
|
||||
}
|
||||
@ -76,12 +80,20 @@ extern int id_main(int argc, char **argv)
|
||||
if (gid == -1 || pwnam==-1 || grnam==-1) {
|
||||
error_msg_and_die("%s: No such user\n", user);
|
||||
}
|
||||
if (no_group)
|
||||
printf("%ld\n", pwnam);
|
||||
else if (no_user)
|
||||
printf("%ld\n", grnam);
|
||||
else
|
||||
|
||||
if (no_group) {
|
||||
if(name_not_number && user)
|
||||
printf("%s\n",user);
|
||||
else
|
||||
printf("%ld\n", pwnam);
|
||||
} else if (no_user) {
|
||||
if(name_not_number && group)
|
||||
printf("%s\n", group);
|
||||
else
|
||||
printf("%ld\n", grnam);
|
||||
} else {
|
||||
printf("uid=%ld(%s) gid=%ld(%s)\n", pwnam, user, grnam, group);
|
||||
}
|
||||
return(0);
|
||||
}
|
||||
|
||||
|
@ -871,6 +871,7 @@ Options:
|
||||
|
||||
-g prints only the group ID
|
||||
-u prints only the user ID
|
||||
-n print a name instead of a number (with for -ug)
|
||||
-r prints the real user ID instead of the effective ID (with -ug)
|
||||
|
||||
Example:
|
||||
@ -2321,4 +2322,4 @@ Enrique Zanardi <ezanardi@ull.es>
|
||||
|
||||
=cut
|
||||
|
||||
# $Id: busybox.pod,v 1.87 2001/01/24 19:15:07 andersen Exp $
|
||||
# $Id: busybox.pod,v 1.88 2001/01/25 05:12:02 andersen Exp $
|
||||
|
@ -1474,6 +1474,7 @@
|
||||
<screen>
|
||||
-g Print only the group ID
|
||||
-u Print only the user ID
|
||||
-n print a name instead of a number (with for -ug)
|
||||
-r Print the real user ID instead of the effective ID (with -ug)
|
||||
</screen>
|
||||
</para>
|
||||
|
24
id.c
24
id.c
@ -31,6 +31,7 @@
|
||||
extern int id_main(int argc, char **argv)
|
||||
{
|
||||
int no_user = 0, no_group = 0, print_real = 0;
|
||||
int name_not_number = 0;
|
||||
char user[9], group[9];
|
||||
long gid;
|
||||
long pwnam, grnam;
|
||||
@ -38,7 +39,7 @@ extern int id_main(int argc, char **argv)
|
||||
|
||||
gid = 0;
|
||||
|
||||
while ((opt = getopt(argc, argv, "ugr")) > 0) {
|
||||
while ((opt = getopt(argc, argv, "ugrn")) > 0) {
|
||||
switch (opt) {
|
||||
case 'u':
|
||||
no_group++;
|
||||
@ -49,6 +50,9 @@ extern int id_main(int argc, char **argv)
|
||||
case 'r':
|
||||
print_real++;
|
||||
break;
|
||||
case 'n':
|
||||
name_not_number++;
|
||||
break;
|
||||
default:
|
||||
usage(id_usage);
|
||||
}
|
||||
@ -76,12 +80,20 @@ extern int id_main(int argc, char **argv)
|
||||
if (gid == -1 || pwnam==-1 || grnam==-1) {
|
||||
error_msg_and_die("%s: No such user\n", user);
|
||||
}
|
||||
if (no_group)
|
||||
printf("%ld\n", pwnam);
|
||||
else if (no_user)
|
||||
printf("%ld\n", grnam);
|
||||
else
|
||||
|
||||
if (no_group) {
|
||||
if(name_not_number && user)
|
||||
printf("%s\n",user);
|
||||
else
|
||||
printf("%ld\n", pwnam);
|
||||
} else if (no_user) {
|
||||
if(name_not_number && group)
|
||||
printf("%s\n", group);
|
||||
else
|
||||
printf("%ld\n", grnam);
|
||||
} else {
|
||||
printf("uid=%ld(%s) gid=%ld(%s)\n", pwnam, user, grnam, group);
|
||||
}
|
||||
return(0);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user