[SCM] The rsync repository. - branch master updated

[Rsync CVS commit messages]

The branch, master has been updated
       via  9e2e7a1 Restoring use of socketpair on cygwin.
       via  d34eaa8 Use 0 (not NULL) for a non-pointer arg.
      from  b4ea93c Try to fix bug 7865 for some acl() EINVAL results.

;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 9e2e7a1b2d921a56cbf8f8a76d6fdc12af8d07f8
Author: Wayne Davison <wayned at samba.org>
Date:   Wed Dec 25 14:20:52 2013 -0800

    Restoring use of socketpair on cygwin.
    
    Use of socketpair is much faster on cygwin, and some folks report fewer
    hangs using the modern socketpair implementation vs pipes.

commit d34eaa8183296e3fda0d609e8cefd2c2f3d1ef9d
Author: Wayne Davison <wayned at samba.org>
Date:   Wed Dec 25 14:19:30 2013 -0800

    Use 0 (not NULL) for a non-pointer arg.

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

Summary of changes:
 acls.c       |    2 +-
 configure.ac |    4 ----
 2 files changed, 1 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/acls.c b/acls.c
index 46c5be5..23bdf86 100644
--- a/acls.c
+++ b/acls.c
@@ -423,7 +423,7 @@ static BOOL pack_smb_acl(SMB_ACL_T *smb_acl, const rsync_acl *racl)
 #ifdef ACLS_NEED_MASK
 	mask_bits = racl->mask_obj == NO_ENTRY ? racl->group_obj & ~NO_ENTRY : racl->mask_obj;
 	COE( sys_acl_create_entry,(smb_acl, &entry) );
-	COE( sys_acl_set_info,(entry, SMB_ACL_MASK, mask_bits, NULL) );
+	COE( sys_acl_set_info,(entry, SMB_ACL_MASK, mask_bits, 0) );
 #else
 	if (racl->mask_obj != NO_ENTRY) {
 		COE( sys_acl_create_entry,(smb_acl, &entry) );
diff --git a/configure.ac b/configure.ac
index 99a2dab..f66e5ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -739,11 +739,7 @@ AC_TRY_RUN([
 
 main() {
        int fd[2];
-#ifdef __CYGWIN__
-       exit(1);
-#else
        exit((socketpair(AF_UNIX, SOCK_STREAM, 0, fd) != -1) ? 0 : 1);
-#endif
 }],
 rsync_cv_HAVE_SOCKETPAIR=yes,rsync_cv_HAVE_SOCKETPAIR=no,rsync_cv_HAVE_SOCKETPAIR=cross)])
 if test x"$rsync_cv_HAVE_SOCKETPAIR" = x"yes"; then


-- 
The rsync repository.