svn commit: samba r25744 - in branches/SAMBA_4_0/source/librpc/ndr: .
Author: metze
Date: 2007-10-27 08:10:14 + (Sat, 27 Oct 2007)
New Revision: 25744
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25744
Log:
add NDR_ERR_INVALID_POINTER
metze
Modified:
branches/SAMBA_4_0/source/librpc/ndr/libndr.h
branches/SAMBA_4_0/source/librpc/ndr/ndr.c
Changeset:
Modified: branches/SAMBA_4_0/source/librpc/ndr/libndr.h
===
--- branches/SAMBA_4_0/source/librpc/ndr/libndr.h 2007-10-26 23:28:36 UTC
(rev 25743)
+++ branches/SAMBA_4_0/source/librpc/ndr/libndr.h 2007-10-27 08:10:14 UTC
(rev 25744)
@@ -174,7 +174,8 @@
NDR_ERR_ALLOC,
NDR_ERR_RANGE,
NDR_ERR_TOKEN,
- NDR_ERR_IPV4ADDRESS
+ NDR_ERR_IPV4ADDRESS,
+ NDR_ERR_INVALID_POINTER
};
enum ndr_compression_alg {
Modified: branches/SAMBA_4_0/source/librpc/ndr/ndr.c
===
--- branches/SAMBA_4_0/source/librpc/ndr/ndr.c 2007-10-26 23:28:36 UTC (rev
25743)
+++ branches/SAMBA_4_0/source/librpc/ndr/ndr.c 2007-10-27 08:10:14 UTC (rev
25744)
@@ -365,6 +365,8 @@
return NT_STATUS_NO_MEMORY;
case NDR_ERR_ARRAY_SIZE:
return NT_STATUS_ARRAY_BOUNDS_EXCEEDED;
+ case NDR_ERR_INVALID_POINTER:
+ return NT_STATUS_INVALID_PARAMETER_MIX;
default:
break;
}
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-127-g3625ed3
The branch, v3-2-test has been updated
via 3625ed395c23101095321de80e89fcbc8c76be4c (commit)
from 25bbc9a6613bef0f3f73ecf634a38a9d56020f40 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 3625ed395c23101095321de80e89fcbc8c76be4c
Author: metze [EMAIL PROTECTED]
Date: Sat Oct 27 08:10:14 2007 +
add NDR_ERR_INVALID_POINTER
metze
git-svn-id: svn+ssh://svn.samba.org/data/svn/samba/branches/[EMAIL
PROTECTED] 0c0555d6-39d7-0310-84fc-f1cc0bd64818
---
Summary of changes:
source/librpc/ndr/libndr.h |3 ++-
source/librpc/ndr/ndr.c|2 ++
2 files changed, 4 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/librpc/ndr/libndr.h b/source/librpc/ndr/libndr.h
index 4531293..ee27464 100644
--- a/source/librpc/ndr/libndr.h
+++ b/source/librpc/ndr/libndr.h
@@ -174,7 +174,8 @@ enum ndr_err_code {
NDR_ERR_ALLOC,
NDR_ERR_RANGE,
NDR_ERR_TOKEN,
- NDR_ERR_IPV4ADDRESS
+ NDR_ERR_IPV4ADDRESS,
+ NDR_ERR_INVALID_POINTER
};
enum ndr_compression_alg {
diff --git a/source/librpc/ndr/ndr.c b/source/librpc/ndr/ndr.c
index 5525459..326ab12 100644
--- a/source/librpc/ndr/ndr.c
+++ b/source/librpc/ndr/ndr.c
@@ -328,6 +328,8 @@ static NTSTATUS ndr_map_error(enum ndr_err_code ndr_err)
return NT_STATUS_NO_MEMORY;
case NDR_ERR_ARRAY_SIZE:
return NT_STATUS_ARRAY_BOUNDS_EXCEEDED;
+ case NDR_ERR_INVALID_POINTER:
+ return NT_STATUS_INVALID_PARAMETER_MIX;
default:
break;
}
--
Samba Shared Repository
svn commit: samba r25745 - in branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR: .
Author: metze
Date: 2007-10-27 09:57:09 + (Sat, 27 Oct 2007)
New Revision: 25745
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25745
Log:
[pidl] ndr_pull/push_error(ndr, NDR_ERR_INVALID_POINTER,..)
instead NT_STATUS_INVALID_PARAMETER_MIX
metze
Modified:
branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
Changeset:
Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
===
--- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
2007-10-27 08:10:14 UTC (rev 25744)
+++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
2007-10-27 09:57:09 UTC (rev 25745)
@@ -423,8 +423,10 @@
} elsif ($l-{IS_ZERO_TERMINATED}) { # Noheader arrays
$length = $size = ndr_get_string_size($ndr,
sizeof(*$var_name));
} else {
- $length = $size = ParseExprExt($l-{SIZE_IS}, $env,
$e-{ORIGINAL},
- check_null_pointer($e, $env, sub { $self-pidl(shift); },
return NT_STATUS_INVALID_PARAMETER_MIX;), check_fully_dereferenced($e, $env));
+ $length = $size = ParseExprExt($l-{SIZE_IS}, $env,
$e-{ORIGINAL},
+ check_null_pointer($e, $env, sub { $self-pidl(shift);
},
+ return ndr_pull_error(ndr,
NDR_ERR_INVALID_POINTER, \NULL Pointer for size_is()\);),
+ check_fully_dereferenced($e, $env));
}
if ((!$l-{IS_SURROUNDING}) and $l-{IS_CONFORMANT}) {
@@ -447,7 +449,10 @@
if ($l-{IS_CONFORMANT} and not $l-{IS_ZERO_TERMINATED}) {
$self-defer(if ($var_name) {);
$self-defer_indent;
- my $size = ParseExprExt($l-{SIZE_IS}, $env, $e-{ORIGINAL},
check_null_pointer($e, $env, sub { $self-defer(shift); }, return
NT_STATUS_INVALID_PARAMETER_MIX;), check_fully_dereferenced($e, $env));
+ my $size = ParseExprExt($l-{SIZE_IS}, $env, $e-{ORIGINAL},
+ check_null_pointer($e, $env, sub { $self-defer(shift);
},
+ return ndr_pull_error(ndr,
NDR_ERR_INVALID_POINTER, \NULL Pointer for size_is()\);),
+ check_fully_dereferenced($e, $env));
$self-defer(NDR_CHECK(ndr_check_array_size(ndr, (void*) .
get_pointer_to($var_name) . , $size)););
$self-defer_deindent;
$self-defer(});
@@ -457,7 +462,8 @@
$self-defer(if ($var_name) {);
$self-defer_indent;
my $length = ParseExprExt($l-{LENGTH_IS}, $env,
$e-{ORIGINAL},
- check_null_pointer($e, $env, sub { $self-defer(shift);
}, return NT_STATUS_INVALID_PARAMETER_MIX;),
+ check_null_pointer($e, $env, sub { $self-defer(shift);
},
+ return ndr_pull_error(ndr,
NDR_ERR_INVALID_POINTER, \NULL Pointer for length_is()\);),
check_fully_dereferenced($e, $env));
$self-defer(NDR_CHECK(ndr_check_array_length(ndr, (void*) .
get_pointer_to($var_name) . , $length)););
$self-defer_deindent;
@@ -740,7 +746,11 @@
my ($self,$e,$l,$var_name) = @_;
if ($l-{POINTER_TYPE} eq ref) {
- $self-pidl(if ($var_name == NULL) return
NT_STATUS_INVALID_PARAMETER_MIX;);
+ $self-pidl(if ($var_name == NULL) {);
+ $self-indent;
+ $self-pidl(return ndr_push_error(ndr,
NDR_ERR_INVALID_POINTER, \NULL [ref] pointer\););
+ $self-deindent;
+ $self-pidl(});
if ($l-{LEVEL} eq EMBEDDED) {
$self-pidl(NDR_CHECK(ndr_push_ref_ptr(ndr)););
}
@@ -875,7 +885,9 @@
{
my($self,$e,$l,$ndr,$var_name,$env) = @_;
my $switch_var = ParseExprExt($l-{SWITCH_IS}, $env, $e-{ORIGINAL},
- check_null_pointer($e, $env, sub { $self-pidl(shift); },
return NT_STATUS_INVALID_PARAMETER_MIX;), check_fully_dereferenced($e, $env));
+ check_null_pointer($e, $env, sub { $self-pidl(shift); },
+ return ndr_pull_error(ndr,
NDR_ERR_INVALID_POINTER, \NULL Pointer for switch_is()\);),
+ check_fully_dereferenced($e, $env));
$var_name = get_pointer_to($var_name);
$self-pidl(NDR_CHECK(ndr_pull_set_switch_value($ndr, $var_name,
$switch_var)););
@@ -887,7 +899,9 @@
{
my($self,$e,$l,$ndr,$var_name,$env) = @_;
my $switch_var = ParseExprExt($l-{SWITCH_IS}, $env, $e-{ORIGINAL},
- check_null_pointer($e, $env, sub { $self-pidl(shift); },
return NT_STATUS_INVALID_PARAMETER_MIX;), check_fully_dereferenced($e, $env));
+ check_null_pointer($e, $env, sub { $self-pidl(shift); },
+ return ndr_push_error(ndr,
NDR_ERR_INVALID_POINTER, \NULL
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-128-g83b3ecd
The branch, v3-2-test has been updated
via 83b3ecde1312092fd9875a2a8628652ffa6b6aca (commit)
from 3625ed395c23101095321de80e89fcbc8c76be4c (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 83b3ecde1312092fd9875a2a8628652ffa6b6aca
Author: Stefan Metzmacher [EMAIL PROTECTED]
Date: Sat Oct 27 11:57:48 2007 +0200
rerun make idl
metze
---
Summary of changes:
source/librpc/gen_ndr/ndr_dfs.c | 28 ++-
source/librpc/gen_ndr/ndr_echo.c | 64 --
source/librpc/gen_ndr/ndr_epmapper.c | 36 ++-
source/librpc/gen_ndr/ndr_eventlog.c | 44 +++-
source/librpc/gen_ndr/ndr_lsa.c | 468 +-
source/librpc/gen_ndr/ndr_netlogon.c | 280 +++-
source/librpc/gen_ndr/ndr_srvsvc.c | 212
source/librpc/gen_ndr/ndr_svcctl.c | 316 +--
source/librpc/gen_ndr/ndr_unixinfo.c | 24 ++-
source/librpc/gen_ndr/ndr_winreg.c | 240 +-
source/librpc/gen_ndr/ndr_wkssvc.c | 60 -
11 files changed, 1325 insertions(+), 447 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/librpc/gen_ndr/ndr_dfs.c b/source/librpc/gen_ndr/ndr_dfs.c
index 959abdc..bc76339 100644
--- a/source/librpc/gen_ndr/ndr_dfs.c
+++ b/source/librpc/gen_ndr/ndr_dfs.c
@@ -3113,7 +3113,9 @@ _PUBLIC_ NTSTATUS ndr_push_dfs_GetManagerVersion(struct
ndr_push *ndr, int flags
if (flags NDR_IN) {
}
if (flags NDR_OUT) {
- if (r-out.version == NULL) return
NT_STATUS_INVALID_PARAMETER_MIX;
+ if (r-out.version == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
NULL [ref] pointer);
+ }
NDR_CHECK(ndr_push_dfs_ManagerVersion(ndr, NDR_SCALARS,
*r-out.version));
}
return NT_STATUS_OK;
@@ -3167,12 +3169,16 @@ _PUBLIC_ void ndr_print_dfs_GetManagerVersion(struct
ndr_print *ndr, const char
static NTSTATUS ndr_push_dfs_Add(struct ndr_push *ndr, int flags, const struct
dfs_Add *r)
{
if (flags NDR_IN) {
- if (r-in.path == NULL) return NT_STATUS_INVALID_PARAMETER_MIX;
+ if (r-in.path == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
NULL [ref] pointer);
+ }
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
ndr_charset_length(r-in.path, CH_UTF16)));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
ndr_charset_length(r-in.path, CH_UTF16)));
NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r-in.path,
ndr_charset_length(r-in.path, CH_UTF16), sizeof(uint16_t), CH_UTF16));
- if (r-in.server == NULL) return
NT_STATUS_INVALID_PARAMETER_MIX;
+ if (r-in.server == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
NULL [ref] pointer);
+ }
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
ndr_charset_length(r-in.server, CH_UTF16)));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
ndr_charset_length(r-in.server, CH_UTF16)));
@@ -3309,7 +3315,9 @@ _PUBLIC_ void ndr_print_dfs_Add(struct ndr_print *ndr,
const char *name, int fla
static NTSTATUS ndr_push_dfs_Remove(struct ndr_push *ndr, int flags, const
struct dfs_Remove *r)
{
if (flags NDR_IN) {
- if (r-in.dfs_entry_path == NULL) return
NT_STATUS_INVALID_PARAMETER_MIX;
+ if (r-in.dfs_entry_path == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
NULL [ref] pointer);
+ }
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
ndr_charset_length(r-in.dfs_entry_path, CH_UTF16)));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
ndr_charset_length(r-in.dfs_entry_path, CH_UTF16)));
@@ -3451,7 +3459,9 @@ static NTSTATUS ndr_push_dfs_SetInfo(struct ndr_push
*ndr, int flags, const stru
NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS,
r-in.sharename, ndr_charset_length(r-in.sharename, CH_UTF16),
sizeof(uint16_t), CH_UTF16));
}
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r-in.level));
- if (r-in.info == NULL) return NT_STATUS_INVALID_PARAMETER_MIX;
+ if (r-in.info == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
NULL [ref] pointer);
+ }
NDR_CHECK(ndr_push_set_switch_value(ndr, r-in.info,
r-in.level));
NDR_CHECK(ndr_push_dfs_Info(ndr, NDR_SCALARS|NDR_BUFFERS,
r-in.info));
}
@@ -3592,7
svn commit: samba r25746 - in branches/SAMBA_4_0/source/selftest/output: .
Author: metze
Date: 2007-10-27 10:00:44 + (Sat, 27 Oct 2007)
New Revision: 25746
WebSVN:
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=sambarev=25746
Log:
[selftest] make plain output more readable
metze
Modified:
branches/SAMBA_4_0/source/selftest/output/plain.pm
Changeset:
Modified: branches/SAMBA_4_0/source/selftest/output/plain.pm
===
--- branches/SAMBA_4_0/source/selftest/output/plain.pm 2007-10-27 09:57:09 UTC
(rev 25745)
+++ branches/SAMBA_4_0/source/selftest/output/plain.pm 2007-10-27 10:00:44 UTC
(rev 25746)
@@ -122,14 +122,6 @@
}
}
- if ($self-{statistics}-{SUITES_FAIL} == 0) {
- my $ok = $self-{statistics}-{TESTS_EXPECTED_OK} +
-$self-{statistics}-{TESTS_EXPECTED_FAIL};
- print ALL OK ($ok tests in $self-{statistics}-{SUITES_OK}
testsuites)\n;
- } else {
- print FAILED ($self-{statistics}-{TESTS_UNEXPECTED_FAIL}
failures and $self-{statistics}-{TESTS_ERROR} errors in
$self-{statistics}-{SUITES_FAIL} testsuites)\n;
- }
-
print SUMMARY = Skipped tests =\n;
foreach my $reason (keys %{$self-{skips}}) {
print SUMMARY $reason\n;
@@ -140,7 +132,16 @@
}
close(SUMMARY);
- print A summary can be found in $self-{summaryfile}\n;
+ print \nA summary with detailed informations can be found in:\n
$self-{summaryfile}\n;
+
+ if ($self-{statistics}-{SUITES_FAIL} == 0) {
+ my $ok = $self-{statistics}-{TESTS_EXPECTED_OK} +
+$self-{statistics}-{TESTS_EXPECTED_FAIL};
+ print \nALL OK ($ok tests in $self-{statistics}-{SUITES_OK}
testsuites)\n;
+ } else {
+ print \nFAILED ($self-{statistics}-{TESTS_UNEXPECTED_FAIL}
failures and $self-{statistics}-{TESTS_ERROR} errors in
$self-{statistics}-{SUITES_FAIL} testsuites)\n;
+ }
+
}
sub skip_testsuite($$)
Re: [SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-126-g25bbc9a
On Fri, 2007-10-26 at 20:05 -0500, Jeremy Allison wrote: Ensure temporary memory is freed - pointed out by Li, Ying (ESG) [EMAIL PROTECTED]. We aren't currently leaking memory, but are leaving it around for longer than we need to. Jeremy. Thanks for pushing this Jeremy. Simo. -- Simo Sorce Samba Team GPL Compliance Officer [EMAIL PROTECTED] Senior Software Engineer at Red Hat Inc. [EMAIL PROTECTED]
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-130-g9f82a57
The branch, v3-2-test has been updated
via 9f82a5766968dc72db5a86ad0afc71e8cffd5be0 (commit)
via e17d3e10e860c96b6d5208e5fe51e43b8e58c174 (commit)
from 83b3ecde1312092fd9875a2a8628652ffa6b6aca (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 9f82a5766968dc72db5a86ad0afc71e8cffd5be0
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Sat Oct 27 12:51:38 2007 -0700
Fix zero_addr(ip, INADDR_ANY); - zero_addr(ip, AF_INET)
from Volker's patch.
Jeremy.
commit e17d3e10e860c96b6d5208e5fe51e43b8e58c174
Author: Volker Lendecke [EMAIL PROTECTED]
Date: Sat Oct 27 21:15:07 2007 +0200
Two patches
Hi!
Can you check and push them?
Thanks,
Volker
From b488af5905e2dee12a1a72a3b40801ae5c26f24f Mon Sep 17 00:00:00 2001
From: Volker Lendecke [EMAIL PROTECTED]
Date: Sat, 27 Oct 2007 14:20:09 +0200
Subject: [PATCH] Fix some warnings and errors
---
Summary of changes:
source/Makefile.in |5 +++--
source/client/smbmount.c | 10 +-
source/client/smbumount.c|2 +-
source/include/interfaces.h | 36
source/lib/interfaces.c |4 ++--
source/lib/replace/getpass.c |1 +
source/smbd/server.c |2 +-
source/winbindd/idmap_ad.c |2 +-
8 files changed, 50 insertions(+), 12 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/Makefile.in b/source/Makefile.in
index a559d63..98fd8f8 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -269,11 +269,12 @@ TALLOC_OBJ = lib/talloc/talloc.o
LIB_WITHOUT_PROTO_OBJ = $(LIBREPLACE_OBJ) $(SOCKET_WRAPPER_OBJ) $(TALLOC_OBJ) \
lib/messages.o librpc/gen_ndr/ndr_messaging.o lib/messages_local.o \
- lib/messages_ctdbd.o lib/packet.o lib/ctdbd_conn.o lib/talloc_stack.o
+ lib/messages_ctdbd.o lib/packet.o lib/ctdbd_conn.o lib/talloc_stack.o \
+ lib/interfaces.o
LIB_WITH_PROTO_OBJ = $(VERSION_OBJ) lib/charcnv.o lib/debug.o lib/fault.o \
lib/interface.o lib/md4.o \
- lib/interfaces.o lib/pidfile.o \
+ lib/pidfile.o \
lib/signal.o lib/system.o lib/sendfile.o lib/time.o \
lib/ufc.o lib/genrand.o lib/username.o \
lib/util_pw.o lib/access.o lib/smbrun.o \
diff --git a/source/client/smbmount.c b/source/client/smbmount.c
index 95adc9a..0c57c40 100644
--- a/source/client/smbmount.c
+++ b/source/client/smbmount.c
@@ -37,7 +37,7 @@ static pstring mpoint;
static pstring service;
static pstring options;
-static struct in_addr dest_ip;
+static struct sockaddr_storage dest_ip;
static bool have_ip;
static int smb_port = 0;
static bool got_user;
@@ -122,7 +122,7 @@ static struct cli_state *do_connection(char *the_service)
struct cli_state *c;
struct nmb_name called, calling;
char *server_n;
- struct in_addr ip;
+ struct sockaddr_storage ip;
pstring server;
char *share;
@@ -146,7 +146,7 @@ static struct cli_state *do_connection(char *the_service)
make_nmb_name(called , server, 0x20);
again:
-zero_ip_v4(ip);
+zero_addr(ip, AF_INET);
if (have_ip) ip = dest_ip;
/* have to open a new connection */
@@ -798,8 +798,8 @@ static void parse_mount_smb(int argc, char **argv)
} else if(!strcmp(opts, debug)) {
DEBUGLEVEL = val;
} else if(!strcmp(opts, ip)) {
- dest_ip = *interpret_addr2(opteq+1);
- if (is_zero_ip_v4(dest_ip)) {
+ if (!interpret_string_addr(dest_ip, opteq+1,
+ 0)) {
fprintf(stderr,Can't resolve address
%s\n, opteq+1);
exit(1);
}
diff --git a/source/client/smbumount.c b/source/client/smbumount.c
index 4be54b6..1664e4b 100644
--- a/source/client/smbumount.c
+++ b/source/client/smbumount.c
@@ -80,7 +80,7 @@ umount_ok(const char *mount_point)
static char *
canonicalize (char *path)
{
- char *canonical = malloc (PATH_MAX + 1);
+ char *canonical = (char*)malloc (PATH_MAX + 1);
if (!canonical) {
fprintf(stderr, Error! Not enough memory!\n);
diff --git a/source/include/interfaces.h b/source/include/interfaces.h
index 66ea151..b9d9000 100644
--- a/source/include/interfaces.h
+++ b/source/include/interfaces.h
@@ -1,8 +1,31 @@
/*
+ Unix SMB/CIFS implementation.
+ Machine customisation and include handling
+ Copyright (C) Jeremy Allison [EMAIL PROTECTED] 2007
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General
Build status as of Sun Oct 28 00:00:02 2007
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2007-10-27 00:01:00.0 + +++ /home/build/master/cache/broken_results.txt 2007-10-28 00:01:09.0 + @@ -1,25 +1,25 @@ -Build status as of Sat Oct 27 00:00:02 2007 +Build status as of Sun Oct 28 00:00:02 2007 Build counts: Tree Total Broken Panic SOC 0 0 0 build_farm 0 0 0 -ccache 29 11 0 +ccache 30 11 0 ctdb 0 0 0 distcc 1 0 0 -ldb 29 6 0 -libreplace 28 11 0 -lorikeet-heimdal 23 14 0 -pidl 16 3 0 -ppp 9 7 0 +ldb 30 6 0 +libreplace 29 11 0 +lorikeet-heimdal 24 14 0 +pidl 17 3 0 +ppp 10 8 0 python 0 0 0 -rsync29 13 0 +rsync30 13 0 samba-docs 0 0 0 -samba-gtk2 2 0 -samba4 26 19 5 +samba-gtk3 3 0 +samba4 27 18 5 samba_3_20 0 0 samba_3_2_test 29 21 0 -smb-build28 28 0 -talloc 29 2 0 -tdb 29 3 0 +smb-build29 29 0 +talloc 30 2 0 +tdb 30 3 0
[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-131-g2e92418
The branch, v3-2-test has been updated
via 2e92418a138bf2738b77b7e0fcb2fa37ad84fc0c (commit)
from 9f82a5766968dc72db5a86ad0afc71e8cffd5be0 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 2e92418a138bf2738b77b7e0fcb2fa37ad84fc0c
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Sat Oct 27 20:29:36 2007 -0700
Change all occurrences of zero_addr(ss,AF_INET) to
zero_addr(ss). All current uses were always of the
AF_INET form, so simplify the call. If in the future
we need to zero an addr to AF_INET6 this can be
done separately.
Jeremy.
---
Summary of changes:
source/client/client.c |2 +-
source/client/smbmount.c |2 +-
source/lib/util_sock.c |8
source/libsmb/cliconnect.c |2 +-
source/libsmb/clidfs.c |4 ++--
source/libsmb/libsmbclient.c |6 +++---
source/libsmb/namequery.c|8
source/libsmb/namequery_dc.c |4 ++--
source/rpcclient/rpcclient.c |2 +-
source/torture/locktest.c|4 ++--
source/torture/masktest.c|4 ++--
source/torture/torture.c |2 +-
source/utils/net.c |2 +-
source/utils/smbcacls.c |2 +-
source/utils/smbcquotas.c|2 +-
15 files changed, 27 insertions(+), 27 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/client/client.c b/source/client/client.c
index 7561ecb..f18505a 100644
--- a/source/client/client.c
+++ b/source/client/client.c
@@ -3853,7 +3853,7 @@ static int do_message_op(void)
snprintf(name_type_hex, sizeof(name_type_hex), #%X, name_type);
fstrcat(server_name, name_type_hex);
-zero_addr(ss,AF_INET);
+zero_addr(ss);
if (have_ip)
ss = dest_ss;
diff --git a/source/client/smbmount.c b/source/client/smbmount.c
index 0c57c40..9c671e3 100644
--- a/source/client/smbmount.c
+++ b/source/client/smbmount.c
@@ -146,7 +146,7 @@ static struct cli_state *do_connection(char *the_service)
make_nmb_name(called , server, 0x20);
again:
-zero_addr(ip, AF_INET);
+zero_addr(ip);
if (have_ip) ip = dest_ip;
/* have to open a new connection */
diff --git a/source/lib/util_sock.c b/source/lib/util_sock.c
index 91da407..e66bd5f 100644
--- a/source/lib/util_sock.c
+++ b/source/lib/util_sock.c
@@ -238,7 +238,7 @@ bool interpret_string_addr(struct sockaddr_storage *pss,
}
#endif
- zero_addr(pss, AF_INET);
+ zero_addr(pss);
if (!interpret_string_addr_internal(res, str, flags|AI_ADDRCONFIG)) {
return false;
@@ -343,14 +343,14 @@ void zero_ip_v4(struct in_addr *ip)
}
/***
- Set an address to INADDR_ANY, or IN6ADDR_ANY.
+ Set an address to INADDR_ANY.
**/
-void zero_addr(struct sockaddr_storage *pss, int family)
+void zero_addr(struct sockaddr_storage *pss)
{
memset(pss, '\0', sizeof(*pss));
/* Ensure we're at least a valid sockaddr-storage. */
- pss-ss_family = family;
+ pss-ss_family = AF_INET;
}
/***
diff --git a/source/libsmb/cliconnect.c b/source/libsmb/cliconnect.c
index 826315a..448bfd7 100644
--- a/source/libsmb/cliconnect.c
+++ b/source/libsmb/cliconnect.c
@@ -1519,7 +1519,7 @@ NTSTATUS cli_start_connection(struct cli_state
**output_cli,
if (dest_ss) {
ss = *dest_ss;
} else {
- zero_addr(ss, AF_INET);
+ zero_addr(ss);
}
again:
diff --git a/source/libsmb/clidfs.c b/source/libsmb/clidfs.c
index e1ca924..6393f65 100644
--- a/source/libsmb/clidfs.c
+++ b/source/libsmb/clidfs.c
@@ -83,13 +83,13 @@ static struct cli_state *do_connect( const char *server,
const char *share,
server_n = server;
- zero_addr(ss, AF_INET);
+ zero_addr(ss);
make_nmb_name(calling, global_myname(), 0x0);
make_nmb_name(called , server, name_type);
again:
- zero_addr(ss, AF_INET);
+ zero_addr(ss);
if (have_ip)
ss = dest_ss;
diff --git a/source/libsmb/libsmbclient.c b/source/libsmb/libsmbclient.c
index d5bf182..0b45cad 100644
--- a/source/libsmb/libsmbclient.c
+++ b/source/libsmb/libsmbclient.c
@@ -654,7 +654,7 @@ smbc_server(SMBCCTX *context,
const char *username_used;
NTSTATUS status;
- zero_addr(ss, AF_INET);
+ zero_addr(ss);
ZERO_STRUCT(c);
if (server[0] == 0) {
@@ -742,7 +742,7 @@ smbc_server(SMBCCTX *context,
again:
slprintf(ipenv,sizeof(ipenv)-1,HOST_%s, server_n);
- zero_addr(ss, AF_INET);
+ zero_addr(ss);
/* have to open a new connection */
if
