bytemark/flexnbd-c
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Alex Young
2012-06-01 16:25:41 +01:00
parent 1ddb3bb609 b985e97098
commit 29937cdcf9
4 changed files with 40 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/serve.c
View File

@@ -530,6 +530,8 @@ void accept_nbd_client(
struct client_params* client_params;
int slot = cleanup_and_find_client_slot(params);
char s_client_address[64];
int acl_passed = 0;
if (inet_ntop(client_address->generic.sa_family,
sockaddr_address_data(&client_address->generic),
@@ -539,12 +541,21 @@ void accept_nbd_client(
return;
}
if (params->acl &&
!is_included_in_acl(params->acl_entries, params->acl, client_address)) {
write(client_fd, "Access control error", 20);
close(client_fd);
return;
if (params->acl) {
if (is_included_in_acl(params->acl_entries, params->acl, client_address))
acl_passed = 1;
} else {
if (!params->default_deny)
acl_passed = 1;
}
if (!acl_passed) {
write(client_fd, "Access control error", 20);
close(client_fd);
return;
}
if (slot < 0) {
write(client_fd, "Too many clients", 16);