diff options
author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2008-07-21 14:41:33 +0000 |
---|---|---|
committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2008-07-21 14:41:33 +0000 |
commit | d73cbd31a295ac757e59f129f162d9cd69440224 (patch) | |
tree | 53d9c4cff7223be124698ec8cc3ccba4bded52eb /networking/tcpudp.c | |
parent | a53de7f7c2cd3ac46b26642aafb1a573a096a80d (diff) | |
download | busybox-w32-d73cbd31a295ac757e59f129f162d9cd69440224.tar.gz busybox-w32-d73cbd31a295ac757e59f129f162d9cd69440224.tar.bz2 busybox-w32-d73cbd31a295ac757e59f129f162d9cd69440224.zip |
- first pass to unify/cleanup uid handling (-236b)
This needs further love, alot of love.. Tito?
Diffstat (limited to 'networking/tcpudp.c')
-rw-r--r-- | networking/tcpudp.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/networking/tcpudp.c b/networking/tcpudp.c index 29408c5be..d6731198c 100644 --- a/networking/tcpudp.c +++ b/networking/tcpudp.c | |||
@@ -216,8 +216,7 @@ int tcpudpsvd_main(int argc UNUSED_PARAM, char **argv) | |||
216 | if (max_per_host > cmax) | 216 | if (max_per_host > cmax) |
217 | max_per_host = cmax; | 217 | max_per_host = cmax; |
218 | if (option_mask32 & OPT_u) { | 218 | if (option_mask32 & OPT_u) { |
219 | if (!get_uidgid(&ugid, user, 1)) | 219 | xget_uidgid(&ugid, user); |
220 | bb_error_msg_and_die("unknown user/group: %s", user); | ||
221 | } | 220 | } |
222 | #ifdef SSLSVD | 221 | #ifdef SSLSVD |
223 | if (option_mask32 & OPT_U) ssluser = optarg; | 222 | if (option_mask32 & OPT_U) ssluser = optarg; |
@@ -245,9 +244,9 @@ int tcpudpsvd_main(int argc UNUSED_PARAM, char **argv) | |||
245 | if (option_mask32 & OPT_u) | 244 | if (option_mask32 & OPT_u) |
246 | if (!uidgid_get(&sslugid, ssluser, 1)) { | 245 | if (!uidgid_get(&sslugid, ssluser, 1)) { |
247 | if (errno) { | 246 | if (errno) { |
248 | bb_perror_msg_and_die("fatal: cannot get user/group: %s", ssluser); | 247 | bb_perror_msg_and_die("can't get user/group: %s", ssluser); |
249 | } | 248 | } |
250 | bb_error_msg_and_die("unknown user/group '%s'", ssluser); | 249 | bb_error_msg_and_die("unknown user/group %s", ssluser); |
251 | } | 250 | } |
252 | if (!cert) cert = "./cert.pem"; | 251 | if (!cert) cert = "./cert.pem"; |
253 | if (!key) key = cert; | 252 | if (!key) key = cert; |