From b65d497c33058a1613421ee19981089ad1f1cfab Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Wed, 9 Jul 2008 00:33:14 +0200 Subject: testsuite: fix expr typo in net registry testscript. Michael (This used to be commit 5b6c32160a5d8fafc807fbefb66aa8c98662baae) --- source3/script/tests/test_net_registry.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source3/script/tests/test_net_registry.sh b/source3/script/tests/test_net_registry.sh index b6d27970cc..0c26527aa5 100755 --- a/source3/script/tests/test_net_registry.sh +++ b/source3/script/tests/test_net_registry.sh @@ -402,7 +402,7 @@ testit "delete^2 key" \ testit "enumerate nonexisting key" \ test_enumerate_nonexisting HKLM/testkey || \ - failed=`expr $failed +1` + failed=`expr $failed + 1` testit "create key with subkey" \ test_createkey_with_subkey HKLM/testkey/subkey || \ -- cgit From 733cf7602670d6762dd9aa85d3332f6e10ee78cd Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Wed, 9 Jul 2008 00:33:54 +0200 Subject: testsuite: fix another expr typo in net registry test script. Michael (This used to be commit 73312e4e21b6d14363bd0987e0c9716c4ec91834) --- source3/script/tests/test_net_registry.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source3/script/tests/test_net_registry.sh b/source3/script/tests/test_net_registry.sh index 0c26527aa5..0f29b25019 100755 --- a/source3/script/tests/test_net_registry.sh +++ b/source3/script/tests/test_net_registry.sh @@ -435,7 +435,7 @@ testit "delete key with value" \ if test "x${RPC}" = "xrpc" ; then testit "taking administrative rights from user ${USERNAME}" \ take_administrative_rights || \ - failed=`expr $failed +1` + failed=`expr $failed + 1` fi testok $0 $failed -- cgit From 272690bda864d04e9e95e103393fb51d1affc334 Mon Sep 17 00:00:00 2001 From: Zach Loafman Date: Mon, 7 Jul 2008 19:30:47 -0700 Subject: Minor style correction Set sin[6]_family instead of ss_family in in[6]_addr_to_sockaddr_storage so that assignments look like they're going to the same place. (This used to be commit 3d19112f645fb0f4bb6b644207ed2cee0b6b3ea9) --- source3/lib/util_sock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source3/lib/util_sock.c b/source3/lib/util_sock.c index b2a1ece5db..822ff26331 100644 --- a/source3/lib/util_sock.c +++ b/source3/lib/util_sock.c @@ -365,7 +365,7 @@ void in_addr_to_sockaddr_storage(struct sockaddr_storage *ss, { struct sockaddr_in *sa = (struct sockaddr_in *)ss; memset(ss, '\0', sizeof(*ss)); - ss->ss_family = AF_INET; + sa->sin_family = AF_INET; sa->sin_addr = ip; } @@ -379,7 +379,7 @@ void in_addr_to_sockaddr_storage(struct sockaddr_storage *ss, { struct sockaddr_in6 *sa = (struct sockaddr_in6 *)ss; memset(ss, '\0', sizeof(*ss)); - ss->ss_family = AF_INET6; + sa->sin6_family = AF_INET6; sa->sin6_addr = ip; } #endif -- cgit