[SCM] CTDB repository - branch master updated - ctdb-1.0.59-4-g8e912ab
The branch, master has been updated
via 8e912abc2c68f5fe7b06c600ba6fec1a6900127c (commit)
from 6b76c520f97127099bd9fbaa0fa7af1c61947fb7 (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master
- Log -
commit 8e912abc2c68f5fe7b06c600ba6fec1a6900127c
Author: Ronnie Sahlberg [EMAIL PROTECTED]
Date: Wed Oct 15 00:24:44 2008 +1100
update the client side of getnodemap and getpublicips controls to
fallback to the old-style ipv4-only controls if the new-style ipv4/ipv6
control fails.
this allows a 1.0.59+ (ipv4/ipv6) ctdb daemon being recmaster to be
compatible with
pre-1.0.59 versions of ctdb that are ipv4 only.
---
Summary of changes:
client/ctdb_client.c | 54 +++--
include/ctdb.h |4 +++
2 files changed, 55 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/client/ctdb_client.c b/client/ctdb_client.c
index a4d2a2b..4018300 100644
--- a/client/ctdb_client.c
+++ b/client/ctdb_client.c
@@ -1221,7 +1221,7 @@ int ctdb_ctrl_getdbmap(struct ctdb_context *ctdb, struct
timeval timeout, uint32
CTDB_CONTROL_GET_DBMAP, 0, tdb_null,
mem_ctx, outdata, res, timeout, NULL);
if (ret != 0 || res != 0) {
- DEBUG(DEBUG_ERR,(__location__ ctdb_control for getdbmap
failed\n));
+ DEBUG(DEBUG_ERR,(__location__ ctdb_control for getdbmap
failed ret:%d res:%d\n, ret, res));
return -1;
}
@@ -1245,8 +1245,12 @@ int ctdb_ctrl_getnodemap(struct ctdb_context *ctdb,
ret = ctdb_control(ctdb, destnode, 0,
CTDB_CONTROL_GET_NODEMAP, 0, tdb_null,
mem_ctx, outdata, res, timeout, NULL);
+ if (ret == 0 res == -1 outdata.dsize == 0) {
+ DEBUG(DEBUG_ERR,(__location__ ctdb_control for getnodes
failed, falling back to ipv4-only control\n));
+ return ctdb_ctrl_getnodemapv4(ctdb, timeout, destnode, mem_ctx,
nodemap);
+ }
if (ret != 0 || res != 0 || outdata.dsize == 0) {
- DEBUG(DEBUG_ERR,(__location__ ctdb_control for getnodes
failed\n));
+ DEBUG(DEBUG_ERR,(__location__ ctdb_control for getnodes
failed ret:%d res:%d\n, ret, res));
return -1;
}
@@ -1257,6 +1261,45 @@ int ctdb_ctrl_getnodemap(struct ctdb_context *ctdb,
}
/*
+ old style ipv4-only get a list of nodes (vnn and flags ) from a remote node
+ */
+int ctdb_ctrl_getnodemapv4(struct ctdb_context *ctdb,
+ struct timeval timeout, uint32_t destnode,
+ TALLOC_CTX *mem_ctx, struct ctdb_node_map **nodemap)
+{
+ int ret, i, len;
+ TDB_DATA outdata;
+ struct ctdb_node_mapv4 *nodemapv4;
+ int32_t res;
+
+ ret = ctdb_control(ctdb, destnode, 0,
+ CTDB_CONTROL_GET_NODEMAPv4, 0, tdb_null,
+ mem_ctx, outdata, res, timeout, NULL);
+ if (ret != 0 || res != 0 || outdata.dsize == 0) {
+ DEBUG(DEBUG_ERR,(__location__ ctdb_control for getnodesv4
failed ret:%d res:%d\n, ret, res));
+ return -1;
+ }
+
+ nodemapv4 = (struct ctdb_node_mapv4 *)outdata.dptr;
+
+ len = offsetof(struct ctdb_node_map, nodes) +
nodemapv4-num*sizeof(struct ctdb_node_and_flags);
+ (*nodemap) = talloc_zero_size(mem_ctx, len);
+ CTDB_NO_MEMORY(ctdb, (*nodemap));
+
+ (*nodemap)-num = nodemapv4-num;
+ for (i=0; inodemapv4-num; i++) {
+ (*nodemap)-nodes[i].pnn = nodemapv4-nodes[i].pnn;
+ (*nodemap)-nodes[i].flags = nodemapv4-nodes[i].flags;
+ (*nodemap)-nodes[i].addr.ip = nodemapv4-nodes[i].sin;
+ (*nodemap)-nodes[i].addr.sa.sa_family = AF_INET;
+ }
+
+ talloc_free(outdata.dptr);
+
+ return 0;
+}
+
+/*
drop the transport, reload the nodes file and restart the transport
*/
int ctdb_ctrl_reload_nodes_file(struct ctdb_context *ctdb,
@@ -2254,8 +2297,12 @@ int ctdb_ctrl_get_public_ips(struct ctdb_context *ctdb,
ret = ctdb_control(ctdb, destnode, 0,
CTDB_CONTROL_GET_PUBLIC_IPS, 0, tdb_null,
mem_ctx, outdata, res, timeout, NULL);
+ if (ret == 0 res == -1) {
+ DEBUG(DEBUG_ERR,(__location__ ctdb_control to get public ips
failed, falling back to ipv4-only version\n));
+ return ctdb_ctrl_get_public_ipsv4(ctdb, timeout, destnode,
mem_ctx, ips);
+ }
if (ret != 0 || res != 0) {
- DEBUG(DEBUG_ERR,(__location__ ctdb_control for getpublicips
failed\n));
+ DEBUG(DEBUG_ERR,(__location__ ctdb_control for getpublicips failed
ret:%d res:%d\n, ret,
[SCM] Samba Shared Repository - branch master updated - 3fe406ee72a787fab2b9b4a8a9f1aa050187437c
The branch, master has been updated
via 3fe406ee72a787fab2b9b4a8a9f1aa050187437c (commit)
via 4577fb5a3b35b8c7ffb1bf3e43f4aa8143c3746d (commit)
via a9d8ed748e06b6c8d30aa554052ab3b63f4e93ea (commit)
via d8a6f1082ca11f0d16e8eec677e3069fb07e834d (commit)
via de5d41ab7b2b318b48d487a001a56fd790f29cab (commit)
from f4f59bf24803df975ed38d558c7b0931ca575c3d (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 3fe406ee72a787fab2b9b4a8a9f1aa050187437c
Merge: 4577fb5a3b35b8c7ffb1bf3e43f4aa8143c3746d
f4f59bf24803df975ed38d558c7b0931ca575c3d
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Tue Oct 14 15:57:26 2008 +0200
Merge branch 'master' of git://git.samba.org/samba
commit 4577fb5a3b35b8c7ffb1bf3e43f4aa8143c3746d
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Tue Oct 14 15:57:03 2008 +0200
Remove unused types.
commit a9d8ed748e06b6c8d30aa554052ab3b63f4e93ea
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Tue Oct 14 15:43:04 2008 +0200
Sync with Samba 3.
commit d8a6f1082ca11f0d16e8eec677e3069fb07e834d
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Tue Oct 14 15:27:27 2008 +0200
Remove unused structures.
commit de5d41ab7b2b318b48d487a001a56fd790f29cab
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Tue Oct 14 15:16:40 2008 +0200
Remove unused header file.
---
Summary of changes:
source3/include/ndr.h |1 -
source3/librpc/idl/idl_types.h | 17
source4/cldap_server/netlogon.c |2 +-
source4/lib/samba3/config.mk|2 -
source4/lib/samba3/samba3.h | 190 +--
source4/librpc/idl/lsa.idl | 17 -
source4/librpc/idl/nbt.idl | 81 -
source4/torture/ldap/cldap.c|8 +-
8 files changed, 65 insertions(+), 253 deletions(-)
delete mode 100644 source3/include/ndr.h
Changeset truncated at 500 lines:
diff --git a/source3/include/ndr.h b/source3/include/ndr.h
deleted file mode 100644
index a416866..000
--- a/source3/include/ndr.h
+++ /dev/null
@@ -1 +0,0 @@
-/* dummy file to deal with pidl autogenerated ndr files */
diff --git a/source3/librpc/idl/idl_types.h b/source3/librpc/idl/idl_types.h
index f21f3e6..9885ca5 100644
--- a/source3/librpc/idl/idl_types.h
+++ b/source3/librpc/idl/idl_types.h
@@ -5,33 +5,16 @@
#define STR_NOTERM LIBNDR_FLAG_STR_NOTERM
#define STR_NULLTERM LIBNDR_FLAG_STR_NULLTERM
#define STR_BYTESIZE LIBNDR_FLAG_STR_BYTESIZE
-#define STR_FIXLEN32 LIBNDR_FLAG_STR_FIXLEN32
-#define STR_FIXLEN15 LIBNDR_FLAG_STR_FIXLEN15
#define STR_CONFORMANT LIBNDR_FLAG_STR_CONFORMANT
#define STR_CHARLENLIBNDR_FLAG_STR_CHARLEN
#define STR_UTF8 LIBNDR_FLAG_STR_UTF8
/*
- a UCS2 string prefixed with [size], 32 bits
-*/
-#define lstring[flag(STR_SIZE4)] string
-
-/*
a null terminated UCS2 string
*/
#define nstring[flag(STR_NULLTERM)] string
/*
- fixed length 32 character UCS-2 string
-*/
-#define string32 [flag(STR_FIXLEN32)] string
-
-/*
- fixed length 16 character ascii string
-*/
-#define astring15 [flag(STR_ASCII|STR_FIXLEN15)] string
-
-/*
an ascii string prefixed with [offset] [length], both 32 bits
null terminated
*/
diff --git a/source4/cldap_server/netlogon.c b/source4/cldap_server/netlogon.c
index 1cb0d50..cc2c69b 100644
--- a/source4/cldap_server/netlogon.c
+++ b/source4/cldap_server/netlogon.c
@@ -349,7 +349,7 @@ NTSTATUS fill_netlogon_samlogon_response(struct ldb_context
*sam_ctx,
if (version NETLOGON_NT_VERSION_5EX_WITH_IP) {
/* Clearly this needs to be fixed up for IPv6 */
extra_flags = NETLOGON_NT_VERSION_5EX_WITH_IP;
- netlogon-data.nt5_ex.sockaddr.sa_family= 2;
+ netlogon-data.nt5_ex.sockaddr.sockaddr_family= 2;
netlogon-data.nt5_ex.sockaddr.pdc_ip = pdc_ip;
netlogon-data.nt5_ex.sockaddr.remaining =
data_blob_talloc_zero(mem_ctx, 8);
}
diff --git a/source4/lib/samba3/config.mk b/source4/lib/samba3/config.mk
index e089149..365347f 100644
--- a/source4/lib/samba3/config.mk
+++ b/source4/lib/samba3/config.mk
@@ -6,5 +6,3 @@ PRIVATE_DEPENDENCIES = CHARSET LIBSAMBA-UTIL
SMBPASSWD_OBJ_FILES = $(libsrcdir)/samba3/smbpasswd.o
-
-$(eval $(call
proto_header_template,$(libsrcdir)/samba3/samba3_smbpasswd_proto.h,$(SMBPASSWD_OBJ_FILES:.o=.c)))
diff --git a/source4/lib/samba3/samba3.h b/source4/lib/samba3/samba3.h
index aea87da..1a0ce04 100644
--- a/source4/lib/samba3/samba3.h
+++ b/source4/lib/samba3/samba3.h
@@ -24,191 +24,9 @@
#include librpc/gen_ndr/samr.h
#include param/param.h
-struct samba3_samaccount {
- uint32_t
[SCM] CTDB repository - branch master updated - ctdb-1.0.59-5-gd13da2e
The branch, master has been updated
via d13da2e8fe2fab619540525d98a5502a23ab7d20 (commit)
from 8e912abc2c68f5fe7b06c600ba6fec1a6900127c (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master
- Log -
commit d13da2e8fe2fab619540525d98a5502a23ab7d20
Author: Ronnie Sahlberg [EMAIL PROTECTED]
Date: Wed Oct 15 01:08:29 2008 +1100
Revert from Mathieu Parent [EMAIL PROTECTED]
This reverts commit dc9cd4779db4a89697731e4cf415be51067a07c1.
Conflicts:
---
Summary of changes:
Makefile.in|5 ++---
server/ctdbd.c |2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/Makefile.in b/Makefile.in
index e51fec9..cf1240b 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -12,7 +12,6 @@ bindir = @bindir@
sbindir = @sbindir@
mandir = @mandir@
localstatedir = @localstatedir@
-logdir = @logdir@
VPATH = @srcdir@:@tdbdir@:@tallocdir@:@libreplacedir@:@poptdir@
srcdir = @srcdir@
etcdir = @sysconfdir@
@@ -30,8 +29,8 @@ IPQ_LIBS = @IPQ_LIBS@
CFLAGS=-g -I$(srcdir)/include -Iinclude -Ilib -Ilib/util -I$(srcdir) \
[EMAIL PROTECTED]@ [EMAIL PROTECTED]@/include [EMAIL PROTECTED]@ \
- -DVARDIR=\$(localstatedir)\ -DLOGDIR=\$(logdir)\ \
- -DETCDIR=\$(etcdir)\ -DUSE_MMAP=1 @CFLAGS@ $(POPT_CFLAGS)
+ -DVARDIR=\$(localstatedir)\ -DETCDIR=\$(etcdir)\ \
+ -DUSE_MMAP=1 @CFLAGS@ $(POPT_CFLAGS)
[EMAIL PROTECTED]@ -Llib @LIBS@ $(POPT_LIBS) @INFINIBAND_LIBS@
@CTDB_PCAP_LDFLAGS@
diff --git a/server/ctdbd.c b/server/ctdbd.c
index 48e361f..4dc0f74 100644
--- a/server/ctdbd.c
+++ b/server/ctdbd.c
@@ -50,7 +50,7 @@ static struct {
.nlist = ETCDIR /ctdb/nodes,
.transport = tcp,
.event_script_dir = ETCDIR /ctdb/events.d,
- .logfile = LOGDIR /log.ctdb,
+ .logfile = VARDIR /log/log.ctdb,
.db_dir = VARDIR /ctdb,
.db_dir_persistent = VARDIR /ctdb/persistent,
};
--
CTDB repository
[SCM] Samba Shared Repository - branch master updated - d940012dc8db9104c929f588f1d28ba18cbbd420
The branch, master has been updated
via d940012dc8db9104c929f588f1d28ba18cbbd420 (commit)
via 42f0172fe2d3010a346e99f4dc16b1396fdd931c (commit)
from 3fe406ee72a787fab2b9b4a8a9f1aa050187437c (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit d940012dc8db9104c929f588f1d28ba18cbbd420
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Tue Oct 14 16:23:46 2008 +0200
Move ndr pkg-config file to top-level.
commit 42f0172fe2d3010a346e99f4dc16b1396fdd931c
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Tue Oct 14 16:21:26 2008 +0200
Remove unused file.
---
Summary of changes:
{source4/librpc = librpc}/ndr.pc.in |0
source3/librpc/ndr/ndr.c | 1113 --
source4/configure.ac |2 +-
source4/librpc/config.mk |2 +-
4 files changed, 2 insertions(+), 1115 deletions(-)
rename {source4/librpc = librpc}/ndr.pc.in (100%)
delete mode 100644 source3/librpc/ndr/ndr.c
Changeset truncated at 500 lines:
diff --git a/source4/librpc/ndr.pc.in b/librpc/ndr.pc.in
similarity index 100%
rename from source4/librpc/ndr.pc.in
rename to librpc/ndr.pc.in
diff --git a/source3/librpc/ndr/ndr.c b/source3/librpc/ndr/ndr.c
deleted file mode 100644
index d19e861..000
--- a/source3/librpc/ndr/ndr.c
+++ /dev/null
@@ -1,1113 +0,0 @@
-/*
- Unix SMB/CIFS implementation.
-
- libndr interface
-
- Copyright (C) Andrew Tridgell 2003
-
- 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/.
-*/
-
-/*
- this provides the core routines for NDR parsing functions
-
- see http://www.opengroup.org/onlinepubs/9629399/chap14.htm for details
- of NDR encoding rules
-*/
-
-#include includes.h
-
-#define NDR_BASE_MARSHALL_SIZE 1024
-
-/* this guid indicates NDR encoding in a protocol tower */
-const struct ndr_syntax_id ndr_transfer_syntax = {
- { 0x8a885d04, 0x1ceb, 0x11c9, {0x9f, 0xe8}, {0x08,0x00,0x2b,0x10,0x48,0x60}
},
- 2
-};
-
-const struct ndr_syntax_id ndr64_transfer_syntax = {
- { 0x71710533, 0xbeba, 0x4937, {0x83, 0x19}, {0xb5,0xdb,0xef,0x9c,0xcc,0x36}
},
- 1
-};
-
-/*
- work out the number of bytes needed to align on a n byte boundary
-*/
-_PUBLIC_ size_t ndr_align_size(uint32_t offset, size_t n)
-{
- if ((offset (n-1)) == 0) return 0;
- return n - (offset (n-1));
-}
-
-/*
- initialise a ndr parse structure from a data blob
-*/
-_PUBLIC_ struct ndr_pull *ndr_pull_init_blob(const DATA_BLOB *blob, TALLOC_CTX
*mem_ctx, struct smb_iconv_convenience *iconv_convenience)
-{
- struct ndr_pull *ndr;
-
- ndr = talloc_zero(mem_ctx, struct ndr_pull);
- if (!ndr) return NULL;
- ndr-current_mem_ctx = mem_ctx;
-
- ndr-data = blob-data;
- ndr-data_size = blob-length;
- ndr-iconv_convenience = talloc_reference(ndr, iconv_convenience);
-
- return ndr;
-}
-
-/*
- advance by 'size' bytes
-*/
-_PUBLIC_ enum ndr_err_code ndr_pull_advance(struct ndr_pull *ndr, uint32_t
size)
-{
- ndr-offset += size;
- if (ndr-offset ndr-data_size) {
- return ndr_pull_error(ndr, NDR_ERR_BUFSIZE,
- ndr_pull_advance by %u failed,
- size);
- }
- return NDR_ERR_SUCCESS;
-}
-
-/*
- set the parse offset to 'ofs'
-*/
-static enum ndr_err_code ndr_pull_set_offset(struct ndr_pull *ndr, uint32_t
ofs)
-{
- ndr-offset = ofs;
- if (ndr-offset ndr-data_size) {
- return ndr_pull_error(ndr, NDR_ERR_BUFSIZE,
- ndr_pull_set_offset %u failed,
- ofs);
- }
- return NDR_ERR_SUCCESS;
-}
-
-/* create a ndr_push structure, ready for some marshalling */
-_PUBLIC_ struct ndr_push *ndr_push_init_ctx(TALLOC_CTX *mem_ctx, struct
smb_iconv_convenience *iconv_convenience)
-{
- struct ndr_push *ndr;
-
- ndr = talloc_zero(mem_ctx, struct ndr_push);
- if (!ndr) {
- return NULL;
- }
-
- ndr-flags = 0;
- ndr-alloc_size = NDR_BASE_MARSHALL_SIZE;
- ndr-data = talloc_array(ndr, uint8_t, ndr-alloc_size);
- if (!ndr-data) {
- return NULL;
- }
-
[SCM] CTDB repository - branch master updated - ctdb-1.0.60-1-g77ed0d7
The branch, master has been updated
via 77ed0d71b1fb8d06d70d01a8e8f9eb04ffe7f02f (commit)
from 5747dd2d80af29d6252afb6aeb3e66328ee20de5 (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master
- Log -
commit 77ed0d71b1fb8d06d70d01a8e8f9eb04ffe7f02f
Author: Ronnie Sahlberg [EMAIL PROTECTED]
Date: Wed Oct 15 01:32:46 2008 +1100
new version 1.0.60
---
Summary of changes:
packaging/RPM/ctdb.spec |8 +++-
1 files changed, 7 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/packaging/RPM/ctdb.spec b/packaging/RPM/ctdb.spec
index f0baa30..1e1cf22 100644
--- a/packaging/RPM/ctdb.spec
+++ b/packaging/RPM/ctdb.spec
@@ -5,7 +5,7 @@ Vendor: Samba Team
Packager: Samba Team [EMAIL PROTECTED]
Name: ctdb
Version: 1.0
-Release: 59
+Release: 60
Epoch: 0
License: GNU GPL version 3
Group: System Environment/Daemons
@@ -118,6 +118,12 @@ fi
%{_includedir}/ctdb_private.h
%changelog
+* Wed Oct 15 2008 : Version 1.0.60
+ - Verify that nodes we try to ban/unban are reachable and print an error
othervise.
+ - Update the client and server sides of TAKEIP/RELEASEIP/GETPUBLICIPS and
GETNODEMAP to fall back to the old style ipv4-only controls if the new
ipv4/ipv6 controls fail. This allows an ipv4/v6 enabled ctdb daemon to
interoperate with earlier ipv4-only versions of the daemons.
+ - From Mathieu Parent : log debian systems log the package versions in ctdb
diagnostics
+ - From Mathieu Parent : specify logdir location for debian (this patch was
later reversed)
+ - From Michael Adams : allow # comments in nodes/public_addresses files
* Tue Oct 7 2008 : Version 1.0.59
- Updated reloadnodes logic. Instead of bouncing the entire tcp layer it is
sufficient to just close and reopen all outgoing tcp connections.
- New eventscript 99.routing which can be used to re-attach routes to public
interfaces after a takeip event. (routes may be deleted by the kernel when we
release an ip)
--
CTDB repository
[SCM] CTDB repository - branch master updated - ctdb-1.0.60-2-gc0b3bd8
The branch, master has been updated
via c0b3bd8a3fa580dca5afa97c8012fccb25231373 (commit)
from 77ed0d71b1fb8d06d70d01a8e8f9eb04ffe7f02f (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master
- Log -
commit c0b3bd8a3fa580dca5afa97c8012fccb25231373
Author: Ronnie Sahlberg [EMAIL PROTECTED]
Date: Wed Oct 15 01:49:19 2008 +1100
change ip route add to route add -net since this works more reliably
update the makefile and rpm to install 99.routing
---
Summary of changes:
Makefile.in|1 +
config/events.d/99.routing |2 +-
packaging/RPM/ctdb.spec|1 +
3 files changed, 3 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/Makefile.in b/Makefile.in
index cf1240b..98ab197 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -197,6 +197,7 @@ install: all
${INSTALLCMD} -m 755 config/events.d/70.iscsi
$(DESTDIR)$(etcdir)/ctdb/events.d
${INSTALLCMD} -m 755 config/events.d/90.ipmux
$(DESTDIR)$(etcdir)/ctdb/events.d
${INSTALLCMD} -m 755 config/events.d/91.lvs
$(DESTDIR)$(etcdir)/ctdb/events.d
+ ${INSTALLCMD} -m 755 config/events.d/99.routing
$(DESTDIR)$(etcdir)/ctdb/events.d
${INSTALLCMD} -m 755 tools/ctdb_diagnostics $(DESTDIR)$(bindir)
${INSTALLCMD} -m 755 tools/onnode $(DESTDIR)$(bindir)
if [ -f doc/ctdb.1 ];then ${INSTALLCMD} -d $(DESTDIR)$(mandir)/man1; fi
diff --git a/config/events.d/99.routing b/config/events.d/99.routing
index dd0a6c3..ec0a7bf 100755
--- a/config/events.d/99.routing
+++ b/config/events.d/99.routing
@@ -27,7 +27,7 @@ case $cmd in
takeip)
iface=$1
cat $CTDB_BASE/static-routes | egrep ^$iface | while read IFACE DEST
GW; do
- ip route add $DEST via $GW 2/dev/null /dev/null
+ route add -net $DEST gw $GW
done
;;
diff --git a/packaging/RPM/ctdb.spec b/packaging/RPM/ctdb.spec
index 1e1cf22..a9807e0 100644
--- a/packaging/RPM/ctdb.spec
+++ b/packaging/RPM/ctdb.spec
@@ -104,6 +104,7 @@ fi
%{_sysconfdir}/ctdb/events.d/70.iscsi
%{_sysconfdir}/ctdb/events.d/90.ipmux
%{_sysconfdir}/ctdb/events.d/91.lvs
+%{_sysconfdir}/ctdb/events.d/99.routing
%{_sysconfdir}/ctdb/statd-callout
%{_sbindir}/ctdbd
%{_bindir}/ctdb
--
CTDB repository
[SCM] Samba Shared Repository - branch master updated - da4399c509e9acfb372b90785292dcb1a08cf784
The branch, master has been updated
via da4399c509e9acfb372b90785292dcb1a08cf784 (commit)
from d940012dc8db9104c929f588f1d28ba18cbbd420 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit da4399c509e9acfb372b90785292dcb1a08cf784
Author: Günther Deschner [EMAIL PROTECTED]
Date: Tue Oct 14 15:36:31 2008 +0200
s3-build: add and use IDL_PATH while building IDL files.
Guenther
---
Summary of changes:
source3/Makefile.in |2 +-
source3/script/build_idl.sh |6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/Makefile.in b/source3/Makefile.in
index bd29792..76fc101 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1198,10 +1198,10 @@ samba3-idl::
epmapper.idl messaging.idl xattr.idl misc.idl samr.idl
security.idl \
dssetup.idl krb5pac.idl ntsvcs.idl libnetapi.idl drsuapi.idl
drsblobs.idl \
nbt.idl \
+ IDL_PATH=librpc/idl \
CPP=$(CPP) PIDL=../pidl/pidl \
srcdir=$(srcdir) $(srcdir)/script/build_idl.sh $(PIDL_ARGS)
-
#
diff --git a/source3/script/build_idl.sh b/source3/script/build_idl.sh
index 2027fd3..75f8612 100755
--- a/source3/script/build_idl.sh
+++ b/source3/script/build_idl.sh
@@ -20,11 +20,11 @@ for f in ${IDL_FILES}; do
ndr=librpc/gen_ndr/ndr_$basename.c
if [ -f $ndr ]; then
- if [ x`find librpc/idl/$f -newer $ndr -print` =
xlibrpc/idl/$f ]; then
- list=$list librpc/idl/$f
+ if [ x`find ${IDL_PATH}/$f -newer $ndr -print` =
x${IDL_PATH}/$f ]; then
+ list=$list ${IDL_PATH}/$f
fi
else
- list=$list librpc/idl/$f
+ list=$list ${IDL_PATH}/$f
fi
done
--
Samba Shared Repository
[SCM] CTDB repository - branch master updated - ctdb-1.0.60-3-g9b1d089
The branch, master has been updated
via 9b1d089c99413f3681440f3cf33c293d118c9108 (commit)
from c0b3bd8a3fa580dca5afa97c8012fccb25231373 (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master
- Log -
commit 9b1d089c99413f3681440f3cf33c293d118c9108
Author: Ronnie Sahlberg [EMAIL PROTECTED]
Date: Wed Oct 15 03:02:09 2008 +1100
lower the loglevel for the informational message that a TCP_ADD opeation
described an ip address not known to be a public address.
This could happen if someone for genuine reasons accesses a share
through a static ip address.
It can also happen if non homogenous public address configurations are
used and when a tcp description is pushed out to a different node that
does not server/know the specific ip address.
---
Summary of changes:
server/ctdb_takeover.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/server/ctdb_takeover.c b/server/ctdb_takeover.c
index 4bfac52..6533d71 100644
--- a/server/ctdb_takeover.c
+++ b/server/ctdb_takeover.c
@@ -1133,7 +1133,7 @@ int32_t ctdb_control_tcp_add(struct ctdb_context *ctdb,
TDB_DATA indata)
vnn = find_public_ip_vnn(ctdb, p-dest);
if (vnn == NULL) {
- DEBUG(DEBUG_ERR,(__location__ got TCP_ADD control for an
address which is not a public address '%s'\n,
+ DEBUG(DEBUG_INFO,(__location__ got TCP_ADD control for an
address which is not a public address '%s'\n,
ctdb_addr_to_str(p-dest)));
return -1;
--
CTDB repository
[SCM] Samba Shared Repository - branch master updated - 7fb9007f3dbaa50491b851eec6d303b3c17c2c2e
The branch, master has been updated via 7fb9007f3dbaa50491b851eec6d303b3c17c2c2e (commit) from da4399c509e9acfb372b90785292dcb1a08cf784 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 7fb9007f3dbaa50491b851eec6d303b3c17c2c2e Author: Simo Sorce [EMAIL PROTECTED] Date: Tue Oct 14 12:25:18 2008 -0400 Fix very old bug in ASQ --- Summary of changes: source4/lib/ldb/modules/asq.c |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/lib/ldb/modules/asq.c b/source4/lib/ldb/modules/asq.c index 17896a0..835715e 100644 --- a/source4/lib/ldb/modules/asq.c +++ b/source4/lib/ldb/modules/asq.c @@ -222,10 +222,10 @@ static int asq_build_first_request(struct asq_context *ac, struct ldb_request ** base_attrs[1] = NULL; - ret = ldb_build_search_req_ex(base_req, ac-module-ldb, ac, + ret = ldb_build_search_req(base_req, ac-module-ldb, ac, ac-req-op.search.base, LDB_SCOPE_BASE, - ac-req-op.search.tree, + NULL, (const char * const *)base_attrs, NULL, ac, asq_base_callback, -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3089-g1d202a8
The branch, v3-2-test has been updated via 1d202a8a7bccc65e47fc78b17d89b7e74a358487 (commit) from c67cf648331bf4b8268813cb005b7283dd65eb73 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log - commit 1d202a8a7bccc65e47fc78b17d89b7e74a358487 Author: Holger Hetterich [EMAIL PROTECTED] Date: Tue Oct 14 11:37:41 2008 -0700 Fix the Premature end of data in tag error when buiding the manpage, fix a typo in the text, add an example for anonymization usage. --- Summary of changes: docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml | 18 +++--- 1 files changed, 15 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml b/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml index 8f6375e..a12f44b 100644 --- a/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml +++ b/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml @@ -105,7 +105,8 @@ paraThe module will send the data using the TCP port given in STRING. /para - + /listitem + /varlistentry varlistentry termsmb_traffic_analyzer:anonymize_prefix = STRING/term listitem @@ -131,16 +132,27 @@ smbconfoption name=smb_traffic_analyzer:modeunix_domain_socket/smbconfoption /programlisting - paraThe module running on share example_share, using an internet domain socket, + paraThe module running on share example_share, using an internet socket, connecting to host examplehost on port 3491./para programlisting smbconfsection name=[example_share]/ smbconfoption name=path/data/example/smbconfoption smbconfoption name=vfs objectssmb_traffic_analyzer/smbconfoption smbconfoption name=smb_traffic_analyzer:hostexamplehost/smbconfoption - smbconfoption name=smb_traffic_analyzer:port3490/smbconfoption + smbconfoption name=smb_traffic_analyzer:port3491/smbconfoption /programlisting + paraThe module running on share example_share, using an internet socket, + connecting to host examplehost on port 3491, anonymizing user names with + the prefix User./para + programlisting + smbconfsection name=[example_share]/ + smbconfoption name=path/data/example/smbconfoption + smbconfoption name=vfs objectssmb_traffic_analyzer/smbconfoption + smbconfoption name=smb_traffic_analyzer:hostexamplehost/smbconfoption + smbconfoption name=smb_traffic_analyzer:port3491/smbconfoption + smbconfoption name=smb_traffic_analyzer:anonymize_prefixUser/smbconfoption + /programlisting /refsect1 refsect1 -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4261-g5f41f1c
The branch, v3-3-test has been updated via 5f41f1c8192739b5b9c14f1e9967567d9d781851 (commit) from 8e33baf4729a290fba26857e7b0a6ef9f9933b72 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test - Log - commit 5f41f1c8192739b5b9c14f1e9967567d9d781851 Author: Holger Hetterich [EMAIL PROTECTED] Date: Tue Oct 14 11:39:15 2008 -0700 Fix the Premature end of data in tag error when buiding the manpage, fix a typo in the text, add an example for anonymization usage. --- Summary of changes: docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml | 18 +++--- 1 files changed, 15 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml b/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml index b51f6e8..556fa3e 100644 --- a/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml +++ b/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml @@ -105,7 +105,8 @@ paraThe module will send the data using the TCP port given in STRING. /para - + /listitem + /varlistentry varlistentry termsmb_traffic_analyzer:anonymize_prefix = STRING/term listitem @@ -131,16 +132,27 @@ smbconfoption name=smb_traffic_analyzer:modeunix_domain_socket/smbconfoption /programlisting - paraThe module running on share example_share, using an internet domain socket, + paraThe module running on share example_share, using an internet socket, connecting to host examplehost on port 3491./para programlisting smbconfsection name=[example_share]/ smbconfoption name=path/data/example/smbconfoption smbconfoption name=vfs objectssmb_traffic_analyzer/smbconfoption smbconfoption name=smb_traffic_analyzer:hostexamplehost/smbconfoption - smbconfoption name=smb_traffic_analyzer:port3490/smbconfoption + smbconfoption name=smb_traffic_analyzer:port3491/smbconfoption /programlisting + paraThe module running on share example_share, using an internet socket, + connecting to host examplehost on port 3491, anonymizing user names with + the prefix User./para + programlisting + smbconfsection name=[example_share]/ + smbconfoption name=path/data/example/smbconfoption + smbconfoption name=vfs objectssmb_traffic_analyzer/smbconfoption + smbconfoption name=smb_traffic_analyzer:hostexamplehost/smbconfoption + smbconfoption name=smb_traffic_analyzer:port3491/smbconfoption + smbconfoption name=smb_traffic_analyzer:anonymize_prefixUser/smbconfoption + /programlisting /refsect1 refsect1 -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - 69c5992d173f58a71f1899fbb63d3b6219bd3f98
The branch, master has been updated via 69c5992d173f58a71f1899fbb63d3b6219bd3f98 (commit) from 3bd73c926ec83e07051b361c5681c29ced1f4fd3 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 69c5992d173f58a71f1899fbb63d3b6219bd3f98 Author: Holger Hetterich [EMAIL PROTECTED] Date: Tue Oct 14 10:45:09 2008 +0200 Fix the Premature end of data in tag error when buiding the manpage, fix a typo in the text, add an example for anonymization usage. --- Summary of changes: docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml | 18 +++--- 1 files changed, 15 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml b/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml index b51f6e8..556fa3e 100644 --- a/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml +++ b/docs-xml/manpages-3/vfs_smb_traffic_analyzer.8.xml @@ -105,7 +105,8 @@ paraThe module will send the data using the TCP port given in STRING. /para - + /listitem + /varlistentry varlistentry termsmb_traffic_analyzer:anonymize_prefix = STRING/term listitem @@ -131,16 +132,27 @@ smbconfoption name=smb_traffic_analyzer:modeunix_domain_socket/smbconfoption /programlisting - paraThe module running on share example_share, using an internet domain socket, + paraThe module running on share example_share, using an internet socket, connecting to host examplehost on port 3491./para programlisting smbconfsection name=[example_share]/ smbconfoption name=path/data/example/smbconfoption smbconfoption name=vfs objectssmb_traffic_analyzer/smbconfoption smbconfoption name=smb_traffic_analyzer:hostexamplehost/smbconfoption - smbconfoption name=smb_traffic_analyzer:port3490/smbconfoption + smbconfoption name=smb_traffic_analyzer:port3491/smbconfoption /programlisting + paraThe module running on share example_share, using an internet socket, + connecting to host examplehost on port 3491, anonymizing user names with + the prefix User./para + programlisting + smbconfsection name=[example_share]/ + smbconfoption name=path/data/example/smbconfoption + smbconfoption name=vfs objectssmb_traffic_analyzer/smbconfoption + smbconfoption name=smb_traffic_analyzer:hostexamplehost/smbconfoption + smbconfoption name=smb_traffic_analyzer:port3491/smbconfoption + smbconfoption name=smb_traffic_analyzer:anonymize_prefixUser/smbconfoption + /programlisting /refsect1 refsect1 -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - 15c52eb514d9b498363f16391f825b6776cb0d4c
The branch, master has been updated via 15c52eb514d9b498363f16391f825b6776cb0d4c (commit) via 6e2a470cd281cf39555d6401455be2f3bdca23ec (commit) via 009dcbf477aa4b0529a2c9d9bc8b38d84732f0a2 (commit) via 79f1ba875471f797218a0fbc76cbf06b0a862cf8 (commit) via 4468279ca27b25a6e562b5c367487294a016c7e3 (commit) via ed6d3fd7ab827f48c8e5949805644bb34b1ad5f2 (commit) via 436346e3adff8804bd9e49bfa7ec4ace8eb4e12a (commit) via b208262c537e92d2f9f74217ae8245fc7d76debf (commit) via 5c16a0618579d1dca03f33159390b371e6853604 (commit) from 7fb9007f3dbaa50491b851eec6d303b3c17c2c2e (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 15c52eb514d9b498363f16391f825b6776cb0d4c Merge: 6e2a470cd281cf39555d6401455be2f3bdca23ec 7fb9007f3dbaa50491b851eec6d303b3c17c2c2e Author: Jelmer Vernooij [EMAIL PROTECTED] Date: Tue Oct 14 22:41:02 2008 +0200 Merge branch 'master' of ssh://git.samba.org/data/git/samba commit 6e2a470cd281cf39555d6401455be2f3bdca23ec Author: Jelmer Vernooij [EMAIL PROTECTED] Date: Tue Oct 14 22:40:21 2008 +0200 Move make check out of cache call to avoid weird formatting. commit 009dcbf477aa4b0529a2c9d9bc8b38d84732f0a2 Author: Jelmer Vernooij [EMAIL PROTECTED] Date: Tue Oct 14 22:39:19 2008 +0200 Give the user a hint about whether a merged build would be possible. commit 79f1ba875471f797218a0fbc76cbf06b0a862cf8 Author: Jelmer Vernooij [EMAIL PROTECTED] Date: Tue Oct 14 22:37:10 2008 +0200 Make check_*.m4 m4 library files just contain functions that can be executed from other m4 files. commit 4468279ca27b25a6e562b5c367487294a016c7e3 Author: Jelmer Vernooij [EMAIL PROTECTED] Date: Tue Oct 14 22:27:07 2008 +0200 Move checks for perl inside function. commit ed6d3fd7ab827f48c8e5949805644bb34b1ad5f2 Author: Jelmer Vernooij [EMAIL PROTECTED] Date: Tue Oct 14 22:26:54 2008 +0200 Move checks for make inside function. commit 436346e3adff8804bd9e49bfa7ec4ace8eb4e12a Author: Jelmer Vernooij [EMAIL PROTECTED] Date: Tue Oct 14 22:26:39 2008 +0200 Move tests for Python inside function. commit b208262c537e92d2f9f74217ae8245fc7d76debf Author: Jelmer Vernooij [EMAIL PROTECTED] Date: Tue Oct 14 22:20:36 2008 +0200 Fix path check. commit 5c16a0618579d1dca03f33159390b371e6853604 Author: Jelmer Vernooij [EMAIL PROTECTED] Date: Tue Oct 14 21:46:58 2008 +0200 Allow auto-detect if --enable-merged-build was not specified. --- Summary of changes: source3/configure.in| 24 ++- source3/samba4.m4 |1 - source4/build/m4/ac_pkg_swig.m4 | 125 +++ source4/build/m4/check_make.m4 | 34 - source4/build/m4/check_path.m4 |2 +- source4/build/m4/check_perl.m4 | 16 +++-- source4/build/m4/check_python.m4| 89 ++ source4/build/m4/env.m4 | 49 source4/configure.ac|1 - source4/scripting/python/ac_pkg_swig.m4 | 125 --- source4/scripting/python/config.m4 | 83 11 files changed, 311 insertions(+), 238 deletions(-) create mode 100644 source4/build/m4/ac_pkg_swig.m4 create mode 100644 source4/build/m4/check_python.m4 delete mode 100644 source4/scripting/python/ac_pkg_swig.m4 delete mode 100644 source4/scripting/python/config.m4 Changeset truncated at 500 lines: diff --git a/source3/configure.in b/source3/configure.in index 1eba4a0..7d05b63 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -6219,7 +6219,29 @@ MSG fi AC_ARG_ENABLE(merged-build, -[AS_HELP_STRING([--enable-merged-build], [Build Samba 4 as well])]) +[AS_HELP_STRING([--enable-merged-build], [Build Samba 4 as well])], +[], [ enable_merged_build=auto ]) + +if test x$enable_merged_build = xauto; then + merged_build_possible=yes + + # Check for GNU make + m4_include(../source4/build/m4/check_make.m4) + AC_SAMBA_GNU_MAKE([true], [merged_build_possible=no]) + + # Check for perl + m4_include(../source4/build/m4/check_perl.m4) + AC_SAMBA_PERL([true], [merged_build_possible=no]) + + # Check for python + m4_include(../source4/build/m4/check_python.m4) + AC_SAMBA_PYTHON_DEVEL([true], [merged_build_possible=no]) + + AC_MSG_CHECKING([whether it would be possible to do a merged build]) + AC_MSG_RESULT([$merged_build_possible]) + + dnl FIXME: enable_merged_build=$merged_build_possible +fi if test x$enable_merged_build = xyes; then MERGED_BUILD=1 diff --git a/source3/samba4.m4 b/source3/samba4.m4 index 9cf0150..2f93268 100644 --- a/source3/samba4.m4 +++ b/source3/samba4.m4 @@ -87,7 +87,6 @@
[SCM] Samba Shared Repository - branch master updated - ecc108ccb0e8dde06791f207cebd53f17cd06e55
The branch, master has been updated via ecc108ccb0e8dde06791f207cebd53f17cd06e55 (commit) from 15c52eb514d9b498363f16391f825b6776cb0d4c (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit ecc108ccb0e8dde06791f207cebd53f17cd06e55 Author: Jelmer Vernooij [EMAIL PROTECTED] Date: Tue Oct 14 22:43:29 2008 +0200 Fix pkg-config file location. --- Summary of changes: source3/samba4.m4 |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/samba4.m4 b/source3/samba4.m4 index 2f93268..1bd9c38 100644 --- a/source3/samba4.m4 +++ b/source3/samba4.m4 @@ -21,7 +21,7 @@ m4_include(lib/zlib.m4) AC_CONFIG_FILES(../source4/lib/registry/registry.pc) AC_CONFIG_FILES(../source4/librpc/dcerpc.pc) -AC_CONFIG_FILES(../source4/librpc/ndr.pc) +AC_CONFIG_FILES(../librpc/ndr.pc) AC_CONFIG_FILES(../source4/lib/torture/torture.pc) AC_CONFIG_FILES(../source4/auth/gensec/gensec.pc) AC_CONFIG_FILES(../source4/param/samba-hostconfig.pc) -- Samba Shared Repository
[SCM] CTDB repository - annotated tag ctdb-1.0.60 created - ctdb-1.0.60
The annotated tag, ctdb-1.0.60 has been created at aeecba87a6b32063a34b6df02a223437c389d1c4 (tag) tagging 5747dd2d80af29d6252afb6aeb3e66328ee20de5 (commit) replaces ctdb-1.0.59 tagged by Ronnie Sahlberg on Wed Oct 15 01:29:35 2008 +1100 - Log - tag for version 1.0.60 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.6 (GNU/Linux) iD8DBQBI9Kzm2aJ36aon/y8RAkLEAJ99BvqMZnB59+l110OF10kKB6jS3QCcDvHW 27qk2p7ftg5UTv6DrcFxUm0= =z29m -END PGP SIGNATURE- Ronnie Sahlberg (6): From Mathieu Parent from Mathieu Parent [EMAIL PROTECTED] update TAKEIP/RELEASEIP/GETPUBLICIP/GETNODEMAP controls so we retain an update the client side of getnodemap and getpublicips controls to Revert from Mathieu Parent [EMAIL PROTECTED] verify that the nodes we try to ban/unban are operational and print an --- -- CTDB repository
[SCM] Samba Shared Repository - branch master updated - ecca199486a30957e7f0dc084d0e21eb3c812c15
The branch, master has been updated
via ecca199486a30957e7f0dc084d0e21eb3c812c15 (commit)
from ecc108ccb0e8dde06791f207cebd53f17cd06e55 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit ecca199486a30957e7f0dc084d0e21eb3c812c15
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Tue Oct 14 23:25:12 2008 +0200
Fix merged build .
---
Summary of changes:
source3/configure.in |2 +-
source3/lib/ldb/libldb.m4 | 32
source3/samba4.m4 | 20
source4/build/m4/env.m4 |1 -
4 files changed, 21 insertions(+), 34 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/configure.in b/source3/configure.in
index 7d05b63..443cdd6 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -6220,7 +6220,7 @@ fi
AC_ARG_ENABLE(merged-build,
[AS_HELP_STRING([--enable-merged-build], [Build Samba 4 as well])],
-[], [ enable_merged_build=auto ])
+[ enable_merged_build=$enableval ], [ enable_merged_build=auto ])
if test x$enable_merged_build = xauto; then
merged_build_possible=yes
diff --git a/source3/lib/ldb/libldb.m4 b/source3/lib/ldb/libldb.m4
index 845563b..df2075d 100644
--- a/source3/lib/ldb/libldb.m4
+++ b/source3/lib/ldb/libldb.m4
@@ -1,33 +1 @@
SMB_ENABLE(ldb_sqlite3,$with_sqlite3_support)
-
-AC_MSG_CHECKING([for Python])
-
-PYTHON=
-
-AC_ARG_WITH(python,
-[ --with-python=PYTHONNAME build Python libraries],
-[ case ${withval-python} in
- yes)
-PYTHON=python
-;;
- no)
-PYTHON=
-;;
- *)
-PYTHON=${withval-python}
-;;
- esac ])
-
-if test x$PYTHON != x; then
- incdir=`python -c 'import sys; print %s/include/python%d.%d %
(sys.prefix, sys.version_info[[0]], sys.version_info[[1]])'`
- CPPFLAGS=$CPPFLAGS -I $incdir
-fi
-
-if test x$PYTHON != x; then
- AC_MSG_RESULT([${withval-python}])
-else
- AC_MSG_RESULT(no)
- SMB_ENABLE(swig_ldb, NO)
-fi
-
-AC_SUBST(PYTHON)
diff --git a/source3/samba4.m4 b/source3/samba4.m4
index 1bd9c38..a5b7da7 100644
--- a/source3/samba4.m4
+++ b/source3/samba4.m4
@@ -3,6 +3,26 @@ AC_SUBST(BLDSHARED)
smbtorture4_path=bin/smbtorture4
m4_include(build/m4/public.m4)
+m4_include(build/m4/check_python.m4)
+
+m4_include(build/m4/ac_pkg_swig.m4)
+
+AC_PROG_SWIG(1.3.36)
+
+AC_SAMBA_PYTHON_DEVEL([
+SMB_EXT_LIB(EXT_LIB_PYTHON, [$PYTHON_LDFLAGS], [$PYTHON_CFLAGS])
+SMB_ENABLE(EXT_LIB_PYTHON,YES)
+SMB_ENABLE(LIBPYTHON,YES)
+],[
+AC_MSG_ERROR([Python not found. Please install Python 2.x and its development
headers/libraries.])
+])
+
+AC_MSG_CHECKING(python library directory)
+pythondir=`$PYTHON -c from distutils import sysconfig; print
sysconfig.get_python_lib(1, 0, '\\${prefix}')`
+AC_MSG_RESULT($pythondir)
+
+AC_SUBST(pythondir)
+
m4_include(lib/smbreadline/readline.m4)
m4_include(heimdal_build/internal.m4)
m4_include(../lib/util/fault.m4)
diff --git a/source4/build/m4/env.m4 b/source4/build/m4/env.m4
index 360ce17..4cde95d 100644
--- a/source4/build/m4/env.m4
+++ b/source4/build/m4/env.m4
@@ -77,7 +77,6 @@ m4_include(build/m4/check_python.m4)
m4_include(build/m4/ac_pkg_swig.m4)
-
AC_PROG_SWIG(1.3.36)
AC_SAMBA_PYTHON_DEVEL([
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - f4f59bf24803df975ed38d558c7b0931ca575c3d
The branch, master has been updated via f4f59bf24803df975ed38d558c7b0931ca575c3d (commit) from e03730518711c9b5d54109562c2e226e5146555f (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit f4f59bf24803df975ed38d558c7b0931ca575c3d Author: Günther Deschner [EMAIL PROTECTED] Date: Tue Oct 14 13:36:15 2008 +0200 s3-build: fix init_samba_module missing proto warning. Guenther --- Summary of changes: source3/include/module.h |1 + 1 files changed, 1 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/include/module.h b/source3/include/module.h index 20dbaba..52245e0 100644 --- a/source3/include/module.h +++ b/source3/include/module.h @@ -23,6 +23,7 @@ /* Module support */ typedef NTSTATUS (init_module_function) (void); +NTSTATUS init_samba_module(void); typedef int smb_event_id_t; #define SMB_EVENT_ID_INVALID (-1) -- Samba Shared Repository
[SCM] CTDB repository - branch master updated - ctdb-1.0.60-4-g6fb2f8a
The branch, master has been updated
via 6fb2f8a36239e5902e27cf10213f85faf216d6f1 (commit)
from 9b1d089c99413f3681440f3cf33c293d118c9108 (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master
- Log -
commit 6fb2f8a36239e5902e27cf10213f85faf216d6f1
Author: Ronnie Sahlberg [EMAIL PROTECTED]
Date: Wed Oct 15 08:33:37 2008 +1100
we must also check the status returned from the get tickles control to
determine whether it was successful or not
---
Summary of changes:
client/ctdb_client.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/client/ctdb_client.c b/client/ctdb_client.c
index 4018300..07c0b88 100644
--- a/client/ctdb_client.c
+++ b/client/ctdb_client.c
@@ -2538,7 +2538,7 @@ int ctdb_ctrl_get_tcp_tickles(struct ctdb_context *ctdb,
ret = ctdb_control(ctdb, destnode, 0,
CTDB_CONTROL_GET_TCP_TICKLE_LIST, 0, data,
mem_ctx, outdata, status, NULL, NULL);
- if (ret != 0) {
+ if (ret != 0 || status != 0) {
DEBUG(DEBUG_ERR,(__location__ ctdb_control for get tcp
tickles failed\n));
return -1;
}
--
CTDB repository
[SCM] CTDB repository - branch master updated - ctdb-1.0.59-6-g5747dd2
The branch, master has been updated
via 5747dd2d80af29d6252afb6aeb3e66328ee20de5 (commit)
from d13da2e8fe2fab619540525d98a5502a23ab7d20 (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master
- Log -
commit 5747dd2d80af29d6252afb6aeb3e66328ee20de5
Author: Ronnie Sahlberg [EMAIL PROTECTED]
Date: Wed Oct 15 01:23:57 2008 +1100
verify that the nodes we try to ban/unban are operational and print an
error to the user othervise.
---
Summary of changes:
tools/ctdb.c | 14 ++
1 files changed, 14 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/tools/ctdb.c b/tools/ctdb.c
index 1f537d9..5055c26 100644
--- a/tools/ctdb.c
+++ b/tools/ctdb.c
@@ -1196,6 +1196,13 @@ static int control_ban(struct ctdb_context *ctdb, int
argc, const char **argv)
usage();
}
+ /* verify we can access the node */
+ ret = ctdb_ctrl_getpnn(ctdb, TIMELIMIT(), options.pnn);
+ if (ret == -1) {
+ DEBUG(DEBUG_ERR,(Can not ban node. Node is not
operational.\n));
+ return -1;
+ }
+
ban_time = strtoul(argv[0], NULL, 0);
b.pnn = options.pnn;
@@ -1222,6 +1229,13 @@ static int control_unban(struct ctdb_context *ctdb, int
argc, const char **argv)
int ret;
TDB_DATA data;
+ /* verify we can access the node */
+ ret = ctdb_ctrl_getpnn(ctdb, TIMELIMIT(), options.pnn);
+ if (ret == -1) {
+ DEBUG(DEBUG_ERR,(Can not unban node. Node is not
operational.\n));
+ return -1;
+ }
+
data.dptr = (uint8_t *)options.pnn;
data.dsize = sizeof(uint32_t);
--
CTDB repository
[SCM] Samba Shared Repository - branch master updated - e03730518711c9b5d54109562c2e226e5146555f
The branch, master has been updated
via e03730518711c9b5d54109562c2e226e5146555f (commit)
via a7187e80832685f252ea94b82724f21d05c9ea22 (commit)
from 69c5992d173f58a71f1899fbb63d3b6219bd3f98 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit e03730518711c9b5d54109562c2e226e5146555f
Author: Volker Lendecke [EMAIL PROTECTED]
Date: Tue Oct 14 13:29:03 2008 +0200
Add the oplock-batch25 test showing that a writeattr does not break an
oplock
Probably that's already somewhere else, but I did not find it.
commit a7187e80832685f252ea94b82724f21d05c9ea22
Author: Volker Lendecke [EMAIL PROTECTED]
Date: Tue Oct 14 13:28:06 2008 +0200
Remove unused stuff
---
Summary of changes:
source3/smbd/pipes.c | 12 ---
source4/torture/raw/oplock.c | 70 ++
2 files changed, 70 insertions(+), 12 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/pipes.c b/source3/smbd/pipes.c
index af36368..25a1fe2 100644
--- a/source3/smbd/pipes.c
+++ b/source3/smbd/pipes.c
@@ -32,18 +32,6 @@
#define MAX_PIPE_NAME_LEN 24
-/* PIPE/name/pid/pnum */
-#define PIPEDB_KEY_FORMAT PIPE/%s/%u/%d
-
-struct pipe_dbrec {
- struct server_id pid;
- int pnum;
- uid_t uid;
-
- char name[MAX_PIPE_NAME_LEN];
- fstring user;
-};
-
/
Reply to an open and X on a named pipe.
This code is basically stolen from reply_open_and_X with some
diff --git a/source4/torture/raw/oplock.c b/source4/torture/raw/oplock.c
index 7e964b4..19924e7 100644
--- a/source4/torture/raw/oplock.c
+++ b/source4/torture/raw/oplock.c
@@ -2788,6 +2788,75 @@ done:
return ret;
}
+static bool test_raw_oplock_batch25(struct torture_context *tctx,
+ struct smbcli_state *cli1,
+ struct smbcli_state *cli2)
+{
+ const char *fname = BASEDIR \\test_batch25.dat;
+ NTSTATUS status;
+ bool ret = true;
+ union smb_open io;
+ union smb_setfileinfo sfi;
+ uint16_t fnum=0;
+
+ if (!torture_setup_dir(cli1, BASEDIR)) {
+ return false;
+ }
+
+ /* cleanup */
+ smbcli_unlink(cli1-tree, fname);
+
+ smbcli_oplock_handler(cli1-transport, oplock_handler_ack_to_given,
cli1-tree);
+
+ /*
+ base ntcreatex parms
+ */
+ io.generic.level = RAW_OPEN_NTCREATEX;
+ io.ntcreatex.in.root_fid = 0;
+ io.ntcreatex.in.access_mask = SEC_RIGHTS_FILE_ALL;
+ io.ntcreatex.in.alloc_size = 0;
+ io.ntcreatex.in.file_attr = FILE_ATTRIBUTE_NORMAL;
+ io.ntcreatex.in.share_access = NTCREATEX_SHARE_ACCESS_NONE;
+ io.ntcreatex.in.open_disposition = NTCREATEX_DISP_OPEN_IF;
+ io.ntcreatex.in.create_options = 0;
+ io.ntcreatex.in.impersonation = NTCREATEX_IMPERSONATION_ANONYMOUS;
+ io.ntcreatex.in.security_flags = 0;
+ io.ntcreatex.in.fname = fname;
+
+ torture_comment(tctx, BATCH25: open a file with an batch oplock
+ (share mode: none)\n);
+
+ ZERO_STRUCT(break_info);
+ io.ntcreatex.in.flags = NTCREATEX_FLAGS_EXTENDED |
+ NTCREATEX_FLAGS_REQUEST_OPLOCK |
+ NTCREATEX_FLAGS_REQUEST_BATCH_OPLOCK;
+ status = smb_raw_open(cli1-tree, tctx, io);
+ CHECK_STATUS(tctx, status, NT_STATUS_OK);
+ fnum = io.ntcreatex.out.file.fnum;
+ CHECK_VAL(io.ntcreatex.out.oplock_level, BATCH_OPLOCK_RETURN);
+
+ torture_comment(tctx, setpathinfo attribute info should not trigger
+ a break nor a violation\n);
+ ZERO_STRUCT(sfi);
+ sfi.generic.level = RAW_SFILEINFO_SETATTR;
+ sfi.generic.in.file.path= fname;
+ sfi.setattr.in.attrib = FILE_ATTRIBUTE_HIDDEN;
+ sfi.setattr.in.write_time = 0;
+
+status = smb_raw_setpathinfo(cli2-tree, sfi);
+
+ CHECK_STATUS(tctx, status, NT_STATUS_OK);
+ CHECK_VAL(break_info.count, 0);
+
+ smbcli_close(cli1-tree, fnum);
+
+done:
+ smb_raw_exit(cli1-session);
+ smb_raw_exit(cli2-session);
+ smbcli_deltree(cli1-tree, BASEDIR);
+ return ret;
+}
+
/*
basic testing of oplocks
*/
@@ -2825,6 +2894,7 @@ struct torture_suite *torture_raw_oplock(TALLOC_CTX
*mem_ctx)
torture_suite_add_2smb_test(suite, BATCH22, test_raw_oplock_batch22);
torture_suite_add_2smb_test(suite, BATCH23, test_raw_oplock_batch23);
torture_suite_add_2smb_test(suite, BATCH24, test_raw_oplock_batch24);
+ torture_suite_add_2smb_test(suite, BATCH25, test_raw_oplock_batch25);
return suite;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - 75dabe874c0cf8893dd61f547d0c3878d411a433
The branch, master has been updated
via 75dabe874c0cf8893dd61f547d0c3878d411a433 (commit)
via 91437ea7bc6f74729ec40b5b1eeea57287dd85c4 (commit)
via 235e68f7b7ec9f8989c1b021768bed4072a77e16 (commit)
via ed7cc8fc1c0189b78144de0f9f47e624a7dea085 (commit)
via 5198fb6e19f1741c5296ad27dd6fc4ca03581624 (commit)
via 198974a781b7474b73eca92e51fc50d6d05fdf85 (commit)
via f02a68a89f1da4d4e5b8e637b17b2bc09cd37d67 (commit)
via 831141e334141c4f7d04238a533972e6be40dbba (commit)
from ecca199486a30957e7f0dc084d0e21eb3c812c15 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 75dabe874c0cf8893dd61f547d0c3878d411a433
Merge: 91437ea7bc6f74729ec40b5b1eeea57287dd85c4
ecca199486a30957e7f0dc084d0e21eb3c812c15
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Wed Oct 15 00:15:34 2008 +0200
Merge branch 'master' of git://git.samba.org/samba
commit 91437ea7bc6f74729ec40b5b1eeea57287dd85c4
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Wed Oct 15 00:14:58 2008 +0200
Fix include path.
commit 235e68f7b7ec9f8989c1b021768bed4072a77e16
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Wed Oct 15 00:09:08 2008 +0200
Remove unused variable.
commit ed7cc8fc1c0189b78144de0f9f47e624a7dea085
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Tue Oct 14 23:59:58 2008 +0200
Fix include path.
commit 5198fb6e19f1741c5296ad27dd6fc4ca03581624
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Tue Oct 14 23:52:20 2008 +0200
Share ndr_krb5pac implementation.
commit 198974a781b7474b73eca92e51fc50d6d05fdf85
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Tue Oct 14 23:49:13 2008 +0200
Compile lzcompress (required for ndr_compression)
commit f02a68a89f1da4d4e5b8e637b17b2bc09cd37d67
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Tue Oct 14 23:46:34 2008 +0200
Share ndr_compression.c.
commit 831141e334141c4f7d04238a533972e6be40dbba
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Tue Oct 14 23:37:55 2008 +0200
Remove unused file.
---
Summary of changes:
librpc/ndr/ndr_compression.c | 516
librpc/ndr/ndr_compression.h | 35 +
librpc/ndr/ndr_krb5pac.c | 140
source3/Makefile.in |9 +-
source3/librpc/ndr/ndr_compression.c | 293 ---
source3/librpc/ndr/ndr_compression.h | 51 --
source3/librpc/ndr/ndr_krb5pac.c | 140
source3/librpc/rpc/dcerpc_util.c | 1438 --
source4/auth/ntlm/auth_server.c |1 -
source4/configure.ac |2 +-
source4/lib/zlib.m4 |1 -
source4/librpc/config.mk |6 +-
source4/librpc/ndr/ndr_compression.c | 516
source4/librpc/ndr/ndr_krb5pac.c | 140
14 files changed, 699 insertions(+), 2589 deletions(-)
create mode 100644 librpc/ndr/ndr_compression.c
create mode 100644 librpc/ndr/ndr_compression.h
create mode 100644 librpc/ndr/ndr_krb5pac.c
delete mode 100644 source3/librpc/ndr/ndr_compression.c
delete mode 100644 source3/librpc/ndr/ndr_compression.h
delete mode 100644 source3/librpc/ndr/ndr_krb5pac.c
delete mode 100644 source3/librpc/rpc/dcerpc_util.c
delete mode 100644 source4/librpc/ndr/ndr_compression.c
delete mode 100644 source4/librpc/ndr/ndr_krb5pac.c
Changeset truncated at 500 lines:
diff --git a/librpc/ndr/ndr_compression.c b/librpc/ndr/ndr_compression.c
new file mode 100644
index 000..afd397e
--- /dev/null
+++ b/librpc/ndr/ndr_compression.c
@@ -0,0 +1,516 @@
+/*
+ Unix SMB/CIFS implementation.
+
+ libndr compression support
+
+ Copyright (C) Stefan Metzmacher 2005
+ Copyright (C) Matthieu Suiche 2008
+
+ 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
+#include ../lib/compression/lzxpress.h
+#include librpc/ndr/libndr.h
+#include ../librpc/ndr/ndr_compression.h
+#include zlib.h
+
+static voidpf ndr_zlib_alloc(voidpf opaque, uInt items, uInt size)
+{
+ return talloc_zero_size(opaque, items * size);
+}
+
+static void ndr_zlib_free(voidpf opaque, voidpf address)
+{
+ talloc_free(address);
+}
+
+static enum ndr_err_code ndr_pull_compression_mszip_chunk(struct ndr_pull
[SCM] Samba Shared Repository - branch master updated - 0132423a094e8f619bef9e59728e4fa76303c834
The branch, master has been updated
via 0132423a094e8f619bef9e59728e4fa76303c834 (commit)
from 75dabe874c0cf8893dd61f547d0c3878d411a433 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 0132423a094e8f619bef9e59728e4fa76303c834
Author: Jelmer Vernooij [EMAIL PROTECTED]
Date: Wed Oct 15 00:35:13 2008 +0200
Share libndr.h between Samba 3 and Samba 4.
---
Summary of changes:
lib/util/util.h |2 +
{source4/librpc = librpc}/ndr/libndr.h |6 +-
source3/include/includes.h |5 +
source3/librpc/ndr/libndr.h | 515 ---
4 files changed, 12 insertions(+), 516 deletions(-)
rename {source4/librpc = librpc}/ndr/libndr.h (99%)
delete mode 100644 source3/librpc/ndr/libndr.h
Changeset truncated at 500 lines:
diff --git a/lib/util/util.h b/lib/util/util.h
index 720aa53..61c93f3 100644
--- a/lib/util/util.h
+++ b/lib/util/util.h
@@ -21,7 +21,9 @@
#ifndef _SAMBA_UTIL_H_
#define _SAMBA_UTIL_H_
+#if _SAMBA_BUILD_ == 4
#include lib/charset/charset.h
+#endif
#include ../lib/util/attr.h
/* for TALLOC_CTX */
diff --git a/source4/librpc/ndr/libndr.h b/librpc/ndr/libndr.h
similarity index 99%
rename from source4/librpc/ndr/libndr.h
rename to librpc/ndr/libndr.h
index 335383d..63b89e1 100644
--- a/source4/librpc/ndr/libndr.h
+++ b/librpc/ndr/libndr.h
@@ -26,9 +26,11 @@
#define __LIBNDR_H__
#include talloc.h
-#include ../lib/util/util.h /* for discard_const */
#include sys/time.h
+#if _SAMBA_BUILD_ == 4
+#include ../lib/util/util.h /* for discard_const */
#include lib/charset/charset.h
+#endif
/*
this provides definitions for the libcli/rpc/ MSRPC library
@@ -300,7 +302,9 @@ typedef enum ndr_err_code (*ndr_pull_flags_fn_t)(struct
ndr_pull *, int ndr_flag
typedef void (*ndr_print_fn_t)(struct ndr_print *, const char *, const void *);
typedef void (*ndr_print_function_t)(struct ndr_print *, const char *, int,
const void *);
+#if _SAMBA_BUILD_ == 4
#include libcli/util/error.h
+#endif
#include librpc/gen_ndr/misc.h
extern const struct ndr_syntax_id ndr_transfer_syntax;
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 0df4ef9..7178fb4 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -585,6 +585,11 @@ struct timespec {
typedef char fstring[FSTRING_LEN];
#endif
+/* Samba 3 doesn't use iconv_convenience: */
+extern void *global_loadparm;
+extern void *cmdline_lp_ctx;
+struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx);
+
/* Lists, trees, caching, database... */
#include ../lib/util/xfile.h
#include intl.h
diff --git a/source3/librpc/ndr/libndr.h b/source3/librpc/ndr/libndr.h
deleted file mode 100644
index e25a7b8..000
--- a/source3/librpc/ndr/libndr.h
+++ /dev/null
@@ -1,515 +0,0 @@
-/*
- Unix SMB/CIFS implementation.
- rpc interface definitions
-
- Copyright (C) Andrew Tridgell 2003
-
- 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/.
-*/
-
-#ifndef __LIBNDR_H__
-#define __LIBNDR_H__
-
-#define _PRINTF_ATTRIBUTE(a,b)
-
-#include librpc/gen_ndr/misc.h
-#include librpc/gen_ndr/security.h
-
-/* Samba 3 doesn't use iconv_convenience: */
-extern void *global_loadparm;
-extern void *cmdline_lp_ctx;
-struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx);
-
-/*
- this provides definitions for the libcli/rpc/ MSRPC library
-*/
-
-
-/*
- this is used by the token store/retrieve code
-*/
-struct ndr_token_list {
- struct ndr_token_list *next, *prev;
- const void *key;
- uint32_t value;
-};
-
-/* this is the base structure passed to routines that
- parse MSRPC formatted data
-
- note that in Samba4 we use separate routines and structures for
- MSRPC marshalling and unmarshalling. Also note that these routines
- are being kept deliberately very simple, and are not tied to a
- particular transport
-*/
-struct ndr_pull {
- uint32_t flags; /* LIBNDR_FLAG_* */
- uint8_t *data;
- uint32_t data_size;
- uint32_t offset;
-
- struct smb_iconv_convenience *iconv_convenience;
-
- uint32_t relative_base_offset;
- struct ndr_token_list *relative_base_list;
-
- struct ndr_token_list
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4262-g9fd84b9
The branch, v3-3-test has been updated via 9fd84b90bf783987d32aded9be98c9c7b7543b2b (commit) from 5f41f1c8192739b5b9c14f1e9967567d9d781851 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test - Log - commit 9fd84b90bf783987d32aded9be98c9c7b7543b2b Author: Jeremy Allison [EMAIL PROTECTED] Date: Tue Oct 14 15:37:40 2008 -0700 Note url explaining this code. Jeremy. --- Summary of changes: source/smbd/posix_acls.c |4 1 files changed, 4 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source/smbd/posix_acls.c b/source/smbd/posix_acls.c index 4e35e9d..5686937 100644 --- a/source/smbd/posix_acls.c +++ b/source/smbd/posix_acls.c @@ -3510,6 +3510,10 @@ NTSTATUS set_nt_acl(files_struct *fsp, uint32 security_info_sent, const SEC_DESC create_file_sids(sbuf, file_owner_sid, file_grp_sid); + /* See here: http://www.codeproject.com/KB/winsdk/accessctrl2.aspx +* for details. JRA. +*/ + if ((security_info_sent DACL_SECURITY_INFORMATION) psd-dacl != NULL (psd-type (SE_DESC_DACL_AUTO_INHERITED| -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - 7fb590d4f9be26a67e7cd276d63b66cff8901e91
The branch, master has been updated via 7fb590d4f9be26a67e7cd276d63b66cff8901e91 (commit) from 0132423a094e8f619bef9e59728e4fa76303c834 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 7fb590d4f9be26a67e7cd276d63b66cff8901e91 Author: Jeremy Allison [EMAIL PROTECTED] Date: Tue Oct 14 15:39:02 2008 -0700 Note url explaining this code. Jeremy. --- Summary of changes: source3/smbd/posix_acls.c |4 1 files changed, 4 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c index f129506..848d3e4 100644 --- a/source3/smbd/posix_acls.c +++ b/source3/smbd/posix_acls.c @@ -3510,6 +3510,10 @@ NTSTATUS set_nt_acl(files_struct *fsp, uint32 security_info_sent, const SEC_DESC create_file_sids(sbuf, file_owner_sid, file_grp_sid); + /* See here: http://www.codeproject.com/KB/winsdk/accessctrl2.aspx +* for details. JRA. +*/ + if ((security_info_sent DACL_SECURITY_INFORMATION) psd-dacl != NULL (psd-type (SE_DESC_DACL_AUTO_INHERITED| -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3090-g4f1cdfe
The branch, v3-2-test has been updated via 4f1cdfe0901f4c78dff56ae5c26d2801b97d50d5 (commit) from 1d202a8a7bccc65e47fc78b17d89b7e74a358487 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log - commit 4f1cdfe0901f4c78dff56ae5c26d2801b97d50d5 Author: Jeremy Allison [EMAIL PROTECTED] Date: Tue Oct 14 15:40:44 2008 -0700 Note url explaining this code. Jeremy. --- Summary of changes: source/smbd/posix_acls.c |4 1 files changed, 4 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source/smbd/posix_acls.c b/source/smbd/posix_acls.c index d798fa8..65ec251 100644 --- a/source/smbd/posix_acls.c +++ b/source/smbd/posix_acls.c @@ -3525,6 +3525,10 @@ NTSTATUS set_nt_acl(files_struct *fsp, uint32 security_info_sent, SEC_DESC *psd) create_file_sids(sbuf, file_owner_sid, file_grp_sid); + /* See here: http://www.codeproject.com/KB/winsdk/accessctrl2.aspx +* for details. JRA. +*/ + if ((security_info_sent DACL_SECURITY_INFORMATION) psd-dacl != NULL (psd-type (SE_DESC_DACL_AUTO_INHERITED| -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - 65fdcd92fa9d5bc290274be458157d5bc8fea351
The branch, master has been updated via 65fdcd92fa9d5bc290274be458157d5bc8fea351 (commit) from 7fb590d4f9be26a67e7cd276d63b66cff8901e91 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 65fdcd92fa9d5bc290274be458157d5bc8fea351 Author: Jelmer Vernooij [EMAIL PROTECTED] Date: Wed Oct 15 01:04:13 2008 +0200 Build zlib (required for ndr_compression) if it's not pulled in through other means. --- Summary of changes: source3/Makefile.in |6 +- source3/configure.in | 36 2 files changed, 41 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/Makefile.in b/source3/Makefile.in index d9ff859..234490e 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -56,6 +56,7 @@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ @@ -251,8 +252,11 @@ LIBNDR_DRSUAPI_OBJ = librpc/ndr/ndr_drsuapi.o \ librpc/gen_ndr/ndr_drsuapi.o \ librpc/gen_ndr/ndr_drsblobs.o +ZLIB_OBJ = @ZLIB_OBJS@ + COMPRESSION_OBJ = ../lib/compression/mszip.o \ - ../lib/compression/lzxpress.o + ../lib/compression/lzxpress.o \ + $(ZLIB_OBJ) DRSUAPI_OBJ = $(LIBNDR_DRSUAPI_OBJ) \ $(COMPRESSION_OBJ) diff --git a/source3/configure.in b/source3/configure.in index 443cdd6..29209fd 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -6248,6 +6248,42 @@ if test x$enable_merged_build = xyes; then m4_include(samba4.m4) fi +AC_CHECK_HEADERS(zlib.h) + +AC_CHECK_LIB_EXT(z, ZLIB_LIBS, zlibVersion) + +AC_CACHE_CHECK([for zlib = 1.2.3], samba_cv_zlib_1_2_3, [ + AC_TRY_COMPILE([ + #include zlib.h + ],[ + #if (ZLIB_VERNUM = 0x1230) + #else + #error ZLIB_VERNUM 0x1230 + #endif + ],[ + samba_cv_zlib_1_2_3=yes + ],[ + samba_cv_zlib_1_2_3=no + ]) +]) + +AC_SUBST(ZLIB_LIBS) +AC_SUBST(ZLIB_OBJS) +if test x$ac_cv_header_zlib_h = xyes -a \ + x$ac_cv_lib_ext_z_zlibVersion = xyes -a \ + x$samba_cv_zlib_1_2_3 = xyes; then + ZLIB_OBJS= +else + ZLIB_LIBS= + for o in adler32.o compress.o crc32.o gzio.o uncompr.o \ +deflate.o trees.o zutil.o inflate.o infback.o \ +inftrees.o inffast.o + do + ZLIB_OBJS=$ZLIB_OBJS ../lib/zlib/$o + done + CFLAGS=$CFLAGS -I../lib/zlib +fi + dnl Remove -L/usr/lib/? from LDFLAGS and LIBS LIB_REMOVE_USR_LIB(LDFLAGS) LIB_REMOVE_USR_LIB(LIBS) -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4263-gc780a66
The branch, v3-3-test has been updated
via c780a666920a5efc06b29335d4ae78f1eca6b66a (commit)
from 9fd84b90bf783987d32aded9be98c9c7b7543b2b (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit c780a666920a5efc06b29335d4ae78f1eca6b66a
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Tue Oct 14 16:08:14 2008 -0700
Attempt to fix bug #5818 - smbcacls: sorts ACEs improperly and loses
inheritance, based on
a patch from Paul Fertser [EMAIL PROTECTED]. I also added the ability to
get/set hex
and symbolic inheritance flag names on ACE flags. I'm still investigating
the effects
of setting the SEC_DESC_DACL_AUTO_INHERIT_REQ flag as I don't yet see
what effects
this is having on the ACE sent.
Jeremy.
---
Summary of changes:
source/utils/smbcacls.c | 183 ---
1 files changed, 157 insertions(+), 26 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/utils/smbcacls.c b/source/utils/smbcacls.c
index eda8732..10b5501 100644
--- a/source/utils/smbcacls.c
+++ b/source/utils/smbcacls.c
@@ -23,13 +23,13 @@
#include includes.h
-static int test_args = False;
+static int test_args;
#define CREATE_ACCESS_READ READ_CONTROL_ACCESS
/* numeric is set when the user wants numeric SIDs and ACEs rather
than going via LSA calls to resolve them */
-static int numeric = False;
+static int numeric;
enum acl_mode {SMB_ACL_SET, SMB_ACL_DELETE, SMB_ACL_MODIFY, SMB_ACL_ADD };
enum chown_mode {REQUEST_NONE, REQUEST_CHOWN, REQUEST_CHGRP};
@@ -179,9 +179,12 @@ static void SidToString(struct cli_state *cli, fstring
str, const DOM_SID *sid)
return;
}
- slprintf(str, sizeof(fstring) - 1, %s%s%s,
-domain, lp_winbind_separator(), name);
-
+ if (*domain) {
+ slprintf(str, sizeof(fstring) - 1, %s%s%s,
+ domain, lp_winbind_separator(), name);
+ } else {
+ fstrcpy(str, name);
+ }
}
/* convert a string to a SID, either numeric or username/group */
@@ -196,6 +199,65 @@ static bool StringToSid(struct cli_state *cli, DOM_SID
*sid, const char *str)
return NT_STATUS_IS_OK(cli_lsa_lookup_name(cli, str, type, sid));
}
+static void print_ace_flags(FILE *f, uint8_t flags)
+{
+ char *str = talloc_strdup(NULL, );
+
+ if (!str) {
+ goto out;
+ }
+
+ if (flags SEC_ACE_FLAG_OBJECT_INHERIT) {
+ str = talloc_asprintf(str, %s%s,
+ str, OI|);
+ if (!str) {
+ goto out;
+ }
+ }
+ if (flags SEC_ACE_FLAG_CONTAINER_INHERIT) {
+ str = talloc_asprintf(str, %s%s,
+ str, CI|);
+ if (!str) {
+ goto out;
+ }
+ }
+ if (flags SEC_ACE_FLAG_NO_PROPAGATE_INHERIT) {
+ str = talloc_asprintf(str, %s%s,
+ str, NP|);
+ if (!str) {
+ goto out;
+ }
+ }
+ if (flags SEC_ACE_FLAG_INHERIT_ONLY) {
+ str = talloc_asprintf(str, %s%s,
+ str, IO|);
+ if (!str) {
+ goto out;
+ }
+ }
+ if (flags SEC_ACE_FLAG_INHERITED_ACE) {
+ str = talloc_asprintf(str, %s%s,
+ str, I|);
+ if (!str) {
+ goto out;
+ }
+ }
+ /* Ignore define SEC_ACE_FLAG_SUCCESSFUL_ACCESS ( 0x40 )
+ and SEC_ACE_FLAG_FAILED_ACCESS ( 0x80 ) as they're
+ audit ace flags. */
+
+ if (str[strlen(str)-1] == '|') {
+ str[strlen(str)-1] = '\0';
+ fprintf(f, /%s/, str);
+ } else {
+ fprintf(f, /0x%x/, flags);
+ }
+ TALLOC_FREE(str);
+ return;
+
+ out:
+ fprintf(f, /0x%x/, flags);
+}
/* print an ACE on a FILE, using either numeric or ascii representation */
static void print_ace(struct cli_state *cli, FILE *f, SEC_ACE *ace)
@@ -210,7 +272,7 @@ static void print_ace(struct cli_state *cli, FILE *f,
SEC_ACE *ace)
fprintf(f, %s:, sidstr);
if (numeric) {
- fprintf(f, %d/%d/0x%08x,
+ fprintf(f, %d/0x%x/0x%08x,
ace-type, ace-flags, ace-access_mask);
return;
}
@@ -225,9 +287,7 @@ static void print_ace(struct cli_state *cli, FILE *f,
SEC_ACE *ace)
fprintf(f, %d, ace-type);
}
- /* Not sure what flags can be set in a file ACL */
-
- fprintf(f, /%d/, ace-flags);
+ print_ace_flags(f, ace-flags);
/* Standard permissions */
@@
[SCM] Samba Shared Repository - branch master updated - aed571d1687f5342cc9a0958e3b54f8016a2c526
The branch, master has been updated
via aed571d1687f5342cc9a0958e3b54f8016a2c526 (commit)
from 65fdcd92fa9d5bc290274be458157d5bc8fea351 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit aed571d1687f5342cc9a0958e3b54f8016a2c526
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Tue Oct 14 16:09:17 2008 -0700
Attempt to fix bug #5818 - smbcacls: sorts ACEs improperly and loses
inheritance, based on
a patch from Paul Fertser [EMAIL PROTECTED]. I also added the ability to
get/set hex
and symbolic inheritance flag names on ACE flags. I'm still investigating
the effects
of setting the SEC_DESC_DACL_AUTO_INHERIT_REQ flag as I don't yet see
what effects
this is having on the ACE sent.
Jeremy.
---
Summary of changes:
source3/utils/smbcacls.c | 183 +++---
1 files changed, 157 insertions(+), 26 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c
index eda8732..10b5501 100644
--- a/source3/utils/smbcacls.c
+++ b/source3/utils/smbcacls.c
@@ -23,13 +23,13 @@
#include includes.h
-static int test_args = False;
+static int test_args;
#define CREATE_ACCESS_READ READ_CONTROL_ACCESS
/* numeric is set when the user wants numeric SIDs and ACEs rather
than going via LSA calls to resolve them */
-static int numeric = False;
+static int numeric;
enum acl_mode {SMB_ACL_SET, SMB_ACL_DELETE, SMB_ACL_MODIFY, SMB_ACL_ADD };
enum chown_mode {REQUEST_NONE, REQUEST_CHOWN, REQUEST_CHGRP};
@@ -179,9 +179,12 @@ static void SidToString(struct cli_state *cli, fstring
str, const DOM_SID *sid)
return;
}
- slprintf(str, sizeof(fstring) - 1, %s%s%s,
-domain, lp_winbind_separator(), name);
-
+ if (*domain) {
+ slprintf(str, sizeof(fstring) - 1, %s%s%s,
+ domain, lp_winbind_separator(), name);
+ } else {
+ fstrcpy(str, name);
+ }
}
/* convert a string to a SID, either numeric or username/group */
@@ -196,6 +199,65 @@ static bool StringToSid(struct cli_state *cli, DOM_SID
*sid, const char *str)
return NT_STATUS_IS_OK(cli_lsa_lookup_name(cli, str, type, sid));
}
+static void print_ace_flags(FILE *f, uint8_t flags)
+{
+ char *str = talloc_strdup(NULL, );
+
+ if (!str) {
+ goto out;
+ }
+
+ if (flags SEC_ACE_FLAG_OBJECT_INHERIT) {
+ str = talloc_asprintf(str, %s%s,
+ str, OI|);
+ if (!str) {
+ goto out;
+ }
+ }
+ if (flags SEC_ACE_FLAG_CONTAINER_INHERIT) {
+ str = talloc_asprintf(str, %s%s,
+ str, CI|);
+ if (!str) {
+ goto out;
+ }
+ }
+ if (flags SEC_ACE_FLAG_NO_PROPAGATE_INHERIT) {
+ str = talloc_asprintf(str, %s%s,
+ str, NP|);
+ if (!str) {
+ goto out;
+ }
+ }
+ if (flags SEC_ACE_FLAG_INHERIT_ONLY) {
+ str = talloc_asprintf(str, %s%s,
+ str, IO|);
+ if (!str) {
+ goto out;
+ }
+ }
+ if (flags SEC_ACE_FLAG_INHERITED_ACE) {
+ str = talloc_asprintf(str, %s%s,
+ str, I|);
+ if (!str) {
+ goto out;
+ }
+ }
+ /* Ignore define SEC_ACE_FLAG_SUCCESSFUL_ACCESS ( 0x40 )
+ and SEC_ACE_FLAG_FAILED_ACCESS ( 0x80 ) as they're
+ audit ace flags. */
+
+ if (str[strlen(str)-1] == '|') {
+ str[strlen(str)-1] = '\0';
+ fprintf(f, /%s/, str);
+ } else {
+ fprintf(f, /0x%x/, flags);
+ }
+ TALLOC_FREE(str);
+ return;
+
+ out:
+ fprintf(f, /0x%x/, flags);
+}
/* print an ACE on a FILE, using either numeric or ascii representation */
static void print_ace(struct cli_state *cli, FILE *f, SEC_ACE *ace)
@@ -210,7 +272,7 @@ static void print_ace(struct cli_state *cli, FILE *f,
SEC_ACE *ace)
fprintf(f, %s:, sidstr);
if (numeric) {
- fprintf(f, %d/%d/0x%08x,
+ fprintf(f, %d/0x%x/0x%08x,
ace-type, ace-flags, ace-access_mask);
return;
}
@@ -225,9 +287,7 @@ static void print_ace(struct cli_state *cli, FILE *f,
SEC_ACE *ace)
fprintf(f, %d, ace-type);
}
- /* Not sure what flags can be set in a file ACL */
-
- fprintf(f, /%d/, ace-flags);
+ print_ace_flags(f, ace-flags);
/* Standard permissions */
@@ -263,6
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3091-ge59a21e
The branch, v3-2-test has been updated
via e59a21e945e6336f3d7622bf77cf5c2304936b70 (commit)
from 4f1cdfe0901f4c78dff56ae5c26d2801b97d50d5 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit e59a21e945e6336f3d7622bf77cf5c2304936b70
Author: Jeremy Allison [EMAIL PROTECTED]
Date: Tue Oct 14 16:05:00 2008 -0700
Attempt to fix bug #5818 - smbcacls: sorts ACEs improperly and loses
inheritance, based on
a patch from Paul Fertser [EMAIL PROTECTED]. I also added the ability to
get/set hex
and symbolic inheritance flag names on ACE flags. I'm still investigating
the effects
of setting the SEC_DESC_DACL_AUTO_INHERIT_REQ flag as I don't yet see
what effects
this is having on the ACE sent.
Jeremy.
---
Summary of changes:
source/utils/smbcacls.c | 183 ---
1 files changed, 157 insertions(+), 26 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/utils/smbcacls.c b/source/utils/smbcacls.c
index 0534921..817f3ce 100644
--- a/source/utils/smbcacls.c
+++ b/source/utils/smbcacls.c
@@ -23,13 +23,13 @@
#include includes.h
-static int test_args = False;
+static int test_args;
#define CREATE_ACCESS_READ READ_CONTROL_ACCESS
/* numeric is set when the user wants numeric SIDs and ACEs rather
than going via LSA calls to resolve them */
-static int numeric = False;
+static int numeric;
enum acl_mode {SMB_ACL_SET, SMB_ACL_DELETE, SMB_ACL_MODIFY, SMB_ACL_ADD };
enum chown_mode {REQUEST_NONE, REQUEST_CHOWN, REQUEST_CHGRP};
@@ -181,9 +181,12 @@ static void SidToString(struct cli_state *cli, fstring
str, const DOM_SID *sid)
return;
}
- slprintf(str, sizeof(fstring) - 1, %s%s%s,
-domain, lp_winbind_separator(), name);
-
+ if (*domain) {
+ slprintf(str, sizeof(fstring) - 1, %s%s%s,
+ domain, lp_winbind_separator(), name);
+ } else {
+ fstrcpy(str, name);
+ }
}
/* convert a string to a SID, either numeric or username/group */
@@ -198,6 +201,65 @@ static bool StringToSid(struct cli_state *cli, DOM_SID
*sid, const char *str)
return NT_STATUS_IS_OK(cli_lsa_lookup_name(cli, str, type, sid));
}
+static void print_ace_flags(FILE *f, uint8_t flags)
+{
+ char *str = talloc_strdup(NULL, );
+
+ if (!str) {
+ goto out;
+ }
+
+ if (flags SEC_ACE_FLAG_OBJECT_INHERIT) {
+ str = talloc_asprintf(str, %s%s,
+ str, OI|);
+ if (!str) {
+ goto out;
+ }
+ }
+ if (flags SEC_ACE_FLAG_CONTAINER_INHERIT) {
+ str = talloc_asprintf(str, %s%s,
+ str, CI|);
+ if (!str) {
+ goto out;
+ }
+ }
+ if (flags SEC_ACE_FLAG_NO_PROPAGATE_INHERIT) {
+ str = talloc_asprintf(str, %s%s,
+ str, NP|);
+ if (!str) {
+ goto out;
+ }
+ }
+ if (flags SEC_ACE_FLAG_INHERIT_ONLY) {
+ str = talloc_asprintf(str, %s%s,
+ str, IO|);
+ if (!str) {
+ goto out;
+ }
+ }
+ if (flags SEC_ACE_FLAG_INHERITED_ACE) {
+ str = talloc_asprintf(str, %s%s,
+ str, I|);
+ if (!str) {
+ goto out;
+ }
+ }
+ /* Ignore define SEC_ACE_FLAG_SUCCESSFUL_ACCESS ( 0x40 )
+ and SEC_ACE_FLAG_FAILED_ACCESS ( 0x80 ) as they're
+ audit ace flags. */
+
+ if (str[strlen(str)-1] == '|') {
+ str[strlen(str)-1] = '\0';
+ fprintf(f, /%s/, str);
+ } else {
+ fprintf(f, /0x%x/, flags);
+ }
+ TALLOC_FREE(str);
+ return;
+
+ out:
+ fprintf(f, /0x%x/, flags);
+}
/* print an ACE on a FILE, using either numeric or ascii representation */
static void print_ace(struct cli_state *cli, FILE *f, SEC_ACE *ace)
@@ -212,7 +274,7 @@ static void print_ace(struct cli_state *cli, FILE *f,
SEC_ACE *ace)
fprintf(f, %s:, sidstr);
if (numeric) {
- fprintf(f, %d/%d/0x%08x,
+ fprintf(f, %d/0x%x/0x%08x,
ace-type, ace-flags, ace-access_mask);
return;
}
@@ -227,9 +289,7 @@ static void print_ace(struct cli_state *cli, FILE *f,
SEC_ACE *ace)
fprintf(f, %d, ace-type);
}
- /* Not sure what flags can be set in a file ACL */
-
- fprintf(f, /%d/, ace-flags);
+ print_ace_flags(f, ace-flags);
/* Standard permissions */
@@
[SCM] Samba Shared Repository - branch master updated - 98a6b91da57ba71a0fe971cb24b1647d5f0062e8
The branch, master has been updated via 98a6b91da57ba71a0fe971cb24b1647d5f0062e8 (commit) via 95a86edd97943aec086ed119975bad940c0cfe47 (commit) from aed571d1687f5342cc9a0958e3b54f8016a2c526 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 98a6b91da57ba71a0fe971cb24b1647d5f0062e8 Merge: 95a86edd97943aec086ed119975bad940c0cfe47 aed571d1687f5342cc9a0958e3b54f8016a2c526 Author: Jelmer Vernooij [EMAIL PROTECTED] Date: Wed Oct 15 01:11:56 2008 +0200 Merge branch 'master' of git://git.samba.org/samba commit 95a86edd97943aec086ed119975bad940c0cfe47 Author: Jelmer Vernooij [EMAIL PROTECTED] Date: Wed Oct 15 01:11:18 2008 +0200 Fix installation of libndr.h --- Summary of changes: source4/headermap.txt|2 +- source4/librpc/config.mk |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/headermap.txt b/source4/headermap.txt index a1b21d7..43119d2 100644 --- a/source4/headermap.txt +++ b/source4/headermap.txt @@ -12,7 +12,7 @@ librpc/rpc/dcerpc.h: dcerpc.h lib/ldb/include/ldb.h: ldb.h lib/ldb/include/ldb_errors.h: ldb_errors.h auth/gensec/gensec.h: gensec.h -librpc/ndr/libndr.h: ndr.h +../librpc/ndr/libndr.h: ndr.h lib/registry/registry.h: registry.h libcli/util/werror.h: core/werror.h libcli/util/doserr.h: core/doserr.h diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk index f3e9d46..02eb0ac 100644 --- a/source4/librpc/config.mk +++ b/source4/librpc/config.mk @@ -19,7 +19,7 @@ LIBNDR_SOVERSION = 0 # End SUBSYSTEM LIBNDR -PUBLIC_HEADERS += $(ndrsrcdir)/libndr.h +PUBLIC_HEADERS += ../librpc/ndr/libndr.h # # Start BINARY ndrdump -- Samba Shared Repository
Build status as of Wed Oct 15 00:00:02 2008
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2008-10-14 00:00:09.0 + +++ /home/build/master/cache/broken_results.txt 2008-10-15 00:00:41.0 + @@ -1,23 +1,23 @@ -Build status as of Tue Oct 14 00:00:01 2008 +Build status as of Wed Oct 15 00:00:02 2008 Build counts: Tree Total Broken Panic build_farm 0 0 0 -ccache 34 7 0 +ccache 33 7 0 ctdb 0 0 0 distcc 1 0 0 -ldb 34 33 0 +ldb 33 32 0 libreplace 32 12 0 -lorikeet-heimdal 30 20 0 -pidl 20 3 0 -ppp 14 14 0 -rsync34 9 0 +lorikeet-heimdal 29 20 0 +pidl 19 3 0 +ppp 13 13 0 +rsync33 9 0 samba-docs 0 0 0 samba-gtk8 8 0 -samba_3_X_devel 30 21 0 -samba_3_X_test 30 16 0 -samba_4_0_test 33 29 1 -smb-build32 7 0 -talloc 34 33 0 -tdb 34 12 0 +samba_3_X_devel 29 22 0 +samba_3_X_test 29 17 0 +samba_4_0_test 32 29 1 +smb-build31 6 0 +talloc 33 32 0 +tdb 33 12 0
[SCM] Samba Shared Repository - branch master updated - 16bbfc22629ea9e9aebc6164cae28a6b031cd9e0
The branch, master has been updated
via 16bbfc22629ea9e9aebc6164cae28a6b031cd9e0 (commit)
from 98a6b91da57ba71a0fe971cb24b1647d5f0062e8 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 16bbfc22629ea9e9aebc6164cae28a6b031cd9e0
Author: Tim Prouty [EMAIL PROTECTED]
Date: Mon Oct 6 18:55:21 2008 -0700
Fixed argument differ in signedness warning on linux
---
Summary of changes:
source3/libsmb/async_smb.c |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/libsmb/async_smb.c b/source3/libsmb/async_smb.c
index 6849507..d371e05 100644
--- a/source3/libsmb/async_smb.c
+++ b/source3/libsmb/async_smb.c
@@ -697,7 +697,7 @@ NTSTATUS cli_pull_reply(struct async_req *req,
*/
-static NTSTATUS validate_smb_crypto(struct cli_state *cli, uint8_t *pdu)
+static NTSTATUS validate_smb_crypto(struct cli_state *cli, char *pdu)
{
NTSTATUS status;
@@ -710,7 +710,7 @@ static NTSTATUS validate_smb_crypto(struct cli_state *cli,
uint8_t *pdu)
if (cli_encryption_on(cli) CVAL(pdu, 0) == 0) {
uint16_t enc_ctx_num;
- status = get_enc_ctx_num(pdu, enc_ctx_num);
+ status = get_enc_ctx_num((uint8_t *)pdu, enc_ctx_num);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(10, (get_enc_ctx_num returned %s\n,
nt_errstr(status)));
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - d6e5204807fcd5a84b8b3b5d3717d352f6852b22
The branch, master has been updated via d6e5204807fcd5a84b8b3b5d3717d352f6852b22 (commit) via aaa3e0425d8394c36a6211ddbd76837b5b3e3e56 (commit) via 4695504a6c0929da20bb8c53d7c14d0dca88933f (commit) via f75b46081457cd3801d93c91cce51f3d10976234 (commit) via 358e9931bc55e8c645b60da821e88cea4b4a8801 (commit) via 4f6a4b55101f9b2c5356eda43b0f56fa61ce5775 (commit) via 4999c5b2b95bca8e30653a6ce4e6623e6977102e (commit) via bd8998226cef7bec8bb92a7d31ec7ddcb9d08511 (commit) via daeceff217f3c5214b80a4645bfa0c0e03eeab04 (commit) via 45f97c4614e9fe7d4828eb47e32ebe0ba03893b5 (commit) via 7f24027e024bc56cb95b76ee0f9838d609e903cb (commit) from 16bbfc22629ea9e9aebc6164cae28a6b031cd9e0 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit d6e5204807fcd5a84b8b3b5d3717d352f6852b22 Merge: aaa3e0425d8394c36a6211ddbd76837b5b3e3e56 16bbfc22629ea9e9aebc6164cae28a6b031cd9e0 Author: Jelmer Vernooij [EMAIL PROTECTED] Date: Wed Oct 15 02:54:39 2008 +0200 Merge branch 'master' of git://git.samba.org/samba commit aaa3e0425d8394c36a6211ddbd76837b5b3e3e56 Author: Jelmer Vernooij [EMAIL PROTECTED] Date: Wed Oct 15 02:52:10 2008 +0200 Fix includes. commit 4695504a6c0929da20bb8c53d7c14d0dca88933f Author: Jelmer Vernooij [EMAIL PROTECTED] Date: Wed Oct 15 02:33:16 2008 +0200 Share security.idl. commit f75b46081457cd3801d93c91cce51f3d10976234 Author: Jelmer Vernooij [EMAIL PROTECTED] Date: Wed Oct 15 02:08:24 2008 +0200 Share misc.idl. commit 358e9931bc55e8c645b60da821e88cea4b4a8801 Author: Jelmer Vernooij [EMAIL PROTECTED] Date: Wed Oct 15 02:06:41 2008 +0200 Also check include dirs for IDL files. commit 4f6a4b55101f9b2c5356eda43b0f56fa61ce5775 Author: Jelmer Vernooij [EMAIL PROTECTED] Date: Wed Oct 15 01:53:09 2008 +0200 Share idl_types.h. commit 4999c5b2b95bca8e30653a6ce4e6623e6977102e Author: Jelmer Vernooij [EMAIL PROTECTED] Date: Wed Oct 15 01:48:02 2008 +0200 Regenerated pidl output. commit bd8998226cef7bec8bb92a7d31ec7ddcb9d08511 Author: Jelmer Vernooij [EMAIL PROTECTED] Date: Wed Oct 15 01:33:47 2008 +0200 Sync misc.idl with Samba 4. commit daeceff217f3c5214b80a4645bfa0c0e03eeab04 Author: Jelmer Vernooij [EMAIL PROTECTED] Date: Wed Oct 15 01:30:11 2008 +0200 Fix typo. commit 45f97c4614e9fe7d4828eb47e32ebe0ba03893b5 Author: Jelmer Vernooij [EMAIL PROTECTED] Date: Wed Oct 15 01:23:36 2008 +0200 Move shared DCE/RPC IDL files to root IDL dir. commit 7f24027e024bc56cb95b76ee0f9838d609e903cb Author: Jelmer Vernooij [EMAIL PROTECTED] Date: Wed Oct 15 01:15:58 2008 +0200 Allow specifying the exact IDL files to build. --- Summary of changes: librpc/idl/atsvc.idl | 119 +++ librpc/idl/audiosrv.idl | 23 + librpc/idl/browser.idl | 58 ++ librpc/idl/dbgidl.idl|9 + librpc/idl/dcom.idl | 302 ++ librpc/idl/dfs.idl | 419 librpc/idl/dnsserver.idl | 12 + librpc/idl/dsbackup.idl | 34 + librpc/idl/dssetup.idl | 101 ++ librpc/idl/echo.idl | 127 +++ librpc/idl/efs.idl | 108 ++ librpc/idl/frsapi.idl| 121 +++ librpc/idl/frsrpc.idl| 168 librpc/idl/idl_types.h | 69 ++ librpc/idl/keysvc.idl| 16 + librpc/idl/mgmt.idl | 75 ++ librpc/idl/misc.idl | 54 + librpc/idl/msgsvc.idl| 22 + librpc/idl/notify.idl| 58 ++ librpc/idl/orpc.idl | 230 + librpc/idl/oxidresolver.idl | 94 ++ librpc/idl/policyagent.idl | 13 + librpc/idl/protected_storage.idl | 14 + librpc/idl/remact.idl| 46 + librpc/idl/rot.idl | 44 + librpc/idl/security.idl | 394 librpc/idl/spoolss.idl | 1571 ++ librpc/idl/trkwks.idl| 17 + librpc/idl/unixinfo.idl | 56 ++ librpc/idl/w32time.idl | 21 + librpc/idl/wmi.idl | 716 ++ librpc/idl/wzcsvc.idl| 31 + pidl/lib/Parse/Pidl/ODL.pm | 13 +- source3/Makefile.in | 18 +- source3/configure.in |2 +- source3/librpc/gen_ndr/ndr_security.c| 26 + source3/librpc/gen_ndr/ndr_security.h|3 + source3/librpc/gen_ndr/security.h| 14 + source3/librpc/idl/dfs.idl | 419
