emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- first pass to unify/cleanup uid handling (-236b)

Browse Source 
This needs further love, alot of love.. Tito?
This commit is contained in:
Bernhard Reutner-Fischer
2008-07-21 14:41:33 +00:00
parent a53de7f7c2
commit d73cbd31a2
13 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
networking/httpd.c
View File

@@ -2351,9 +2351,7 @@ int httpd_main(int argc UNUSED_PARAM, char **argv)
#endif
#if ENABLE_FEATURE_HTTPD_SETUID
if (opt & OPT_SETUID) {
if (!get_uidgid(&ugid, s_ugid, 1))
bb_error_msg_and_die("unknown user[:group] "
"name '%s'", s_ugid);
xget_uidgid(&ugid, s_ugid);
}
#endif

2
networking/libiproute/libnetlink.c
View File

@@ -37,7 +37,7 @@ int FAST_FUNC xrtnl_open(struct rtnl_handle *rth/*, unsigned subscriptions*/)
xbind(rth->fd, (struct sockaddr*)&rth->local, sizeof(rth->local));
addr_len = sizeof(rth->local);
if (getsockname(rth->fd, (struct sockaddr*)&rth->local, &addr_len) < 0)
bb_perror_msg_and_die("cannot getsockname");
bb_perror_msg_and_die("getsockname");
if (addr_len != sizeof(rth->local))
bb_error_msg_and_die("wrong address length %d", addr_len);
if (rth->local.nl_family != AF_NETLINK)

7
networking/tcpudp.c
View File

@@ -216,8 +216,7 @@ int tcpudpsvd_main(int argc UNUSED_PARAM, char **argv)
if (max_per_host > cmax)
max_per_host = cmax;
if (option_mask32 & OPT_u) {
if (!get_uidgid(&ugid, user, 1))
bb_error_msg_and_die("unknown user/group: %s", user);
xget_uidgid(&ugid, user);
}
#ifdef SSLSVD
if (option_mask32 & OPT_U) ssluser = optarg;
@@ -245,9 +244,9 @@ int tcpudpsvd_main(int argc UNUSED_PARAM, char **argv)
if (option_mask32 & OPT_u)
if (!uidgid_get(&sslugid, ssluser, 1)) {
if (errno) {
bb_perror_msg_and_die("fatal: cannot get user/group: %s", ssluser);
bb_perror_msg_and_die("can't get user/group: %s", ssluser);
}
bb_error_msg_and_die("unknown user/group '%s'", ssluser);
bb_error_msg_and_die("unknown user/group %s", ssluser);
}
if (!cert) cert = "./cert.pem";
if (!key) key = cert;

2
networking/tftp.c
View File

@@ -225,7 +225,7 @@ static int tftp_protocol(
if (user_opt) {
struct passwd *pw = getpwnam(user_opt);
if (!pw)
bb_error_msg_and_die("unknown user '%s'", user_opt);
bb_error_msg_and_die("unknown user %s", user_opt);
change_identity(pw); /* initgroups, setgid, setuid */
}
}