[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-233-g27e4032
The branch, master has been updated
via 27e4032287e72bd3b1299210a487a5c16c8ae143 (commit)
via 52a49b448e4a9ccd3044b47a9efaf15f30fbd032 (commit)
from 4e0a61970120e10a6309251a97e660697818fa8a (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 27e4032287e72bd3b1299210a487a5c16c8ae143
Author: Stefan Metzmacher me...@samba.org
Date: Fri Jan 30 09:36:12 2009 +0100
s4:fix the build after 380874ef863866c94c999ef53252b9d30df65e88
metze
commit 52a49b448e4a9ccd3044b47a9efaf15f30fbd032
Author: Stefan Metzmacher me...@samba.org
Date: Fri Jan 30 08:25:27 2009 +0100
selftest: allow environment options
We support local and client (default) now.
We can decide if we want to run a client against the server
(with a special client.conf) or if we want to run tests localy
on the server with the same config as the server.
metze
---
Summary of changes:
selftest/selftest.pl| 58 +-
selftest/target/Samba4.pm | 11 ++---
source4/dsdb/samdb/ldb_modules/objectguid.c |1 +
source4/lib/ldb/ldb_map/ldb_map_outbound.c |1 +
source4/selftest/tests.sh |4 +-
5 files changed, 46 insertions(+), 29 deletions(-)
Changeset truncated at 500 lines:
diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index 97cf697..7d40db5 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -572,16 +572,6 @@ sub write_clientconf($$)
if (defined($vars-{REALM})) {
print CF \trealm = $vars-{REALM}\n;
}
- if (defined($vars-{NCALRPCDIR})) {
- print CF \tncalrpc dir = $vars-{NCALRPCDIR}\n;
- }
- if (defined($vars-{PIDDIR})) {
- print CF \tpid directory = $vars-{PIDDIR}\n;
- }
- if (defined($vars-{WINBINDD_SOCKET_DIR})) {
- print CF \twinbindd socket directory =
$vars-{WINBINDD_SOCKET_DIR}\n;
- print CF \twinbindd:socket dir =
$vars-{WINBINDD_SOCKET_DIR}\n;
- }
if ($opt_socket_wrapper) {
print CF \tinterfaces = $interfaces\n;
}
@@ -706,6 +696,17 @@ $| = 1;
my %running_envs = ();
+sub get_running_env($)
+{
+ my ($name) = @_;
+
+ my $envname = $name;
+
+ $envname =~ s/:.*//;
+
+ return $running_envs{$envname};
+}
+
my @exported_envvars = (
# domain stuff
DOMAIN,
@@ -743,13 +744,22 @@ $SIG{INT} = $SIG{QUIT} = $SIG{TERM} = sub {
sub setup_env($)
{
- my ($envname) = @_;
+ my ($name) = @_;
+
+ my $testenv_vars = undef;
+
+ my $envname = $name;
+ my $option = $name;
+
+ $envname =~ s/:.*//;
+ $option =~ s/^[^:]*://;
+
+ $option = client if $option eq ;
- my $testenv_vars;
if ($envname eq none) {
- $testenv_vars = {};
- } elsif (defined($running_envs{$envname})) {
- $testenv_vars = $running_envs{$envname};
+ $testenv_vars = \{};
+ } elsif (defined(get_running_env($envname))) {
+ $testenv_vars = get_running_env($envname);
if (not $target-check_env($testenv_vars)) {
$testenv_vars = undef;
}
@@ -761,8 +771,16 @@ sub setup_env($)
$running_envs{$envname} = $testenv_vars;
- SocketWrapper::set_default_iface(6);
- write_clientconf($conffile, $testenv_vars);
+ if ($option eq local) {
+
SocketWrapper::set_default_iface($testenv_vars-{SOCKET_WRAPPER_DEFAULT_IFACE});
+ $ENV{SMB_CONF_PATH} = $testenv_vars-{SERVERCONFFILE};
+ } elsif ($option eq client) {
+ SocketWrapper::set_default_iface(6);
+ write_clientconf($conffile, $testenv_vars);
+ $ENV{SMB_CONF_PATH} = $conffile;
+ } else {
+ die(Unknown option[$option] for envname[$envname]);
+ }
foreach (@exported_envvars) {
if (defined($testenv_vars-{$_})) {
@@ -792,21 +810,21 @@ sub getlog_env($)
{
my ($envname) = @_;
return if ($envname eq none);
- return $target-getlog_env($running_envs{$envname});
+ return $target-getlog_env(get_running_env($envname));
}
sub check_env($)
{
my ($envname) = @_;
return 1 if ($envname eq none);
- return $target-check_env($running_envs{$envname});
+ return $target-check_env(get_running_env($envname));
}
sub teardown_env($)
{
my ($envname) = @_;
return if ($envname eq none);
- $target-teardown_env($running_envs{$envname});
+ $target-teardown_env(get_running_env($envname));
delete $running_envs{$envname};
}
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 97f9878..208824d 100644
---
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-234-gfd82f59
The branch, master has been updated via fd82f593d75363e3d38f314425bc95ee192299b8 (commit) from 27e4032287e72bd3b1299210a487a5c16c8ae143 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit fd82f593d75363e3d38f314425bc95ee192299b8 Author: Stefan Metzmacher me...@samba.org Date: Fri Jan 30 10:01:48 2009 +0100 selftest: fix default option name metze --- Summary of changes: selftest/selftest.pl |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/selftest/selftest.pl b/selftest/selftest.pl index 7d40db5..cf25fa1 100755 --- a/selftest/selftest.pl +++ b/selftest/selftest.pl @@ -752,7 +752,8 @@ sub setup_env($) my $option = $name; $envname =~ s/:.*//; - $option =~ s/^[^:]*://; + $option =~ s/^[^:]*//; + $option =~ s/^://; $option = client if $option eq ; -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-235-gb88a0ad
The branch, master has been updated
via b88a0adbeda88729302bc8c8b027e197ebfc7015 (commit)
from fd82f593d75363e3d38f314425bc95ee192299b8 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit b88a0adbeda88729302bc8c8b027e197ebfc7015
Author: Stefan Metzmacher me...@samba.org
Date: Fri Jan 30 10:29:39 2009 +0100
selftest: fix none test
metze
---
Summary of changes:
selftest/selftest.pl |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index cf25fa1..b4cc4c1 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -758,7 +758,7 @@ sub setup_env($)
$option = client if $option eq ;
if ($envname eq none) {
- $testenv_vars = \{};
+ $testenv_vars = {};
} elsif (defined(get_running_env($envname))) {
$testenv_vars = get_running_env($envname);
if (not $target-check_env($testenv_vars)) {
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-236-gfb7b92a
The branch, master has been updated via fb7b92abc2bea4b3d91cdd896f02db88065a4b8f (commit) from b88a0adbeda88729302bc8c8b027e197ebfc7015 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit fb7b92abc2bea4b3d91cdd896f02db88065a4b8f Author: Günther Deschner g...@samba.org Date: Thu Jan 22 19:31:22 2009 +0100 s3-docs: fix typo in eventlogadm manpage. Guenther --- Summary of changes: docs-xml/manpages-3/eventlogadm.8.xml |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/manpages-3/eventlogadm.8.xml b/docs-xml/manpages-3/eventlogadm.8.xml index 04ba022..51a066f 100644 --- a/docs-xml/manpages-3/eventlogadm.8.xml +++ b/docs-xml/manpages-3/eventlogadm.8.xml @@ -91,7 +91,7 @@ /term listitempara The command-o write/command reads event log - records from standard input and writes them to theSamba + records from standard input and writes them to the Samba event log store named by EVENTLOG. /para /listitem /varlistentry @@ -180,7 +180,7 @@ /para/listitem listitempara - commandSRN/command - he name of the machine on + commandSRN/command - The name of the machine on which the eventlog was generated. This is typically the host name. /para/listitem -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4891-g0cc588a
The branch, v3-3-test has been updated via 0cc588ac53316299d2e1ff7d61947fd864d412f9 (commit) from 250caa1f2f285063249b2c4a7266196938d24761 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test - Log - commit 0cc588ac53316299d2e1ff7d61947fd864d412f9 Author: Günther Deschner g...@samba.org Date: Thu Jan 22 19:31:22 2009 +0100 s3-docs: fix typo in eventlogadm manpage. Guenther (cherry picked from commit fb7b92abc2bea4b3d91cdd896f02db88065a4b8f) --- Summary of changes: docs-xml/manpages-3/eventlogadm.8.xml |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/manpages-3/eventlogadm.8.xml b/docs-xml/manpages-3/eventlogadm.8.xml index 1fa89fd..e7d838b 100644 --- a/docs-xml/manpages-3/eventlogadm.8.xml +++ b/docs-xml/manpages-3/eventlogadm.8.xml @@ -91,7 +91,7 @@ /term listitempara The command-o write/command reads event log - records from standard input and writes them to theSamba + records from standard input and writes them to the Samba event log store named by EVENTLOG. /para /listitem /varlistentry @@ -180,7 +180,7 @@ /para/listitem listitempara - commandSRN/command - he name of the machine on + commandSRN/command - The name of the machine on which the eventlog was generated. This is typically the host name. /para/listitem -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3416-ga0d32cb
The branch, v3-2-test has been updated via a0d32cbc36a52bcd6b9b542919edee72ce95acdf (commit) from ce440096473d4db0e43f65ced6c2084a5bdbabc6 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log - commit a0d32cbc36a52bcd6b9b542919edee72ce95acdf Author: Günther Deschner g...@samba.org Date: Thu Jan 22 19:31:22 2009 +0100 s3-docs: fix typo in eventlogadm manpage. Guenther (cherry picked from commit fb7b92abc2bea4b3d91cdd896f02db88065a4b8f) (cherry picked from commit 0cc588ac53316299d2e1ff7d61947fd864d412f9) --- Summary of changes: docs-xml/manpages-3/eventlogadm.8.xml |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/manpages-3/eventlogadm.8.xml b/docs-xml/manpages-3/eventlogadm.8.xml index 04ba022..51a066f 100644 --- a/docs-xml/manpages-3/eventlogadm.8.xml +++ b/docs-xml/manpages-3/eventlogadm.8.xml @@ -91,7 +91,7 @@ /term listitempara The command-o write/command reads event log - records from standard input and writes them to theSamba + records from standard input and writes them to the Samba event log store named by EVENTLOG. /para /listitem /varlistentry @@ -180,7 +180,7 @@ /para/listitem listitempara - commandSRN/command - he name of the machine on + commandSRN/command - The name of the machine on which the eventlog was generated. This is typically the host name. /para/listitem -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-241-g22e3004
The branch, master has been updated
via 22e3004829fe742efdbf750611749b9aaf585515 (commit)
via b873ede89d3155438f7f9938d9a027cb4e3791e7 (commit)
via a0d52e7d54da450a734d7bc7f3827a2791e802b1 (commit)
via 0bd92281e49b91a9b9a14486adbe6f44affb7a13 (commit)
via 7b934c6af3f80c9d75151906eed929045cec28a2 (commit)
from fb7b92abc2bea4b3d91cdd896f02db88065a4b8f (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 22e3004829fe742efdbf750611749b9aaf585515
Author: Volker Lendecke v...@samba.org
Date: Thu Jan 29 22:54:55 2009 +0100
Add the SMBD rpc transport
The idea of this is that all client utils like smbpasswd and also for
example
net join do not access our internal databases like passdb and secrets.tdb
directly anymore but pass everything throught the well-established RPC
interfaces.
The way you use this is the following: With rpc_cli_smbd_conn_init() or its
async variant you initialize a struct rpc_cli_smbd_conn. This structure is
the link to a freshly forked smbd, ready to be used for RPC services. You
should only ever have one such structure in your program. More don't hurt,
but
are plainly unnecessary.
If you want to use the SAMR pipe to change a passwort, you connect to that
pipe
with rpc_pipe_open_local. Do you normal rpccli_samr calls on that and your
locally forked smbd will connect to passdb for you.
GD, this might make the distinction between the _l and _r calls in libnetapi
mostly unnecessary. At least it is intended to do so... :-)
commit b873ede89d3155438f7f9938d9a027cb4e3791e7
Author: Volker Lendecke v...@samba.org
Date: Thu Jan 29 22:41:33 2009 +0100
Make rpc_transport_np_init async
commit a0d52e7d54da450a734d7bc7f3827a2791e802b1
Author: Volker Lendecke v...@samba.org
Date: Mon Jan 26 20:45:19 2009 +0100
Add async cli_ntcreate
commit 0bd92281e49b91a9b9a14486adbe6f44affb7a13
Author: Volker Lendecke v...@samba.org
Date: Mon Jan 26 08:37:13 2009 +0100
Make cli_tcon_andx async
commit 7b934c6af3f80c9d75151906eed929045cec28a2
Author: Volker Lendecke v...@samba.org
Date: Sun Jan 25 21:54:55 2009 +0100
Make cli_session_setup_guest async
---
Summary of changes:
source3/Makefile.in |2 +-
source3/client/smbspool.c |9 +-
source3/include/proto.h | 77 -
source3/include/smb.h |1 +
source3/libsmb/cliconnect.c | 337 +++
source3/libsmb/clidfs.c |9 +-
source3/libsmb/clifile.c| 132 ++
source3/libsmb/libsmb_server.c | 17 +-
source3/libsmb/passchange.c | 10 +-
source3/nmbd/nmbd_synclists.c |2 +-
source3/rpc_client/cli_pipe.c | 55 +++
source3/rpc_client/rpc_transport_np.c | 153 ++--
source3/rpc_client/rpc_transport_smbd.c | 694 +++
source3/torture/locktest.c |7 +-
source3/torture/masktest.c |7 +-
source3/torture/torture.c | 20 +-
source3/utils/net_rpc.c |4 +-
source3/utils/smbcacls.c| 10 +-
source3/winbindd/winbindd_cm.c |9 +-
19 files changed, 1384 insertions(+), 171 deletions(-)
create mode 100644 source3/rpc_client/rpc_transport_smbd.c
Changeset truncated at 500 lines:
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 5448643..9bc6329 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -579,7 +579,7 @@ RPC_PARSE_OBJ = $(RPC_PARSE_OBJ2) \
rpc_parse/parse_eventlog.o rpc_parse/parse_buffer.o
RPC_CLIENT_OBJ = rpc_client/cli_pipe.o rpc_client/rpc_transport_np.o \
- rpc_client/rpc_transport_sock.o
+ rpc_client/rpc_transport_sock.o rpc_client/rpc_transport_smbd.o
LOCKING_OBJ = locking/locking.o locking/brlock.o locking/posix.o
diff --git a/source3/client/smbspool.c b/source3/client/smbspool.c
index 1910ccd..7943cf5 100644
--- a/source3/client/smbspool.c
+++ b/source3/client/smbspool.c
@@ -432,10 +432,13 @@ smb_complete_connection(const char *myname,
return NULL;
}
- if (!cli_send_tconX(cli, share, ?, password, strlen(password) +
1)) {
- fprintf(stderr, ERROR: Tree connect failed (%s)\n,
cli_errstr(cli));
+ nt_status = cli_tcon_andx(cli, share, ?, password,
+ strlen(password) + 1);
+ if (!NT_STATUS_IS_OK(nt_status)) {
+ fprintf(stderr, ERROR: Tree connect failed (%s)\n,
+ nt_errstr(nt_status));
- if (get_exit_code(cli, cli_nt_error(cli)) == 2) {
+ if (get_exit_code(cli, nt_status) == 2) {
*need_auth =
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-245-g01f30a5
The branch, master has been updated
via 01f30a5e8e6d860391e79896f6d1de782e239f68 (commit)
via 3f967153c0f87febb2e0d75d24080faa9d647666 (commit)
via 6b128f03d500b13468c666db51c87eb2e194f2ca (commit)
via 4b541c6f030e9459df35337bce3d8ce7ba92a2c6 (commit)
from 22e3004829fe742efdbf750611749b9aaf585515 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 01f30a5e8e6d860391e79896f6d1de782e239f68
Author: Stefan Metzmacher me...@samba.org
Date: Fri Jan 30 13:33:45 2009 +0100
s4:selftest: run RPC-COUNTCALLS as dc:local
metze
commit 3f967153c0f87febb2e0d75d24080faa9d647666
Author: Stefan Metzmacher me...@samba.org
Date: Fri Jan 30 10:30:13 2009 +0100
s4:selftest: run ncalrpc tests in dc:local mode
metze
commit 6b128f03d500b13468c666db51c87eb2e194f2ca
Author: Stefan Metzmacher me...@samba.org
Date: Fri Jan 30 11:03:45 2009 +0100
selftest: don't export $CONFIGURATION anymore only $SMB_CONF_PATH
metze
commit 4b541c6f030e9459df35337bce3d8ce7ba92a2c6
Author: Stefan Metzmacher me...@samba.org
Date: Fri Jan 30 13:22:31 2009 +0100
pidl: fix samba3-cli test after change to cli-dispatch()
metze
---
Summary of changes:
pidl/tests/samba3-cli.pl |4 +-
selftest/selftest.pl |3 +-
source3/selftest/tests.sh |2 +-
source4/selftest/tests.sh | 48 ++--
4 files changed, 32 insertions(+), 25 deletions(-)
Changeset truncated at 500 lines:
diff --git a/pidl/tests/samba3-cli.pl b/pidl/tests/samba3-cli.pl
index d762954..5a55163 100755
--- a/pidl/tests/samba3-cli.pl
+++ b/pidl/tests/samba3-cli.pl
@@ -42,7 +42,7 @@ is($x-{res},
\t\tNDR_PRINT_IN_DEBUG(bar, r);
\t}
- status = cli_do_rpc_ndr(cli,
+ status = cli-dispatch(cli,
mem_ctx,
ndr_table_foo,
NDR_BAR,
@@ -86,7 +86,7 @@ is($x-{res},
\t\tNDR_PRINT_IN_DEBUG(bar, r);
\t}
- status = cli_do_rpc_ndr(cli,
+ status = cli-dispatch(cli,
mem_ctx,
ndr_table_foo,
NDR_BAR,
diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index b4cc4c1..d4fd57e 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -648,7 +648,6 @@ if ($opt_quick) {
}
$ENV{SELFTEST_TARGET} = $opt_target;
$ENV{SELFTEST_MAXTIME} = $torture_maxtime;
-$ENV{SELFTEST_CONFFILE} = $conffile;
my @available = ();
foreach my $fn (@testlists) {
@@ -852,7 +851,7 @@ server is pid `cat \$PIDDIR/samba.pid`
Some useful environment variables:
TORTURE_OPTIONS=\$TORTURE_OPTIONS
-CONFIGURATION=\$CONFIGURATION
+SMB_CONF_PATH=\$SMB_CONF_PATH
$envvarstr
\ LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH} bash');
diff --git a/source3/selftest/tests.sh b/source3/selftest/tests.sh
index 7f2c8f2..e07dee6 100755
--- a/source3/selftest/tests.sh
+++ b/source3/selftest/tests.sh
@@ -51,7 +51,7 @@ export SCRIPTDIR
plantest talloctort3 none $VALGRIND $BINDIR/talloctort
plantest replacetort3 none $VALGRIND $BINDIR/replacetort
plantest tdbtorture3 none $VALGRIND $BINDIR/tdbtorture
-plantest smbconftort3 none $VALGRIND $BINDIR/smbconftort $CONFIGURATION
+plantest smbconftort3 none $VALGRIND $BINDIR/smbconftort -s \$SMB_CONF_PATH
tests=FDPASS LOCK1 LOCK2 LOCK3 LOCK4 LOCK5 LOCK6 LOCK7
tests=$tests UNLINK BROWSE ATTR TRANS2 TORTURE
diff --git a/source4/selftest/tests.sh b/source4/selftest/tests.sh
index 5c2b079..2acd376 100755
--- a/source4/selftest/tests.sh
+++ b/source4/selftest/tests.sh
@@ -60,12 +60,12 @@ smb4torture=$samba4bindir/smbtorture${EXEEXT}
$smb4torture -V
prefix_abs=$SELFTEST_PREFIX/s4client
+CONFIGURATION=--configfile=\$SMB_CONF_PATH
test -d $prefix_abs || mkdir $prefix_abs
-conffile=$SELFTEST_CONFFILE
TORTURE_OPTIONS=
-TORTURE_OPTIONS=$TORTURE_OPTIONS --configfile=$conffile
+TORTURE_OPTIONS=$TORTURE_OPTIONS $CONFIGURATION
TORTURE_OPTIONS=$TORTURE_OPTIONS --maximum-runtime=$SELFTEST_MAXTIME
TORTURE_OPTIONS=$TORTURE_OPTIONS --target=$SELFTEST_TARGET
TORTURE_OPTIONS=$TORTURE_OPTIONS --basedir=$prefix_abs
@@ -80,11 +80,6 @@ smb4torture=$smb4torture $TORTURE_OPTIONS
echo OPTIONS $TORTURE_OPTIONS
-SMB_CONF_PATH=$conffile
-export SMB_CONF_PATH
-CONFIGURATION=--configfile=$conffile
-export CONFIGURATION
-
# Simple tests for LDAP and CLDAP
for options in --option=socket:testnonblock=true -U\$USERNAME%\$PASSWORD
--option=socket:testnonblock=true -U\$USERNAME%\$PASSWORD; do
@@ -119,7 +114,7 @@ slow_ncacn_np_tests=RPC-SAMLOGON RPC-SAMR RPC-SAMR-USERS
RPC-SAMR-PASSWORDS
slow_ncalrpc_tests=RPC-SAMR RPC-SAMR-PASSWORDS
slow_ncacn_ip_tcp_tests=RPC-SAMR RPC-SAMR-PASSWORDS RPC-CRACKNAMES
-all_tests=$ncalrpc_tests $ncacn_np_tests $ncacn_ip_tcp_tests
$slow_ncalrpc_tests
[SCM] Samba Shared Repository - branch v3-2-stable updated - release-3-2-7-155-ge0b8d1a
The branch, v3-2-stable has been updated via e0b8d1af1bef392b4b188ca3f8ea5066b6547433 (commit) via 36780b4e4f3e2d8ceac8c7121df1f9d973eb8d4f (commit) via d90f4f56fc93418121506caa215cab4d80fb6f7a (commit) via 3ad6389bb8c921a31fb8cfc22e509c1f4023eb9a (commit) via a88e491d1047a73909c9c6afd638c88a4bb4001e (commit) via 2c127c4636eec1e060b3cfd5876622e42e8eafdd (commit) via 23429e754a5583493380e63b0f19d24641bbefea (commit) via 37ec855659d83c9c3de8455d4839a7f6027afb90 (commit) from d98820b808581a1c585c8fc45335ccc28ca2888b (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-stable - Log - commit e0b8d1af1bef392b4b188ca3f8ea5066b6547433 Author: Günther Deschner g...@samba.org Date: Thu Jan 22 19:31:22 2009 +0100 s3-docs: fix typo in eventlogadm manpage. Guenther (cherry picked from commit fb7b92abc2bea4b3d91cdd896f02db88065a4b8f) (cherry picked from commit 0cc588ac53316299d2e1ff7d61947fd864d412f9) (cherry picked from commit a0d32cbc36a52bcd6b9b542919edee72ce95acdf) commit 36780b4e4f3e2d8ceac8c7121df1f9d973eb8d4f Author: Björn Jacke b...@sernet.de Date: Thu Jan 29 22:59:00 2009 +0100 add Tru64 sub-second resolution timestamp support (cherry picked from commit ce440096473d4db0e43f65ced6c2084a5bdbabc6) commit d90f4f56fc93418121506caa215cab4d80fb6f7a Author: Björn Jacke b...@sernet.de Date: Thu Jan 29 21:59:44 2009 +0100 add configure check for Tru64 sub-second timestamp resolution (cherry picked from commit bbfe82768add789a98ce3711fb5f378d19363401) commit 3ad6389bb8c921a31fb8cfc22e509c1f4023eb9a Author: Björn Jacke b...@sernet.de Date: Thu Jan 29 20:56:51 2009 +0100 add missing semicolons the fixed configure check led to a missing semicolon in the now activated BSD code. Then this error was even copypasted into the new AIX code. grrr (cherry picked from commit 5e4f6639e7ed96f3457177d203283c1c55ec52dd) commit a88e491d1047a73909c9c6afd638c88a4bb4001e Author: Jeremy Allison j...@samba.org Date: Thu Jan 29 10:47:02 2009 -0800 Following Björn JACKE's patch, unify the detection of the timespec code in configure.in, and the application of it in time.c Jeremy. (cherry picked from commit d7c7acee813b3cd9649b381a3e63c0be56e67d29) commit 2c127c4636eec1e060b3cfd5876622e42e8eafdd Author: Björn Jacke b...@sernet.de Date: Thu Jan 29 00:33:19 2009 +0100 add configure check for AIX style sub-second resolution support (cherry picked from commit e0381d6a173dcf64910ac597a10a3f0fa59ffe43) commit 23429e754a5583493380e63b0f19d24641bbefea Author: Björn Jacke b...@sernet.de Date: Thu Jan 29 00:20:00 2009 +0100 rather cosmetic fix for failed birthtime configure checks (cherry picked from commit ca155297bf932df6fd4a0ff223e5a7f1b8340f6b) commit 37ec855659d83c9c3de8455d4839a7f6027afb90 Author: Björn Jacke b...@sernet.de Date: Thu Jan 29 00:17:12 2009 +0100 give configure check sub-second timestamps without struct timespec a chance to succeed (cherry picked from commit 772dcc3b3703507af6baee090602a0ae8633fe2f) --- Summary of changes: docs-xml/manpages-3/eventlogadm.8.xml |4 +- source/configure.in | 132 +++-- source/lib/time.c | 66 - 3 files changed, 190 insertions(+), 12 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/manpages-3/eventlogadm.8.xml b/docs-xml/manpages-3/eventlogadm.8.xml index 04ba022..51a066f 100644 --- a/docs-xml/manpages-3/eventlogadm.8.xml +++ b/docs-xml/manpages-3/eventlogadm.8.xml @@ -91,7 +91,7 @@ /term listitempara The command-o write/command reads event log - records from standard input and writes them to theSamba + records from standard input and writes them to the Samba event log store named by EVENTLOG. /para /listitem /varlistentry @@ -180,7 +180,7 @@ /para/listitem listitempara - commandSRN/command - he name of the machine on + commandSRN/command - The name of the machine on which the eventlog was generated. This is typically the host name. /para/listitem diff --git a/source/configure.in b/source/configure.in index 08eb67d..257d2ad 100644 --- a/source/configure.in +++ b/source/configure.in @@ -1278,7 +1278,8 @@ fi # # Check whether struct stat has timestamps with sub-second resolution. -# At least IRIX and Solaris have these. +# At least IRIX and Solaris have these. FREEBSD does as well, +# but with different members # # We check that # all of st_mtim, st_atim
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4892-g9ffb1e6
The branch, v3-3-test has been updated
via 9ffb1e6f0ded2647efe567912873a1a63e2ffed1 (commit)
from 0cc588ac53316299d2e1ff7d61947fd864d412f9 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit 9ffb1e6f0ded2647efe567912873a1a63e2ffed1
Author: Volker Lendecke v...@samba.org
Date: Thu Oct 2 02:17:04 2008 +0200
Fix bug 5798: CFLAGS info lost in configure
picked from 9097a67de
Volker
---
Summary of changes:
source/configure.in |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/configure.in b/source/configure.in
index f9f882e..c518921 100644
--- a/source/configure.in
+++ b/source/configure.in
@@ -128,7 +128,7 @@ fi
if test x$debug = xyes ; then
CFLAGS=${CFLAGS} -g
else
- CFLAGS=-O
+ CFLAGS=${CFLAGS} -O
fi
CFLAGS=${CFLAGS} -D_SAMBA_BUILD_=3
--
Samba Shared Repository
svn commit: samba-web r1266 - in trunk/patches: . patches-3.3.0
Author: kseeger Date: 2009-01-30 14:07:15 + (Fri, 30 Jan 2009) New Revision: 1266 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-webrev=1266 Log: Add patch for Samba 3.3.0 Karolin Added: trunk/patches/patches-3.3.0/ trunk/patches/patches-3.3.0/0001-fix-bug-6073-prevent-ads_connect-from-using-SSL.patch trunk/patches/patches-3.3.0/series Removed: trunk/patches/patches-3.0.24/ trunk/patches/patches-3.2.1/ trunk/patches/series-3.0.24 trunk/patches/series-3.2.1 Modified: trunk/patches/index.html trunk/patches/patches trunk/patches/series Changeset: Modified: trunk/patches/index.html === --- trunk/patches/index.html2009-01-27 08:51:32 UTC (rev 1265) +++ trunk/patches/index.html2009-01-30 14:07:15 UTC (rev 1266) @@ -1,18 +1,18 @@ -!--#include virtual=/samba/header.html -- +!--#include virtual=/samba/header.html -- titleSamba - opening windows to a wider world/title !--#include virtual=/samba/header_columns.html -- h2Patches for Recent Releases/h2 -pIn order to better support the Samba community, this page +pIn order to better support the Samba community, this page contains recommended patches for the most recent production - releases. These patches have been integrated into the - main Samba development trees for the next version of Samba - 3.0.x./p + releases. These patches have been integrated into the + main Samba development trees for the next version of Samba. +/p pFollow these instructions for applying patches:/p -pre$ tar zxvf samba-3.0.x.tar.gz -$ cd samba-3.0.x +pre$ tar zxvf samba-3.x.y.tar.gz +$ cd samba-3.x.y $ patch -p1 lt; quot;downloaded_patch_filequot; $ cd source /pre @@ -31,47 +31,24 @@ pbuild Samba as normal/p pPlease note that in some cases it will be necessary to regenerate - the configure script by executing autogen.sh located in the - source/ directory. In all cases, it is best to do a clean build + the configure script by executing autogen.sh located in the + source/ directory. In all cases, it is best to do a clean build after applying any patches./p !-- Each release gets its own table. -- table class=real thead -trth colspan=2bSamba 3.0.24/b/th/tr +trth colspan=2bSamba 3.3.0/b/th/tr /thead tbody tr tdemPatch/em/tdtdemDescription/em/td /tr tr -tda href=/samba/patches/patches-3.0.24/share_security_ntlmv2.diffsecurity = share and NTLMv2/a/td -tdFixes an issues with servers set to quot;security = sharequot; and Vista - clients that send NTLMv2 responses by default./td +tda href=/samba/patches/patches-3.3.0/0001-fix-bug-6073-prevent-ads_connect-from-using-SSL.patchfix ads domain join/a/td +tdFixes the domain join on domain members using isecurity = ads/i./td /tr - tr -tda href=/samba/patches/patches-3.0.24/spoolss.diffVista Point-n-Print/a/td -tdFixes several point-n-print bugs with Vista clients./td - /tr - tr - tr -tda href=/samba/patches/patches-3.0.24/vista_backup_acl.diffBUG 4361/a/td -tdFix failure when using the Vista backup utility./td - /tr - tr -tda href=/samba/patches/patches-3.0.24/variable_os_expansion.diffBUG 4093/a/td -tdFix expansion of the %a smb.conf variable for Vista clients./td - /tr - tr -tda href=/samba/patches/patches-3.0.24/dfs_referral.diffBUG 4356/a/td -tdFix MS-DFS referrals with Windows Vista clients./td - /tr - tr -tda - href=/samba/patches/patches-3.0.24/directory_delete.diffBUG 4188/a/td -tdFix for Vista failing to delete directories on a Samba share./td - /tr /tbody /table Modified: trunk/patches/patches === --- trunk/patches/patches 2009-01-27 08:51:32 UTC (rev 1265) +++ trunk/patches/patches 2009-01-30 14:07:15 UTC (rev 1266) @@ -1 +1 @@ -link patches-3.2.1 \ No newline at end of file +link patches-3.3.0 \ No newline at end of file Added: trunk/patches/patches-3.3.0/0001-fix-bug-6073-prevent-ads_connect-from-using-SSL.patch === --- trunk/patches/patches-3.3.0/0001-fix-bug-6073-prevent-ads_connect-from-using-SSL.patch 2009-01-27 08:51:32 UTC (rev 1265) +++ trunk/patches/patches-3.3.0/0001-fix-bug-6073-prevent-ads_connect-from-using-SSL.patch 2009-01-30 14:07:15 UTC (rev 1266) @@ -0,0 +1,37 @@ +From d332da87068cd72489941010a33e372ab53d3bcc Mon Sep 17 00:00:00 2001 +From: Michael Adam ob...@samba.org +Date: Thu, 29 Jan 2009 13:17:46 +0100 +Subject: [PATCH] fix bug #6073: prevent ads_connect() from using SSL unless explicitly requested + +This fixes net ads join. +It copes with the changed default ldap ssl = start tls. +A new boolean option ldap ssl : ads is added to allow for +explicitly requesting ssl with ads. + +Michael +--- + source/libads/ldap.c |8 +--- + 1 files changed, 5
svn commit: samba-web r1267 - in trunk/patches: .
Author: kseeger Date: 2009-01-30 14:13:06 + (Fri, 30 Jan 2009) New Revision: 1267 WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-webrev=1267 Log: Add bug number to the description Karolin Modified: trunk/patches/index.html Changeset: Modified: trunk/patches/index.html === --- trunk/patches/index.html2009-01-30 14:07:15 UTC (rev 1266) +++ trunk/patches/index.html2009-01-30 14:13:06 UTC (rev 1267) @@ -46,7 +46,7 @@ tdemPatch/em/tdtdemDescription/em/td /tr tr -tda href=/samba/patches/patches-3.3.0/0001-fix-bug-6073-prevent-ads_connect-from-using-SSL.patchfix ads domain join/a/td +tda href=/samba/patches/patches-3.3.0/0001-fix-bug-6073-prevent-ads_connect-from-using-SSL.patchBUG 6073/a/td tdFixes the domain join on domain members using isecurity = ads/i./td /tr /tbody
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-246-gd93634b
The branch, master has been updated via d93634b7dd753109a5a3621ea7ab610acba8cb65 (commit) from 01f30a5e8e6d860391e79896f6d1de782e239f68 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit d93634b7dd753109a5a3621ea7ab610acba8cb65 Author: Simo Sorce i...@samba.org Date: Fri Jan 30 09:24:48 2009 -0500 Fix misfiled headers. Some public functions were mistakenly put into ldb_private.h Revert all modules to only include ldb_module.h --- Summary of changes: source4/dsdb/samdb/ldb_modules/objectguid.c |1 - source4/lib/ldb/include/ldb.h | 15 --- source4/lib/ldb/include/ldb_private.h |9 - source4/lib/ldb/ldb_map/ldb_map_outbound.c |1 - 4 files changed, 12 insertions(+), 14 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/dsdb/samdb/ldb_modules/objectguid.c b/source4/dsdb/samdb/ldb_modules/objectguid.c index afd8788..46ba8eb 100644 --- a/source4/dsdb/samdb/ldb_modules/objectguid.c +++ b/source4/dsdb/samdb/ldb_modules/objectguid.c @@ -35,7 +35,6 @@ #include includes.h #include ldb_module.h -#include ldb_private.h #include librpc/gen_ndr/ndr_misc.h #include param/param.h diff --git a/source4/lib/ldb/include/ldb.h b/source4/lib/ldb/include/ldb.h index 589887b..6814649 100644 --- a/source4/lib/ldb/include/ldb.h +++ b/source4/lib/ldb/include/ldb.h @@ -1233,6 +1233,11 @@ int ldb_extended(struct ldb_context *ldb, struct ldb_result **res); /** + Obtain current/next database sequence number +*/ +int ldb_sequence_number(struct ldb_context *ldb, enum ldb_sequence_type type, uint64_t *seq_num); + +/** start a transaction */ int ldb_transaction_start(struct ldb_context *ldb); @@ -1633,6 +1638,8 @@ int ldb_msg_add_fmt(struct ldb_message *msg, */ int ldb_msg_element_compare(struct ldb_message_element *el1, struct ldb_message_element *el2); +int ldb_msg_element_compare_name(struct ldb_message_element *el1, +struct ldb_message_element *el2); /** Find elements in a message. @@ -1746,14 +1753,16 @@ const char **ldb_attr_list_copy(TALLOC_CTX *mem_ctx, const char * const *attrs); const char **ldb_attr_list_copy_add(TALLOC_CTX *mem_ctx, const char * const *attrs, const char *new_attr); int ldb_attr_in_list(const char * const *attrs, const char *attr); +int ldb_msg_rename_attr(struct ldb_message *msg, const char *attr, const char *replace); +int ldb_msg_copy_attr(struct ldb_message *msg, const char *attr, const char *replace); +void ldb_msg_remove_attr(struct ldb_message *msg, const char *attr); +void ldb_msg_remove_element(struct ldb_message *msg, struct ldb_message_element *el); + void ldb_parse_tree_attr_replace(struct ldb_parse_tree *tree, const char *attr, const char *replace); -int ldb_msg_rename_attr(struct ldb_message *msg, const char *attr, const char *replace); -int ldb_msg_copy_attr(struct ldb_message *msg, const char *attr, const char *replace); -void ldb_msg_remove_attr(struct ldb_message *msg, const char *attr); /** Convert a time structure to a string diff --git a/source4/lib/ldb/include/ldb_private.h b/source4/lib/ldb/include/ldb_private.h index 04ee002..1097708 100644 --- a/source4/lib/ldb/include/ldb_private.h +++ b/source4/lib/ldb/include/ldb_private.h @@ -158,17 +158,8 @@ int ldb_comparison_binary(struct ldb_context *ldb, void *mem_ctx, /* The following definitions come from lib/ldb/common/ldb_utf8.c */ char *ldb_casefold_default(void *context, void *mem_ctx, const char *s, size_t n); -void ldb_msg_remove_element(struct ldb_message *msg, struct ldb_message_element *el); - -int ldb_msg_element_compare_name(struct ldb_message_element *el1, -struct ldb_message_element *el2); void ldb_dump_results(struct ldb_context *ldb, struct ldb_result *result, FILE *f); -/** - Obtain current/next database sequence number -*/ -int ldb_sequence_number(struct ldb_context *ldb, enum ldb_sequence_type type, uint64_t *seq_num); - #define LDB_SEQ_GLOBAL_SEQUENCE0x01 #define LDB_SEQ_TIMESTAMP_SEQUENCE 0x02 diff --git a/source4/lib/ldb/ldb_map/ldb_map_outbound.c b/source4/lib/ldb/ldb_map/ldb_map_outbound.c index edd3f77..327fa92 100644 --- a/source4/lib/ldb/ldb_map/ldb_map_outbound.c +++ b/source4/lib/ldb/ldb_map/ldb_map_outbound.c @@ -26,7 +26,6 @@ */ #include ldb_module.h -#include ldb_private.h #include ldb_map.h #include ldb_map_private.h -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-247-g1f2b5ea
The branch, master has been updated
via 1f2b5ea97c7957f4f49fdea67960e7c0e505 (commit)
from d93634b7dd753109a5a3621ea7ab610acba8cb65 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 1f2b5ea97c7957f4f49fdea67960e7c0e505
Author: Simo Sorce i...@samba.org
Date: Fri Jan 30 10:18:52 2009 -0500
Add helper function to get a module name, may be useful for debugging.
---
Summary of changes:
source4/lib/ldb/common/ldb_modules.c |5 +
source4/lib/ldb/include/ldb_module.h |3 ++-
2 files changed, 7 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/lib/ldb/common/ldb_modules.c
b/source4/lib/ldb/common/ldb_modules.c
index 03d1e6e..99a4776 100644
--- a/source4/lib/ldb/common/ldb_modules.c
+++ b/source4/lib/ldb/common/ldb_modules.c
@@ -506,6 +506,11 @@ struct ldb_module *ldb_module_new(TALLOC_CTX *memctx,
return module;
}
+const char * ldb_module_get_name(struct ldb_module *module)
+{
+ return module-ops-name;
+}
+
struct ldb_context *ldb_module_get_ctx(struct ldb_module *module)
{
return module-ldb;
diff --git a/source4/lib/ldb/include/ldb_module.h
b/source4/lib/ldb/include/ldb_module.h
index 8742b10..4e10191 100644
--- a/source4/lib/ldb/include/ldb_module.h
+++ b/source4/lib/ldb/include/ldb_module.h
@@ -55,7 +55,7 @@ struct ldb_module_ops {
int (*end_transaction)(struct ldb_module *);
int (*del_transaction)(struct ldb_module *);
int (*sequence_number)(struct ldb_module *, struct ldb_request *);
-void *private_data;
+ void *private_data;
};
@@ -110,6 +110,7 @@ struct ldb_module *ldb_module_new(TALLOC_CTX *memctx,
const char *module_name,
const struct ldb_module_ops *ops);
+const char * ldb_module_get_name(struct ldb_module *module);
struct ldb_context *ldb_module_get_ctx(struct ldb_module *module);
void *ldb_module_get_private(struct ldb_module *module);
void ldb_module_set_private(struct ldb_module *module, void *private_data);
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-250-gcdca75d
The branch, master has been updated via cdca75dee67ebfee62b44273d7d5ae5f123c477b (commit) via 73dbbe0d5406d1852f85a17b506a4b943ad1926f (commit) via 94cb0835ca690cc7eb115693e672ea9a662fc671 (commit) from 1f2b5ea97c7957f4f49fdea67960e7c0e505 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit cdca75dee67ebfee62b44273d7d5ae5f123c477b Author: Stefan Metzmacher me...@samba.org Date: Fri Jan 30 17:34:49 2009 +0100 heimdal: don't include sys/cdefs.h without knowing it's there metze commit 73dbbe0d5406d1852f85a17b506a4b943ad1926f Author: Stefan Metzmacher me...@samba.org Date: Fri Jan 30 17:34:00 2009 +0100 heimdal: don't include ifaddrs.h without knowing it's there metze commit 94cb0835ca690cc7eb115693e672ea9a662fc671 Author: Stefan Metzmacher me...@samba.org Date: Fri Jan 30 17:03:10 2009 +0100 s4:build: kill DEFAULT_HEADERS variable metze --- Summary of changes: lib/util/config.mk |1 + source4/Makefile |7 +++ source4/heimdal/lib/krb5/get_addrs.c |2 ++ source4/heimdal/lib/roken/vis.hin|2 ++ source4/heimdal_build/vis.h | 11 +++ 5 files changed, 19 insertions(+), 4 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/util/config.mk b/lib/util/config.mk index 22f22b5..02f476b 100644 --- a/lib/util/config.mk +++ b/lib/util/config.mk @@ -30,6 +30,7 @@ LIBSAMBA-UTIL_OBJ_FILES = $(addprefix $(libutilsrcdir)/, \ params.o) PUBLIC_HEADERS += $(addprefix $(libutilsrcdir)/, util.h \ +dlinklist.h attr.h \ byteorder.h \ data_blob.h \ diff --git a/source4/Makefile b/source4/Makefile index 7d4540a..b342d67 100644 --- a/source4/Makefile +++ b/source4/Makefile @@ -145,12 +145,11 @@ endif clean:: @find ../lib ../libcli ../librpc ../nsswitch -name '*.o' -o -name '*.ho' | xargs rm -f -DEFAULT_HEADERS = $(srcdir)/../lib/util/dlinklist.h \ - $(srcdir)/version.h +PUBLIC_HEADES += $(srcdir)/version.h libraries:: $(STATIC_LIBS) $(SHARED_LIBS) modules:: $(PLUGINS) -headers:: $(PUBLIC_HEADERS) $(DEFAULT_HEADERS) +headers:: $(PUBLIC_HEADERS) manpages:: $(MANPAGES) all:: showflags $(ALL_PREDEP) binaries modules pythonmods libraries headers everything:: all @@ -233,7 +232,7 @@ installlib:: $(SHARED_LIBS) $(STATIC_LIBS) installdirs #...@$(SHELL) $(srcdir)/script/installlib.sh $(DESTDIR)$(libdir) $(STLIBEXT) $(STATIC_LIBS) installheader:: headers installdirs - @srcdir=$(srcdir) builddir=$(builddir) $(PERL) $(srcdir)/script/installheader.pl $(DESTDIR)$(includedir) $(PUBLIC_HEADERS) $(DEFAULT_HEADERS) + @srcdir=$(srcdir) builddir=$(builddir) $(PERL) $(srcdir)/script/installheader.pl $(DESTDIR)$(includedir) $(PUBLIC_HEADERS) installdat:: installdirs @$(SHELL) $(srcdir)/script/installdat.sh $(DESTDIR)$(datadir) $(srcdir) diff --git a/source4/heimdal/lib/krb5/get_addrs.c b/source4/heimdal/lib/krb5/get_addrs.c index fb45d08..ce16785 100644 --- a/source4/heimdal/lib/krb5/get_addrs.c +++ b/source4/heimdal/lib/krb5/get_addrs.c @@ -43,7 +43,9 @@ struct mbuf; #ifdef HAVE_NET_IF_H #include net/if.h #endif +#ifdef HAVE_IFADDR_H #include ifaddrs.h +#endif static krb5_error_code gethostname_fallback (krb5_context context, krb5_addresses *res) diff --git a/source4/heimdal/lib/roken/vis.hin b/source4/heimdal/lib/roken/vis.hin index 6427452..06a250c 100644 --- a/source4/heimdal/lib/roken/vis.hin +++ b/source4/heimdal/lib/roken/vis.hin @@ -80,7 +80,9 @@ */ #defineUNVIS_END 1 /* no more characters */ +#ifdef HAVE_SYS_CDEFS_H #include sys/cdefs.h +#endif __BEGIN_DECLS char * ROKEN_LIB_FUNCTION diff --git a/source4/heimdal_build/vis.h b/source4/heimdal_build/vis.h index 13b39aa..4389993 100644 --- a/source4/heimdal_build/vis.h +++ b/source4/heimdal_build/vis.h @@ -1,4 +1,15 @@ #ifndef _HEIMDAL_BUILD_VIS_H #define _HEIMDAL_BUILD_VIS_H + +#include system/locale.h + +#ifndef __BEGIN_DECLS +#define __BEGIN_DECLS +#endif + +#ifndef __END_DECLS +#define __END_DECLS +#endif + #include heimdal/lib/roken/vis.hin #endif -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-252-g334c6e6
The branch, master has been updated
via 334c6e6b78de8529fce0061efd5249f8fe2d256f (commit)
via 9cf1175d331369a5552b770f6189f49e4bff44b8 (commit)
from cdca75dee67ebfee62b44273d7d5ae5f123c477b (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 334c6e6b78de8529fce0061efd5249f8fe2d256f
Author: Stefan Metzmacher me...@samba.org
Date: Fri Jan 30 17:53:04 2009 +0100
s4:heimdal_build: include system/network.h via config.h wrapper
This fixes build problems on Tru64.
metze
commit 9cf1175d331369a5552b770f6189f49e4bff44b8
Author: Stefan Metzmacher me...@samba.org
Date: Fri Jan 30 17:52:37 2009 +0100
heimdal:camellia-ntt.c: include config.h as first header
metze
---
Summary of changes:
source4/heimdal/lib/hcrypto/camellia-ntt.c |3 +++
source4/heimdal_build/config.h |1 +
2 files changed, 4 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/heimdal/lib/hcrypto/camellia-ntt.c
b/source4/heimdal/lib/hcrypto/camellia-ntt.c
index 70b0268..c6e3485 100644
--- a/source4/heimdal/lib/hcrypto/camellia-ntt.c
+++ b/source4/heimdal/lib/hcrypto/camellia-ntt.c
@@ -23,6 +23,9 @@
* http://info.isl.ntt.co.jp/crypt/eng/camellia/specifications.html
*/
+#ifdef HAVE_CONFIG_H
+#include config.h
+#endif
#include string.h
#include stdlib.h
diff --git a/source4/heimdal_build/config.h b/source4/heimdal_build/config.h
index e15c6ef..5f21da2 100644
--- a/source4/heimdal_build/config.h
+++ b/source4/heimdal_build/config.h
@@ -8,6 +8,7 @@
#include include/config.h
#include ../replace/replace.h
+#include system/network.h
#define RCSID(msg) struct __rcsid { int __rcsdi; }
#define KRB5
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-253-g3f09dd0
The branch, master has been updated
via 3f09dd0d824c3e35423d68e2fb1f14dbd0875dd2 (commit)
from 334c6e6b78de8529fce0061efd5249f8fe2d256f (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 3f09dd0d824c3e35423d68e2fb1f14dbd0875dd2
Author: Stefan Metzmacher me...@samba.org
Date: Fri Jan 30 17:58:16 2009 +0100
heimdal:roken: arg_printusage() should not try to return a value.
This should fix problems with the IRIX build.
metze
---
Summary of changes:
source4/heimdal/lib/roken/getarg.c |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/heimdal/lib/roken/getarg.c
b/source4/heimdal/lib/roken/getarg.c
index 3884fa8..7679d7f 100644
--- a/source4/heimdal/lib/roken/getarg.c
+++ b/source4/heimdal/lib/roken/getarg.c
@@ -216,8 +216,8 @@ arg_printusage (struct getargs *args,
const char *progname,
const char *extra_string)
{
-return arg_printusage_i18n(args, num_args, Usage,
- progname, extra_string, builtin_i18n);
+arg_printusage_i18n(args, num_args, Usage,
+ progname, extra_string, builtin_i18n);
}
void ROKEN_LIB_FUNCTION
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-254-ge592718
The branch, master has been updated via e592718c43d14ddb1f97be3a10d02b6a8deaa269 (commit) from 3f09dd0d824c3e35423d68e2fb1f14dbd0875dd2 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit e592718c43d14ddb1f97be3a10d02b6a8deaa269 Author: Stefan Metzmacher me...@samba.org Date: Fri Jan 30 18:02:21 2009 +0100 heimdal:roken: arg_match_long() should return a value This should fix a build problem on IRIX. metze --- Summary of changes: source4/heimdal/lib/roken/getarg.c |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/heimdal/lib/roken/getarg.c b/source4/heimdal/lib/roken/getarg.c index 7679d7f..3168ccc 100644 --- a/source4/heimdal/lib/roken/getarg.c +++ b/source4/heimdal/lib/roken/getarg.c @@ -478,6 +478,9 @@ arg_match_long(struct getargs *args, size_t num_args, default: abort (); } + +/* not reached */ +return ARG_ERR_NO_MATCH; } static int -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-257-g9fa2e56
The branch, master has been updated
via 9fa2e564886525dd82b3283da2c467bc8d576225 (commit)
via c28952c55505ce09e3cc082ad59692d4977ed26e (commit)
via 24a1b556fc0296c289a0a83fafc7815fff528cfb (commit)
from e592718c43d14ddb1f97be3a10d02b6a8deaa269 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 9fa2e564886525dd82b3283da2c467bc8d576225
Author: Stefan Metzmacher me...@samba.org
Date: Fri Jan 30 18:41:34 2009 +0100
s4:heimdal_build: add a dummy define for dirfd()
metze
commit c28952c55505ce09e3cc082ad59692d4977ed26e
Author: Stefan Metzmacher me...@samba.org
Date: Fri Jan 30 18:38:00 2009 +0100
lib/replace: check if we have dirfd()
Note: we only use this internally and don't replace it by default.
metze
commit 24a1b556fc0296c289a0a83fafc7815fff528cfb
Author: Stefan Metzmacher me...@samba.org
Date: Fri Jan 30 18:41:07 2009 +0100
s4:lib/util: fix the build
metze
---
Summary of changes:
lib/replace/repdir.m4 |3 +++
lib/util/config.mk |2 +-
source4/heimdal_build/config.h |4
3 files changed, 8 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/replace/repdir.m4 b/lib/replace/repdir.m4
index f53a4c2..fb3f414 100644
--- a/lib/replace/repdir.m4
+++ b/lib/replace/repdir.m4
@@ -7,6 +7,9 @@ AC_CACHE_CHECK([for broken
readdir],libreplace_cv_READDIR_NEEDED,[
[libreplace_cv_READDIR_NEEDED=assuming not])
])
+AC_CHECK_FUNCS(dirfd)
+AC_HAVE_DECL(dirfd, [#include dirent.h])
+
#
# try to replace with getdirentries() if needed
#
diff --git a/lib/util/config.mk b/lib/util/config.mk
index 02f476b..14bdb2a 100644
--- a/lib/util/config.mk
+++ b/lib/util/config.mk
@@ -30,7 +30,7 @@ LIBSAMBA-UTIL_OBJ_FILES = $(addprefix $(libutilsrcdir)/, \
params.o)
PUBLIC_HEADERS += $(addprefix $(libutilsrcdir)/, util.h \
-dlinklist.h
+dlinklist.h \
attr.h \
byteorder.h \
data_blob.h \
diff --git a/source4/heimdal_build/config.h b/source4/heimdal_build/config.h
index 5f21da2..114e536 100644
--- a/source4/heimdal_build/config.h
+++ b/source4/heimdal_build/config.h
@@ -10,6 +10,10 @@
#include ../replace/replace.h
#include system/network.h
+#if !defined(HAVE_DIRFD) !defined(HAVE_DIRFD_DECL) !defined(dirfd)
+#define dirfd(d) (-1)
+#endif
+
#define RCSID(msg) struct __rcsid { int __rcsdi; }
#define KRB5
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-264-g2fe137e
The branch, master has been updated
via 2fe137e7bce425adf9cc64664eb493dfa8a7e885 (commit)
via d129507ee472b884d42d1bf301be6f235b0ac5a7 (commit)
via 84ca20a6b5e63f4bd73e2e2586d88ccb2adca123 (commit)
via 3718cf294ad1f3e00178cb34b2c914c9aecf2016 (commit)
via 2f8a39829611da0ba4661744ff189f66907b43e6 (commit)
via 55f663a04b791baf5a7a0bc635bd6f626498d8fc (commit)
via e8c2ed1d489ad67451459c69877ccba41b157e88 (commit)
from 9fa2e564886525dd82b3283da2c467bc8d576225 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 2fe137e7bce425adf9cc64664eb493dfa8a7e885
Author: Stefan Metzmacher me...@samba.org
Date: Fri Jan 30 19:44:20 2009 +0100
heimdal:hdb: always include config.h first
metze
commit d129507ee472b884d42d1bf301be6f235b0ac5a7
Author: Stefan Metzmacher me...@samba.org
Date: Fri Jan 30 19:41:33 2009 +0100
s4:lib/ldb: include replace.h in pyldb.c
This fixes the build on Tru64.
metze
commit 84ca20a6b5e63f4bd73e2e2586d88ccb2adca123
Author: Stefan Metzmacher me...@samba.org
Date: Fri Jan 30 19:39:34 2009 +0100
lib/tevent: include replace.h in pytevent.c
This fixes the build on Tru64.
metze
commit 3718cf294ad1f3e00178cb34b2c914c9aecf2016
Author: Stefan Metzmacher me...@samba.org
Date: Fri Jan 30 19:38:59 2009 +0100
lib/tdb: include replace.h and system/filesys.h in pytdb.c
This fixes the build on Tru64.
metze
commit 2f8a39829611da0ba4661744ff189f66907b43e6
Author: Stefan Metzmacher me...@samba.org
Date: Fri Jan 30 19:38:09 2009 +0100
lib/talloc: include replace.h in pytalloc.c
This fixes the build on Tru64.
metze
commit 55f663a04b791baf5a7a0bc635bd6f626498d8fc
Author: Stefan Metzmacher me...@samba.org
Date: Fri Jan 30 19:37:06 2009 +0100
heimdal:camellia: include roken.h
metze
commit e8c2ed1d489ad67451459c69877ccba41b157e88
Author: Stefan Metzmacher me...@samba.org
Date: Fri Jan 30 19:24:50 2009 +0100
Revert s4:heimdal_build: include system/network.h via config.h wrapper
This reverts commit 334c6e6b78de8529fce0061efd5249f8fe2d256f.
This breaks the build later in the ntvfs code...
metze
---
Summary of changes:
lib/talloc/pytalloc.c |1 +
lib/tdb/pytdb.c|7 +++
lib/tevent/pytevent.c |1 +
source4/heimdal/lib/hcrypto/camellia-ntt.c |2 ++
source4/heimdal/lib/hcrypto/camellia.c |2 ++
source4/heimdal/lib/hdb/hdb.c |4
source4/heimdal_build/config.h |1 -
source4/lib/ldb/pyldb.c|1 +
8 files changed, 14 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/talloc/pytalloc.c b/lib/talloc/pytalloc.c
index 51d087b..30da9ee 100644
--- a/lib/talloc/pytalloc.c
+++ b/lib/talloc/pytalloc.c
@@ -17,6 +17,7 @@
along with this program. If not, see http://www.gnu.org/licenses/.
*/
+#include replace.h
#include talloc.h
#include pytalloc.h
diff --git a/lib/tdb/pytdb.c b/lib/tdb/pytdb.c
index 15a8d8a..60aae9f 100644
--- a/lib/tdb/pytdb.c
+++ b/lib/tdb/pytdb.c
@@ -24,6 +24,9 @@
License along with this library; if not, see http://www.gnu.org/licenses/.
*/
+#include replace.h
+#include system/filesys.h
+
#include Python.h
#ifndef Py_RETURN_NONE
#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None
@@ -34,11 +37,7 @@
#endif
/* Include tdb headers */
-#include stdint.h
-#include signal.h
#include tdb.h
-#include fcntl.h
-#include stdbool.h
typedef struct {
PyObject_HEAD
diff --git a/lib/tevent/pytevent.c b/lib/tevent/pytevent.c
index 5d10554..5c34064 100644
--- a/lib/tevent/pytevent.c
+++ b/lib/tevent/pytevent.c
@@ -16,6 +16,7 @@
along with this program. If not, see http://www.gnu.org/licenses/.
*/
+#include replace.h
#include Python.h
#ifndef Py_RETURN_NONE
diff --git a/source4/heimdal/lib/hcrypto/camellia-ntt.c
b/source4/heimdal/lib/hcrypto/camellia-ntt.c
index c6e3485..3582211 100644
--- a/source4/heimdal/lib/hcrypto/camellia-ntt.c
+++ b/source4/heimdal/lib/hcrypto/camellia-ntt.c
@@ -27,6 +27,8 @@
#include config.h
#endif
+#include roken.h
+
#include string.h
#include stdlib.h
diff --git a/source4/heimdal/lib/hcrypto/camellia.c
b/source4/heimdal/lib/hcrypto/camellia.c
index 00635c9..d78bbd4 100644
--- a/source4/heimdal/lib/hcrypto/camellia.c
+++ b/source4/heimdal/lib/hcrypto/camellia.c
@@ -37,6 +37,8 @@
RCSID($Id: aes.c 20466 2007-04-20 08:29:05Z lha $);
#endif
+#include roken.h
+
#ifdef KRB5
#include krb5-types.h
#endif
diff --git a/source4/heimdal/lib/hdb/hdb.c b/source4/heimdal/lib/hdb/hdb.c
index 15a1024..ad2c35a 100644
--- a/source4/heimdal/lib/hdb/hdb.c
+++
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-267-gc96534c
The branch, master has been updated
via c96534cd6e3eb3bef88ee538838519437870a085 (commit)
via c0fdc71ecdf437c978ade36603f0280afb1addb5 (commit)
via 50db8ede23dd9bf28a4f329edebb9105be215d3e (commit)
from 2fe137e7bce425adf9cc64664eb493dfa8a7e885 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit c96534cd6e3eb3bef88ee538838519437870a085
Author: Stefan Metzmacher me...@samba.org
Date: Fri Jan 30 14:00:32 2009 +0100
s3:selftest: run the same tests as 'make test'
Only the tests with samba4's smbtorture are missing.
metze
commit c0fdc71ecdf437c978ade36603f0280afb1addb5
Author: Stefan Metzmacher me...@samba.org
Date: Fri Jan 30 13:57:24 2009 +0100
s3:tests: add a guard arround . $incdir/test_functions.sh
So that caller can overwrite the functions.
metze
commit 50db8ede23dd9bf28a4f329edebb9105be215d3e
Author: Stefan Metzmacher me...@samba.org
Date: Fri Jan 30 14:36:48 2009 +0100
s3:smbconftort: don't use reserved words ('test:', 'failure:', 'success:')
Temporary results printfs should not contain reserved subunit words.
metze
---
Summary of changes:
source3/lib/smbconf/testsuite.c| 60 -
source3/script/tests/test_functions.sh |1 +
source3/script/tests/test_local_s3.sh |2 +
source3/script/tests/test_net_misc.sh |2 +
source3/script/tests/test_net_registry.sh |2 +
source3/script/tests/test_net_s3.sh|2 +
source3/script/tests/test_ntlm_auth_s3.sh |2 +
source3/script/tests/test_posix_s3.sh |2 +
source3/script/tests/test_smbclient_s3.sh |2 +
source3/script/tests/test_smbtorture_s3.sh |2 +
source3/script/tests/test_testparm_s3.sh |2 +
source3/script/tests/test_wbinfo_s3.sh |2 +
source3/selftest/tests.sh | 102
13 files changed, 123 insertions(+), 60 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/smbconf/testsuite.c b/source3/lib/smbconf/testsuite.c
index 3d3c2d0..b31dec0 100644
--- a/source3/lib/smbconf/testsuite.c
+++ b/source3/lib/smbconf/testsuite.c
@@ -41,11 +41,11 @@ static bool test_get_includes(struct smbconf_ctx *ctx)
char **includes = NULL;
TALLOC_CTX *mem_ctx = talloc_stackframe();
- printf(test: get_includes\n);
+ printf(TEST: get_includes\n);
werr = smbconf_get_global_includes(ctx, mem_ctx,
num_includes, includes);
if (!W_ERROR_IS_OK(werr)) {
- printf(failure: get_includes - %s\n, win_errstr(werr));
+ printf(FAIL: get_includes - %s\n, win_errstr(werr));
goto done;
}
@@ -53,7 +53,7 @@ static bool test_get_includes(struct smbconf_ctx *ctx)
(num_includes 0) ? : : .);
print_strings(, num_includes, (const char **)includes);
- printf(success: get_includes\n);
+ printf(OK: get_includes\n);
ret = true;
done:
@@ -75,11 +75,11 @@ static bool test_set_get_includes(struct smbconf_ctx *ctx)
uint32_t get_num_includes = 0;
TALLOC_CTX *mem_ctx = talloc_stackframe();
- printf(test: set_get_includes\n);
+ printf(TEST: set_get_includes\n);
werr = smbconf_set_global_includes(ctx, set_num_includes, set_includes);
if (!W_ERROR_IS_OK(werr)) {
- printf(failure: get_set_includes (setting includes) - %s\n,
+ printf(FAIL: get_set_includes (setting includes) - %s\n,
win_errstr(werr));
goto done;
}
@@ -87,13 +87,13 @@ static bool test_set_get_includes(struct smbconf_ctx *ctx)
werr = smbconf_get_global_includes(ctx, mem_ctx, get_num_includes,
get_includes);
if (!W_ERROR_IS_OK(werr)) {
- printf(failure: get_set_includes (getting includes) - %s\n,
+ printf(FAIL: get_set_includes (getting includes) - %s\n,
win_errstr(werr));
goto done;
}
if (get_num_includes != set_num_includes) {
- printf(failure: get_set_includes - set %d includes, got %d\n,
+ printf(FAIL: get_set_includes - set %d includes, got %d\n,
set_num_includes, get_num_includes);
goto done;
}
@@ -105,12 +105,12 @@ static bool test_set_get_includes(struct smbconf_ctx *ctx)
printf(got: \n);
print_strings(* , get_num_includes,
(const char **)get_includes);
- printf(failure: get_set_includes - data mismatch:\n);
+ printf(FAIL: get_set_includes - data mismatch:\n);
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-268-g40b67c3
The branch, master has been updated
via 40b67c3426042ea46d2497e459807ef9551e62f1 (commit)
from c96534cd6e3eb3bef88ee538838519437870a085 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 40b67c3426042ea46d2497e459807ef9551e62f1
Author: Stefan Metzmacher me...@samba.org
Date: Fri Jan 30 20:38:27 2009 +0100
selftest: pass down the path to python for provisioning samba4
metze
---
Summary of changes:
selftest/target/Samba4.pm |3 +++
source4/selftest/config.mk |3 ++-
2 files changed, 5 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 208824d..5ca1a6a 100644
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -717,6 +717,9 @@ nogroup:x:65534:nobody
if (defined($ENV{VALGRIND_PROVISION})) {
push (@provision_options, valgrind);
}
+ if (defined($ENV{PYTHON})) {
+ push (@provision_options, $ENV{PYTHON});
+ }
push (@provision_options, $self-{setupdir}/provision);
push (@provision_options, split(' ', $configuration));
push (@provision_options, --host-name=$netbiosname);
diff --git a/source4/selftest/config.mk b/source4/selftest/config.mk
index c5f7c5a..324532c 100644
--- a/source4/selftest/config.mk
+++ b/source4/selftest/config.mk
@@ -1,6 +1,7 @@
TEST_FORMAT = plain
-SELFTEST = $(LD_LIBPATH_OVERRIDE) $(PERL) $(selftestdir)/selftest.pl
--prefix=${selftest_prefix} \
+SELFTEST = $(LD_LIBPATH_OVERRIDE) PYTHON=$(PYTHON) \
+$(PERL) $(selftestdir)/selftest.pl --prefix=${selftest_prefix} \
--builddir=$(builddir) --srcdir=$(srcdir) \
--expected-failures=$(srcdir)/selftest/knownfail \
--format=$(TEST_FORMAT) \
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-270-gf6d0884
The branch, master has been updated
via f6d08849e11775eb2530f04ecb055269ea445539 (commit)
via aef749b53fb835226d4e879234b3ac3da1e33557 (commit)
from 40b67c3426042ea46d2497e459807ef9551e62f1 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit f6d08849e11775eb2530f04ecb055269ea445539
Author: Volker Lendecke v...@samba.org
Date: Fri Jan 30 21:25:50 2009 +0100
Fix memleaks
commit aef749b53fb835226d4e879234b3ac3da1e33557
Author: Volker Lendecke v...@samba.org
Date: Fri Jan 30 21:25:37 2009 +0100
pass NULL to prs_give_memory, that is a pointer
---
Summary of changes:
source3/rpc_client/cli_pipe.c |9 -
1 files changed, 8 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
index 83247df..a741dec 100644
--- a/source3/rpc_client/cli_pipe.c
+++ b/source3/rpc_client/cli_pipe.c
@@ -1252,7 +1252,7 @@ static struct async_req *rpc_api_pipe_send(TALLOC_CTX
*mem_ctx,
prs_init_empty(state-incoming_pdu, state, UNMARSHALL);
/* Make incoming_pdu dynamic with no memory. */
- prs_give_memory(state-incoming_pdu, 0, 0, true);
+ prs_give_memory(state-incoming_pdu, NULL, 0, true);
talloc_set_destructor(state, rpc_api_pipe_state_destructor);
@@ -2604,6 +2604,7 @@ static void rpc_pipe_bind_step_one_done(struct async_req
*subreq)
/* Unmarshall the RPC header */
if (!smb_io_rpc_hdr(hdr, hdr, reply_pdu, 0)) {
DEBUG(0, (rpc_pipe_bind: failed to unmarshall RPC_HDR.\n));
+ prs_mem_free(reply_pdu);
async_req_error(req, NT_STATUS_BUFFER_TOO_SMALL);
return;
}
@@ -2611,12 +2612,14 @@ static void rpc_pipe_bind_step_one_done(struct
async_req *subreq)
if (!smb_io_rpc_hdr_ba(, hdr_ba, reply_pdu, 0)) {
DEBUG(0, (rpc_pipe_bind: Failed to unmarshall
RPC_HDR_BA.\n));
+ prs_mem_free(reply_pdu);
async_req_error(req, NT_STATUS_BUFFER_TOO_SMALL);
return;
}
if (!check_bind_response(hdr_ba, state-cli-transfer_syntax)) {
DEBUG(2, (rpc_pipe_bind: check_bind_response failed.\n));
+ prs_mem_free(reply_pdu);
async_req_error(req, NT_STATUS_BUFFER_TOO_SMALL);
return;
}
@@ -2633,6 +2636,7 @@ static void rpc_pipe_bind_step_one_done(struct async_req
*subreq)
case PIPE_AUTH_TYPE_NONE:
case PIPE_AUTH_TYPE_SCHANNEL:
/* Bind complete. */
+ prs_mem_free(reply_pdu);
async_req_done(req);
break;
@@ -2640,6 +2644,7 @@ static void rpc_pipe_bind_step_one_done(struct async_req
*subreq)
/* Need to send AUTH3 packet - no reply. */
status = rpc_finish_auth3_bind_send(req, state, hdr,
reply_pdu);
+ prs_mem_free(reply_pdu);
if (!NT_STATUS_IS_OK(status)) {
async_req_error(req, status);
}
@@ -2649,6 +2654,7 @@ static void rpc_pipe_bind_step_one_done(struct async_req
*subreq)
/* Need to send alter context request and reply. */
status = rpc_finish_spnego_ntlmssp_bind_send(req, state, hdr,
reply_pdu);
+ prs_mem_free(reply_pdu);
if (!NT_STATUS_IS_OK(status)) {
async_req_error(req, status);
}
@@ -2660,6 +2666,7 @@ static void rpc_pipe_bind_step_one_done(struct async_req
*subreq)
default:
DEBUG(0,(cli_finish_bind_auth: unknown auth type %u\n,
(unsigned int)state-cli-auth-auth_type));
+ prs_mem_free(reply_pdu);
async_req_error(req, NT_STATUS_INTERNAL_ERROR);
}
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-272-g4519eae
The branch, master has been updated
via 4519eae158e7821dcd2f818eea830cfcdd4a0105 (commit)
via 03bd9b2683ab7abf967118b5970f6a59c101782a (commit)
from f6d08849e11775eb2530f04ecb055269ea445539 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 4519eae158e7821dcd2f818eea830cfcdd4a0105
Author: Stefan Metzmacher me...@samba.org
Date: Fri Jan 30 22:19:50 2009 +0100
s4:lib/socket: don't use gethostbyname2()
metze
commit 03bd9b2683ab7abf967118b5970f6a59c101782a
Author: Stefan Metzmacher me...@samba.org
Date: Fri Jan 30 22:19:10 2009 +0100
s4:heimdal_build: heimdal requires u_int32_t and u_char
metze
---
Summary of changes:
source4/heimdal_build/internal.m4 |3 +++
source4/lib/socket/config.m4 |1 -
source4/lib/socket/socket_ip.c| 33 +
3 files changed, 28 insertions(+), 9 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/heimdal_build/internal.m4
b/source4/heimdal_build/internal.m4
index 06e798c..b2f64a6 100644
--- a/source4/heimdal_build/internal.m4
+++ b/source4/heimdal_build/internal.m4
@@ -33,6 +33,9 @@ esac
])
+AC_CHECK_TYPE(u_char, uint8_t)
+AC_CHECK_TYPE(u_int32_t, uint32_t)
+
dnl Not all systems have err.h, so we provide a replacement. Heimdal
dnl unconditionally #includes err.h, so we need to create an err.h,
dnl but we can't just have a static one because we don't want to use
diff --git a/source4/lib/socket/config.m4 b/source4/lib/socket/config.m4
index 9c0072d..fa987a1 100644
--- a/source4/lib/socket/config.m4
+++ b/source4/lib/socket/config.m4
@@ -1,6 +1,5 @@
AC_CHECK_FUNCS(writev)
AC_CHECK_FUNCS(readv)
-AC_CHECK_FUNCS(gethostbyname2)
# check for unix domain sockets
diff --git a/source4/lib/socket/socket_ip.c b/source4/lib/socket/socket_ip.c
index bca0aab..cdb75fe 100644
--- a/source4/lib/socket/socket_ip.c
+++ b/source4/lib/socket/socket_ip.c
@@ -549,19 +549,36 @@ _PUBLIC_ const struct socket_ops *socket_ipv4_ops(enum
socket_type type)
static struct in6_addr interpret_addr6(const char *name)
{
- struct hostent *he;
-
- if (name == NULL) return in6addr_any;
+ char addr[INET6_ADDRSTRLEN];
+ struct in6_addr dest6;
+ const char *sp = name;
+ char *p = strchr_m(sp, '%');
+ int ret;
+
+ if (sp == NULL) return in6addr_any;
- if (strcasecmp(name, localhost) == 0) {
- name = ::1;
+ if (strcasecmp(sp, localhost) == 0) {
+ sp = ::1;
}
- he = gethostbyname2(name, PF_INET6);
+ /*
+* Cope with link-local.
+* This is IP:v6:addr%ifname.
+*/
+
+ if (p (p sp) (if_nametoindex(p+1) != 0)) {
+ strlcpy(addr, sp,
+ MIN(PTR_DIFF(p,sp)+1,
+ sizeof(addr)));
+ sp = addr;
+ }
- if (he == NULL) return in6addr_any;
+ ret = inet_pton(AF_INET6, sp, dest6);
+ if (ret 0) {
+ return dest6;
+ }
- return *((struct in6_addr *)he-h_addr);
+ return in6addr_any;
}
static NTSTATUS ipv6_init(struct socket_context *sock)
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-273-gd4aeed8
The branch, master has been updated
via d4aeed879b21db41643250a23b1009b543e6c99f (commit)
from 4519eae158e7821dcd2f818eea830cfcdd4a0105 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit d4aeed879b21db41643250a23b1009b543e6c99f
Author: Simo Sorce i...@samba.org
Date: Fri Jan 30 16:31:19 2009 -0500
Fix all other modules to use ldb_module.h instead of ldb_private.h
The only 2 modules escaping the rule so far are rootdse and partitions
---
Summary of changes:
source4/dsdb/samdb/ldb_modules/kludge_acl.c| 58 +++--
source4/dsdb/samdb/ldb_modules/linked_attributes.c | 102 +---
source4/dsdb/samdb/ldb_modules/local_password.c| 105 +---
source4/dsdb/samdb/ldb_modules/naming_fsmo.c | 39 ++--
source4/dsdb/samdb/ldb_modules/objectclass.c | 135 ++
source4/dsdb/samdb/ldb_modules/password_hash.c | 276 +++-
source4/dsdb/samdb/ldb_modules/pdc_fsmo.c | 37 ++--
source4/dsdb/samdb/ldb_modules/proxy.c | 60 +++--
source4/dsdb/samdb/ldb_modules/repl_meta_data.c| 155 +++-
source4/dsdb/samdb/ldb_modules/rootdse.c | 62 +++--
source4/dsdb/samdb/ldb_modules/samba3sam.c | 15 +-
source4/dsdb/samdb/ldb_modules/samldb.c| 176 -
source4/dsdb/samdb/ldb_modules/schema_fsmo.c | 92 ---
source4/dsdb/samdb/ldb_modules/show_deleted.c | 16 +-
source4/dsdb/samdb/ldb_modules/simple_ldap_map.c | 27 +-
source4/dsdb/schema/schema_set.c |4 +-
source4/lib/ldb/include/ldb.h |3 +
source4/lib/ldb/include/ldb_private.h |3 -
source4/nbt_server/wins/wins_ldb.c | 26 +-
19 files changed, 817 insertions(+), 574 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/dsdb/samdb/ldb_modules/kludge_acl.c
b/source4/dsdb/samdb/ldb_modules/kludge_acl.c
index bb95c7e..1597f68 100644
--- a/source4/dsdb/samdb/ldb_modules/kludge_acl.c
+++ b/source4/dsdb/samdb/ldb_modules/kludge_acl.c
@@ -31,9 +31,7 @@
*/
#include includes.h
-#include ldb/include/ldb.h
-#include ldb/include/ldb_errors.h
-#include ldb/include/ldb_private.h
+#include ldb_module.h
#include auth/auth.h
#include libcli/security/security.h
#include dsdb/samdb/samdb.h
@@ -52,15 +50,17 @@ struct kludge_private_data {
static enum security_user_level what_is_user(struct ldb_module *module)
{
+ struct ldb_context *ldb = ldb_module_get_ctx(module);
struct auth_session_info *session_info
- = (struct auth_session_info *)ldb_get_opaque(module-ldb,
sessionInfo);
+ = (struct auth_session_info *)ldb_get_opaque(ldb,
sessionInfo);
return security_session_user_level(session_info);
}
static const char *user_name(TALLOC_CTX *mem_ctx, struct ldb_module *module)
{
+ struct ldb_context *ldb = ldb_module_get_ctx(module);
struct auth_session_info *session_info
- = (struct auth_session_info *)ldb_get_opaque(module-ldb,
sessionInfo);
+ = (struct auth_session_info *)ldb_get_opaque(ldb,
sessionInfo);
if (!session_info) {
return UNKNOWN (NULL);
}
@@ -209,12 +209,14 @@ static int kludge_acl_childClasses(struct ldb_context
*ldb, struct ldb_message *
static int kludge_acl_callback(struct ldb_request *req, struct ldb_reply *ares)
{
+ struct ldb_context *ldb;
struct kludge_acl_context *ac;
struct kludge_private_data *data;
int i, ret;
ac = talloc_get_type(req-context, struct kludge_acl_context);
- data = talloc_get_type(ac-module-private_data, struct
kludge_private_data);
+ data = talloc_get_type(ldb_module_get_private(ac-module), struct
kludge_private_data);
+ ldb = ldb_module_get_ctx(ac-module);
if (!ares) {
return ldb_module_done(ac-req, NULL, NULL,
@@ -228,7 +230,7 @@ static int kludge_acl_callback(struct ldb_request *req,
struct ldb_reply *ares)
switch (ares-type) {
case LDB_REPLY_ENTRY:
if (ac-allowedAttributes) {
- ret = kludge_acl_allowedAttributes(ac-module-ldb,
+ ret = kludge_acl_allowedAttributes(ldb,
ares-message,
allowedAttributes);
if (ret != LDB_SUCCESS) {
@@ -236,7 +238,7 @@ static int kludge_acl_callback(struct ldb_request *req,
struct ldb_reply *ares)
}
}
if (ac-allowedChildClasses) {
- ret = kludge_acl_childClasses(ac-module-ldb,
+ ret = kludge_acl_childClasses(ldb,
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-274-g2c2545d
The branch, master has been updated via 2c2545d45af9c7479bf032fff1263e102926a495 (commit) from d4aeed879b21db41643250a23b1009b543e6c99f (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 2c2545d45af9c7479bf032fff1263e102926a495 Author: Tim Prouty tpro...@samba.org Date: Fri Jan 30 13:53:33 2009 -0800 s3 build: Remove unused fstat check to fix a bunch of HAVE_FSTAT warnings --- Summary of changes: lib/tdb/pytdb.c |4 source3/configure.in |2 +- 2 files changed, 1 insertions(+), 5 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/tdb/pytdb.c b/lib/tdb/pytdb.c index 60aae9f..159bc4d 100644 --- a/lib/tdb/pytdb.c +++ b/lib/tdb/pytdb.c @@ -32,10 +32,6 @@ #define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None #endif -#ifdef HAVE_FSTAT -#undef HAVE_FSTAT -#endif - /* Include tdb headers */ #include tdb.h diff --git a/source3/configure.in b/source3/configure.in index 3ae2c8c..615ab9e 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -1027,7 +1027,7 @@ fi AC_CHECK_FUNCS(getcwd fchown chmod fchmod mknod mknod64) AC_CHECK_FUNCS(strtol) -AC_CHECK_FUNCS(fstat strchr chflags) +AC_CHECK_FUNCS(strchr chflags) AC_CHECK_FUNCS(getrlimit fsync fdatasync setpgid) AC_CHECK_FUNCS(setsid glob strpbrk crypt16 getauthuid) AC_CHECK_FUNCS(sigprocmask sigblock sigaction sigset innetgr setnetgrent getnetgrent endnetgrent) -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-275-g15cfc38
The branch, master has been updated via 15cfc38c255c8caa098ca57774d1ee74b306c813 (commit) from 2c2545d45af9c7479bf032fff1263e102926a495 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 15cfc38c255c8caa098ca57774d1ee74b306c813 Author: Simo Sorce i...@samba.org Date: Fri Jan 30 18:17:47 2009 -0500 Bump up ldb version to 0.9.3 after latest changes --- Summary of changes: source4/lib/ldb/configure.ac |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/lib/ldb/configure.ac b/source4/lib/ldb/configure.ac index 7bc081c..d61b31a 100644 --- a/source4/lib/ldb/configure.ac +++ b/source4/lib/ldb/configure.ac @@ -11,7 +11,7 @@ AC_DEFUN([SMB_MODULE_DEFAULT], [echo -n ]) AC_DEFUN([SMB_LIBRARY_ENABLE], [echo -n ]) AC_DEFUN([SMB_EXT_LIB], [echo -n ]) AC_DEFUN([SMB_ENABLE], [echo -n ]) -AC_INIT(ldb, 0.9.2) +AC_INIT(ldb, 0.9.3) AC_CONFIG_SRCDIR([common/ldb.c]) AC_LIBREPLACE_ALL_CHECKS -- Samba Shared Repository
Build status as of Sat Jan 31 00:00:02 2009
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2009-01-30 00:00:51.0 + +++ /home/build/master/cache/broken_results.txt 2009-01-31 00:00:11.0 + @@ -1,22 +1,22 @@ -Build status as of Fri Jan 30 00:00:02 2009 +Build status as of Sat Jan 31 00:00:02 2009 Build counts: Tree Total Broken Panic build_farm 0 0 0 -ccache 28 6 0 +ccache 29 6 0 ctdb 0 0 0 distcc 1 0 0 ldb 29 29 0 libreplace 28 10 0 lorikeet-heimdal 26 16 0 -pidl 18 16 0 +pidl 18 4 0 ppp 11 0 0 -rsync29 8 0 +rsync27 9 0 samba-docs 0 0 0 samba-gtk4 4 0 -samba_3_X_devel 27 23 0 +samba_3_X_devel 27 26 0 samba_3_X_test 27 23 0 -samba_4_0_test 29 26 1 +samba_4_0_test 29 27 1 smb-build27 6 0 talloc 29 29 0 tdb 27 8 0
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-276-g8b7a139
The branch, master has been updated
via 8b7a1394aae8c59adb04a8cfc5e38ae0cb4462ab (commit)
from 15cfc38c255c8caa098ca57774d1ee74b306c813 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 8b7a1394aae8c59adb04a8cfc5e38ae0cb4462ab
Author: Tim Prouty tpro...@samba.org
Date: Fri Jan 30 15:19:55 2009 -0800
s3 onefs: Fix onefs ACLs to work with updated ACL syscall
---
Summary of changes:
source3/modules/onefs_acl.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/modules/onefs_acl.c b/source3/modules/onefs_acl.c
index b9ec2d6..14b27b8 100644
--- a/source3/modules/onefs_acl.c
+++ b/source3/modules/onefs_acl.c
@@ -667,7 +667,7 @@ onefs_fget_nt_acl(vfs_handle_struct *handle, files_struct
*fsp,
}
error = ifs_get_security_descriptor(fsp-fh-fd, security_info,
- sd_size, sd);
+ sd_size, sd_size, sd);
if (error (errno != EMSGSIZE)) {
DEBUG(0, (Failed getting size of security descriptor!
errno=%d\n, errno));
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-280-g0245b9b
The branch, master has been updated
via 0245b9b97363f08786c25d4412ed293ca6f94cd5 (commit)
via 0498a30b223861a9ea10c75848387755ddedd411 (commit)
via de4f7c0787498ba0030b67a98a5361900775fca1 (commit)
via 7acea5a032e1c1fa14a5b414992d0f8f0a45a9f2 (commit)
from 8b7a1394aae8c59adb04a8cfc5e38ae0cb4462ab (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 0245b9b97363f08786c25d4412ed293ca6f94cd5
Author: Simo Sorce i...@samba.org
Date: Fri Jan 30 20:12:16 2009 -0500
Explicitly include ldb_handlers.h where necessary
commit 0498a30b223861a9ea10c75848387755ddedd411
Author: Simo Sorce i...@samba.org
Date: Fri Jan 30 20:11:37 2009 -0500
Install mising public headers
commit de4f7c0787498ba0030b67a98a5361900775fca1
Author: Simo Sorce i...@samba.org
Date: Fri Jan 30 20:11:16 2009 -0500
Do not install private headers
commit 7acea5a032e1c1fa14a5b414992d0f8f0a45a9f2
Author: Simo Sorce i...@samba.org
Date: Fri Jan 30 20:10:45 2009 -0500
Fix proxy module
---
Summary of changes:
lib/tevent/tevent.mk|2 --
source4/dsdb/samdb/ldb_modules/proxy.c |4 ++--
source4/lib/ldb-samba/ldif_handlers.c |1 +
source4/lib/ldb/Makefile.in |2 +-
source4/lib/ldb/common/ldb_attributes.c |1 +
source4/lib/ldb/include/ldb_private.h |5 -
6 files changed, 5 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/tevent/tevent.mk b/lib/tevent/tevent.mk
index be7e298..ac5710f 100644
--- a/lib/tevent/tevent.mk
+++ b/lib/tevent/tevent.mk
@@ -22,8 +22,6 @@ installdirs::
installheaders:: installdirs
cp $(srcdir)/tevent.h $(DESTDIR)$(includedir)
- cp $(srcdir)/tevent_internal.h $(DESTDIR)$(includedir)
- cp $(srcdir)/tevent_util.h $(DESTDIR)$(includedir)
installlibs:: installdirs
cp tevent.pc $(DESTDIR)$(libdir)/pkgconfig
diff --git a/source4/dsdb/samdb/ldb_modules/proxy.c
b/source4/dsdb/samdb/ldb_modules/proxy.c
index 9a5091c..72b47c3 100644
--- a/source4/dsdb/samdb/ldb_modules/proxy.c
+++ b/source4/dsdb/samdb/ldb_modules/proxy.c
@@ -62,7 +62,7 @@ struct proxy_ctx {
*/
static int load_proxy_info(struct ldb_module *module)
{
- struct ldb = ldb_module_get_ctx(module);
+ struct ldb_context *ldb = ldb_module_get_ctx(module);
struct proxy_data *proxy =
talloc_get_type(ldb_module_get_private(module), struct proxy_data);
struct ldb_dn *dn;
struct ldb_result *res = NULL;
@@ -262,7 +262,7 @@ static int proxy_search_callback(struct ldb_request *req,
ac = talloc_get_type(req-context, struct proxy_ctx);
ldb = ldb_module_get_ctx(ac-module);
- proxy = talloc_get_type(private_data, struct proxy_data);
+ proxy = talloc_get_type(ldb_module_get_private(module), struct
proxy_data);
if (!ares) {
return ldb_module_done(ac-req, NULL, NULL,
diff --git a/source4/lib/ldb-samba/ldif_handlers.c
b/source4/lib/ldb-samba/ldif_handlers.c
index d92f211..13bb320 100644
--- a/source4/lib/ldb-samba/ldif_handlers.c
+++ b/source4/lib/ldb-samba/ldif_handlers.c
@@ -23,6 +23,7 @@
#include includes.h
#include ldb_private.h
+#include ldb_handlers.h
#include dsdb/samdb/samdb.h
#include librpc/gen_ndr/ndr_security.h
#include librpc/gen_ndr/ndr_misc.h
diff --git a/source4/lib/ldb/Makefile.in b/source4/lib/ldb/Makefile.in
index 6313fc1..7f00e8e 100644
--- a/source4/lib/ldb/Makefile.in
+++ b/source4/lib/ldb/Makefile.in
@@ -67,7 +67,7 @@ MDLD_FLAGS = @MDLD_FLAGS@
OBJS = $(MODULES_OBJ) $(COMMON_OBJ) $(LDB_TDB_OBJ) $(TDB_OBJ) $(TEVENT_OBJ)
$(TALLOC_OBJ) $(POPT_OBJ) $(LDB_MAP_OBJ) @LIBREPLACEOBJ@ $(EXTRA_OBJ)
-headers = $(srcdir)/include/ldb.h $(srcdir)/include/ldb_errors.h
$(srcdir)/include/ldb_handlers.h
+headers = $(srcdir)/include/ldb.h $(srcdir)/include/ldb_errors.h
$(srcdir)/include/ldb_handlers.h $(srcdir)/include/ldb_includes.h
$(srcdir)/include/ldb_module.h
BINS = bin/ldbadd bin/ldbsearch bin/ldbdel bin/ldbmodify bin/ldbedit
bin/ldbrename bin/ldbtest
diff --git a/source4/lib/ldb/common/ldb_attributes.c
b/source4/lib/ldb/common/ldb_attributes.c
index 4d688a4..9fa0fb2 100644
--- a/source4/lib/ldb/common/ldb_attributes.c
+++ b/source4/lib/ldb/common/ldb_attributes.c
@@ -29,6 +29,7 @@
*/
#include ldb_private.h
+#include ldb_handlers.h
/*
add a attribute to the ldb_schema
diff --git a/source4/lib/ldb/include/ldb_private.h
b/source4/lib/ldb/include/ldb_private.h
index 2e65908..1ce9e9e 100644
--- a/source4/lib/ldb/include/ldb_private.h
+++ b/source4/lib/ldb/include/ldb_private.h
@@ -150,11 +150,6 @@ const char **ldb_subclass_list(struct ldb_context *ldb,
const char *classname);
void ldb_subclass_remove(struct ldb_context *ldb, const char *classname);
int ldb_subclass_add(struct ldb_context *ldb, const char
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-282-gae19f5a
The branch, master has been updated
via ae19f5acddee6d6507225c0c9a625383255a6d4c (commit)
via 6028e8f34626e7443ee58becaf1d27b9e2c56088 (commit)
from 0245b9b97363f08786c25d4412ed293ca6f94cd5 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit ae19f5acddee6d6507225c0c9a625383255a6d4c
Author: Stefan Metzmacher me...@samba.org
Date: Sat Jan 31 08:55:49 2009 +0100
s4:build: require ldb 0.9.3 when building against an external library
metze
commit 6028e8f34626e7443ee58becaf1d27b9e2c56088
Author: Stefan Metzmacher me...@samba.org
Date: Sat Jan 31 08:53:26 2009 +0100
heimdal: void functions should not return a value
metze
---
Summary of changes:
source3/samba4.m4 |2 +-
source4/configure.ac|2 +-
source4/heimdal/lib/krb5/error_string.c |2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/samba4.m4 b/source3/samba4.m4
index fd0cc83..ee47fcc 100644
--- a/source3/samba4.m4
+++ b/source3/samba4.m4
@@ -71,7 +71,7 @@ SMB_EXT_LIB_FROM_PKGCONFIG(LIBTEVENT, tevent = 0.9.2,
SMB_INCLUDE_MK(../lib/tevent/python.mk)
-SMB_EXT_LIB_FROM_PKGCONFIG(LIBLDB, ldb = 0.9.1,
+SMB_EXT_LIB_FROM_PKGCONFIG(LIBLDB, ldb = 0.9.3,
[
SMB_INCLUDE_MK(lib/ldb/ldb_ildap/config.mk)
SMB_INCLUDE_MK(lib/ldb/tools/config.mk)
diff --git a/source4/configure.ac b/source4/configure.ac
index ef3bfd7..3277879 100644
--- a/source4/configure.ac
+++ b/source4/configure.ac
@@ -66,7 +66,7 @@ SMB_EXT_LIB_FROM_PKGCONFIG(LIBTEVENT, tevent = 0.9.2,
SMB_INCLUDE_MK(../lib/tevent/python.mk)
-SMB_EXT_LIB_FROM_PKGCONFIG(LIBLDB, ldb = 0.9.1,
+SMB_EXT_LIB_FROM_PKGCONFIG(LIBLDB, ldb = 0.9.3,
[
SMB_INCLUDE_MK(lib/ldb/ldb_ildap/config.mk)
SMB_INCLUDE_MK(lib/ldb/tools/config.mk)
diff --git a/source4/heimdal/lib/krb5/error_string.c
b/source4/heimdal/lib/krb5/error_string.c
index db2df47..6374fa1 100644
--- a/source4/heimdal/lib/krb5/error_string.c
+++ b/source4/heimdal/lib/krb5/error_string.c
@@ -271,7 +271,7 @@ void KRB5_LIB_FUNCTION
krb5_clear_error_string(krb5_context context)
__attribute__((deprecated))
{
-return krb5_clear_error_message(context);
+krb5_clear_error_message(context);
}
#endif /* !HEIMDAL_SMALLER */
--
Samba Shared Repository
