diff options
| author | Derrell Lipman <derrell.lipman@unwireduniverse.com> | 2008-07-08 20:44:57 -0400 |
|---|---|---|
| committer | Derrell Lipman <derrell.lipman@unwireduniverse.com> | 2008-07-08 20:44:57 -0400 |
| commit | 8c9bbbae96c247f9c05f085f771d30573e41c687 (patch) | |
| tree | 7f562803c6509090bdbd5ced716ab14621ac2334 | |
| parent | 31262a59bcf1cb04631c2efca169e417ef597bec (diff) | |
| parent | 272690bda864d04e9e95e103393fb51d1affc334 (diff) | |
| download | samba-8c9bbbae96c247f9c05f085f771d30573e41c687.tar.gz samba-8c9bbbae96c247f9c05f085f771d30573e41c687.tar.bz2 samba-8c9bbbae96c247f9c05f085f771d30573e41c687.zip | |
Merge branch 'v3-3-test' of ssh://git.samba.org/data/git/samba into v3-3-test
(This used to be commit 2dab9ad77954dc608f8910bf4d3cb92fcaad5cb6)
| -rw-r--r-- | source3/lib/util_sock.c | 4 | ||||
| -rwxr-xr-x | source3/script/tests/test_net_registry.sh | 4 |
2 files changed, 4 insertions, 4 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 diff --git a/source3/script/tests/test_net_registry.sh b/source3/script/tests/test_net_registry.sh index b6d27970cc..0f29b25019 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 || \ @@ -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 |