[SCM] SAMBA-CTDB repository - branch v3-2-ctdb updated - build_3.2.7_ctdb.54-195-gace9b51
The branch, v3-2-ctdb has been updated
via ace9b51a1bee3500f83a531d14ccfdea2e3f4474 (commit)
via c8bfcb5e352797570b1d02ca22bcac1ae5e3ca89 (commit)
via d7230a735d8ea4faf22652f1ec9abc341a96631f (commit)
via ad37b95b0fd6007f2d848cf9c8e281ed05bf1a10 (commit)
via daf55b73022942b06508ca549d9cd7ce89428d9d (commit)
via 7aed4d006a5aaa9105206df346973816037fb189 (commit)
via a138e775e0a73a914ae762dee2da0ef0ee6c5b65 (commit)
via 389169fbe247c4a989d9fe5394e9fd3dda1faef7 (commit)
via f88be619fc110c6e9ea41c50b8e03ca7eec8bcd6 (commit)
via 2f562d57d9ba2f6e0fdf7dc35b32878e5d2115da (commit)
via 1cdca4cd4b6a2595e284da9f999321a32741251c (commit)
via 5e94a031c4684900c0020b36b30fdfc68b232f52 (commit)
via c07a2c9716ab267b04376c1cc7210e8dc59aa0dc (commit)
via 32700b54e4082a39a09f2a36d3cb803eec91aec9 (commit)
via e6db18da0c93042d38f75413f95d6488c3f788ae (commit)
from a19b56ddc07866bbcbb92e9e79b23cc440ef49e2 (commit)
http://gitweb.samba.org/?p=obnox/samba-ctdb.git;a=shortlog;h=v3-2-ctdb
- Log -
commit ace9b51a1bee3500f83a531d14ccfdea2e3f4474
Author: Stefan Metzmacher
Date: Fri Jan 30 14:36:48 2009 +0100
s3:smbconftort: don't use reserved words ('test:', 'failure:', 'success:')
Temporary results printfs should not contain reserved subunit words.
metze
commit c8bfcb5e352797570b1d02ca22bcac1ae5e3ca89
Author: Michael Adam
Date: Wed Jan 21 18:25:47 2009 +0100
s3:libsmbconf: include smbconf headers with lib/smbconf prefix
Michael
commit d7230a735d8ea4faf22652f1ec9abc341a96631f
Author: Michael Adam
Date: Wed Jan 21 17:14:56 2009 +0100
s3:libsmbconf: use talloc_free instead of TALLOC_FREE in txt backend
Michael
commit ad37b95b0fd6007f2d848cf9c8e281ed05bf1a10
Author: Michael Adam
Date: Wed Jan 21 17:12:50 2009 +0100
s3:libsmbconf: use talloc_free instead of TALLOC_FREE in smbconf_init
Michael
commit daf55b73022942b06508ca549d9cd7ce89428d9d
Author: Michael Adam
Date: Wed Jan 21 17:11:46 2009 +0100
s3:libsmbconf: use talloc_free instead of TALLOC_FREE in testsuite
Michael
commit 7aed4d006a5aaa9105206df346973816037fb189
Author: Michael Adam
Date: Wed Jan 21 17:11:02 2009 +0100
s3:libsmbconf: use talloc_free instead of TALLOC_FREE in smbconf_util.c
Michael
commit a138e775e0a73a914ae762dee2da0ef0ee6c5b65
Author: Michael Adam
Date: Wed Jan 21 17:10:20 2009 +0100
s3:libsmbconf: use talloc_free instead of TALLOC_FREE in smbconf.c
Michael
commit 389169fbe247c4a989d9fe5394e9fd3dda1faef7
Author: Michael Adam
Date: Wed Jan 21 16:59:09 2009 +0100
s3:libsmbconf: remove the init headers from smbconf.h
give the smbconf_init() dispatcher and the backends
(smbconf_reg and smbconf_txt) a header of their own each.
This allows to use the basic infrastructure and
single backends individually.
Michael
commit f88be619fc110c6e9ea41c50b8e03ca7eec8bcd6
Author: Michael Adam
Date: Wed Jan 21 16:24:32 2009 +0100
s3:libsmbconf: remove unused function smbconf_is_writeable_bystring()
Michael
commit 2f562d57d9ba2f6e0fdf7dc35b32878e5d2115da
Author: Michael Adam
Date: Fri Oct 24 10:36:29 2008 +0200
libsmbconf: add utility function smbconf_is_writeable_bystring()
This checks the writeability of a config source specified by the
config source name.
Michael
commit 1cdca4cd4b6a2595e284da9f999321a32741251c
Author: Michael Adam
Date: Fri Oct 24 00:00:20 2008 +0200
libsmbconf: create text config in smbconftort
Michael
commit 5e94a031c4684900c0020b36b30fdfc68b232f52
Author: Michael Adam
Date: Thu Oct 23 16:05:19 2008 +0200
libsmbconf: return WERR_BADFILE when no path to text backend is provided.
Michael
commit c07a2c9716ab267b04376c1cc7210e8dc59aa0dc
Author: Michael Adam
Date: Tue Oct 21 23:20:57 2008 +0200
libsmbconf: fall back to file backend when no valid backend was found
Interpret the source string as a file name when it contains
a ':' sign but the initial part is not a known backend.
This might occur even implicitly when "%T" is used in an
include file name (even though this is not realistic..).
Michael
commit 32700b54e4082a39a09f2a36d3cb803eec91aec9
Author: Michael Adam
Date: Tue Oct 21 23:20:31 2008 +0200
libsmbconf: fix comment typo.
Michael
commit e6db18da0c93042d38f75413f95d6488c3f788ae
Author: Michael Adam
Date: Mon Oct 20 16:10:54 2008 +0200
libsmbconf: remove unused define.
Michael
---
Summary of changes:
source/include/includes.h |3 +
source/lib/smbconf/smbconf.c |4 +-
source/lib/smbconf/smbconf.h |
[SCM] SAMBA-CTDB repository - branch v3-2-ctdb updated - build_3.2.7_ctdb.54-196-ge627e49
The branch, v3-2-ctdb has been updated
via e627e495f56f3d3b9fcbab87d9c5899176c5ff65 (commit)
from ace9b51a1bee3500f83a531d14ccfdea2e3f4474 (commit)
http://gitweb.samba.org/?p=obnox/samba-ctdb.git;a=shortlog;h=v3-2-ctdb
- Log -
commit e627e495f56f3d3b9fcbab87d9c5899176c5ff65
Author: Michael Adam
Date: Fri Feb 27 15:28:52 2009 +0100
s3: Fix a memleak in dbwrap_rbt.
The SMB_MALLOC'ed rbt node data was not free'd on talloc free of
the db context. This is a quick fix using talloc instead of malloc
for allocation of the node data.
Since malloc was originally used for performance reasons, one
might want to reverse to malloc and create a talloc destructor
that walks the tree and frees all the node data if this talloc
approach proves to be too slow..
Michael
---
Summary of changes:
source/lib/dbwrap_rbt.c |8
1 files changed, 4 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/lib/dbwrap_rbt.c b/source/lib/dbwrap_rbt.c
index b70ce3d..7747be7 100644
--- a/source/lib/dbwrap_rbt.c
+++ b/source/lib/dbwrap_rbt.c
@@ -131,12 +131,12 @@ static NTSTATUS db_rbt_store(struct db_record *rec,
TDB_DATA data, int flag)
*/
}
- node = (struct db_rbt_node *)SMB_MALLOC(
+ node = (struct db_rbt_node *)talloc_size(rec_priv->db_ctx,
offsetof(struct db_rbt_node, data) + rec->key.dsize
+ data.dsize);
if (node == NULL) {
- SAFE_FREE(rec_priv->node);
+ TALLOC_FREE(rec_priv->node);
return NT_STATUS_NO_MEMORY;
}
@@ -148,7 +148,7 @@ static NTSTATUS db_rbt_store(struct db_record *rec,
TDB_DATA data, int flag)
db_rbt_parse_node(node, &this_key, &this_val);
memcpy(this_key.dptr, rec->key.dptr, node->keysize);
- SAFE_FREE(rec_priv->node);
+ TALLOC_FREE(rec_priv->node);
memcpy(this_val.dptr, data.dptr, node->valuesize);
@@ -194,7 +194,7 @@ static NTSTATUS db_rbt_delete(struct db_record *rec)
}
rb_erase(&rec_priv->node->rb_node, &rec_priv->db_ctx->tree);
- SAFE_FREE(rec_priv->node);
+ TALLOC_FREE(rec_priv->node);
return NT_STATUS_OK;
}
--
SAMBA-CTDB repository
[SCM] SAMBA-CTDB repository - branch v3-2-ctdb updated - build_3.2.7_ctdb.54-197-g06a3ab7
The branch, v3-2-ctdb has been updated
via 06a3ab7b3c787df05a5a5e482ce44f4e80dbb117 (commit)
from e627e495f56f3d3b9fcbab87d9c5899176c5ff65 (commit)
http://gitweb.samba.org/?p=obnox/samba-ctdb.git;a=shortlog;h=v3-2-ctdb
- Log -
commit 06a3ab7b3c787df05a5a5e482ce44f4e80dbb117
Author: Volker Lendecke
Date: Mon Mar 2 14:56:01 2009 +0100
Make use of gpfs_get_real_filename optional
---
Summary of changes:
source/modules/gpfs.c |6 +-
source/modules/vfs_gpfs.c |5 +
2 files changed, 10 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/modules/gpfs.c b/source/modules/gpfs.c
index cba14ac..96bce00 100644
--- a/source/modules/gpfs.c
+++ b/source/modules/gpfs.c
@@ -26,6 +26,7 @@
static bool gpfs_share_modes;
static bool gpfs_leases;
+static bool gpfs_getrealfilename;
static int (*gpfs_set_share_fn)(int fd, unsigned int allow, unsigned int deny);
static int (*gpfs_set_lease_fn)(int fd, unsigned int leaseType);
@@ -139,7 +140,8 @@ int smbd_gpfs_putacl(char *pathname, int flags, void *acl)
int smbd_gpfs_get_realfilename_path(char *pathname, char *filenamep,
int *buflen)
{
- if (gpfs_get_realfilename_path_fn == NULL) {
+ if ((!gpfs_getrealfilename)
+ || (gpfs_get_realfilename_path_fn == NULL)) {
errno = ENOSYS;
return -1;
}
@@ -208,6 +210,8 @@ void init_gpfs(void)
gpfs_share_modes = lp_parm_bool(-1, "gpfs", "sharemodes", True);
gpfs_leases = lp_parm_bool(-1, "gpfs", "leases", True);
+ gpfs_getrealfilename = lp_parm_bool(-1, "gpfs", "getrealfilename",
+ True);
return;
}
diff --git a/source/modules/vfs_gpfs.c b/source/modules/vfs_gpfs.c
index 383d8ce..5aaba7b 100644
--- a/source/modules/vfs_gpfs.c
+++ b/source/modules/vfs_gpfs.c
@@ -96,6 +96,11 @@ static int vfs_gpfs_get_real_filename(struct
vfs_handle_struct *handle,
TALLOC_FREE(full_path);
+ if ((result == -1) && (errno == ENOSYS)) {
+ return SMB_VFS_NEXT_GET_REAL_FILENAME(
+ handle, path, name, mem_ctx, found_name);
+ }
+
if (result == -1) {
DEBUG(10, ("smbd_gpfs_get_realfilename_path returned %s\n",
strerror(errno)));
--
SAMBA-CTDB repository
[SCM] SAMBA-CTDB repository - branch v3-2-ctdb updated - build_3.2.7_ctdb.54-198-ga679d21
The branch, v3-2-ctdb has been updated via a679d210f8ce750a11fdf7006d56a4934203e087 (commit) from 06a3ab7b3c787df05a5a5e482ce44f4e80dbb117 (commit) http://gitweb.samba.org/?p=obnox/samba-ctdb.git;a=shortlog;h=v3-2-ctdb - Log - commit a679d210f8ce750a11fdf7006d56a4934203e087 Author: Michael Adam Date: Wed Mar 4 11:19:01 2009 +0100 version: raise ctdb vendor patch level to 56 Michael --- Summary of changes: source/VERSION |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source/VERSION b/source/VERSION index a4af01a..8189440 100644 --- a/source/VERSION +++ b/source/VERSION @@ -96,4 +96,4 @@ SAMBA_VERSION_IS_GIT_SNAPSHOT= # -> "CVS 3.0.0rc2-VendorVersion"# SAMBA_VERSION_VENDOR_SUFFIX="ctdb" -SAMBA_VERSION_VENDOR_PATCH=55 +SAMBA_VERSION_VENDOR_PATCH=56 -- SAMBA-CTDB repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-151-ge8484e0
The branch, master has been updated
via e8484e01ed6c3893f89abeec5f7a2d214d77c576 (commit)
via fb70a8a255f7fd40c7e578d9d21977259f9aa86c (commit)
from 27cf23958b02b05becce6e7c68347f6fea5b7845 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit e8484e01ed6c3893f89abeec5f7a2d214d77c576
Author: Volker Lendecke
Date: Mon Mar 2 14:56:01 2009 +0100
Make use of gpfs_get_real_filename optional
commit fb70a8a255f7fd40c7e578d9d21977259f9aa86c
Author: Michael Adam
Date: Fri Feb 27 15:28:52 2009 +0100
s3: Fix a memleak in dbwrap_rbt.
The SMB_MALLOC'ed rbt node data was not free'd on talloc free of
the db context. This is a quick fix using talloc instead of malloc
for allocation of the node data.
Since malloc was originally used for performance reasons, one
might want to reverse to malloc and create a talloc destructor
that walks the tree and frees all the node data if this talloc
approach proves to be too slow..
Michael
---
Summary of changes:
source3/lib/dbwrap_rbt.c |8
source3/modules/gpfs.c |6 +-
source3/modules/vfs_gpfs.c |5 +
3 files changed, 14 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/dbwrap_rbt.c b/source3/lib/dbwrap_rbt.c
index 6e09627..cf4faa2 100644
--- a/source3/lib/dbwrap_rbt.c
+++ b/source3/lib/dbwrap_rbt.c
@@ -131,12 +131,12 @@ static NTSTATUS db_rbt_store(struct db_record *rec,
TDB_DATA data, int flag)
*/
}
- node = (struct db_rbt_node *)SMB_MALLOC(
+ node = (struct db_rbt_node *)talloc_size(rec_priv->db_ctx,
offsetof(struct db_rbt_node, data) + rec->key.dsize
+ data.dsize);
if (node == NULL) {
- SAFE_FREE(rec_priv->node);
+ TALLOC_FREE(rec_priv->node);
return NT_STATUS_NO_MEMORY;
}
@@ -148,7 +148,7 @@ static NTSTATUS db_rbt_store(struct db_record *rec,
TDB_DATA data, int flag)
db_rbt_parse_node(node, &this_key, &this_val);
memcpy(this_key.dptr, rec->key.dptr, node->keysize);
- SAFE_FREE(rec_priv->node);
+ TALLOC_FREE(rec_priv->node);
memcpy(this_val.dptr, data.dptr, node->valuesize);
@@ -194,7 +194,7 @@ static NTSTATUS db_rbt_delete(struct db_record *rec)
}
rb_erase(&rec_priv->node->rb_node, &rec_priv->db_ctx->tree);
- SAFE_FREE(rec_priv->node);
+ TALLOC_FREE(rec_priv->node);
return NT_STATUS_OK;
}
diff --git a/source3/modules/gpfs.c b/source3/modules/gpfs.c
index 1659900..9fc4524 100644
--- a/source3/modules/gpfs.c
+++ b/source3/modules/gpfs.c
@@ -26,6 +26,7 @@
static bool gpfs_share_modes;
static bool gpfs_leases;
+static bool gpfs_getrealfilename;
static int (*gpfs_set_share_fn)(int fd, unsigned int allow, unsigned int deny);
static int (*gpfs_set_lease_fn)(int fd, unsigned int leaseType);
@@ -139,7 +140,8 @@ int smbd_gpfs_putacl(char *pathname, int flags, void *acl)
int smbd_gpfs_get_realfilename_path(char *pathname, char *filenamep,
int *buflen)
{
- if (gpfs_get_realfilename_path_fn == NULL) {
+ if ((!gpfs_getrealfilename)
+ || (gpfs_get_realfilename_path_fn == NULL)) {
errno = ENOSYS;
return -1;
}
@@ -208,6 +210,8 @@ void init_gpfs(void)
gpfs_share_modes = lp_parm_bool(-1, "gpfs", "sharemodes", True);
gpfs_leases = lp_parm_bool(-1, "gpfs", "leases", True);
+ gpfs_getrealfilename = lp_parm_bool(-1, "gpfs", "getrealfilename",
+ True);
return;
}
diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c
index 1d7cdba..3c061ec 100644
--- a/source3/modules/vfs_gpfs.c
+++ b/source3/modules/vfs_gpfs.c
@@ -96,6 +96,11 @@ static int vfs_gpfs_get_real_filename(struct
vfs_handle_struct *handle,
TALLOC_FREE(full_path);
+ if ((result == -1) && (errno == ENOSYS)) {
+ return SMB_VFS_NEXT_GET_REAL_FILENAME(
+ handle, path, name, mem_ctx, found_name);
+ }
+
if (result == -1) {
DEBUG(10, ("smbd_gpfs_get_realfilename_path returned %s\n",
strerror(errno)));
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-152-gddc1864
The branch, master has been updated
via ddc1864fb22dfcd86e3a8688cfd12e0dccd835da (commit)
from e8484e01ed6c3893f89abeec5f7a2d214d77c576 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit ddc1864fb22dfcd86e3a8688cfd12e0dccd835da
Author: Volker Lendecke
Date: Wed Mar 4 12:21:26 2009 +0100
Attempt to fix the build on IRIX
---
Summary of changes:
source3/param/loadparm.c |4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 89c706d..f49a1bc 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -4668,7 +4668,9 @@ static int max_open_files(void)
#if (defined(HAVE_GETRLIMIT) && defined(RLIMIT_NOFILE))
{
- struct rlimit rl = {};
+ struct rlimit rl;
+
+ ZERO_STRUCT(rl);
if (getrlimit(RLIMIT_NOFILE, &rl) == 0)
rlimit_max = rl.rlim_cur;
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3493-g43ea273
The branch, v3-2-test has been updated
via 43ea27319933f3b49b61decde8321d9162cfd9ef (commit)
from 0a9aff0bca4c49de0f87e496f6205378f61d (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 43ea27319933f3b49b61decde8321d9162cfd9ef
Author: Volker Lendecke
Date: Wed Mar 4 14:00:03 2009 +0100
Fix an uninitialized variable warning
---
Summary of changes:
source/auth/auth_util.c |1 -
1 files changed, 0 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/auth/auth_util.c b/source/auth/auth_util.c
index f3075ac..24b05a5 100644
--- a/source/auth/auth_util.c
+++ b/source/auth/auth_util.c
@@ -702,7 +702,6 @@ NTSTATUS create_local_token(auth_serversupplied_info
*server_info)
}
if (!NT_STATUS_IS_OK(status)) {
- TALLOC_FREE(mem_ctx);
return status;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-153-g5a9f668
The branch, master has been updated
via 5a9f668dabb62efd70054dc35d19c60d027793b5 (commit)
from ddc1864fb22dfcd86e3a8688cfd12e0dccd835da (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 5a9f668dabb62efd70054dc35d19c60d027793b5
Author: Steven Danneman
Date: Wed Mar 4 11:04:31 2009 -0800
s3: Remove madvise support
This reverts 193be432. The MADVISE_PROTECT is inherited by all child
processes and cannot be unset. The intention of the original patch was
to protect the parent process, but allow children to be killed in low
memory. Since this isn't possible with the current API, reverting the
whole feature.
---
Summary of changes:
source3/configure.in | 29 -
source3/lib/util.c |7 ---
2 files changed, 0 insertions(+), 36 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/configure.in b/source3/configure.in
index d67fecc..e48ff34 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -4723,35 +4723,6 @@ SMB_LIBRARY(addns, 0, no, [undefined API])
#
-# check to see if we should set the protected madvise flag,
-# which will keep smbd alive in low memory conditions
-AC_MSG_CHECKING(whether to protect smbd from being killed in low memory)
-AC_ARG_WITH(madvise-protect,
-[AS_HELP_STRING([--with-madvise-protect], [Include low memory madvise
protection (default=no)])],
-[ case "$withval" in
- yes)
-AC_TRY_COMPILE([
-#include
-],[
-int a = MADV_PROTECT;
-],
-[samba_cv_madvise_protect=yes],
-[samba_cv_madvise_protect=no])
-if test x"$samba_cv_madvise_protect" = x"yes"; then
-AC_MSG_RESULT(yes)
-AC_DEFINE(WITH_MADVISE_PROTECTED,1,[Whether to include low memory
protection support])
-else
-AC_MSG_ERROR(Low memory protection supporte requires availability of
MADVISE_PROTECT flag.)
-fi
-;;
- *)
-AC_MSG_RESULT(no)
-;;
- esac ],
- AC_MSG_RESULT(no)
-)
-
-#
# these tests are taken from the GNU fileutils package
AC_CHECKING(how to get filesystem space usage)
space=no
diff --git a/source3/lib/util.c b/source3/lib/util.c
index 89f7be8..ec794ca 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -899,13 +899,6 @@ bool reinit_after_fork(struct messaging_context *msg_ctx,
* numbers as each other */
set_need_random_reseed();
-#ifdef WITH_MADVISE_PROTECTED
- /* Protect parent process from being killed by kernel when system
-* memory is low. Child processes can still be killed */
- if(!parent_longlived)
- madvise(NULL,0,MADV_PROTECT);
-#endif
-
/* tdb needs special fork handling */
if (tdb_reopen_all(parent_longlived ? 1 : 0) == -1) {
DEBUG(0,("tdb_reopen_all failed.\n"));
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-154-gf9636b0
The branch, master has been updated via f9636b0c01b962d2915895ef7125eed955423ded (commit) from 5a9f668dabb62efd70054dc35d19c60d027793b5 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit f9636b0c01b962d2915895ef7125eed955423ded Author: Tim Prouty Date: Wed Mar 4 12:59:16 2009 -0800 socket wrapper: Fix 'might be used uninitialized' warning --- Summary of changes: lib/socket_wrapper/socket_wrapper.c |8 1 files changed, 4 insertions(+), 4 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/socket_wrapper/socket_wrapper.c b/lib/socket_wrapper/socket_wrapper.c index f9ef48e..8ad9e1d 100644 --- a/lib/socket_wrapper/socket_wrapper.c +++ b/lib/socket_wrapper/socket_wrapper.c @@ -831,11 +831,11 @@ static uint8_t *swrap_packet_init(struct timeval *tval, size_t icmp_hdr_len = 0; size_t icmp_truncate_len = 0; uint8_t protocol = 0, icmp_protocol = 0; - const struct sockaddr_in *src_in; - const struct sockaddr_in *dest_in; + const struct sockaddr_in *src_in = NULL; + const struct sockaddr_in *dest_in = NULL; #ifdef HAVE_IPV6 - const struct sockaddr_in6 *src_in6; - const struct sockaddr_in6 *dest_in6; + const struct sockaddr_in6 *src_in6 = NULL; + const struct sockaddr_in6 *dest_in6 = NULL; #endif uint16_t src_port; uint16_t dest_port; -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-157-gbb0fb97
The branch, master has been updated
via bb0fb975621f4962fb7e2438396d94818891151b (commit)
via 9d798494a90c13d605a52644a1a386a9fb109063 (commit)
via 094578903184e2702d2a5000bf448a89954acf95 (commit)
from f9636b0c01b962d2915895ef7125eed955423ded (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit bb0fb975621f4962fb7e2438396d94818891151b
Author: Michael Adam
Date: Wed Mar 4 22:05:17 2009 +0100
s3:dbwrap_ctdb_marshall_add: don't leak the ctdb_rec_data to the outside
Michael
commit 9d798494a90c13d605a52644a1a386a9fb109063
Author: Michael Adam
Date: Wed Mar 4 22:02:07 2009 +0100
s3:smbconf: move smbconf_share_exists checks into backend
Michael
commit 094578903184e2702d2a5000bf448a89954acf95
Author: Michael Adam
Date: Wed Mar 4 21:46:32 2009 +0100
s3:net conf: reduce memory usage of "net conf import".
"net conf import" was wrapped in one big transaction.
This lead to MAX_TALLOC_SIZE being exceeded at roughly
1500 shares. This patch resolves that problem by
limiting the top level transactions in "net conf import"
to 100 shares.
Michael
---
Summary of changes:
lib/smbconf/smbconf.c | 24 --
source3/lib/dbwrap_ctdb.c | 12 +-
source3/lib/smbconf/smbconf_reg.c | 13 ---
source3/utils/net_conf.c | 39 +++-
4 files changed, 48 insertions(+), 40 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/smbconf/smbconf.c b/lib/smbconf/smbconf.c
index f25ccae..80fe9aa 100644
--- a/lib/smbconf/smbconf.c
+++ b/lib/smbconf/smbconf.c
@@ -226,10 +226,6 @@ WERROR smbconf_set_parameter(struct smbconf_ctx *ctx,
const char *param,
const char *valstr)
{
- if (!smbconf_share_exists(ctx, service)) {
- return WERR_NO_SUCH_SERVICE;
- }
-
return ctx->ops->set_parameter(ctx, service, param, valstr);
}
@@ -265,10 +261,6 @@ WERROR smbconf_get_parameter(struct smbconf_ctx *ctx,
return WERR_INVALID_PARAM;
}
- if (!smbconf_share_exists(ctx, service)) {
- return WERR_NO_SUCH_SERVICE;
- }
-
return ctx->ops->get_parameter(ctx, mem_ctx, service, param, valstr);
}
@@ -299,10 +291,6 @@ WERROR smbconf_get_global_parameter(struct smbconf_ctx
*ctx,
WERROR smbconf_delete_parameter(struct smbconf_ctx *ctx,
const char *service, const char *param)
{
- if (!smbconf_share_exists(ctx, service)) {
- return WERR_NO_SUCH_SERVICE;
- }
-
return ctx->ops->delete_parameter(ctx, service, param);
}
@@ -329,10 +317,6 @@ WERROR smbconf_get_includes(struct smbconf_ctx *ctx,
const char *service,
uint32_t *num_includes, char ***includes)
{
- if (!smbconf_share_exists(ctx, service)) {
- return WERR_NO_SUCH_SERVICE;
- }
-
return ctx->ops->get_includes(ctx, mem_ctx, service, num_includes,
includes);
}
@@ -356,10 +340,6 @@ WERROR smbconf_set_includes(struct smbconf_ctx *ctx,
const char *service,
uint32_t num_includes, const char **includes)
{
- if (!smbconf_share_exists(ctx, service)) {
- return WERR_NO_SUCH_SERVICE;
- }
-
return ctx->ops->set_includes(ctx, service, num_includes, includes);
}
@@ -381,10 +361,6 @@ WERROR smbconf_set_global_includes(struct smbconf_ctx *ctx,
WERROR smbconf_delete_includes(struct smbconf_ctx *ctx, const char *service)
{
- if (!smbconf_share_exists(ctx, service)) {
- return WERR_NO_SUCH_SERVICE;
- }
-
return ctx->ops->delete_includes(ctx, service);
}
diff --git a/source3/lib/dbwrap_ctdb.c b/source3/lib/dbwrap_ctdb.c
index 03667ff..4a5bf6d 100644
--- a/source3/lib/dbwrap_ctdb.c
+++ b/source3/lib/dbwrap_ctdb.c
@@ -121,9 +121,9 @@ static struct ctdb_marshall_buffer
*db_ctdb_marshall_add(TALLOC_CTX *mem_ctx,
{
struct ctdb_rec_data *r;
size_t m_size, r_size;
- struct ctdb_marshall_buffer *m2;
+ struct ctdb_marshall_buffer *m2 = NULL;
- r = db_ctdb_marshall_record(mem_ctx, reqid, key, header, data);
+ r = db_ctdb_marshall_record(talloc_tos(), reqid, key, header, data);
if (r == NULL) {
talloc_free(m);
return NULL;
@@ -133,7 +133,7 @@ static struct ctdb_marshall_buffer
*db_ctdb_marshall_add(TALLOC_CTX *mem_ctx,
m = (struct ctdb_marshall_buffer *)talloc_zero_size(
mem_ctx, offsetof(struct ctdb_marshall_buffer, data));
if (m == NULL) {
-
[SCM] SAMBA-CTDB repository - branch v3-2-ctdb updated - build_3.2.7_ctdb.54-201-g352fca6
The branch, v3-2-ctdb has been updated
via 352fca67a831e061ed3c126d7513611aa4c1fcf3 (commit)
via 7ef193f9d367372a11e665505cd0c4b53b7d0cca (commit)
via d69c3db9d44ad5d9fd1f5d7a9499f3bd79ecfb47 (commit)
from a679d210f8ce750a11fdf7006d56a4934203e087 (commit)
http://gitweb.samba.org/?p=obnox/samba-ctdb.git;a=shortlog;h=v3-2-ctdb
- Log -
commit 352fca67a831e061ed3c126d7513611aa4c1fcf3
Author: Michael Adam
Date: Wed Mar 4 22:05:17 2009 +0100
s3:dbwrap_ctdb_marshall_add: don't leak the ctdb_rec_data to the outside
Michael
commit 7ef193f9d367372a11e665505cd0c4b53b7d0cca
Author: Michael Adam
Date: Wed Mar 4 22:02:07 2009 +0100
s3:smbconf: move smbconf_share_exists checks into backend
Michael
commit d69c3db9d44ad5d9fd1f5d7a9499f3bd79ecfb47
Author: Michael Adam
Date: Wed Mar 4 21:46:32 2009 +0100
s3:net conf: reduce memory usage of "net conf import".
"net conf import" was wrapped in one big transaction.
This lead to MAX_TALLOC_SIZE being exceeded at roughly
1500 shares. This patch resolves that problem by
limiting the top level transactions in "net conf import"
to 100 shares.
Michael
---
Summary of changes:
source/lib/dbwrap_ctdb.c | 12 +-
source/lib/smbconf/smbconf.c | 24 ---
source/lib/smbconf/smbconf_reg.c | 13 ---
source/utils/net_conf.c | 39 -
4 files changed, 48 insertions(+), 40 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/lib/dbwrap_ctdb.c b/source/lib/dbwrap_ctdb.c
index 816b522..60dc857 100644
--- a/source/lib/dbwrap_ctdb.c
+++ b/source/lib/dbwrap_ctdb.c
@@ -121,9 +121,9 @@ static struct ctdb_marshall_buffer
*db_ctdb_marshall_add(TALLOC_CTX *mem_ctx,
{
struct ctdb_rec_data *r;
size_t m_size, r_size;
- struct ctdb_marshall_buffer *m2;
+ struct ctdb_marshall_buffer *m2 = NULL;
- r = db_ctdb_marshall_record(mem_ctx, reqid, key, header, data);
+ r = db_ctdb_marshall_record(talloc_tos(), reqid, key, header, data);
if (r == NULL) {
talloc_free(m);
return NULL;
@@ -133,7 +133,7 @@ static struct ctdb_marshall_buffer
*db_ctdb_marshall_add(TALLOC_CTX *mem_ctx,
m = (struct ctdb_marshall_buffer *)talloc_zero_size(
mem_ctx, offsetof(struct ctdb_marshall_buffer, data));
if (m == NULL) {
- return NULL;
+ goto done;
}
m->db_id = db_id;
}
@@ -145,15 +145,15 @@ static struct ctdb_marshall_buffer
*db_ctdb_marshall_add(TALLOC_CTX *mem_ctx,
mem_ctx, m, m_size + r_size);
if (m2 == NULL) {
talloc_free(m);
- return NULL;
+ goto done;
}
memcpy(m_size + (uint8_t *)m2, r, r_size);
- talloc_free(r);
-
m2->count++;
+done:
+ talloc_free(r);
return m2;
}
diff --git a/source/lib/smbconf/smbconf.c b/source/lib/smbconf/smbconf.c
index 3290198..01557a7 100644
--- a/source/lib/smbconf/smbconf.c
+++ b/source/lib/smbconf/smbconf.c
@@ -226,10 +226,6 @@ WERROR smbconf_set_parameter(struct smbconf_ctx *ctx,
const char *param,
const char *valstr)
{
- if (!smbconf_share_exists(ctx, service)) {
- return WERR_NO_SUCH_SERVICE;
- }
-
return ctx->ops->set_parameter(ctx, service, param, valstr);
}
@@ -265,10 +261,6 @@ WERROR smbconf_get_parameter(struct smbconf_ctx *ctx,
return WERR_INVALID_PARAM;
}
- if (!smbconf_share_exists(ctx, service)) {
- return WERR_NO_SUCH_SERVICE;
- }
-
return ctx->ops->get_parameter(ctx, mem_ctx, service, param, valstr);
}
@@ -299,10 +291,6 @@ WERROR smbconf_get_global_parameter(struct smbconf_ctx
*ctx,
WERROR smbconf_delete_parameter(struct smbconf_ctx *ctx,
const char *service, const char *param)
{
- if (!smbconf_share_exists(ctx, service)) {
- return WERR_NO_SUCH_SERVICE;
- }
-
return ctx->ops->delete_parameter(ctx, service, param);
}
@@ -329,10 +317,6 @@ WERROR smbconf_get_includes(struct smbconf_ctx *ctx,
const char *service,
uint32_t *num_includes, char ***includes)
{
- if (!smbconf_share_exists(ctx, service)) {
- return WERR_NO_SUCH_SERVICE;
- }
-
return ctx->ops->get_includes(ctx, mem_ctx, service, num_includes,
includes);
}
@@ -356,10 +340,6 @@ WERROR smbconf_set_includes(struct smbconf_ctx *ctx,
const char *service,
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-5036-g9809849
The branch, v3-3-test has been updated
via 9809849d976597a0b1ed098ac5f9f353a98ca651 (commit)
from 784a9ae6fed4169b2e21608a1963a2b9af8c47fc (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit 9809849d976597a0b1ed098ac5f9f353a98ca651
Author: Jeremy Allison
Date: Wed Mar 4 14:47:44 2009 -0800
Fix crashes when running RAW-ACLs against system with tdb ACL modules
(caused by the POSIX pathname fixes).
Jeremy.
---
Summary of changes:
source/modules/vfs_acl_tdb.c |4 ++--
source/modules/vfs_acl_xattr.c |2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/modules/vfs_acl_tdb.c b/source/modules/vfs_acl_tdb.c
index 49a316a..829ac48 100644
--- a/source/modules/vfs_acl_tdb.c
+++ b/source/modules/vfs_acl_tdb.c
@@ -191,7 +191,7 @@ static NTSTATUS get_acl_blob(TALLOC_CTX *ctx,
if (fsp && fsp->fh->fd != -1) {
ret = SMB_VFS_FSTAT(fsp, &sbuf);
} else {
- if (fsp->posix_open) {
+ if (fsp && fsp->posix_open) {
ret = SMB_VFS_LSTAT(handle->conn, name, &sbuf);
} else {
ret = SMB_VFS_STAT(handle->conn, name, &sbuf);
@@ -508,7 +508,7 @@ static NTSTATUS inherit_new_acl(vfs_handle_struct *handle,
if (fsp && !fsp->is_directory && fsp->fh->fd != -1) {
ret = SMB_VFS_FSTAT(fsp, &sbuf);
} else {
- if (fsp->posix_open) {
+ if (fsp && fsp->posix_open) {
ret = SMB_VFS_LSTAT(handle->conn,fname, &sbuf);
} else {
ret = SMB_VFS_STAT(handle->conn,fname, &sbuf);
diff --git a/source/modules/vfs_acl_xattr.c b/source/modules/vfs_acl_xattr.c
index b12422f..958991b 100644
--- a/source/modules/vfs_acl_xattr.c
+++ b/source/modules/vfs_acl_xattr.c
@@ -384,7 +384,7 @@ static NTSTATUS inherit_new_acl(vfs_handle_struct *handle,
if (fsp && !fsp->is_directory && fsp->fh->fd != -1) {
ret = SMB_VFS_FSTAT(fsp, &sbuf);
} else {
- if (fsp->posix_open) {
+ if (fsp && fsp->posix_open) {
ret = SMB_VFS_LSTAT(handle->conn,fname, &sbuf);
} else {
ret = SMB_VFS_STAT(handle->conn,fname, &sbuf);
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-158-gf85aa66
The branch, master has been updated
via f85aa66ca22f29734bdacaa559737990fbe28d8a (commit)
from bb0fb975621f4962fb7e2438396d94818891151b (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit f85aa66ca22f29734bdacaa559737990fbe28d8a
Author: Jeremy Allison
Date: Wed Mar 4 14:48:33 2009 -0800
Fix crashes when running RAW-ACLs against system with tdb ACL modules
(caused by the POSIX pathname fixes).
Jeremy.
---
Summary of changes:
source3/modules/vfs_acl_tdb.c |4 ++--
source3/modules/vfs_acl_xattr.c |2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/modules/vfs_acl_tdb.c b/source3/modules/vfs_acl_tdb.c
index 73dbca4..a77f6d6 100644
--- a/source3/modules/vfs_acl_tdb.c
+++ b/source3/modules/vfs_acl_tdb.c
@@ -195,7 +195,7 @@ static NTSTATUS get_acl_blob(TALLOC_CTX *ctx,
if (fsp && fsp->fh->fd != -1) {
ret = SMB_VFS_FSTAT(fsp, &sbuf);
} else {
- if (fsp->posix_open) {
+ if (fsp && fsp->posix_open) {
ret = SMB_VFS_LSTAT(handle->conn, name, &sbuf);
} else {
ret = SMB_VFS_STAT(handle->conn, name, &sbuf);
@@ -513,7 +513,7 @@ static NTSTATUS inherit_new_acl(vfs_handle_struct *handle,
if (fsp && !fsp->is_directory && fsp->fh->fd != -1) {
ret = SMB_VFS_FSTAT(fsp, &sbuf);
} else {
- if (fsp->posix_open) {
+ if (fsp && fsp->posix_open) {
ret = SMB_VFS_LSTAT(handle->conn,fname, &sbuf);
} else {
ret = SMB_VFS_STAT(handle->conn,fname, &sbuf);
diff --git a/source3/modules/vfs_acl_xattr.c b/source3/modules/vfs_acl_xattr.c
index 039e469..49e4899 100644
--- a/source3/modules/vfs_acl_xattr.c
+++ b/source3/modules/vfs_acl_xattr.c
@@ -381,7 +381,7 @@ static NTSTATUS inherit_new_acl(vfs_handle_struct *handle,
if (fsp && !fsp->is_directory && fsp->fh->fd != -1) {
ret = SMB_VFS_FSTAT(fsp, &sbuf);
} else {
- if (fsp->posix_open) {
+ if (fsp && fsp->posix_open) {
ret = SMB_VFS_LSTAT(handle->conn,fname, &sbuf);
} else {
ret = SMB_VFS_STAT(handle->conn,fname, &sbuf);
--
Samba Shared Repository
Build status as of Thu Mar 5 00:00:02 2009
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2009-03-04 00:00:21.0 + +++ /home/build/master/cache/broken_results.txt 2009-03-05 00:00:38.0 + @@ -1,4 +1,4 @@ -Build status as of Wed Mar 4 00:00:02 2009 +Build status as of Thu Mar 5 00:00:02 2009 Build counts: Tree Total Broken Panic @@ -11,13 +11,13 @@ lorikeet-heimdal 26 14 0 pidl 20 3 0 ppp 12 0 0 -rsync28 10 0 +rsync29 10 0 samba-docs 0 0 0 samba-gtk5 5 0 samba_3_X_devel 28 25 0 -samba_3_X_test 27 27 0 -samba_4_0_test 29 28 3 +samba_3_X_test 26 27 1 +samba_4_0_test 29 28 2 smb-build28 6 0 -talloc 28 29 0 +talloc 29 29 0 tdb 27 8 0
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-161-gebe5b28
The branch, master has been updated via ebe5b2835331ab259dd32bf6dc574ae999e2d36d (commit) via 5a10d804919af205b027ee519b9fa05519913ebe (commit) via 92bb91a6115ac035e3c37e471931c2a388dc843e (commit) from f85aa66ca22f29734bdacaa559737990fbe28d8a (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit ebe5b2835331ab259dd32bf6dc574ae999e2d36d Merge: 5a10d804919af205b027ee519b9fa05519913ebe f85aa66ca22f29734bdacaa559737990fbe28d8a Author: Andrew Bartlett Date: Thu Mar 5 11:11:19 2009 +1100 Merge branch 'master' of ssh://git.samba.org/data/git/samba into master-devel commit 5a10d804919af205b027ee519b9fa05519913ebe Author: Andrew Bartlett Date: Thu Mar 5 11:07:35 2009 +1100 Remove parse_control from header, long after the function was removed Simo reminded me that when (long ago) I moved parse_controls away from this place, I forgot to update the manually maintained header file. Andrew Bartlett commit 92bb91a6115ac035e3c37e471931c2a388dc843e Author: Andrew Bartlett Date: Thu Mar 5 10:46:46 2009 +1100 Update talloc version so we don't fail on system talloc 1.2.0 The problem is that talloc in the Samba tree now includes talloc_get_type_abort(), which is not present on Fedora 10 or ubuntu's talloc 1.2.0. Andrew Bartlett --- Summary of changes: lib/talloc/configure.ac |2 +- source4/configure.ac|2 +- source4/lib/ldb/tools/cmdline.h |1 - 3 files changed, 2 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/talloc/configure.ac b/lib/talloc/configure.ac index d2538f9..39cea39 100644 --- a/lib/talloc/configure.ac +++ b/lib/talloc/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.50) -AC_INIT(talloc, 1.2.0) +AC_INIT(talloc, 1.2.1) AC_CONFIG_SRCDIR([talloc.c]) AC_SUBST(datarootdir) AC_CONFIG_HEADER(config.h) diff --git a/source4/configure.ac b/source4/configure.ac index 54ca910..d33df08 100644 --- a/source4/configure.ac +++ b/source4/configure.ac @@ -42,7 +42,7 @@ AC_CONFIG_FILES(param/samba-hostconfig.pc) AC_CONFIG_FILES(librpc/dcerpc_samr.pc) AC_CONFIG_FILES(librpc/dcerpc_atsvc.pc) -SMB_INCLUDED_LIB_PKGCONFIG(LIBTALLOC, talloc >= 1.2.0, [], +SMB_INCLUDED_LIB_PKGCONFIG(LIBTALLOC, talloc >= 1.2.1, [], [ m4_include(../lib/talloc/libtalloc.m4) SMB_INCLUDE_MK(../lib/talloc/config.mk) diff --git a/source4/lib/ldb/tools/cmdline.h b/source4/lib/ldb/tools/cmdline.h index 3473d62..45619ce 100644 --- a/source4/lib/ldb/tools/cmdline.h +++ b/source4/lib/ldb/tools/cmdline.h @@ -50,5 +50,4 @@ struct ldb_cmdline *ldb_cmdline_process(struct ldb_context *ldb, int argc, const void (*usage)(void)); -struct ldb_control **parse_controls(void *mem_ctx, char **control_strings); int handle_controls_reply(struct ldb_control **reply, struct ldb_control **request); -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-5037-ga7efcb3
The branch, v3-3-test has been updated
via a7efcb3666fe4df778df95449e98970a77369b79 (commit)
from 9809849d976597a0b1ed098ac5f9f353a98ca651 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit a7efcb3666fe4df778df95449e98970a77369b79
Author: Jeremy Allison
Date: Wed Mar 4 16:56:45 2009 -0800
Fix bug #6154 - zfs does not honor admin users.
Jeremy.
---
Summary of changes:
source/smbd/file_access.c |5 +
1 files changed, 5 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/smbd/file_access.c b/source/smbd/file_access.c
index 743e079..fd3c8f7 100644
--- a/source/smbd/file_access.c
+++ b/source/smbd/file_access.c
@@ -34,6 +34,11 @@ bool can_access_file_acl(struct connection_struct *conn,
uint32_t access_granted;
struct security_descriptor *secdesc = NULL;
+ if (conn->server_info->utok.uid == 0 || conn->admin_user) {
+ /* I'm sorry sir, I didn't know you were root... */
+ return true;
+ }
+
status = SMB_VFS_GET_NT_ACL(conn, fname,
(OWNER_SECURITY_INFORMATION |
GROUP_SECURITY_INFORMATION |
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-162-gbadad0a
The branch, master has been updated
via badad0a6a6d2b0f0a34b09f83d0ea25596dc9bf6 (commit)
from ebe5b2835331ab259dd32bf6dc574ae999e2d36d (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit badad0a6a6d2b0f0a34b09f83d0ea25596dc9bf6
Author: Jeremy Allison
Date: Wed Mar 4 16:57:37 2009 -0800
Fix bug #6154 - zfs does not honor admin users.
Jeremy
---
Summary of changes:
source3/smbd/file_access.c |5 +
1 files changed, 5 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/file_access.c b/source3/smbd/file_access.c
index fe7ba1c..abffcd2 100644
--- a/source3/smbd/file_access.c
+++ b/source3/smbd/file_access.c
@@ -34,6 +34,11 @@ bool can_access_file_acl(struct connection_struct *conn,
uint32_t access_granted;
struct security_descriptor *secdesc = NULL;
+ if (conn->server_info->utok.uid == 0 || conn->admin_user) {
+ /* I'm sorry sir, I didn't know you were root... */
+ return true;
+ }
+
status = SMB_VFS_GET_NT_ACL(conn, fname,
(OWNER_SECURITY_INFORMATION |
GROUP_SECURITY_INFORMATION |
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-5038-g30d2017
The branch, v3-3-test has been updated
via 30d2017c7bb01adb5e9ce4bf84df845d676665de (commit)
from a7efcb3666fe4df778df95449e98970a77369b79 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -
commit 30d2017c7bb01adb5e9ce4bf84df845d676665de
Author: Jeremy Allison
Date: Wed Mar 4 17:18:12 2009 -0800
Second part of fix for #6154, ensure we return max access
if admin user.
Jeremy.
---
Summary of changes:
source/smbd/open.c |9 +
1 files changed, 9 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/smbd/open.c b/source/smbd/open.c
index 9b51ff0..d2f85ce 100644
--- a/source/smbd/open.c
+++ b/source/smbd/open.c
@@ -59,6 +59,15 @@ static NTSTATUS check_open_rights(struct connection_struct
*conn,
*access_granted = 0;
+ if (conn->server_info->utok.uid == 0 || conn->admin_user) {
+ /* I'm sorry sir, I didn't know you were root... */
+ *access_granted = access_mask;
+ if (access_mask & SEC_FLAG_MAXIMUM_ALLOWED) {
+ *access_granted |= FILE_GENERIC_ALL;
+ }
+ return NT_STATUS_OK;
+ }
+
status = SMB_VFS_GET_NT_ACL(conn, fname,
(OWNER_SECURITY_INFORMATION |
GROUP_SECURITY_INFORMATION |
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-163-gc8ea9d1
The branch, master has been updated
via c8ea9d1f13096cd7f51e5972915a61ca65b56ac3 (commit)
from badad0a6a6d2b0f0a34b09f83d0ea25596dc9bf6 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit c8ea9d1f13096cd7f51e5972915a61ca65b56ac3
Author: Jeremy Allison
Date: Wed Mar 4 17:17:43 2009 -0800
Second part of fix for #6154, ensure we return max access
if admin user.
Jeremy.
---
Summary of changes:
source3/smbd/open.c |9 +
1 files changed, 9 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 569c260..acd3475 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -76,6 +76,15 @@ static NTSTATUS check_open_rights(struct connection_struct
*conn,
*access_granted = 0;
+ if (conn->server_info->utok.uid == 0 || conn->admin_user) {
+ /* I'm sorry sir, I didn't know you were root... */
+ *access_granted = access_mask;
+ if (access_mask & SEC_FLAG_MAXIMUM_ALLOWED) {
+ *access_granted |= FILE_GENERIC_ALL;
+ }
+ return NT_STATUS_OK;
+ }
+
status = SMB_VFS_GET_NT_ACL(conn, fname,
(OWNER_SECURITY_INFORMATION |
GROUP_SECURITY_INFORMATION |
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-164-gd526d34
The branch, master has been updated
via d526d340d8f5d70ea48bcaf535ea57d2c1cd48db (commit)
from c8ea9d1f13096cd7f51e5972915a61ca65b56ac3 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit d526d340d8f5d70ea48bcaf535ea57d2c1cd48db
Author: Bo Yang
Date: Wed Mar 4 17:26:57 2009 -0800
Fix careless mistake in winbindd_setup_sig_usr2_handler
---
Summary of changes:
source3/winbindd/winbindd.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
index dbe8315..e455d93 100644
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -320,7 +320,7 @@ static bool winbindd_setup_sig_usr2_handler(void)
se = tevent_add_signal(winbind_event_context(),
winbind_event_context(),
- SIGCHLD, 0,
+ SIGUSR2, 0,
winbindd_sig_usr2_handler,
NULL);
if (!se) {
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-168-g6652646
The branch, master has been updated
via 66526464328ffb07d380973edf3002a2361ab996 (commit)
via cfb47573865610d2e02b08507f09b52c3b38d19e (commit)
via 04f5f739056b535c71f0991b388f7f4b14c0b75e (commit)
via f61f1690548edbd1c6e3badfe8d2e7b50485d03e (commit)
from d526d340d8f5d70ea48bcaf535ea57d2c1cd48db (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 66526464328ffb07d380973edf3002a2361ab996
Author: Tim Prouty
Date: Wed Mar 4 18:29:18 2009 -0800
librpc: Re-run make idl_full from source3
commit cfb47573865610d2e02b08507f09b52c3b38d19e
Author: Tim Prouty
Date: Tue Mar 3 13:04:14 2009 -0800
pidl: Don't generate variables declarations for pointless array counters.
Code isn't generated to iterate over arrays of length 0, but the
variable declarations still are. The result is 'unused variable'
warnings. This only seems to be happening in one place right now, so I
targeted the fix to this case, but refactoring could be done to make
all variable declarations do this zero length check. Making it the
default would be a much more invasive fix.
Jelmer, please check!
commit 04f5f739056b535c71f0991b388f7f4b14c0b75e
Author: Tim Prouty
Date: Tue Mar 3 19:27:50 2009 -0800
s3 OneFS: Use the public open_streams_for_delete
commit f61f1690548edbd1c6e3badfe8d2e7b50485d03e
Author: Tim Prouty
Date: Tue Mar 3 19:23:33 2009 -0800
s3: Change open_streams_for_delete to call through the vfs layer
This eliminates the last direct caller of create_file_unixpath
---
Summary of changes:
librpc/gen_ndr/ndr_drsblobs.c|1 -
pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm | 20 +-
source3/include/proto.h |2 +
source3/modules/onefs_open.c | 113 --
source3/smbd/open.c | 12 ++--
5 files changed, 28 insertions(+), 120 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/gen_ndr/ndr_drsblobs.c b/librpc/gen_ndr/ndr_drsblobs.c
index ee7c993..426ade2 100644
--- a/librpc/gen_ndr/ndr_drsblobs.c
+++ b/librpc/gen_ndr/ndr_drsblobs.c
@@ -1856,7 +1856,6 @@ _PUBLIC_ void
ndr_print_package_PrimaryKerberosKey4(struct ndr_print *ndr, const
static enum ndr_err_code ndr_push_package_PrimaryKerberosCtr4(struct ndr_push
*ndr, int ndr_flags, const struct package_PrimaryKerberosCtr4 *r)
{
uint32_t cntr_keys_0;
- uint32_t cntr_service_keys_0;
uint32_t cntr_old_keys_0;
uint32_t cntr_older_keys_0;
if (ndr_flags & NDR_SCALARS) {
diff --git a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
index 34aebc7..7ce9708 100644
--- a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
@@ -1256,7 +1256,7 @@ sub ParseStructPush()
EnvSubstituteValue($env, $struct);
- $self->DeclareArrayVariables($_) foreach (@{$struct->{ELEMENTS}});
+ $self->DeclareArrayVariablesNoZero($_, $env) foreach
(@{$struct->{ELEMENTS}});
$self->start_flags($struct, $ndr);
@@ -1481,6 +1481,24 @@ sub DeclareArrayVariables($$)
}
}
+sub DeclareArrayVariablesNoZero($$$)
+{
+ my ($self,$e,$env) = @_;
+
+ foreach my $l (@{$e->{LEVELS}}) {
+ next if has_fast_array($e,$l);
+ next if is_charset_array($e,$l);
+ if ($l->{TYPE} eq "ARRAY") {
+ my $length = ParseExpr($l->{LENGTH_IS}, $env,
$e->{ORIGINAL});
+ if ($length eq "0") {
+ warning($e->{ORIGINAL}, "pointless array cntr:
'cntr_$e->{NAME}_$l->{LEVEL_INDEX}': length=$length");
+ } else {
+ $self->pidl("uint32_t
cntr_$e->{NAME}_$l->{LEVEL_INDEX};");
+ }
+ }
+ }
+}
+
sub DeclareMemCtxVariables($$)
{
my ($self,$e) = @_;
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 7811016..41e3618 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -6723,6 +6723,8 @@ void msg_file_was_renamed(struct messaging_context *msg,
struct case_semantics_state;
struct case_semantics_state *set_posix_case_semantics(TALLOC_CTX *mem_ctx,
connection_struct *conn);
+NTSTATUS open_streams_for_delete(connection_struct *conn,
+const char *fname);
NTSTATUS create_file_default(connection_struct *conn,
struct smb_request *req,
uint16_t root_dir_fid,
diff --git a/source3/modules/onefs_open.c b/source3/modules/onefs_open.c
index d3ba0ac..c5030f4 100644
--- a/source3/modules/onefs_open.c
+++ b/source3/modules/onefs_open.c
@@ -1649,119 +1649,6 @@ static NTSTATUS onef
