[SCM] Samba Shared Repository - branch master updated

Stefan Metzmacher metze at samba.org
Mon Dec 8 08:55:04 MST 2014


The branch, master has been updated
       via  4acf171 vfs: Add missing include for sys_pread() in cacheprime module.
       via  266323d smbd: Add missing include for iov_buflen().
       via  78e8baf socket_wrapper: Add missing prototype check for eventfd.
      from  29732b0 s4-tests/env_loadparm: Throw KeyError in case SMB_CONF_PATH

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 4acf171ab9480dbf23d95bd9624e2e4ec6723316
Author: Andreas Schneider <asn at samba.org>
Date:   Mon Dec 8 10:09:29 2014 +0100

    vfs: Add missing include for sys_pread() in cacheprime module.
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>
    
    Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
    Autobuild-Date(master): Mon Dec  8 16:54:51 CET 2014 on sn-devel-104

commit 266323dac64977c236ff19679aaf90f69a1ec245
Author: Andreas Schneider <asn at samba.org>
Date:   Mon Dec 8 10:07:42 2014 +0100

    smbd: Add missing include for iov_buflen().
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>

commit 78e8bafb322ec69c5ff4b32a5e1c5679c9dea6bf
Author: Andreas Schneider <asn at samba.org>
Date:   Wed Nov 26 10:18:34 2014 +0100

    socket_wrapper: Add missing prototype check for eventfd.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=10965
    
    Newer glibc versions use and unsinged integer for the count instead of
    an integer.
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 lib/socket_wrapper/wscript       | 5 +++++
 source3/modules/vfs_cacheprime.c | 1 +
 source3/smbd/smb2_server.c       | 1 +
 3 files changed, 7 insertions(+)


Changeset truncated at 500 lines:

diff --git a/lib/socket_wrapper/wscript b/lib/socket_wrapper/wscript
index 279f577..91d23d1 100644
--- a/lib/socket_wrapper/wscript
+++ b/lib/socket_wrapper/wscript
@@ -88,6 +88,11 @@ def configure(conf):
                                'int ioctl(int s, int r, ...)',
                                define='HAVE_IOCTL_INT', headers='unistd.h sys/ioctl.h')
 
+        if conf.CONFIG_SET("HAVE_EVENTFD"):
+            conf.CHECK_C_PROTOTYPE('eventfd',
+                                   'int eventfd(unsigned int count, int flags)',
+                                   define='HAVE_EVENTFD_UNSIGNED_INT', headers='sys/eventfd.h')
+
         # Create full path to socket_wrapper
         srcdir = os.path.realpath(conf.srcdir)
         libsocket_wrapper_so_path = srcdir + '/bin/default/lib/socket_wrapper/libsocket-wrapper.so'
diff --git a/source3/modules/vfs_cacheprime.c b/source3/modules/vfs_cacheprime.c
index 65e63e2..e90e09a 100644
--- a/source3/modules/vfs_cacheprime.c
+++ b/source3/modules/vfs_cacheprime.c
@@ -17,6 +17,7 @@
 
 #include "includes.h"
 #include "smbd/smbd.h"
+#include "lib/sys_rw.h"
 
 /* Cache priming module.
  *
diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c
index 3f23e2a..4a2c875 100644
--- a/source3/smbd/smb2_server.c
+++ b/source3/smbd/smb2_server.c
@@ -28,6 +28,7 @@
 #include "smbprofile.h"
 #include "../lib/util/bitmap.h"
 #include "../librpc/gen_ndr/krb5pac.h"
+#include "lib/iov_buf.h"
 #include "auth.h"
 
 static void smbd_smb2_connection_handler(struct tevent_context *ev,


-- 
Samba Shared Repository


More information about the samba-cvs mailing list