From: Wayne Davison <wayned@samba.org>
Date: Sun, 22 Oct 2006 07:15:17 +0000 (+0000)
Subject: Added missing DEBUG() define.
X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/commitdiff_plain/f42b0645cdd269cf50911e168cde67248ea5bca3?ds=sidebyside

Added missing DEBUG() define.
---

diff --git a/acls.diff b/acls.diff
index 56035e0..082803d 100644
--- a/acls.diff
+++ b/acls.diff
@@ -1455,13 +1455,13 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  
 -	if (preserve_gid && file->gid != GID_NONE && st->st_gid != file->gid)
 +	if (preserve_gid && file->gid != GID_NONE && sxp->st.st_gid != file->gid)
- 		return 0;
- 
++		return 0;
++
 +#ifdef SUPPORT_ACLS
 +	if (preserve_acls && set_acl(NULL, file, sxp) == 0)
-+		return 0;
+ 		return 0;
 +#endif
-+
+ 
  	return 1;
  }
  
@@ -2238,7 +2238,7 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
  			SIVAL(numbuf, 0, ndx);
 --- old/lib/sysacls.c
 +++ new/lib/sysacls.c
-@@ -0,0 +1,3240 @@
+@@ -0,0 +1,3245 @@
 +/* 
 +   Unix SMB/CIFS implementation.
 +   Samba system utilities for ACL support.
@@ -2263,6 +2263,11 @@ latest ACL-enabling patch to send files to an older ACL-enabled rsync.
 +#include "sysacls.h" /****** ADDED ******/
 +
 +/****** EXTRAS -- THESE ITEMS ARE NOT FROM THE SAMBA SOURCE ******/
++#ifdef DEBUG
++#undef DEBUG
++#endif
++#define DEBUG(x,y)
++
 +void SAFE_FREE(void *mem)
 +{
 +	if (mem)