[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 2501afe vfs_ceph: fix disk_free_fn callback from d1da1f7 s4-messaging: Unify list of possible messages into messaging.idl https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 2501afe08b94a514d8e2f3eeb4a2c4edc9764979 Author: Yan, Zheng z...@redhat.com Date: Fri Feb 13 18:25:57 2015 +0800 vfs_ceph: fix disk_free_fn callback Free space and available space should be in unit of block size. Besides, we should call disk_norm() to adjust the returned values. Signed-off-by: Yan, Zheng z...@redhat.com Reviewed-by: Ira Cooper i...@samba.org Reviewed-by: David Disseldorp dd...@samba.org Autobuild-User(master): Ira Cooper i...@samba.org Autobuild-Date(master): Mon Feb 16 18:14:02 CET 2015 on sn-devel-104 --- Summary of changes: source3/modules/vfs_ceph.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/modules/vfs_ceph.c b/source3/modules/vfs_ceph.c index ec72312..b074e2d 100644 --- a/source3/modules/vfs_ceph.c +++ b/source3/modules/vfs_ceph.c @@ -167,8 +167,9 @@ static uint64_t cephwrap_disk_free(struct vfs_handle_struct *handle, const char * Provide all the correct values. */ *bsize = statvfs_buf.f_bsize; - *dfree = statvfs_buf.f_bsize * statvfs_buf.f_bavail; - *dsize = statvfs_buf.f_bsize * statvfs_buf.f_blocks; + *dfree = statvfs_buf.f_bavail; + *dsize = statvfs_buf.f_blocks; + disk_norm(small_query, bsize, dfree, dsize); DEBUG(10, ([CEPH] bsize: %llu, dfree: %llu, dsize: %llu\n, llu(*bsize), llu(*dfree), llu(*dsize))); return *dfree; -- Samba Shared Repository
autobuild: intermittent test failure detected
The autobuild test system has detected an intermittent failing test in the current master tree. The autobuild log of the failure is available here: http://git.samba.org/autobuild.flakey/2015-02-16-1912/flakey.log The samba build logs are available here: http://git.samba.org/autobuild.flakey/2015-02-16-1912/samba.stderr http://git.samba.org/autobuild.flakey/2015-02-16-1912/samba.stdout The top commit at the time of the failure was: commit d1da1f78a5e5cb2778bf0f5483c01edcf178143a Author: Andrew Bartlett abart...@samba.org Date: Mon Feb 16 12:43:40 2015 +1300 s4-messaging: Unify list of possible messages into messaging.idl Signed-off-by: Andrew Bartlett abart...@samba.org Pair-programmed-with: Garming Sam garm...@catalyst.net.nz Signed-off-by: Garming Sam garm...@catalyst.net.nz Reviewed-by: Volker Lendecke v...@samba.org Autobuild-User(master): Volker Lendecke v...@samba.org Autobuild-Date(master): Mon Feb 16 14:48:41 CET 2015 on sn-devel-104
autobuild: intermittent test failure detected
The autobuild test system has detected an intermittent failing test in the current master tree. The autobuild log of the failure is available here: http://git.samba.org/autobuild.flakey/2015-02-16-2254/flakey.log The samba build logs are available here: http://git.samba.org/autobuild.flakey/2015-02-16-2254/samba.stderr http://git.samba.org/autobuild.flakey/2015-02-16-2254/samba.stdout The top commit at the time of the failure was: commit 2501afe08b94a514d8e2f3eeb4a2c4edc9764979 Author: Yan, Zheng z...@redhat.com Date: Fri Feb 13 18:25:57 2015 +0800 vfs_ceph: fix disk_free_fn callback Free space and available space should be in unit of block size. Besides, we should call disk_norm() to adjust the returned values. Signed-off-by: Yan, Zheng z...@redhat.com Reviewed-by: Ira Cooper i...@samba.org Reviewed-by: David Disseldorp dd...@samba.org Autobuild-User(master): Ira Cooper i...@samba.org Autobuild-Date(master): Mon Feb 16 18:14:02 CET 2015 on sn-devel-104
[SCM] Samba Shared Repository - branch v4-1-test updated
The branch, v4-1-test has been updated via 99fe2d6 s3: smbclient: Allinfo leaves the file handle open. from 1872ddc printing/cups: pack requested-attributes with IPP_TAG_KEYWORD https://git.samba.org/?p=samba.git;a=shortlog;h=v4-1-test - Log - commit 99fe2d6464afd260cf08971fcb7071e44e46572e Author: Jeremy Allison j...@samba.org Date: Tue Feb 10 09:32:11 2015 -0800 s3: smbclient: Allinfo leaves the file handle open. https://bugzilla.samba.org/show_bug.cgi?id=11094 Signed-off-by: Jeremy Allison j...@samba.org Reviewed-by: Volker Lendecke v...@samba.org Autobuild-User(master): Volker Lendecke v...@samba.org Autobuild-Date(master): Tue Feb 10 23:28:46 CET 2015 on sn-devel-104 (cherry picked from commit 080ec0f7d9735b27138deb5f91a397935f089f02) Autobuild-User(v4-1-test): Karolin Seeger ksee...@samba.org Autobuild-Date(v4-1-test): Mon Feb 16 23:20:50 CET 2015 on sn-devel-104 --- Summary of changes: source3/client/client.c | 1 + 1 file changed, 1 insertion(+) Changeset truncated at 500 lines: diff --git a/source3/client/client.c b/source3/client/client.c index 20932cc..00f8282 100644 --- a/source3/client/client.c +++ b/source3/client/client.c @@ -1820,6 +1820,7 @@ static int do_allinfo(const char *name) } TALLOC_FREE(snapshots); + cli_close(cli, fnum); return 0; } -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 41c4666 s3/vfs: remove unused SMB_VFS_DISK_FREE() small_query
parameter
via 4ab0e57 smbd/reply: convert free space to 16bit in dskattr handler
from 2501afe vfs_ceph: fix disk_free_fn callback
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 41c4666a726d3fbe234bcb8b38bd24c62799598f
Author: David Disseldorp dd...@samba.org
Date: Mon Feb 16 19:26:24 2015 +0100
s3/vfs: remove unused SMB_VFS_DISK_FREE() small_query parameter
The small_query parameter for SMB_VFS_DISK_FREE() was, prior to the
previous commit, used to obtain 16-bit wide free-space information for
the deprecated dskattr SMB_COM_QUERY_INFORMATION_DISK command.
With the dskattr handler now performing the 16-bit collapse directly,
the small_query parameter can be removed from the entire code path.
Signed-off-by: David Disseldorp dd...@samba.org
Reviewed-by: Jeremy Allison j...@samba.org
Autobuild-User(master): Jeremy Allison j...@samba.org
Autobuild-Date(master): Tue Feb 17 05:37:20 CET 2015 on sn-devel-104
commit 4ab0e57f1073e776b8832f5edc3dca04ef903fef
Author: David Disseldorp dd...@samba.org
Date: Mon Feb 16 19:26:23 2015 +0100
smbd/reply: convert free space to 16bit in dskattr handler
The deprecated Core Protocol dskattr SMB_COM_QUERY_INFORMATION_DISK
command provides free space information in the form of 16-bit words.
Until now, this has been handled by passing the dskattr specific
small_query boolean through to disk_norm() via the SMB_VFS_DISK_FREE VFS
hook. disk_norm(small_query=true) then modifies the block size and free
space values such that they fit in the 16-bit field.
This change adds the command specific logic to the dskattr handler, so
that it can be removed from the SMB_VFS_DISK_FREE()-disk_norm() code
path. In doing so, it fixes dskattr request handling against opaque VFS
backends that don't call disk_norm(), such as vfs_glusterfs.
Signed-off-by: David Disseldorp dd...@samba.org
Reviewed-by: Jeremy Allison j...@samba.org
---
Summary of changes:
examples/VFS/skel_opaque.c | 2 +-
examples/VFS/skel_transparent.c| 5 ++---
source3/include/vfs.h | 10 +-
source3/include/vfs_macros.h | 8
source3/modules/vfs_cap.c | 6 ++
source3/modules/vfs_ceph.c | 11 ++-
source3/modules/vfs_default.c | 11 ++-
source3/modules/vfs_full_audit.c | 6 ++
source3/modules/vfs_glusterfs.c| 5 ++---
source3/modules/vfs_gpfs.c | 10 +-
source3/modules/vfs_shadow_copy2.c | 10 --
source3/modules/vfs_snapper.c | 10 --
source3/modules/vfs_time_audit.c | 6 ++
source3/smbd/dfree.c | 40 --
source3/smbd/proto.h | 5 ++---
source3/smbd/reply.c | 21 +++-
source3/smbd/trans2.c | 13 ++---
source3/smbd/vfs.c | 10 --
source3/torture/cmd_vfs.c | 2 +-
19 files changed, 94 insertions(+), 97 deletions(-)
Changeset truncated at 500 lines:
diff --git a/examples/VFS/skel_opaque.c b/examples/VFS/skel_opaque.c
index b52c381..2a53c8a 100644
--- a/examples/VFS/skel_opaque.c
+++ b/examples/VFS/skel_opaque.c
@@ -45,7 +45,7 @@ static void skel_disconnect(vfs_handle_struct *handle)
}
static uint64_t skel_disk_free(vfs_handle_struct *handle, const char *path,
- bool small_query, uint64_t *bsize,
+ uint64_t *bsize,
uint64_t *dfree, uint64_t *dsize)
{
*bsize = 0;
diff --git a/examples/VFS/skel_transparent.c b/examples/VFS/skel_transparent.c
index 925e520..eb561db 100644
--- a/examples/VFS/skel_transparent.c
+++ b/examples/VFS/skel_transparent.c
@@ -49,11 +49,10 @@ static void skel_disconnect(vfs_handle_struct *handle)
}
static uint64_t skel_disk_free(vfs_handle_struct *handle, const char *path,
- bool small_query, uint64_t *bsize,
+ uint64_t *bsize,
uint64_t *dfree, uint64_t *dsize)
{
- return SMB_VFS_NEXT_DISK_FREE(handle, path, small_query, bsize,
- dfree, dsize);
+ return SMB_VFS_NEXT_DISK_FREE(handle, path, bsize, dfree, dsize);
}
static int skel_get_quota(vfs_handle_struct *handle, enum SMB_QUOTA_TYPE qtype,
diff --git a/source3/include/vfs.h b/source3/include/vfs.h
index 1843ef4..3444f62 100644
--- a/source3/include/vfs.h
+++ b/source3/include/vfs.h
@@ -160,7 +160,8 @@
/* Version 32 - Add lease to CREATE_FILE operation */
/* Version 32 - Add lease to struct files_struct */
/*
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via d1da1f7 s4-messaging: Unify list of possible messages into
messaging.idl
via eedd127 librpc: Move messaging.idl to the top level
via 11a513b s4-messaging: Remove unused struct imessaging_rec
from 1d95b0a debug: Set close-on-exec for the main log file FD
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit d1da1f78a5e5cb2778bf0f5483c01edcf178143a
Author: Andrew Bartlett abart...@samba.org
Date: Mon Feb 16 12:43:40 2015 +1300
s4-messaging: Unify list of possible messages into messaging.idl
Signed-off-by: Andrew Bartlett abart...@samba.org
Pair-programmed-with: Garming Sam garm...@catalyst.net.nz
Signed-off-by: Garming Sam garm...@catalyst.net.nz
Reviewed-by: Volker Lendecke v...@samba.org
Autobuild-User(master): Volker Lendecke v...@samba.org
Autobuild-Date(master): Mon Feb 16 14:48:41 CET 2015 on sn-devel-104
commit eedd127c25a479e1b6bfe809d4f0f5d8c0c367f3
Author: Andrew Bartlett abart...@samba.org
Date: Mon Feb 16 12:25:44 2015 +1300
librpc: Move messaging.idl to the top level
Pair-programmed-with: Garming Sam garm...@catalyst.net.nz
Signed-off-by: Garming Sam garm...@catalyst.net.nz
Signed-off-by: Andrew Bartlett abart...@samba.org
Reviewed-by: Volker Lendecke v...@samba.org
commit 11a513b8745698e6b287f185f5d4d80b8d59205b
Author: Andrew Bartlett abart...@samba.org
Date: Mon Feb 16 12:16:03 2015 +1300
s4-messaging: Remove unused struct imessaging_rec
Signed-off-by: Andrew Bartlett abart...@samba.org
Pair-programmed-with: Garming Sam garm...@catalyst.net.nz
Signed-off-by: Garming Sam garm...@catalyst.net.nz
Reviewed-by: Volker Lendecke v...@samba.org
---
Summary of changes:
{source3/librpc = librpc}/idl/messaging.idl | 17 -
librpc/idl/wscript_build | 5 +
librpc/wscript_build | 5 +
source3/librpc/idl/wscript_build | 2 +-
source3/librpc/wscript_build | 5 -
source4/lib/messaging/messaging.c| 19 ---
source4/lib/messaging/messaging.h| 17 +
7 files changed, 28 insertions(+), 42 deletions(-)
rename {source3/librpc = librpc}/idl/messaging.idl (86%)
Changeset truncated at 500 lines:
diff --git a/source3/librpc/idl/messaging.idl b/librpc/idl/messaging.idl
similarity index 86%
rename from source3/librpc/idl/messaging.idl
rename to librpc/idl/messaging.idl
index ce40a7b..99b2af2 100644
--- a/source3/librpc/idl/messaging.idl
+++ b/librpc/idl/messaging.idl
@@ -116,10 +116,25 @@ interface messaging
/* smbXsrv messages */
MSG_SMBXSRV_SESSION_CLOSE = 0x0600,
+ /* source4 and NTVFS smb server messages */
+ MSG_BRL_RETRY = 0x0700,
+ MSG_PVFS_RETRY_OPEN = 0x0701,
+ MSG_IRPC= 0x0702,
+ MSG_NTVFS_OPLOCK_BREAK = 0x0703,
+ MSG_DREPL_ALLOCATE_RID = 0x0704,
+
/* dbwrap messages 4001-4999 (0x0FA0 - 0x1387) */
/* MSG_DBWRAP_TDB2_CHANGES = 4001, */
/* MSG_DBWRAP_G_LOCK_RETRY = 4002, */
- MSG_DBWRAP_MODIFIED = 4003
+ MSG_DBWRAP_MODIFIED = 4003,
+
+ /*
+* source4 allows new messages to be registered at
+* runtime (currently used in python bindings and in
+* smbtorture). Temporary messaging endpoints are
+* allocated above this line
+*/
+ MSG_TMP_BASE= 0xF000
} messaging_type;
/* messaging struct sent across the sockets and stored in the tdb */
diff --git a/librpc/idl/wscript_build b/librpc/idl/wscript_build
index ad6664f..4fdd8c2 100644
--- a/librpc/idl/wscript_build
+++ b/librpc/idl/wscript_build
@@ -28,6 +28,11 @@ bld.SAMBA_PIDL_LIST('PIDL',
output_dir='../gen_ndr')
bld.SAMBA_PIDL_LIST('PIDL',
+'messaging.idl',
+options='--header --ndr-parser',
+output_dir='../gen_ndr')
+
+bld.SAMBA_PIDL_LIST('PIDL',
'rap.idl ntprinting.idl preg.idl ioctl.idl printcap.idl',
options='--header --ndr-parser',
output_dir='../gen_ndr')
diff --git a/librpc/wscript_build b/librpc/wscript_build
index f598d74..da781ca 100644
--- a/librpc/wscript_build
+++ b/librpc/wscript_build
@@ -408,6 +408,11 @@ bld.SAMBA_SUBSYSTEM('NDR_FILE_ID',
public_deps='ndr'
)
+bld.SAMBA_SUBSYSTEM('NDR_MESSAGING',
+source='gen_ndr/ndr_messaging.c',
+public_deps='ndr
[SCM] Samba Shared Repository - branch v4-0-test updated
The branch, v4-0-test has been updated via 0d5069f s3: smbclient: Allinfo leaves the file handle open. from 40b9149 printing/cups: pack requested-attributes with IPP_TAG_KEYWORD https://git.samba.org/?p=samba.git;a=shortlog;h=v4-0-test - Log - commit 0d5069f9c1fddc48019a773bd34708307dd1e401 Author: Jeremy Allison j...@samba.org Date: Tue Feb 10 09:32:11 2015 -0800 s3: smbclient: Allinfo leaves the file handle open. https://bugzilla.samba.org/show_bug.cgi?id=11094 Signed-off-by: Jeremy Allison j...@samba.org Reviewed-by: Volker Lendecke v...@samba.org Autobuild-User(master): Volker Lendecke v...@samba.org Autobuild-Date(master): Tue Feb 10 23:28:46 CET 2015 on sn-devel-104 (cherry picked from commit 080ec0f7d9735b27138deb5f91a397935f089f02) Autobuild-User(v4-0-test): Karolin Seeger ksee...@samba.org Autobuild-Date(v4-0-test): Mon Feb 16 23:13:45 CET 2015 on sn-devel-104 --- Summary of changes: source3/client/client.c | 1 + 1 file changed, 1 insertion(+) Changeset truncated at 500 lines: diff --git a/source3/client/client.c b/source3/client/client.c index a3a1d0a..842b3b6 100644 --- a/source3/client/client.c +++ b/source3/client/client.c @@ -1812,6 +1812,7 @@ static int do_allinfo(const char *name) } TALLOC_FREE(snapshots); + cli_close(cli, fnum); return 0; } -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 1d95b0a debug: Set close-on-exec for the main log file FD
from 88c1eb4 Add Solaris ports as a tevent backend.
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 1d95b0afc3547a91f8558873ce58652c271ed9eb
Author: Andrew Bartlett abart...@samba.org
Date: Mon Feb 16 15:59:11 2015 +1300
debug: Set close-on-exec for the main log file FD
This does not change the properties of dup2() of the fd as STDERR, however
this is closed
before we start smbd or winbindd as child processes.
This is needed otherwise the logfile remains open in the child process, and
logfile rotation can mean this old log remains on disk indefinatly.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11100
Pair-programmed-with: Garming Sam garm...@catalyst.net.nz
Signed-off-by: Garming Sam garm...@catalyst.net.nz
Signed-off-by: Andrew Bartlett abart...@samba.org
Autobuild-User(master): Andrew Bartlett abart...@samba.org
Autobuild-Date(master): Mon Feb 16 11:42:47 CET 2015 on sn-devel-104
---
Summary of changes:
lib/util/debug.c | 3 +++
lib/util/wscript_build | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
Changeset truncated at 500 lines:
diff --git a/lib/util/debug.c b/lib/util/debug.c
index a794c5b..80a1c25 100644
--- a/lib/util/debug.c
+++ b/lib/util/debug.c
@@ -604,6 +604,7 @@ bool reopen_logs_internal(void)
log_overflow = false;
ret = false;
} else {
+ smb_set_close_on_exec(new_fd);
old_fd = state.fd;
state.fd = new_fd;
debug_close_fd(old_fd);
@@ -735,6 +736,7 @@ void check_log_size( void )
*/
int fd = open( /dev/console, O_WRONLY, 0);
if (fd != -1) {
+ smb_set_close_on_exec(fd);
state.fd = fd;
DEBUG(0,(check_log_size: open of debug file %s failed
- using console.\n,
state.debugf ));
@@ -791,6 +793,7 @@ static int Debug1(const char *msg)
if(fd == -1) {
goto done;
}
+ smb_set_close_on_exec(fd);
state.fd = fd;
}
}
diff --git a/lib/util/wscript_build b/lib/util/wscript_build
index a1dec2a..3121e1f 100755
--- a/lib/util/wscript_build
+++ b/lib/util/wscript_build
@@ -27,7 +27,7 @@ bld.SAMBA_SUBSYSTEM('close-low-fd',
bld.SAMBA_LIBRARY('samba-debug',
source='debug.c',
- deps='replace time-basic close-low-fd talloc',
+ deps='replace time-basic close-low-fd talloc
socket-blocking',
local_include=False,
private_library=True)
--
Samba Shared Repository
