summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2015-10-19 02:27:17 (GMT)
committerDenys Vlasenko <vda.linux@googlemail.com>2015-10-19 02:27:17 (GMT)
commit526d85831e7480b9c7a3673d8dd356a438e6dd74 (patch)
tree0063fe2362ecaf3252ccf2a5042bf541546eedd6
parentf3d58a29be7cbf5c0bf94f1a12ac747f706b3d99 (diff)
downloadbusybox-526d85831e7480b9c7a3673d8dd356a438e6dd74.zip
busybox-526d85831e7480b9c7a3673d8dd356a438e6dd74.tar.gz
busybox-526d85831e7480b9c7a3673d8dd356a438e6dd74.tar.bz2
libbb: get_uidgid() always called with allow_numeric=1
function old new delta xget_uidgid 30 25 -5 make_device 2188 2183 -5 main 797 792 -5 get_uidgid 240 225 -15 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--include/libbb.h7
-rw-r--r--libbb/appletlib.c2
-rw-r--r--libpwdgrp/uidgid_get.c42
-rw-r--r--util-linux/mdev.c2
4 files changed, 24 insertions, 29 deletions
diff --git a/include/libbb.h b/include/libbb.h
index f04f555..1a3f6d8 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -920,14 +920,13 @@ long xuname2uid(const char *name) FAST_FUNC;
long xgroup2gid(const char *name) FAST_FUNC;
/* wrapper: allows string to contain numeric uid or gid */
unsigned long get_ug_id(const char *s, long FAST_FUNC (*xname2id)(const char *)) FAST_FUNC;
-/* from chpst. Does not die, returns 0 on failure */
struct bb_uidgid_t {
uid_t uid;
gid_t gid;
};
-/* always sets uid and gid */
-int get_uidgid(struct bb_uidgid_t*, const char*, int numeric_ok) FAST_FUNC;
-/* always sets uid and gid, allows numeric; exits on failure */
+/* always sets uid and gid; returns 0 on failure */
+int get_uidgid(struct bb_uidgid_t*, const char*) FAST_FUNC;
+/* always sets uid and gid; exits on failure */
void xget_uidgid(struct bb_uidgid_t*, const char*) FAST_FUNC;
/* chown-like handling of "user[:[group]" */
void parse_chown_usergroup_or_die(struct bb_uidgid_t *u, char *user_group) FAST_FUNC;
diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index 24253cf..0f83eda 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -437,7 +437,7 @@ static void parse_config_file(void)
goto pe_label;
}
*e = ':'; /* get_uidgid needs USER:GROUP syntax */
- if (get_uidgid(&sct->m_ugid, s, /*allow_numeric:*/ 1) == 0) {
+ if (get_uidgid(&sct->m_ugid, s) == 0) {
errmsg = "unknown user/group";
goto pe_label;
}
diff --git a/libpwdgrp/uidgid_get.c b/libpwdgrp/uidgid_get.c
index 8388be0..eeb6519 100644
--- a/libpwdgrp/uidgid_get.c
+++ b/libpwdgrp/uidgid_get.c
@@ -28,7 +28,7 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "libbb.h"
/* Always sets uid and gid */
-int FAST_FUNC get_uidgid(struct bb_uidgid_t *u, const char *ug, int numeric_ok)
+int FAST_FUNC get_uidgid(struct bb_uidgid_t *u, const char *ug)
{
struct passwd *pwd;
struct group *gr;
@@ -43,18 +43,16 @@ int FAST_FUNC get_uidgid(struct bb_uidgid_t *u, const char *ug, int numeric_ok)
/* copies sz-1 bytes, stores terminating '\0' */
safe_strncpy(user, ug, sz);
}
- if (numeric_ok) {
- n = bb_strtou(user, NULL, 10);
- if (!errno) {
- u->uid = n;
- pwd = getpwuid(n);
- /* If we have e.g. "500" string without user */
- /* with uid 500 in /etc/passwd, we set gid == uid */
- u->gid = pwd ? pwd->pw_gid : n;
- goto skip;
- }
+ n = bb_strtou(user, NULL, 10);
+ if (!errno) {
+ u->uid = n;
+ pwd = getpwuid(n);
+ /* If we have e.g. "500" string without user */
+ /* with uid 500 in /etc/passwd, we set gid == uid */
+ u->gid = pwd ? pwd->pw_gid : n;
+ goto skip;
}
- /* Either it is not numeric, or caller disallows numeric username */
+ /* it is not numeric */
pwd = getpwnam(user);
if (!pwd)
return 0;
@@ -63,12 +61,10 @@ int FAST_FUNC get_uidgid(struct bb_uidgid_t *u, const char *ug, int numeric_ok)
skip:
if (group) {
- if (numeric_ok) {
- n = bb_strtou(group, NULL, 10);
- if (!errno) {
- u->gid = n;
- return 1;
- }
+ n = bb_strtou(group, NULL, 10);
+ if (!errno) {
+ u->gid = n;
+ return 1;
}
gr = getgrnam(group);
if (!gr)
@@ -79,7 +75,7 @@ int FAST_FUNC get_uidgid(struct bb_uidgid_t *u, const char *ug, int numeric_ok)
}
void FAST_FUNC xget_uidgid(struct bb_uidgid_t *u, const char *ug)
{
- if (!get_uidgid(u, ug, 1))
+ if (!get_uidgid(u, ug))
bb_error_msg_and_die("unknown user/group %s", ug);
}
@@ -119,16 +115,16 @@ int main()
{
unsigned u;
struct bb_uidgid_t ug;
- u = get_uidgid(&ug, "apache", 0);
+ u = get_uidgid(&ug, "apache");
printf("%u = %u:%u\n", u, ug.uid, ug.gid);
ug.uid = ug.gid = 1111;
- u = get_uidgid(&ug, "apache", 0);
+ u = get_uidgid(&ug, "apache");
printf("%u = %u:%u\n", u, ug.uid, ug.gid);
ug.uid = ug.gid = 1111;
- u = get_uidgid(&ug, "apache:users", 0);
+ u = get_uidgid(&ug, "apache:users");
printf("%u = %u:%u\n", u, ug.uid, ug.gid);
ug.uid = ug.gid = 1111;
- u = get_uidgid(&ug, "apache:users", 0);
+ u = get_uidgid(&ug, "apache:users");
printf("%u = %u:%u\n", u, ug.uid, ug.gid);
return 0;
}
diff --git a/util-linux/mdev.c b/util-linux/mdev.c
index 51781d5..37fa568 100644
--- a/util-linux/mdev.c
+++ b/util-linux/mdev.c
@@ -400,7 +400,7 @@ static void parse_next_rule(void)
}
/* 2nd field: uid:gid - device ownership */
- if (get_uidgid(&G.cur_rule.ugid, tokens[1], /*allow_numeric:*/ 1) == 0) {
+ if (get_uidgid(&G.cur_rule.ugid, tokens[1]) == 0) {
bb_error_msg("unknown user/group '%s' on line %d", tokens[1], G.parser->lineno);
goto next_rule;
}