From: Martin Pool <mbp@samba.org>
Date: Tue, 26 Mar 2002 11:49:56 +0000 (+0000)
Subject: Fix faulty merge.
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=de11514d3d51dd4ce1a11fdc4a5adf7a7ed4d0df;p=rsync.git

Fix faulty merge.
---

diff --git a/authenticate.c b/authenticate.c
index ebf23d6c..20ff254d 100644
--- a/authenticate.c
+++ b/authenticate.c
@@ -180,7 +180,7 @@ static char *getpassf(char *filename)
 	   rsync as a NT service. Besides, CYGWIN permissions won't
 	   give us any added security -- the security should be
 	   handled with NTFS ACL's. */
-	} else if ((st.st_mode & 06) != 0) {
+	else if ((st.st_mode & 06) != 0) {
 		rprintf(FERROR,"password file must not be other-accessible\n");
 		ok = 0;
 	} else if (am_root && (st.st_uid != 0)) {