[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 9fe4b69 pidl:Samba4/NDR/Parser: add support for 'ms_union' style
aligment
via 6124148 pidl:Samba4/NDR/Parser: only do the switch type alignment
when we have a switch type
via 76f2ddf pidl:NDR: add support for 'ms_union' property.
via 5ae04bc midltests: add invalid/midltests_pipe_struct_union_01.idl
from 6696fd1 Ensure we send the direct levelII oplock break to the
correct fid.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 9fe4b695feefb2a94559ce978048fb8a2189f5ab
Author: Stefan Metzmacher me...@samba.org
Date: Mon Jan 31 14:09:02 2011 +0100
pidl:Samba4/NDR/Parser: add support for 'ms_union' style aligment
metze
Autobuild-User: Stefan Metzmacher me...@samba.org
Autobuild-Date: Tue Feb 1 12:13:45 CET 2011 on sn-devel-104
commit 6124148d66d90064ebe3fa2ecb2c6588705495a0
Author: Stefan Metzmacher me...@samba.org
Date: Mon Jan 31 14:05:52 2011 +0100
pidl:Samba4/NDR/Parser: only do the switch type alignment when we have a
switch type
This doesn't change the logic, it just doesn't call the same aligment
function
twice.
metze
commit 76f2ddf5a9cef9e8253b11dec1304d51e47eda54
Author: Stefan Metzmacher me...@samba.org
Date: Mon Jan 31 13:23:08 2011 +0100
pidl:NDR: add support for 'ms_union' property.
metze
commit 5ae04bca01b974672fcc3c68acf3fc9bab61ba05
Author: Stefan Metzmacher me...@samba.org
Date: Tue Feb 1 09:59:59 2011 +0100
midltests: add invalid/midltests_pipe_struct_union_01.idl
pipes with unions are not supported by midl,
so we don't need to implement them in pidl:-)
metze
---
Summary of changes:
pidl/lib/Parse/Pidl/NDR.pm | 61 ++-
pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm | 29 --
pidl/tests/ndr.pl | 39
.../midltests_pipe_struct_union_01.idl}| 115 +++-
.../invalid/midltests_pipe_struct_union_01.txt | 17 +++
5 files changed, 152 insertions(+), 109 deletions(-)
copy testprogs/win32/midltests/{todo/midltests-pipe-04-struct.idl =
invalid/midltests_pipe_struct_union_01.idl} (96%)
create mode 100644
testprogs/win32/midltests/invalid/midltests_pipe_struct_union_01.txt
Changeset truncated at 500 lines:
diff --git a/pidl/lib/Parse/Pidl/NDR.pm b/pidl/lib/Parse/Pidl/NDR.pm
index 21b7568..3edb9b7 100644
--- a/pidl/lib/Parse/Pidl/NDR.pm
+++ b/pidl/lib/Parse/Pidl/NDR.pm
@@ -81,9 +81,9 @@ my $scalar_alignment = {
'dnsp_string' = 1
};
-sub GetElementLevelTable($$)
+sub GetElementLevelTable($$$)
{
- my ($e, $pointer_default) = @_;
+ my ($e, $pointer_default, $ms_union) = @_;
my $order = [];
my $is_deferred = 0;
@@ -307,9 +307,9 @@ sub GetElementLevelTable($$)
return $order;
}
-sub GetTypedefLevelTable($$$)
+sub GetTypedefLevelTable()
{
- my ($e, $data, $pointer_default) = @_;
+ my ($e, $data, $pointer_default, $ms_union) = @_;
my $order = [];
@@ -432,30 +432,30 @@ sub align_type($)
die(Unknown data type type $dt-{TYPE});
}
-sub ParseElement($$)
+sub ParseElement($$$)
{
- my ($e, $pointer_default) = @_;
+ my ($e, $pointer_default, $ms_union) = @_;
$e-{TYPE} = expandAlias($e-{TYPE});
if (ref($e-{TYPE}) eq HASH) {
- $e-{TYPE} = ParseType($e-{TYPE}, $pointer_default);
+ $e-{TYPE} = ParseType($e-{TYPE}, $pointer_default, $ms_union);
}
return {
NAME = $e-{NAME},
TYPE = $e-{TYPE},
PROPERTIES = $e-{PROPERTIES},
- LEVELS = GetElementLevelTable($e, $pointer_default),
+ LEVELS = GetElementLevelTable($e, $pointer_default, $ms_union),
REPRESENTATION_TYPE = ($e-{PROPERTIES}-{represent_as} or
$e-{TYPE}),
ALIGN = align_type($e-{TYPE}),
ORIGINAL = $e
};
}
-sub ParseStruct($$)
+sub ParseStruct($$$)
{
- my ($struct, $pointer_default) = @_;
+ my ($struct, $pointer_default, $ms_union) = @_;
my @elements = ();
my $surrounding = undef;
@@ -473,7 +473,7 @@ sub ParseStruct($$)
foreach my $x (@{$struct-{ELEMENTS}})
{
- my $e = ParseElement($x, $pointer_default);
+ my $e = ParseElement($x, $pointer_default, $ms_union);
if ($x != $struct-{ELEMENTS}[-1] and
$e-{LEVELS}[0]-{IS_SURROUNDING}) {
fatal($x, conformant member not at end of struct);
@@ -510,8 +510,10 @@ sub ParseStruct($$)
sub ParseUnion($$)
{
- my ($e, $pointer_default) = @_;
+ my ($e, $pointer_default, $ms_union) = @_;
my @elements = ();
+
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via f9af242 s3-libnetapi: prefer dcerpc_samr_X functions in
lib/netapi/user.c.
via 32fb4f5 s3-libnetapi: prefer dcerpc_samr_X functions in
lib/netapi/samr.c.
via b76657f s3-libnetapi: prefer dcerpc_samr_X functions in
lib/netapi/localgroup.c.
via 7f63018 s3-libnetapi: prefer dcerpc_samr_X functions in
lib/netapi/group.c.
from 9fe4b69 pidl:Samba4/NDR/Parser: add support for 'ms_union' style
aligment
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit f9af242886ac014baa3247bfdc1fe8be6cb8366e
Author: Günther Deschner g...@samba.org
Date: Fri Jan 14 17:05:32 2011 +0100
s3-libnetapi: prefer dcerpc_samr_X functions in lib/netapi/user.c.
Guenther
Autobuild-User: Günther Deschner g...@samba.org
Autobuild-Date: Tue Feb 1 13:41:42 CET 2011 on sn-devel-104
commit 32fb4f5206bf754cecc761e5c2634f84a073e1eb
Author: Günther Deschner g...@samba.org
Date: Fri Jan 14 16:16:31 2011 +0100
s3-libnetapi: prefer dcerpc_samr_X functions in lib/netapi/samr.c.
Guenther
commit b76657f8d9fea54430b048e61ed7c8c78eb582e5
Author: Günther Deschner g...@samba.org
Date: Fri Jan 14 16:11:19 2011 +0100
s3-libnetapi: prefer dcerpc_samr_X functions in lib/netapi/localgroup.c.
Guenther
commit 7f6301811781675a7f8f5509e67fb34820a9806d
Author: Günther Deschner g...@samba.org
Date: Fri Jan 14 15:49:37 2011 +0100
s3-libnetapi: prefer dcerpc_samr_X functions in lib/netapi/group.c.
Guenther
---
Summary of changes:
source3/lib/netapi/group.c | 487 -
source3/lib/netapi/localgroup.c | 201
source3/lib/netapi/samr.c | 62 -
source3/lib/netapi/user.c | 507 +--
4 files changed, 943 insertions(+), 314 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/netapi/group.c b/source3/lib/netapi/group.c
index b9dd1e9..5507f71 100644
--- a/source3/lib/netapi/group.c
+++ b/source3/lib/netapi/group.c
@@ -23,7 +23,7 @@
#include lib/netapi/netapi.h
#include lib/netapi/netapi_private.h
#include lib/netapi/libnetapi.h
-#include ../librpc/gen_ndr/cli_samr.h
+#include ../librpc/gen_ndr/ndr_samr_c.h
#include rpc_client/init_lsa.h
#include ../libcli/security/security.h
@@ -34,12 +34,13 @@ WERROR NetGroupAdd_r(struct libnetapi_ctx *ctx,
struct NetGroupAdd *r)
{
struct rpc_pipe_client *pipe_cli = NULL;
- NTSTATUS status;
+ NTSTATUS status, result;
WERROR werr;
struct policy_handle connect_handle, domain_handle, group_handle;
struct lsa_String lsa_group_name;
struct dom_sid2 *domain_sid = NULL;
uint32_t rid = 0;
+ struct dcerpc_binding_handle *b = NULL;
struct GROUP_INFO_0 *info0 = NULL;
struct GROUP_INFO_1 *info1 = NULL;
@@ -80,6 +81,8 @@ WERROR NetGroupAdd_r(struct libnetapi_ctx *ctx,
goto done;
}
+ b = pipe_cli-binding_handle;
+
werr = libnetapi_samr_open_domain(ctx, pipe_cli,
SAMR_ACCESS_ENUM_DOMAINS |
SAMR_ACCESS_LOOKUP_DOMAIN,
@@ -107,18 +110,23 @@ WERROR NetGroupAdd_r(struct libnetapi_ctx *ctx,
break;
}
- status = rpccli_samr_CreateDomainGroup(pipe_cli, talloc_tos(),
+ status = dcerpc_samr_CreateDomainGroup(b, talloc_tos(),
domain_handle,
lsa_group_name,
SEC_STD_DELETE |
SAMR_GROUP_ACCESS_SET_INFO,
group_handle,
- rid);
+ rid,
+ result);
if (!NT_STATUS_IS_OK(status)) {
werr = ntstatus_to_werror(status);
goto done;
}
+ if (!NT_STATUS_IS_OK(result)) {
+ werr = ntstatus_to_werror(result);
+ goto done;
+ }
switch (r-in.level) {
case 1:
@@ -126,10 +134,11 @@ WERROR NetGroupAdd_r(struct libnetapi_ctx *ctx,
init_lsa_String(info.description,
info1-grpi1_comment);
- status = rpccli_samr_SetGroupInfo(pipe_cli,
talloc_tos(),
+ status = dcerpc_samr_SetGroupInfo(b,
talloc_tos(),
group_handle,
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated
via a2eb55e s3-libnetapi: prefer dcerpc_samr_X functions in
lib/netapi/user.c.
via da312fc s3-libnetapi: prefer dcerpc_samr_X functions in
lib/netapi/samr.c.
via 7a22e9c s3-libnetapi: prefer dcerpc_samr_X functions in
lib/netapi/localgroup.c.
via ba6c8f3 s3-libnetapi: prefer dcerpc_samr_X functions in
lib/netapi/group.c.
from 95c1355 Ensure we send the direct levelII oplock break to the
correct fid. (cherry picked from commit
24883229e3ec6237d28b88a2bacc812e1e98b931)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -
commit a2eb55e2d060464146186e47a17ac8d2786a3fa3
Author: Günther Deschner g...@samba.org
Date: Fri Jan 14 17:05:32 2011 +0100
s3-libnetapi: prefer dcerpc_samr_X functions in lib/netapi/user.c.
Guenther
Autobuild-User: Günther Deschner g...@samba.org
Autobuild-Date: Tue Feb 1 13:41:42 CET 2011 on sn-devel-104
(cherry picked from commit f9af242886ac014baa3247bfdc1fe8be6cb8366e)
commit da312fc2f34e872315ad6866625260a43802f142
Author: Günther Deschner g...@samba.org
Date: Fri Jan 14 16:16:31 2011 +0100
s3-libnetapi: prefer dcerpc_samr_X functions in lib/netapi/samr.c.
Guenther
(cherry picked from commit 32fb4f5206bf754cecc761e5c2634f84a073e1eb)
commit 7a22e9cefb9fad9c5a4235fc972aa78084adf2de
Author: Günther Deschner g...@samba.org
Date: Fri Jan 14 16:11:19 2011 +0100
s3-libnetapi: prefer dcerpc_samr_X functions in lib/netapi/localgroup.c.
Guenther
(cherry picked from commit b76657f8d9fea54430b048e61ed7c8c78eb582e5)
commit ba6c8f36d0c7b4915bcfa319620ea54eab83702d
Author: Günther Deschner g...@samba.org
Date: Fri Jan 14 15:49:37 2011 +0100
s3-libnetapi: prefer dcerpc_samr_X functions in lib/netapi/group.c.
Guenther
(cherry picked from commit 7f6301811781675a7f8f5509e67fb34820a9806d)
---
Summary of changes:
source3/lib/netapi/group.c | 487 -
source3/lib/netapi/localgroup.c | 201
source3/lib/netapi/samr.c | 62 -
source3/lib/netapi/user.c | 507 +--
4 files changed, 943 insertions(+), 314 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/netapi/group.c b/source3/lib/netapi/group.c
index b9dd1e9..5507f71 100644
--- a/source3/lib/netapi/group.c
+++ b/source3/lib/netapi/group.c
@@ -23,7 +23,7 @@
#include lib/netapi/netapi.h
#include lib/netapi/netapi_private.h
#include lib/netapi/libnetapi.h
-#include ../librpc/gen_ndr/cli_samr.h
+#include ../librpc/gen_ndr/ndr_samr_c.h
#include rpc_client/init_lsa.h
#include ../libcli/security/security.h
@@ -34,12 +34,13 @@ WERROR NetGroupAdd_r(struct libnetapi_ctx *ctx,
struct NetGroupAdd *r)
{
struct rpc_pipe_client *pipe_cli = NULL;
- NTSTATUS status;
+ NTSTATUS status, result;
WERROR werr;
struct policy_handle connect_handle, domain_handle, group_handle;
struct lsa_String lsa_group_name;
struct dom_sid2 *domain_sid = NULL;
uint32_t rid = 0;
+ struct dcerpc_binding_handle *b = NULL;
struct GROUP_INFO_0 *info0 = NULL;
struct GROUP_INFO_1 *info1 = NULL;
@@ -80,6 +81,8 @@ WERROR NetGroupAdd_r(struct libnetapi_ctx *ctx,
goto done;
}
+ b = pipe_cli-binding_handle;
+
werr = libnetapi_samr_open_domain(ctx, pipe_cli,
SAMR_ACCESS_ENUM_DOMAINS |
SAMR_ACCESS_LOOKUP_DOMAIN,
@@ -107,18 +110,23 @@ WERROR NetGroupAdd_r(struct libnetapi_ctx *ctx,
break;
}
- status = rpccli_samr_CreateDomainGroup(pipe_cli, talloc_tos(),
+ status = dcerpc_samr_CreateDomainGroup(b, talloc_tos(),
domain_handle,
lsa_group_name,
SEC_STD_DELETE |
SAMR_GROUP_ACCESS_SET_INFO,
group_handle,
- rid);
+ rid,
+ result);
if (!NT_STATUS_IS_OK(status)) {
werr = ntstatus_to_werror(status);
goto done;
}
+ if (!NT_STATUS_IS_OK(result)) {
+ werr = ntstatus_to_werror(result);
+ goto done;
+ }
switch (r-in.level) {
case 1:
@@ -126,10 +134,11 @@ WERROR NetGroupAdd_r(struct libnetapi_ctx *ctx,
init_lsa_String(info.description,
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 23146f9 s3: Send a dropped_ip message if we lose an IP
via f71c032 s3: test addrchange
via 80acca1 s3: Add support for AF_NETLINK addr notifications
from f9af242 s3-libnetapi: prefer dcerpc_samr_X functions in
lib/netapi/user.c.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 23146f9912dd79d0ba5a50bf6bb5e36fd7d59565
Author: Volker Lendecke v...@samba.org
Date: Mon Jan 31 17:25:55 2011 +0100
s3: Send a dropped_ip message if we lose an IP
Autobuild-User: Volker Lendecke vlen...@samba.org
Autobuild-Date: Tue Feb 1 15:59:17 CET 2011 on sn-devel-104
commit f71c032f166031381ab117b8beb0d94f73a895cd
Author: Volker Lendecke v...@samba.org
Date: Thu Jan 27 16:56:13 2011 +0100
s3: test addrchange
commit 80acca1ebf8bd8d0350d63277e3143416372fb83
Author: Volker Lendecke v...@samba.org
Date: Thu Jan 27 12:58:22 2011 +0100
s3: Add support for AF_NETLINK addr notifications
Via an AF_NETLINK socket, the Linux kernel can inform us when IP addresses
are
added or dropped.
This will first be used in winbind, it was triggered by clustering with
ctdb.
When winbind is connected to a domain controller and ctdb decides to move
away
the IP address that winbind used locally for the connection to the DC, the
next
request will run into a timeout. winbind sends out its request, but the
response will never arrive: The IP is gone.
It will also be interesting for more reliable online/offline detection, but
this is something for future winbind refactoring.
---
Summary of changes:
source3/Makefile.in|2 +
source3/configure.in |9 +
source3/lib/addrchange.c | 271
.../net_registry_util.h = lib/addrchange.h} | 40 ++--
source3/torture/proto.h|1 +
source3/torture/test_addrchange.c | 93 +++
source3/torture/torture.c |1 +
source3/winbindd/winbindd.c| 85 ++
8 files changed, 484 insertions(+), 18 deletions(-)
create mode 100644 source3/lib/addrchange.c
copy source3/{utils/net_registry_util.h = lib/addrchange.h} (50%)
create mode 100644 source3/torture/test_addrchange.c
Changeset truncated at 500 lines:
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 4cb9a9f..0740133 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -436,6 +436,7 @@ LIB_OBJ = $(LIBSAMBAUTIL_OBJ) $(UTIL_OBJ) $(CRYPTO_OBJ) \
lib/serverid.o \
lib/util_sconn.o \
lib/util_transfer_file.o ../lib/async_req/async_sock.o \
+ lib/addrchange.o \
$(TDB_LIB_OBJ) \
$(VERSION_OBJ) lib/charcnv.o lib/debug.o lib/fault.o \
lib/interface.o lib/pidfile.o \
@@ -1193,6 +1194,7 @@ SMBTORTURE_OBJ1 = torture/torture.o torture/nbio.o
torture/scanner.o torture/uta
torture/nbench.o \
torture/test_async_echo.o \
torture/test_smbsock_any_connect.o \
+ torture/test_addrchange.o \
torture/test_posix_append.o
SMBTORTURE_OBJ = $(SMBTORTURE_OBJ1) $(PARAM_OBJ) $(TLDAP_OBJ) \
diff --git a/source3/configure.in b/source3/configure.in
index cfaf99b..b15bcf6 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -5547,6 +5547,15 @@ else
fi
#
+# check for rtnetlink
+
+AC_CHECK_HEADERS([linux/netlink.h],
+ AC_CHECK_HEADERS([linux/rtnetlink.h],[],[],
+ [#include bits/sockaddr.h
+#include linux/netlink.h]),
+ [],[#include bits/sockaddr.h])
+
+#
# check for ACL support
AC_MSG_CHECKING(whether to support ACLs)
diff --git a/source3/lib/addrchange.c b/source3/lib/addrchange.c
new file mode 100644
index 000..cf415d8
--- /dev/null
+++ b/source3/lib/addrchange.c
@@ -0,0 +1,271 @@
+/*
+ * Samba Unix/Linux SMB client library
+ * Copyright (C) Volker Lendecke 2011
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ */
+
+#include includes.h
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated
via 7f2a129 s3: Send a dropped_ip message if we lose an IP
via 8e5a17b s3: test addrchange
via 6d7c96d0 s3: Add support for AF_NETLINK addr notifications
from a2eb55e s3-libnetapi: prefer dcerpc_samr_X functions in
lib/netapi/user.c.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -
commit 7f2a129a229c9f0c3a24e92e3d2483494c06eda4
Author: Volker Lendecke v...@samba.org
Date: Mon Jan 31 17:25:55 2011 +0100
s3: Send a dropped_ip message if we lose an IP
Autobuild-User: Volker Lendecke vlen...@samba.org
Autobuild-Date: Tue Feb 1 15:59:17 CET 2011 on sn-devel-104
commit 8e5a17b55635f1d3d892bf068fcc95277fc84fe4
Author: Volker Lendecke v...@samba.org
Date: Thu Jan 27 16:56:13 2011 +0100
s3: test addrchange
commit 6d7c96d0b1ea2f5178bf6ad2f3633d13bde250d0
Author: Volker Lendecke v...@samba.org
Date: Thu Jan 27 12:58:22 2011 +0100
s3: Add support for AF_NETLINK addr notifications
Via an AF_NETLINK socket, the Linux kernel can inform us when IP addresses
are
added or dropped.
This will first be used in winbind, it was triggered by clustering with
ctdb.
When winbind is connected to a domain controller and ctdb decides to move
away
the IP address that winbind used locally for the connection to the DC, the
next
request will run into a timeout. winbind sends out its request, but the
response will never arrive: The IP is gone.
It will also be interesting for more reliable online/offline detection, but
this is something for future winbind refactoring.
---
Summary of changes:
source3/Makefile.in|2 +
source3/configure.in |9 +
source3/lib/addrchange.c | 271
.../net_registry_util.h = lib/addrchange.h} | 40 ++--
source3/torture/proto.h|1 +
source3/torture/test_addrchange.c | 93 +++
source3/torture/torture.c |1 +
source3/winbindd/winbindd.c| 85 ++
8 files changed, 484 insertions(+), 18 deletions(-)
create mode 100644 source3/lib/addrchange.c
copy source3/{utils/net_registry_util.h = lib/addrchange.h} (50%)
create mode 100644 source3/torture/test_addrchange.c
Changeset truncated at 500 lines:
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 4cb9a9f..0740133 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -436,6 +436,7 @@ LIB_OBJ = $(LIBSAMBAUTIL_OBJ) $(UTIL_OBJ) $(CRYPTO_OBJ) \
lib/serverid.o \
lib/util_sconn.o \
lib/util_transfer_file.o ../lib/async_req/async_sock.o \
+ lib/addrchange.o \
$(TDB_LIB_OBJ) \
$(VERSION_OBJ) lib/charcnv.o lib/debug.o lib/fault.o \
lib/interface.o lib/pidfile.o \
@@ -1193,6 +1194,7 @@ SMBTORTURE_OBJ1 = torture/torture.o torture/nbio.o
torture/scanner.o torture/uta
torture/nbench.o \
torture/test_async_echo.o \
torture/test_smbsock_any_connect.o \
+ torture/test_addrchange.o \
torture/test_posix_append.o
SMBTORTURE_OBJ = $(SMBTORTURE_OBJ1) $(PARAM_OBJ) $(TLDAP_OBJ) \
diff --git a/source3/configure.in b/source3/configure.in
index cfaf99b..b15bcf6 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -5547,6 +5547,15 @@ else
fi
#
+# check for rtnetlink
+
+AC_CHECK_HEADERS([linux/netlink.h],
+ AC_CHECK_HEADERS([linux/rtnetlink.h],[],[],
+ [#include bits/sockaddr.h
+#include linux/netlink.h]),
+ [],[#include bits/sockaddr.h])
+
+#
# check for ACL support
AC_MSG_CHECKING(whether to support ACLs)
diff --git a/source3/lib/addrchange.c b/source3/lib/addrchange.c
new file mode 100644
index 000..cf415d8
--- /dev/null
+++ b/source3/lib/addrchange.c
@@ -0,0 +1,271 @@
+/*
+ * Samba Unix/Linux SMB client library
+ * Copyright (C) Volker Lendecke 2011
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ */
+
+#include includes.h
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 600ff3a s3-lanman: prefer dcerpc_samr_X functions.
via a51ab04 s3-rpcclient: prefer dcerpc_samr_X functions.
via a0c1c21 s3-libnet: prefer dcerpc_samr_X functions.
from 23146f9 s3: Send a dropped_ip message if we lose an IP
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 600ff3a74e0a69ee0c239f324a5a32dd4ec14546
Author: Günther Deschner g...@samba.org
Date: Mon Jan 17 17:35:21 2011 +0100
s3-lanman: prefer dcerpc_samr_X functions.
Guenther
Autobuild-User: Günther Deschner g...@samba.org
Autobuild-Date: Tue Feb 1 16:45:10 CET 2011 on sn-devel-104
commit a51ab04cced1edc1977d72b07ae42f40ee1f8ccf
Author: Günther Deschner g...@samba.org
Date: Mon Jan 17 16:35:13 2011 +0100
s3-rpcclient: prefer dcerpc_samr_X functions.
Guenther
commit a0c1c219168c8c4ba2e0c3b0cf243b2cc845ba19
Author: Günther Deschner g...@samba.org
Date: Mon Jan 17 15:19:18 2011 +0100
s3-libnet: prefer dcerpc_samr_X functions.
Guenther
---
Summary of changes:
source3/libnet/libnet_join.c | 186 +--
source3/rpcclient/cmd_samr.c | 1380 +++---
source3/smbd/lanman.c| 320 ---
3 files changed, 1258 insertions(+), 628 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c
index 6120617..c0150f2 100644
--- a/source3/libnet/libnet_join.c
+++ b/source3/libnet/libnet_join.c
@@ -23,7 +23,7 @@
#include librpc/gen_ndr/ndr_libnet_join.h
#include libnet/libnet_join.h
#include libcli/auth/libcli_auth.h
-#include ../librpc/gen_ndr/cli_samr.h
+#include ../librpc/gen_ndr/ndr_samr_c.h
#include rpc_client/init_samr.h
#include ../librpc/gen_ndr/cli_lsa.h
#include rpc_client/cli_lsarpc.h
@@ -830,7 +830,7 @@ static NTSTATUS libnet_join_joindomain_rpc(TALLOC_CTX
*mem_ctx,
{
struct rpc_pipe_client *pipe_hnd = NULL;
struct policy_handle sam_pol, domain_pol, user_pol;
- NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
+ NTSTATUS status = NT_STATUS_UNSUCCESSFUL, result;
char *acct_name;
struct lsa_String lsa_acct_name;
uint32_t user_rid;
@@ -838,6 +838,7 @@ static NTSTATUS libnet_join_joindomain_rpc(TALLOC_CTX
*mem_ctx,
struct samr_Ids user_rids;
struct samr_Ids name_types;
union samr_UserInfo user_info;
+ struct dcerpc_binding_handle *b = NULL;
struct samr_CryptPassword crypt_pwd;
struct samr_CryptPasswordEx crypt_pwd_ex;
@@ -872,25 +873,37 @@ static NTSTATUS libnet_join_joindomain_rpc(TALLOC_CTX
*mem_ctx,
goto done;
}
- status = rpccli_samr_Connect2(pipe_hnd, mem_ctx,
+ b = pipe_hnd-binding_handle;
+
+ status = dcerpc_samr_Connect2(b, mem_ctx,
pipe_hnd-desthost,
SAMR_ACCESS_ENUM_DOMAINS
| SAMR_ACCESS_LOOKUP_DOMAIN,
- sam_pol);
+ sam_pol,
+ result);
if (!NT_STATUS_IS_OK(status)) {
goto done;
}
+ if (!NT_STATUS_IS_OK(result)) {
+ status = result;
+ goto done;
+ }
- status = rpccli_samr_OpenDomain(pipe_hnd, mem_ctx,
+ status = dcerpc_samr_OpenDomain(b, mem_ctx,
sam_pol,
SAMR_DOMAIN_ACCESS_LOOKUP_INFO_1
| SAMR_DOMAIN_ACCESS_CREATE_USER
| SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT,
r-out.domain_sid,
- domain_pol);
+ domain_pol,
+ result);
if (!NT_STATUS_IS_OK(status)) {
goto done;
}
+ if (!NT_STATUS_IS_OK(result)) {
+ status = result;
+ goto done;
+ }
/* Create domain user */
@@ -911,14 +924,20 @@ static NTSTATUS libnet_join_joindomain_rpc(TALLOC_CTX
*mem_ctx,
DEBUG(10,(Creating account with desired access mask: %d\n,
access_desired));
- status = rpccli_samr_CreateUser2(pipe_hnd, mem_ctx,
+ status = dcerpc_samr_CreateUser2(b, mem_ctx,
domain_pol,
lsa_acct_name,
acct_flags,
access_desired,
user_pol,
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated
via 755a5a9 s3-lanman: prefer dcerpc_samr_X functions.
via cfb9506 s3-rpcclient: prefer dcerpc_samr_X functions.
via ad537bc s3-libnet: prefer dcerpc_samr_X functions.
from 7f2a129 s3: Send a dropped_ip message if we lose an IP
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -
commit 755a5a96d4f1af0a75bb76f7f1d6ebb03a3638c5
Author: Günther Deschner g...@samba.org
Date: Mon Jan 17 17:35:21 2011 +0100
s3-lanman: prefer dcerpc_samr_X functions.
Guenther
Autobuild-User: Günther Deschner g...@samba.org
Autobuild-Date: Tue Feb 1 16:45:10 CET 2011 on sn-devel-104
(cherry picked from commit 600ff3a74e0a69ee0c239f324a5a32dd4ec14546)
commit cfb9506ed4c132775a571ae6e6b704040510cba7
Author: Günther Deschner g...@samba.org
Date: Mon Jan 17 16:35:13 2011 +0100
s3-rpcclient: prefer dcerpc_samr_X functions.
Guenther
(cherry picked from commit a51ab04cced1edc1977d72b07ae42f40ee1f8ccf)
commit ad537bcdddf12b261c25140fc6db78cf9a37a0fd
Author: Günther Deschner g...@samba.org
Date: Mon Jan 17 15:19:18 2011 +0100
s3-libnet: prefer dcerpc_samr_X functions.
Guenther
(cherry picked from commit a0c1c219168c8c4ba2e0c3b0cf243b2cc845ba19)
---
Summary of changes:
source3/libnet/libnet_join.c | 186 +--
source3/rpcclient/cmd_samr.c | 1380 +++---
source3/smbd/lanman.c| 320 ---
3 files changed, 1258 insertions(+), 628 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c
index 6120617..c0150f2 100644
--- a/source3/libnet/libnet_join.c
+++ b/source3/libnet/libnet_join.c
@@ -23,7 +23,7 @@
#include librpc/gen_ndr/ndr_libnet_join.h
#include libnet/libnet_join.h
#include libcli/auth/libcli_auth.h
-#include ../librpc/gen_ndr/cli_samr.h
+#include ../librpc/gen_ndr/ndr_samr_c.h
#include rpc_client/init_samr.h
#include ../librpc/gen_ndr/cli_lsa.h
#include rpc_client/cli_lsarpc.h
@@ -830,7 +830,7 @@ static NTSTATUS libnet_join_joindomain_rpc(TALLOC_CTX
*mem_ctx,
{
struct rpc_pipe_client *pipe_hnd = NULL;
struct policy_handle sam_pol, domain_pol, user_pol;
- NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
+ NTSTATUS status = NT_STATUS_UNSUCCESSFUL, result;
char *acct_name;
struct lsa_String lsa_acct_name;
uint32_t user_rid;
@@ -838,6 +838,7 @@ static NTSTATUS libnet_join_joindomain_rpc(TALLOC_CTX
*mem_ctx,
struct samr_Ids user_rids;
struct samr_Ids name_types;
union samr_UserInfo user_info;
+ struct dcerpc_binding_handle *b = NULL;
struct samr_CryptPassword crypt_pwd;
struct samr_CryptPasswordEx crypt_pwd_ex;
@@ -872,25 +873,37 @@ static NTSTATUS libnet_join_joindomain_rpc(TALLOC_CTX
*mem_ctx,
goto done;
}
- status = rpccli_samr_Connect2(pipe_hnd, mem_ctx,
+ b = pipe_hnd-binding_handle;
+
+ status = dcerpc_samr_Connect2(b, mem_ctx,
pipe_hnd-desthost,
SAMR_ACCESS_ENUM_DOMAINS
| SAMR_ACCESS_LOOKUP_DOMAIN,
- sam_pol);
+ sam_pol,
+ result);
if (!NT_STATUS_IS_OK(status)) {
goto done;
}
+ if (!NT_STATUS_IS_OK(result)) {
+ status = result;
+ goto done;
+ }
- status = rpccli_samr_OpenDomain(pipe_hnd, mem_ctx,
+ status = dcerpc_samr_OpenDomain(b, mem_ctx,
sam_pol,
SAMR_DOMAIN_ACCESS_LOOKUP_INFO_1
| SAMR_DOMAIN_ACCESS_CREATE_USER
| SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT,
r-out.domain_sid,
- domain_pol);
+ domain_pol,
+ result);
if (!NT_STATUS_IS_OK(status)) {
goto done;
}
+ if (!NT_STATUS_IS_OK(result)) {
+ status = result;
+ goto done;
+ }
/* Create domain user */
@@ -911,14 +924,20 @@ static NTSTATUS libnet_join_joindomain_rpc(TALLOC_CTX
*mem_ctx,
DEBUG(10,(Creating account with desired access mask: %d\n,
access_desired));
- status = rpccli_samr_CreateUser2(pipe_hnd, mem_ctx,
+ status = dcerpc_samr_CreateUser2(b, mem_ctx,
domain_pol,
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 753094d s3-net: add net_scan_dc non-ad variant.
from 600ff3a s3-lanman: prefer dcerpc_samr_X functions.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 753094d5d2525ef738939cae4362fc12f882f60b
Author: Günther Deschner g...@samba.org
Date: Tue Feb 1 16:44:06 2011 +0100
s3-net: add net_scan_dc non-ad variant.
Guenther
Autobuild-User: Günther Deschner g...@samba.org
Autobuild-Date: Tue Feb 1 17:48:40 CET 2011 on sn-devel-104
---
Summary of changes:
source3/utils/net_util.c | 68 +-
1 files changed, 67 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/utils/net_util.c b/source3/utils/net_util.c
index 98d6138..d12a2b9 100644
--- a/source3/utils/net_util.c
+++ b/source3/utils/net_util.c
@@ -621,6 +621,70 @@ const char *net_share_type_str(int num_type)
}
}
+static NTSTATUS net_scan_dc_noad(struct net_context *c,
+struct cli_state *cli,
+struct net_dc_info *dc_info)
+{
+ TALLOC_CTX *mem_ctx = talloc_tos();
+ struct rpc_pipe_client *pipe_hnd = NULL;
+ struct dcerpc_binding_handle *b;
+ NTSTATUS status, result;
+ struct policy_handle pol;
+ union lsa_PolicyInformation *info;
+
+ ZERO_STRUCTP(dc_info);
+ ZERO_STRUCT(pol);
+
+ status = cli_rpc_pipe_open_noauth(cli, ndr_table_lsarpc.syntax_id,
+ pipe_hnd);
+ if (!NT_STATUS_IS_OK(status)) {
+ return status;
+ }
+
+ b = pipe_hnd-binding_handle;
+
+ status = dcerpc_lsa_open_policy(b, mem_ctx,
+ false,
+ SEC_FLAG_MAXIMUM_ALLOWED,
+ pol,
+ result);
+ if (!NT_STATUS_IS_OK(status)) {
+ goto done;
+ }
+ if (!NT_STATUS_IS_OK(result)) {
+ status = result;
+ goto done;
+ }
+
+ status = dcerpc_lsa_QueryInfoPolicy(b, mem_ctx,
+ pol,
+ LSA_POLICY_INFO_ACCOUNT_DOMAIN,
+ info,
+ result);
+ if (!NT_STATUS_IS_OK(status)) {
+ goto done;
+ }
+ if (!NT_STATUS_IS_OK(result)) {
+ status = result;
+ goto done;
+ }
+
+ dc_info-netbios_domain_name = talloc_strdup(mem_ctx,
info-account_domain.name.string);
+ if (dc_info-netbios_domain_name == NULL) {
+ status = NT_STATUS_NO_MEMORY;
+ goto done;
+ }
+
+ done:
+ if (is_valid_policy_hnd(pol)) {
+ dcerpc_lsa_Close(b, mem_ctx, pol, result);
+ }
+
+ TALLOC_FREE(pipe_hnd);
+
+ return status;
+}
+
NTSTATUS net_scan_dc(struct net_context *c,
struct cli_state *cli,
struct net_dc_info *dc_info)
@@ -637,7 +701,9 @@ NTSTATUS net_scan_dc(struct net_context *c,
status = cli_rpc_pipe_open_noauth(cli, ndr_table_dssetup.syntax_id,
dssetup_pipe);
if (!NT_STATUS_IS_OK(status)) {
- return status;
+ DEBUG(10,(net_scan_dc: failed to open dssetup pipe with %s,
+ retrying with lsa pipe\n, nt_errstr(status)));
+ return net_scan_dc_noad(c, cli, dc_info);
}
dssetup_handle = dssetup_pipe-binding_handle;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated
via 21d060a s3-net: add net_scan_dc non-ad variant.
from 755a5a9 s3-lanman: prefer dcerpc_samr_X functions.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -
commit 21d060a001b207469c6e7be8d6dab183a7d8f0cd
Author: Günther Deschner g...@samba.org
Date: Tue Feb 1 16:44:06 2011 +0100
s3-net: add net_scan_dc non-ad variant.
Guenther
Autobuild-User: Günther Deschner g...@samba.org
Autobuild-Date: Tue Feb 1 17:48:40 CET 2011 on sn-devel-104
(cherry picked from commit 753094d5d2525ef738939cae4362fc12f882f60b)
---
Summary of changes:
source3/utils/net_util.c | 68 +-
1 files changed, 67 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/utils/net_util.c b/source3/utils/net_util.c
index 98d6138..d12a2b9 100644
--- a/source3/utils/net_util.c
+++ b/source3/utils/net_util.c
@@ -621,6 +621,70 @@ const char *net_share_type_str(int num_type)
}
}
+static NTSTATUS net_scan_dc_noad(struct net_context *c,
+struct cli_state *cli,
+struct net_dc_info *dc_info)
+{
+ TALLOC_CTX *mem_ctx = talloc_tos();
+ struct rpc_pipe_client *pipe_hnd = NULL;
+ struct dcerpc_binding_handle *b;
+ NTSTATUS status, result;
+ struct policy_handle pol;
+ union lsa_PolicyInformation *info;
+
+ ZERO_STRUCTP(dc_info);
+ ZERO_STRUCT(pol);
+
+ status = cli_rpc_pipe_open_noauth(cli, ndr_table_lsarpc.syntax_id,
+ pipe_hnd);
+ if (!NT_STATUS_IS_OK(status)) {
+ return status;
+ }
+
+ b = pipe_hnd-binding_handle;
+
+ status = dcerpc_lsa_open_policy(b, mem_ctx,
+ false,
+ SEC_FLAG_MAXIMUM_ALLOWED,
+ pol,
+ result);
+ if (!NT_STATUS_IS_OK(status)) {
+ goto done;
+ }
+ if (!NT_STATUS_IS_OK(result)) {
+ status = result;
+ goto done;
+ }
+
+ status = dcerpc_lsa_QueryInfoPolicy(b, mem_ctx,
+ pol,
+ LSA_POLICY_INFO_ACCOUNT_DOMAIN,
+ info,
+ result);
+ if (!NT_STATUS_IS_OK(status)) {
+ goto done;
+ }
+ if (!NT_STATUS_IS_OK(result)) {
+ status = result;
+ goto done;
+ }
+
+ dc_info-netbios_domain_name = talloc_strdup(mem_ctx,
info-account_domain.name.string);
+ if (dc_info-netbios_domain_name == NULL) {
+ status = NT_STATUS_NO_MEMORY;
+ goto done;
+ }
+
+ done:
+ if (is_valid_policy_hnd(pol)) {
+ dcerpc_lsa_Close(b, mem_ctx, pol, result);
+ }
+
+ TALLOC_FREE(pipe_hnd);
+
+ return status;
+}
+
NTSTATUS net_scan_dc(struct net_context *c,
struct cli_state *cli,
struct net_dc_info *dc_info)
@@ -637,7 +701,9 @@ NTSTATUS net_scan_dc(struct net_context *c,
status = cli_rpc_pipe_open_noauth(cli, ndr_table_dssetup.syntax_id,
dssetup_pipe);
if (!NT_STATUS_IS_OK(status)) {
- return status;
+ DEBUG(10,(net_scan_dc: failed to open dssetup pipe with %s,
+ retrying with lsa pipe\n, nt_errstr(status)));
+ return net_scan_dc_noad(c, cli, dc_info);
}
dssetup_handle = dssetup_pipe-binding_handle;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 1c9cf16 s3: Fix the build on sles8 from 753094d s3-net: add net_scan_dc non-ad variant. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 1c9cf16c95cc033920c78686cdadfea8035cb563 Author: Volker Lendecke v...@samba.org Date: Tue Feb 1 17:24:47 2011 +0100 s3: Fix the build on sles8 Autobuild-User: Volker Lendecke vlen...@samba.org Autobuild-Date: Tue Feb 1 18:34:33 CET 2011 on sn-devel-104 --- Summary of changes: source3/lib/addrchange.c |1 + 1 files changed, 1 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/lib/addrchange.c b/source3/lib/addrchange.c index cf415d8..f3606e2 100644 --- a/source3/lib/addrchange.c +++ b/source3/lib/addrchange.c @@ -21,6 +21,7 @@ #if HAVE_LINUX_RTNETLINK_H +#include asm/types.h #include linux/netlink.h #include linux/rtnetlink.h #include lib/async_req/async_sock.h -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via ff0f633 s3:rpcclient/cmd_samr: remove useless ';'
via a152f20 s3:libnet/libnet_samsync_display: fix netr_DELTA_* display
via 5e4691e s3:rpcclient/cmd_netlogon: fix netr_DELTA_* display
via 34b7b55 pidl:Samba4/NDR/Parser: fix ndr_pull/ndr_push mismatch
from 1c9cf16 s3: Fix the build on sles8
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit ff0f63329a884d74d088436958b963787426dc7c
Author: Stefan Metzmacher me...@samba.org
Date: Tue Feb 1 17:38:02 2011 +0100
s3:rpcclient/cmd_samr: remove useless ';'
metze
Autobuild-User: Stefan Metzmacher me...@samba.org
Autobuild-Date: Tue Feb 1 19:19:24 CET 2011 on sn-devel-104
commit a152f20dd10288ce51ac987af8fb87ab30eb5654
Author: Stefan Metzmacher me...@samba.org
Date: Tue Feb 1 17:37:13 2011 +0100
s3:libnet/libnet_samsync_display: fix netr_DELTA_* display
metze
commit 5e4691e70e92e12dd08e88f6abd046637f7b4210
Author: Stefan Metzmacher me...@samba.org
Date: Tue Feb 1 17:36:33 2011 +0100
s3:rpcclient/cmd_netlogon: fix netr_DELTA_* display
metze
commit 34b7b552e85fddedf012af90eb13a4cfdcc16a74
Author: Stefan Metzmacher me...@samba.org
Date: Tue Feb 1 13:10:04 2011 +0100
pidl:Samba4/NDR/Parser: fix ndr_pull/ndr_push mismatch
metze
---
Summary of changes:
pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm |2 +-
source3/libnet/libnet_samsync_display.c | 21 -
source3/rpcclient/cmd_netlogon.c | 25 ++---
source3/rpcclient/cmd_samr.c |2 +-
4 files changed, 28 insertions(+), 22 deletions(-)
Changeset truncated at 500 lines:
diff --git a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
index 69c1386..075ad85 100644
--- a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
@@ -1857,7 +1857,7 @@ sub ParseUnionPullPrimitives($)
if (defined($e-{ALIGN})) {
if ($e-{IS_MS_UNION}) {
$self-pidl(/* ms_union is always aligned to the
largest union arm*/);
- $self-pidl(NDR_CHECK(ndr_push_align($ndr,
$e-{ALIGN})););
+ $self-pidl(NDR_CHECK(ndr_pull_align($ndr,
$e-{ALIGN})););
} else {
$self-pidl(NDR_CHECK(ndr_pull_union_align($ndr,
$e-{ALIGN})););
}
diff --git a/source3/libnet/libnet_samsync_display.c
b/source3/libnet/libnet_samsync_display.c
index eb891cf..f2cff78 100644
--- a/source3/libnet/libnet_samsync_display.c
+++ b/source3/libnet/libnet_samsync_display.c
@@ -206,29 +206,32 @@ static NTSTATUS display_sam_entry(TALLOC_CTX *mem_ctx,
display_alias_mem(id.rid, u.alias_member);
break;
case NETR_DELTA_POLICY:
- printf(Policy\n);
+ printf(Policy: %s\n,
+ sid_string_dbg(id.sid));
break;
case NETR_DELTA_TRUSTED_DOMAIN:
printf(Trusted Domain: %s\n,
u.trusted_domain-domain_name.string);
break;
case NETR_DELTA_DELETE_TRUST:
- printf(Delete Trust: %d\n,
- u.delete_trust.unknown);
+ printf(Delete Trust: %s\n,
+ sid_string_dbg(id.sid));
break;
case NETR_DELTA_ACCOUNT:
- printf(Account\n);
+ printf(Account: %s\n,
+ sid_string_dbg(id.sid));
break;
case NETR_DELTA_DELETE_ACCOUNT:
- printf(Delete Account: %d\n,
- u.delete_account.unknown);
+ printf(Delete Account: %s\n,
+ sid_string_dbg(id.sid));
break;
case NETR_DELTA_SECRET:
- printf(Secret\n);
+ printf(Secret: %s\n,
+ id.name);
break;
case NETR_DELTA_DELETE_SECRET:
- printf(Delete Secret: %d\n,
- u.delete_secret.unknown);
+ printf(Delete Secret: %s\n,
+ id.name);
break;
case NETR_DELTA_DELETE_GROUP2:
printf(Delete Group2: %s\n,
diff --git a/source3/rpcclient/cmd_netlogon.c b/source3/rpcclient/cmd_netlogon.c
index c909efe..63057ac 100644
--- a/source3/rpcclient/cmd_netlogon.c
+++ b/source3/rpcclient/cmd_netlogon.c
@@ -478,7 +478,7 @@ static void display_sam_sync(struct netr_DELTA_ENUM_ARRAY
*r)
break;
case NETR_DELTA_DELETE_GROUP:
printf(Delete Group: %d\n,
- u.delete_account.unknown);
+ id.rid);
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 3b94800 Added SSL global catalog
from ff0f633 s3:rpcclient/cmd_samr: remove useless ';'
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 3b948008ce4083ab551257c18659d5ff912990bd
Author: William Brown william.e.br...@adelaide.edu.au
Date: Thu Jan 20 11:41:01 2011 +1030
Added SSL global catalog
Reviewed-by: Andrew Bartlett
Signed-off-by: Matthias Dieter Wallnöfer m...@samba.org
Autobuild-User: Matthias Dieter Wallnöfer m...@samba.org
Autobuild-Date: Tue Feb 1 20:05:39 CET 2011 on sn-devel-104
---
Summary of changes:
source4/ldap_server/ldap_server.c | 21 ++---
1 files changed, 18 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/ldap_server/ldap_server.c
b/source4/ldap_server/ldap_server.c
index 21030ba..4547759 100644
--- a/source4/ldap_server/ldap_server.c
+++ b/source4/ldap_server/ldap_server.c
@@ -314,7 +314,7 @@ static void ldapsrv_accept(struct stream_connection *c,
}
port = socket_address-port;
talloc_free(socket_address);
- if (port == 3268) /* Global catalog */ {
+ if (port == 3268 || port == 3269) /* Global catalog */ {
conn-global_catalog = true;
}
@@ -347,7 +347,7 @@ static void ldapsrv_accept(struct stream_connection *c,
conn-sockets.active = conn-sockets.raw;
- if (port != 636) {
+ if (port != 636 port != 3269) {
ldapsrv_call_read_next(conn);
return;
}
@@ -860,9 +860,24 @@ static NTSTATUS add_socket(struct task_server *task,
address, port, nt_errstr(status)));
return status;
}
+ if (tstream_tls_params_enabled(ldap_service-tls_params)) {
+ /* add ldaps server for the global catalog */
+ port = 3269;
+ status = stream_setup_socket(task, task-event_ctx,
lp_ctx,
+model_ops,
+ldap_stream_nonpriv_ops,
+ipv4, address, port,
+
lpcfg_socket_options(lp_ctx),
+ldap_service);
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(0,(ldapsrv failed to bind to %s:%u -
%s\n,
+address, port, nt_errstr(status)));
+ return status;
+ }
+ }
}
- /* And once we are bound, free the tempoary ldb, it will
+ /* And once we are bound, free the temporary ldb, it will
* connect again on each incoming LDAP connection */
talloc_unlink(ldap_service, ldb);
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via ba4ec70 s3: Fix bug 7940 -- fall back for utimes calls
from 3b94800 Added SSL global catalog
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit ba4ec70529c0fa9cf4dc797176dbae1a2c949dbc
Author: Volker Lendecke v...@samba.org
Date: Sat Jan 29 10:59:14 2011 +0100
s3: Fix bug 7940 -- fall back for utimes calls
There are systems where ./configure has detected advanced utimes calls which
are then not available on other kernels. We should do a proper fallback.
Autobuild-User: Volker Lendecke vlen...@samba.org
Autobuild-Date: Tue Feb 1 22:37:35 CET 2011 on sn-devel-104
---
Summary of changes:
source3/modules/vfs_default.c | 18 ++
1 files changed, 14 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index 9cca349..698e745 100644
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -786,7 +786,11 @@ static int vfswrap_ntimes(vfs_handle_struct *handle,
} else {
result = utimensat(AT_FDCWD, smb_fname-base_name, NULL, 0);
}
-#elif defined(HAVE_UTIMES)
+ if (!((result == -1) (errno == ENOSYS))) {
+ goto out;
+ }
+#endif
+#if defined(HAVE_UTIMES)
if (ft != NULL) {
struct timeval tv[2];
tv[0] = convert_timespec_to_timeval(ft-atime);
@@ -795,7 +799,11 @@ static int vfswrap_ntimes(vfs_handle_struct *handle,
} else {
result = utimes(smb_fname-base_name, NULL);
}
-#elif defined(HAVE_UTIME)
+ if (!((result == -1) (errno == ENOSYS))) {
+ goto out;
+ }
+#endif
+#if defined(HAVE_UTIME)
if (ft != NULL) {
struct utimbuf times;
times.actime = convert_timespec_to_time_t(ft-atime);
@@ -804,10 +812,12 @@ static int vfswrap_ntimes(vfs_handle_struct *handle,
} else {
result = utime(smb_fname-base_name, NULL);
}
-#else
+ if (!((result == -1) (errno == ENOSYS))) {
+ goto out;
+ }
+#endif
errno = ENOSYS;
result = -1;
-#endif
out:
END_PROFILE(syscall_ntimes);
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via fbbe321 s3-waf: fix the build after linux netlink changes.
from ba4ec70 s3: Fix bug 7940 -- fall back for utimes calls
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit fbbe321d19d0774bf141eddf6dea86e8ae2cf64a
Author: Günther Deschner g...@samba.org
Date: Tue Feb 1 19:22:04 2011 +0100
s3-waf: fix the build after linux netlink changes.
Volker, please check.
Guenther
Autobuild-User: Günther Deschner g...@samba.org
Autobuild-Date: Tue Feb 1 23:21:50 CET 2011 on sn-devel-104
---
Summary of changes:
source3/wscript | 14 ++
source3/wscript_build |2 ++
2 files changed, 16 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/wscript b/source3/wscript
index 89ee79f..61e00aa 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -946,6 +946,20 @@ int i; i = PAM_RADIO_TYPE;
if conf.CONFIG_SET('HAVE_VALGRIND_H') or
conf.CONFIG_SET('HAVE_VALGRIND_VALGRIND_H'):
conf.DEFINE('VALGRIND', '1')
+if conf.CHECK_CODE('''
+#include bits/sockaddr.h
+#include linux/netlink.h
+''',
+ 'HAVE_LINUX_NETLINK_H',
+msg=Checking whether Linux netlink is available):
+conf.CHECK_CODE('''
+#include bits/sockaddr.h
+#include linux/netlink.h
+#include linux/rtnetlink.h
+''',
+ 'HAVE_LINUX_RTNETLINK_H',
+ msg='Checking whether Linux rtnetlink is available')
+
conf.SAMBA_CONFIG_H('include/config.h')
def ctags(ctx):
diff --git a/source3/wscript_build b/source3/wscript_build
index 669..23d55b9 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -80,6 +80,7 @@ LIB_SRC = '''${LIBSAMBAUTIL_SRC}
lib/util_sconn.c
lib/serverid.c
lib/util_transfer_file.c
+ lib/addrchange.c
${TDB_LIB_SRC}
lib/debug.c lib/fault.c
lib/interface.c lib/pidfile.c
@@ -604,6 +605,7 @@ SMBTORTURE_SRC1 = '''torture/torture.c torture/nbio.c
torture/scanner.c torture/
torture/denytest.c torture/mangle_test.c
torture/nbench.c
torture/test_async_echo.c
+torture/test_addrchange.c
torture/test_posix_append.c
torture/test_smbsock_any_connect.c'''
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via a19c1cbb s3-net: prefer dcerpc_samr_X functions in rpc_trustdom_list. via c7b1432 s3-net: prefer dcerpc_samr_X functions in rpc_trustdom_del_internals. via 95ee07d s3-net: prefer dcerpc_samr_X functions in rpc_trustdom_add_internals. via 49f08d1 s3-net: prefer dcerpc_samr_X functions in rpc_aliaslist_internals. via 37f2f51 s3-net: prefer dcerpc_samr_X functions in rpc_fetch_domain_aliases. via bf10bbc s3-net: prefer dcerpc_samr_X functions in rpc_group_members_internals. via 20edb2d s3-net: prefer dcerpc_samr_X functions in rpc_list_alias_members. via 2a63433 s3-net: prefer dcerpc_samr_X functions in rpc_list_group_members. via d280a52 s3-net: prefer dcerpc_samr_X functions in rpc_group_list_internals. via 84e3d14 s3-net: prefer dcerpc_samr_X functions in rpc_del_aliasmem. via b9b2325 s3-net: prefer dcerpc_samr_X functions in rpc_del_groupmem. via 55e042a s3-net: prefer dcerpc_samr_X functions in rpc_add_aliasmem. via f8147fb s3-net: prefer dcerpc_samr_X functions in rpc_add_groupmem. via e14c214 s3-net: prefer dcerpc_samr_X functions in rpc_group_delete_internals. via 54b74c7 s3-net: prefer dcerpc_samr_X functions in rpc_sh_user_flag_edit_internals. via 1d3b378 s3-net: prefer dcerpc_samr_X functions in rpc_sh_user_str_edit_internals. via a87a9fc s3-net: prefer dcerpc_samr_X functions in rpc_sh_user_show_internals. via 021e0b4 s3-net: prefer dcerpc_samr_X functions in rpc_sh_handle_user. via f140e89 s3-net: prefer dcerpc_samr_X functions in rpc_info_internals. via e3aafb2 s3-net: prefer dcerpc_samr_X functions in net_rpc_sh_acct.c. from fbbe321 s3-waf: fix the build after linux netlink changes. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit a19c1cbb8d74307e05cba379903c739e7abc0943 Author: Günther Deschner g...@samba.org Date: Tue Jan 18 12:10:02 2011 +0100 s3-net: prefer dcerpc_samr_X functions in rpc_trustdom_list. Guenther Autobuild-User: Günther Deschner g...@samba.org Autobuild-Date: Wed Feb 2 00:21:19 CET 2011 on sn-devel-104 commit c7b1432b6eeba79aa8cfe22f68c983cd2532ac5f Author: Günther Deschner g...@samba.org Date: Tue Jan 18 12:08:02 2011 +0100 s3-net: prefer dcerpc_samr_X functions in rpc_trustdom_del_internals. Guenther commit 95ee07d8abbd7d487003d3b07e67cbcc7e0816c5 Author: Günther Deschner g...@samba.org Date: Tue Jan 18 12:06:42 2011 +0100 s3-net: prefer dcerpc_samr_X functions in rpc_trustdom_add_internals. Guenther commit 49f08d1d7cd9a8bd9e7757ec2575175b79255e14 Author: Günther Deschner g...@samba.org Date: Tue Jan 18 12:05:38 2011 +0100 s3-net: prefer dcerpc_samr_X functions in rpc_aliaslist_internals. Guenther commit 37f2f518bed220a83025884e4b345ba2b0a08dd6 Author: Günther Deschner g...@samba.org Date: Tue Jan 18 12:04:56 2011 +0100 s3-net: prefer dcerpc_samr_X functions in rpc_fetch_domain_aliases. Guenther commit bf10bbc074decbdffe9f094cdf6a7ec859dd708e Author: Günther Deschner g...@samba.org Date: Tue Jan 18 12:02:53 2011 +0100 s3-net: prefer dcerpc_samr_X functions in rpc_group_members_internals. Guenther commit 20edb2d48bc0b7c4d4d44baf491480838d1e38ba Author: Günther Deschner g...@samba.org Date: Tue Jan 18 12:01:35 2011 +0100 s3-net: prefer dcerpc_samr_X functions in rpc_list_alias_members. Guenther commit 2a63433e942a8b75c27291fba6d6c230be020b09 Author: Günther Deschner g...@samba.org Date: Tue Jan 18 12:00:09 2011 +0100 s3-net: prefer dcerpc_samr_X functions in rpc_list_group_members. Guenther commit d280a52fdd04a02d68525f341ede4d39534f0b4c Author: Günther Deschner g...@samba.org Date: Tue Jan 18 11:59:16 2011 +0100 s3-net: prefer dcerpc_samr_X functions in rpc_group_list_internals. Guenther commit 84e3d14f7a1cc9a0d03235a95a2813cb54947ded Author: Günther Deschner g...@samba.org Date: Tue Jan 18 11:57:33 2011 +0100 s3-net: prefer dcerpc_samr_X functions in rpc_del_aliasmem. Guenther commit b9b2325f4566423f67b93309b47401d992257c38 Author: Günther Deschner g...@samba.org Date: Tue Jan 18 11:56:52 2011 +0100 s3-net: prefer dcerpc_samr_X functions in rpc_del_groupmem. Guenther commit 55e042a4f2689ecc9c78933792047b6426950662 Author: Günther Deschner g...@samba.org Date: Tue Jan 18 11:56:12 2011 +0100 s3-net: prefer dcerpc_samr_X functions in rpc_add_aliasmem. Guenther commit f8147fbb149574023d6e0ed3662b0a0a43f4bbb9 Author: Günther Deschner g...@samba.org Date: Tue Jan 18 11:44:42 2011 +0100 s3-net: prefer dcerpc_samr_X functions in rpc_add_groupmem. Guenther commit e14c214ab38024b37e460a1160f11ddfbef5d3c6 Author: Günther Deschner
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated via 75493e6 s3-net: prefer dcerpc_samr_X functions in rpc_trustdom_list. via 3dea5be s3-net: prefer dcerpc_samr_X functions in rpc_trustdom_del_internals. via d8ab6bf s3-net: prefer dcerpc_samr_X functions in rpc_trustdom_add_internals. via 01df26f s3-net: prefer dcerpc_samr_X functions in rpc_aliaslist_internals. via ee56b19 s3-net: prefer dcerpc_samr_X functions in rpc_fetch_domain_aliases. via 26cb555 s3-net: prefer dcerpc_samr_X functions in rpc_group_members_internals. via 4866076 s3-net: prefer dcerpc_samr_X functions in rpc_list_alias_members. via 613fa68 s3-net: prefer dcerpc_samr_X functions in rpc_list_group_members. via 3e952b1 s3-net: prefer dcerpc_samr_X functions in rpc_group_list_internals. via dfcbade s3-net: prefer dcerpc_samr_X functions in rpc_del_aliasmem. via e75826b s3-net: prefer dcerpc_samr_X functions in rpc_del_groupmem. via 738202d s3-net: prefer dcerpc_samr_X functions in rpc_add_aliasmem. via b04f5f3 s3-net: prefer dcerpc_samr_X functions in rpc_add_groupmem. via b2f3f9d s3-net: prefer dcerpc_samr_X functions in rpc_group_delete_internals. via db91b4c s3-net: prefer dcerpc_samr_X functions in rpc_sh_user_flag_edit_internals. via cf32f14 s3-net: prefer dcerpc_samr_X functions in rpc_sh_user_str_edit_internals. via c9f20cc s3-net: prefer dcerpc_samr_X functions in rpc_sh_user_show_internals. via c004fdc s3-net: prefer dcerpc_samr_X functions in rpc_sh_handle_user. via 6f4cd79 s3-net: prefer dcerpc_samr_X functions in rpc_info_internals. via a067748 s3-net: prefer dcerpc_samr_X functions in net_rpc_sh_acct.c. via 2fb2c5c s3-waf: fix the build after linux netlink changes. from 743e887 s3: Fix the build on sles8 http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test - Log - commit 75493e6f5085410ac08b995db3b4dcccd7ae353d Author: Günther Deschner g...@samba.org Date: Tue Jan 18 12:10:02 2011 +0100 s3-net: prefer dcerpc_samr_X functions in rpc_trustdom_list. Guenther Autobuild-User: Günther Deschner g...@samba.org Autobuild-Date: Wed Feb 2 00:21:19 CET 2011 on sn-devel-104 (cherry picked from commit a19c1cbb8d74307e05cba379903c739e7abc0943) commit 3dea5be68d1c2799cff38c5427ed9437012e3457 Author: Günther Deschner g...@samba.org Date: Tue Jan 18 12:08:02 2011 +0100 s3-net: prefer dcerpc_samr_X functions in rpc_trustdom_del_internals. Guenther (cherry picked from commit c7b1432b6eeba79aa8cfe22f68c983cd2532ac5f) commit d8ab6bf98d911f016be930a72a12a1ac23564b31 Author: Günther Deschner g...@samba.org Date: Tue Jan 18 12:06:42 2011 +0100 s3-net: prefer dcerpc_samr_X functions in rpc_trustdom_add_internals. Guenther (cherry picked from commit 95ee07d8abbd7d487003d3b07e67cbcc7e0816c5) commit 01df26f716c1f0dd3354b69a770c5948c0b2d87b Author: Günther Deschner g...@samba.org Date: Tue Jan 18 12:05:38 2011 +0100 s3-net: prefer dcerpc_samr_X functions in rpc_aliaslist_internals. Guenther (cherry picked from commit 49f08d1d7cd9a8bd9e7757ec2575175b79255e14) commit ee56b1942b7d8ac499fbc71f4ec340cd1c8a58dd Author: Günther Deschner g...@samba.org Date: Tue Jan 18 12:04:56 2011 +0100 s3-net: prefer dcerpc_samr_X functions in rpc_fetch_domain_aliases. Guenther (cherry picked from commit 37f2f518bed220a83025884e4b345ba2b0a08dd6) commit 26cbb38a91e17a3beecebf50b323873c47fc Author: Günther Deschner g...@samba.org Date: Tue Jan 18 12:02:53 2011 +0100 s3-net: prefer dcerpc_samr_X functions in rpc_group_members_internals. Guenther (cherry picked from commit bf10bbc074decbdffe9f094cdf6a7ec859dd708e) commit 48660763c9b5557bb354bd31ab489819e80926e3 Author: Günther Deschner g...@samba.org Date: Tue Jan 18 12:01:35 2011 +0100 s3-net: prefer dcerpc_samr_X functions in rpc_list_alias_members. Guenther (cherry picked from commit 20edb2d48bc0b7c4d4d44baf491480838d1e38ba) commit 613fa6888635b4ee3f2e8c378f611f4cb5f9387c Author: Günther Deschner g...@samba.org Date: Tue Jan 18 12:00:09 2011 +0100 s3-net: prefer dcerpc_samr_X functions in rpc_list_group_members. Guenther (cherry picked from commit 2a63433e942a8b75c27291fba6d6c230be020b09) commit 3e952b164f25322a735c1761dc302a11fb2410ee Author: Günther Deschner g...@samba.org Date: Tue Jan 18 11:59:16 2011 +0100 s3-net: prefer dcerpc_samr_X functions in rpc_group_list_internals. Guenther (cherry picked from commit d280a52fdd04a02d68525f341ede4d39534f0b4c) commit dfcbade483be28e0fb158a7489425a0f20039c13 Author: Günther Deschner g...@samba.org Date: Tue Jan 18 11:57:33 2011 +0100 s3-net: prefer dcerpc_samr_X functions in rpc_del_aliasmem. Guenther
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated via a5b7549 Based on a conversation with Volker, refactor some of the oplock code to make it comprehensible. via db1f553 s3: Fix bug 7940 -- fall back for utimes calls via ac8fa07 s3:rpcclient/cmd_samr: remove useless ';' via af692c2 s3:libnet/libnet_samsync_display: fix netr_DELTA_* display via 0c668fe s3:rpcclient/cmd_netlogon: fix netr_DELTA_* display from 75493e6 s3-net: prefer dcerpc_samr_X functions in rpc_trustdom_list. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test - Log - commit a5b754953412aa6daedbf97f680fadf3c545b95d Author: Jeremy Allison j...@samba.org Date: Tue Feb 1 16:01:57 2011 -0800 Based on a conversation with Volker, refactor some of the oplock code to make it comprehensible. delay_for_oplocks() did 4 things. 1). Validation of existing oplock types. 2). Check for compatibility with batch oplocks (pass 1). 3). Check for compatibility with exclusive oplocks (pass 2). 4). Set the correct oplock type from the requested value. Refactor into 4 separate functions: 1). find_oplock_types() - does validation of oplock types and returns pointers to specific values. 2). delay_for_batch_oplocks() - the pass 1 phase above. 3). delay_for_exclusive_oplocks() - the pass 2 phase above 4). grant_fsp_oplock_type() - Set the correct oplock type from the requested value. Now separated out this code should be much easier to understand and modify. This also fixes an erroneous SMB_ASSERT which was hidden by the previous complexity of the single delay_for_oplocks() code. Jeremy. (cherry picked from commit 8c226c3c9db422ee6cb35cecdc3fe39130c64752) commit db1f553a446e7b70192202a8a99d0033b120 Author: Volker Lendecke v...@samba.org Date: Sat Jan 29 10:59:14 2011 +0100 s3: Fix bug 7940 -- fall back for utimes calls There are systems where ./configure has detected advanced utimes calls which are then not available on other kernels. We should do a proper fallback. Autobuild-User: Volker Lendecke vlen...@samba.org Autobuild-Date: Tue Feb 1 22:37:35 CET 2011 on sn-devel-104 (cherry picked from commit ba4ec70529c0fa9cf4dc797176dbae1a2c949dbc) commit ac8fa0749e93dff51fea29fa88bbd99c7e4f59cd Author: Stefan Metzmacher me...@samba.org Date: Tue Feb 1 17:38:02 2011 +0100 s3:rpcclient/cmd_samr: remove useless ';' metze Autobuild-User: Stefan Metzmacher me...@samba.org Autobuild-Date: Tue Feb 1 19:19:24 CET 2011 on sn-devel-104 (cherry picked from commit ff0f63329a884d74d088436958b963787426dc7c) commit af692c25ef111ff751c5bc316333486d11489a1c Author: Stefan Metzmacher me...@samba.org Date: Tue Feb 1 17:37:13 2011 +0100 s3:libnet/libnet_samsync_display: fix netr_DELTA_* display metze (cherry picked from commit a152f20dd10288ce51ac987af8fb87ab30eb5654) commit 0c668fea6587cd6e68bb57af5700f6effcb5b126 Author: Stefan Metzmacher me...@samba.org Date: Tue Feb 1 17:36:33 2011 +0100 s3:rpcclient/cmd_netlogon: fix netr_DELTA_* display metze (cherry picked from commit 5e4691e70e92e12dd08e88f6abd046637f7b4210) --- Summary of changes: source3/libnet/libnet_samsync_display.c | 21 ++-- source3/modules/vfs_default.c | 18 ++- source3/rpcclient/cmd_netlogon.c| 25 ++-- source3/rpcclient/cmd_samr.c|2 +- source3/smbd/open.c | 231 +-- 5 files changed, 201 insertions(+), 96 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/libnet/libnet_samsync_display.c b/source3/libnet/libnet_samsync_display.c index eb891cf..f2cff78 100644 --- a/source3/libnet/libnet_samsync_display.c +++ b/source3/libnet/libnet_samsync_display.c @@ -206,29 +206,32 @@ static NTSTATUS display_sam_entry(TALLOC_CTX *mem_ctx, display_alias_mem(id.rid, u.alias_member); break; case NETR_DELTA_POLICY: - printf(Policy\n); + printf(Policy: %s\n, + sid_string_dbg(id.sid)); break; case NETR_DELTA_TRUSTED_DOMAIN: printf(Trusted Domain: %s\n, u.trusted_domain-domain_name.string); break; case NETR_DELTA_DELETE_TRUST: - printf(Delete Trust: %d\n, - u.delete_trust.unknown); + printf(Delete Trust: %s\n, + sid_string_dbg(id.sid)); break; case NETR_DELTA_ACCOUNT: - printf(Account\n); + printf(Account: %s\n, + sid_string_dbg(id.sid)); break; case NETR_DELTA_DELETE_ACCOUNT: -
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 3d4a9dd Based on a conversation with Volker, refactor some of the
oplock code to make it comprehensible.
from a19c1cbb s3-net: prefer dcerpc_samr_X functions in
rpc_trustdom_list.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 3d4a9ddc244bd4937af9ff1c6e898ab45a7d28b5
Author: Jeremy Allison j...@samba.org
Date: Tue Feb 1 16:01:57 2011 -0800
Based on a conversation with Volker, refactor some of the oplock code to
make it comprehensible.
delay_for_oplocks() did 4 things.
1). Validation of existing oplock types.
2). Check for compatibility with batch oplocks (pass 1).
3). Check for compatibility with exclusive oplocks (pass 2).
4). Set the correct oplock type from the requested value.
Refactor into 4 separate functions:
1). find_oplock_types() - does validation of oplock types and
returns pointers to specific values.
2). delay_for_batch_oplocks() - the pass 1 phase above.
3). delay_for_exclusive_oplocks() - the pass 2 phase above
4). grant_fsp_oplock_type() - Set the correct oplock type from the
requested value.
Now separated out this code should be much easier to understand
and modify. This also fixes an erroneous SMB_ASSERT which was
hidden by the previous complexity of the single delay_for_oplocks()
code.
Jeremy.
Autobuild-User: Jeremy Allison j...@samba.org
Autobuild-Date: Wed Feb 2 01:52:21 CET 2011 on sn-devel-104
---
Summary of changes:
source3/smbd/open.c | 231 +++
1 files changed, 160 insertions(+), 71 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 5a725c6..f236243 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -915,93 +915,137 @@ static NTSTATUS send_break_message(files_struct *fsp,
}
/*
- * 1) No files open at all or internal open: Grant whatever the client wants.
- *
- * 2) Exclusive (or batch) oplock around: If the requested access is a delete
- *request, break if the oplock around is a batch oplock. If it's another
- *requested access type, break.
- *
- * 3) Only level2 around: Grant level2 and do nothing else.
+ * Return share_mode_entry pointers for :
+ * 1). Batch oplock entry.
+ * 2). Batch or exclusive oplock entry (may be identical to #1).
+ * bool have_level2_oplock
+ * bool have_no_oplock.
+ * Do internal consistency checks on the share mode for a file.
*/
-static bool delay_for_oplocks(struct share_mode_lock *lck,
- files_struct *fsp,
- uint64_t mid,
- int pass_number,
- int oplock_request)
+static void find_oplock_types(struct share_mode_lock *lck,
+ struct share_mode_entry **pp_batch,
+ struct share_mode_entry **pp_ex_or_batch,
+ bool *got_level2,
+ bool *got_no_oplock)
{
int i;
- struct share_mode_entry *exclusive = NULL;
- bool valid_entry = false;
- bool have_level2 = false;
- bool have_a_none_oplock = false;
- bool allow_level2 = (global_client_caps CAP_LEVEL_II_OPLOCKS)
- lp_level2_oplocks(SNUM(fsp-conn));
-
- if (oplock_request INTERNAL_OPEN_ONLY) {
- fsp-oplock_type = NO_OPLOCK;
- }
- if ((oplock_request INTERNAL_OPEN_ONLY) ||
is_stat_open(fsp-access_mask)) {
- return false;
- }
+ *pp_batch = NULL;
+ *pp_ex_or_batch = NULL;
+ *got_level2 = false;
+ *got_no_oplock = false;
for (i=0; ilck-num_share_modes; i++) {
-
if (!is_valid_share_mode_entry(lck-share_modes[i])) {
continue;
}
- /* At least one entry is not an invalid or deferred entry. */
- valid_entry = true;
-
- if (pass_number == 1) {
- if (BATCH_OPLOCK_TYPE(lck-share_modes[i].op_type)) {
- SMB_ASSERT(exclusive == NULL);
- exclusive = lck-share_modes[i];
+ if (BATCH_OPLOCK_TYPE(lck-share_modes[i].op_type)) {
+ /* batch - can only be one. */
+ if (*pp_batch || *got_level2 || *got_no_oplock) {
+ smb_panic(Bad batch oplock entry.);
}
- } else {
- if (EXCLUSIVE_OPLOCK_TYPE(lck-share_modes[i].op_type))
{
- SMB_ASSERT(exclusive == NULL);
- exclusive = lck-share_modes[i];
+
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via f19c1e3 s4-dsdb Add tests to ensure we don't break the rootDSE function levels again via 2e865be s4-dsdb Fix generation of rootDSE domainControllerFunctionality via e830cb4 wintest Return debug info when dcpromo fails from the log via a3e9935 s4-waf Don't install any Samba packages into PYTHONDIR via dbe0b07 s4-python Remove manipuation of python path from samba module via 7faa3be s4-python Ensure we add the Samba python path first. via 38aacd7 waf: Replace python installation rule to allow PYTHONARCHDIR and PYTHONDIR via 5d4dc6c s4-python Remove unused missing.py (used by old build system) via eab493b Remove unused installmisc.sh script, from old build system via 2d9bcc8 s4:heimdal: import lorikeet-heimdal-201101310455 (commit aa88eb1a05c4985cc23fb65fc1bad75bdce01c1f) from 3d4a9dd Based on a conversation with Volker, refactor some of the oplock code to make it comprehensible. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit f19c1e37c7d56ad9037e98067ca041a18a479e78 Author: Andrew Bartlett abart...@samba.org Date: Wed Feb 2 14:51:27 2011 +1100 s4-dsdb Add tests to ensure we don't break the rootDSE function levels again This both checks that the levels make sense, and they match what they should be based on in the DB. Andrew Bartlett Autobuild-User: Andrew Bartlett abart...@samba.org Autobuild-Date: Wed Feb 2 06:09:53 CET 2011 on sn-devel-104 commit 2e865bed0aa6d28d2543ca6ad0a9c3d73c7db53f Author: Andrew Bartlett abart...@samba.org Date: Wed Feb 2 14:01:35 2011 +1100 s4-dsdb Fix generation of rootDSE domainControllerFunctionality The issue here is that when the samdb calls were removed, this call relied on going back to the top of the module stack, so as to re-enter the rootDSE search handler. It makes more sense to check the @ROOTDSE record directly, and therefore not to invoke the search() handler during the init. Andrew Bartlett commit e830cb48396b6b480794c5d982f0f75f025e8c14 Author: Andrew Bartlett abart...@samba.org Date: Wed Feb 2 11:48:44 2011 +1100 wintest Return debug info when dcpromo fails from the log commit a3e99356abab3fd77a87d2ac594243b3f77e3cdd Author: Andrew Bartlett abart...@samba.org Date: Tue Feb 1 16:36:10 2011 +1100 s4-waf Don't install any Samba packages into PYTHONDIR This causes the parts of Samba installed into PYTHONARCHDIR to then be missed in mixed python/C module namespaces. Andrew Bartlett commit dbe0b078492ea20da2b0aa3bb1d1c6138d16454e Author: Andrew Bartlett abart...@samba.org Date: Tue Feb 1 14:58:11 2011 +1100 s4-python Remove manipuation of python path from samba module This manipulation should be done by top level scripts, otherwise we won't find samba in the first place (and these can be munged correctly for the install). Andrew Bartlett commit 7faa3be45359a94593d22e2bbe7eda0ddffa146c Author: Andrew Bartlett abart...@samba.org Date: Tue Feb 1 14:43:34 2011 +1100 s4-python Ensure we add the Samba python path first. This exact form of the construction is important, and we match on it in the installation scripts. Andrew Bartlett commit 38aacd7a7bc551797d8c60cc695fc4922941add9 Author: Andrew Bartlett abart...@samba.org Date: Tue Feb 1 14:29:35 2011 +1100 waf: Replace python installation rule to allow PYTHONARCHDIR and PYTHONDIR The old rule could only substitute one part of one line, but we need to add a second line to handle when PYTHONDIR and PYTHONARCHDIR do not match. This also avoids shelling out to sed with a regex, which was difficult to read. Andrew Bartlett commit 5d4dc6cbd5e0a77687dc279ff6d3955b2b02f9ca Author: Andrew Bartlett abart...@samba.org Date: Tue Feb 1 14:28:29 2011 +1100 s4-python Remove unused missing.py (used by old build system) commit eab493b7ea032ed420a08a71f0ad385aca150b2b Author: Andrew Bartlett abart...@samba.org Date: Tue Feb 1 13:45:33 2011 +1100 Remove unused installmisc.sh script, from old build system commit 2d9bcc861d6b2cd67d7c6439e90d9ac4a600f0f2 Author: Andrew Bartlett abart...@samba.org Date: Mon Jan 31 15:59:06 2011 +1100 s4:heimdal: import lorikeet-heimdal-201101310455 (commit aa88eb1a05c4985cc23fb65fc1bad75bdce01c1f) --- Summary of changes: buildtools/wafsamba/wafsamba.py| 30 +-- lib/wscript_build |4 +- source4/auth/credentials/tests/bind.py |2 +- source4/dsdb/samdb/ldb_modules/rootdse.c |4 +- source4/dsdb/tests/python/acl.py |2 +- source4/dsdb/tests/python/deletetest.py
