Commit fbf11f41 authored by JINMEI Tatuya's avatar JINMEI Tatuya
Browse files

[master] Merge branch 'master' of ssh://git.bind10.isc.org/var/bind10/git/bind10

parents 733d42fa bfefbfda
......@@ -106,7 +106,7 @@ public:
rollbackAddresses_ = old;
}
virtual void commit() {
rollbackAddresses_.release();
rollbackAddresses_.reset();
}
private:
AuthSrv& server_;
......
......@@ -130,7 +130,7 @@ TEST_F(AuthConfigTest, invalidListenAddressConfig) {
isc::testutils::portconfig::invalidListenAddressConfig(server);
}
// Try setting addresses trough config
// Try setting addresses through config
TEST_F(AuthConfigTest, listenAddressConfig) {
isc::testutils::portconfig::listenAddressConfig(server);
......
......@@ -325,8 +325,8 @@ class SysInfoBSD(SysInfoPOSIX):
except (subprocess.CalledProcessError, OSError):
self._net_connections = 'Warning: "netstat -nr" command failed.\n'
class SysInfoOpenBSD(SysInfoBSD):
"""OpenBSD implementation of the SysInfo class.
class SysInfoNetBSD(SysInfoBSD):
"""NetBSD and OpenBSD implementation of the SysInfo class.
See the SysInfo class documentation for more information.
"""
def __init__(self):
......@@ -502,8 +502,8 @@ def SysInfoFromFactory():
osname = platform.system()
if osname == 'Linux':
return SysInfoLinux()
elif osname == 'OpenBSD':
return SysInfoOpenBSD()
elif (osname == 'NetBSD') or (osname == 'OpenBSD'):
return SysInfoNetBSD()
elif osname == 'FreeBSD':
return SysInfoFreeBSD()
elif osname == 'Darwin':
......
......@@ -93,10 +93,10 @@ provide_input(int *read_pipe, const void *input, const size_t length)
/*
* This creates a pipe, forks and reads the pipe and compares it
* with given data. Used to check output of run in asynchronous way.
* with given data. Used to check output of run in an asynchronous way.
*/
pid_t
check_output(int *write_pipe, const void *output, const size_t length)
check_output(int *write_pipe, const void* const output, const size_t length)
{
int pipes[2];
if (pipe(pipes)) {
......@@ -109,9 +109,7 @@ check_output(int *write_pipe, const void *output, const size_t length)
return pid;
} else {
close(pipes[1]);
// We don't return the memory, but we're in tests and end this process
// right away.
unsigned char *buffer = new unsigned char[length + 1];
unsigned char* buffer = new unsigned char[length + 1];
// Try to read one byte more to see if the output ends here
size_t got_length(read_data(pipes[0], buffer, length + 1));
bool ok(true);
......@@ -133,8 +131,10 @@ check_output(int *write_pipe, const void *output, const size_t length)
fprintf(stderr, "%02hhx", output_c[i]);
}
fprintf(stderr, "\n");
delete [] buffer;
exit(1);
} else {
delete [] buffer;
exit(0);
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment