Fossil SCM
Correct vfile_check_signature() handling of manifest.symlinks not existing or manifest setting not containing the l flag
Commit
de50c496d275a6522bdb419f2a8c29ee9cca1bb4c44314afab82d9f1c2347c1f
Parent
23e67f67d0fb5ea…
1 file changed
+1
-1
+1
-1
| --- src/vfile.c | ||
| +++ src/vfile.c | ||
| @@ -217,11 +217,11 @@ | ||
| 217 | 217 | * files do and do not have the symlink permission. */ |
| 218 | 218 | if( manifestSymlinks |
| 219 | 219 | && db_exists("SELECT 1 FROM symlink_perm WHERE filename=%Q", zName) ){ |
| 220 | 220 | currentPerm = PERM_LNK; |
| 221 | 221 | }else{ |
| 222 | - currentPerm = 0; | |
| 222 | + currentPerm = origPerm; | |
| 223 | 223 | } |
| 224 | 224 | #else |
| 225 | 225 | currentPerm = file_wd_perm(zName); |
| 226 | 226 | #endif |
| 227 | 227 | if( chnged==0 && (isDeleted || rid==0) ){ |
| 228 | 228 |
| --- src/vfile.c | |
| +++ src/vfile.c | |
| @@ -217,11 +217,11 @@ | |
| 217 | * files do and do not have the symlink permission. */ |
| 218 | if( manifestSymlinks |
| 219 | && db_exists("SELECT 1 FROM symlink_perm WHERE filename=%Q", zName) ){ |
| 220 | currentPerm = PERM_LNK; |
| 221 | }else{ |
| 222 | currentPerm = 0; |
| 223 | } |
| 224 | #else |
| 225 | currentPerm = file_wd_perm(zName); |
| 226 | #endif |
| 227 | if( chnged==0 && (isDeleted || rid==0) ){ |
| 228 |
| --- src/vfile.c | |
| +++ src/vfile.c | |
| @@ -217,11 +217,11 @@ | |
| 217 | * files do and do not have the symlink permission. */ |
| 218 | if( manifestSymlinks |
| 219 | && db_exists("SELECT 1 FROM symlink_perm WHERE filename=%Q", zName) ){ |
| 220 | currentPerm = PERM_LNK; |
| 221 | }else{ |
| 222 | currentPerm = origPerm; |
| 223 | } |
| 224 | #else |
| 225 | currentPerm = file_wd_perm(zName); |
| 226 | #endif |
| 227 | if( chnged==0 && (isDeleted || rid==0) ){ |
| 228 |