From 2fe13c2e32913e8aec729e2f260192b12bc835c4 Mon Sep 17 00:00:00 2001 From: Radim Kolar <> Date: Mon, 14 Sep 2009 16:41:30 +0200 Subject: [PATCH] fixed permission check for overwriting uploaded files --- ChangeLog | 4 ++++ server/file.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 83885f2..adce04f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,10 @@ Version NEXT We can now reupload last block which can happen if fspd server is restarted and reply to upload command is lost on way from server to client. + Check for overwriting uploaded files in fspd was reversed by mistake. + Now if you want to overwrite file you must have permission for + deleting and adding files or be directory owner. + if you want to overwrite Version 2.8.1b25 - 10 Sep 2009 GNU autotools build system was entirely replaced by SCons diff --git a/server/file.c b/server/file.c index 8ccdcf8..d55f8bc 100644 --- a/server/file.c +++ b/server/file.c @@ -912,7 +912,7 @@ const char *server_install (PPATH * pp, unsigned long inet_num, } if(fexist(pp->fullp) && - ( (di->protection & DIR_DEL) || acc[0]=='O' ) + ( (di->protection & DIR_DEL)==0 && acc[0] != 'O') ) { unlink(tname);