Fossil SCM
Remove call of "getuid()" added on previous commit because it is not available on windows. For the pledge() call, always allow "chown" for now, even if not running as root.
Commit
6b41a7e803348a9247818a66c9b968a9fd8e5d3408cecdaeeeed905c08dc018a
Parent
396513fa4a6f8da…
1 file changed
+1
-5
+1
-5
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -472,15 +472,11 @@ | ||
| 472 | 472 | const char *zIgnoreFlag = find_option("ignore", 0, 1); |
| 473 | 473 | unsigned scanFlags = 0; |
| 474 | 474 | unsigned flags = 0; |
| 475 | 475 | int vid, i; |
| 476 | 476 | |
| 477 | - if( getuid()==0 ){ | |
| 478 | - fossil_pledge("stdio rpath wpath cpath id flock tty chown"); | |
| 479 | - }else{ | |
| 480 | - fossil_pledge("stdio rpath wpath cpath id flock tty"); | |
| 481 | - } | |
| 477 | + fossil_pledge("stdio rpath wpath cpath id flock tty chown"); | |
| 482 | 478 | |
| 483 | 479 | /* Load affirmative flag options. */ |
| 484 | 480 | for( i=0; i<count(flagDefs); ++i ){ |
| 485 | 481 | if( (command==CHANGES || !(flagDefs[i].mask & C_CLASSIFY)) |
| 486 | 482 | && find_option(flagDefs[i].option, 0, 0) ){ |
| 487 | 483 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -472,15 +472,11 @@ | |
| 472 | const char *zIgnoreFlag = find_option("ignore", 0, 1); |
| 473 | unsigned scanFlags = 0; |
| 474 | unsigned flags = 0; |
| 475 | int vid, i; |
| 476 | |
| 477 | if( getuid()==0 ){ |
| 478 | fossil_pledge("stdio rpath wpath cpath id flock tty chown"); |
| 479 | }else{ |
| 480 | fossil_pledge("stdio rpath wpath cpath id flock tty"); |
| 481 | } |
| 482 | |
| 483 | /* Load affirmative flag options. */ |
| 484 | for( i=0; i<count(flagDefs); ++i ){ |
| 485 | if( (command==CHANGES || !(flagDefs[i].mask & C_CLASSIFY)) |
| 486 | && find_option(flagDefs[i].option, 0, 0) ){ |
| 487 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -472,15 +472,11 @@ | |
| 472 | const char *zIgnoreFlag = find_option("ignore", 0, 1); |
| 473 | unsigned scanFlags = 0; |
| 474 | unsigned flags = 0; |
| 475 | int vid, i; |
| 476 | |
| 477 | fossil_pledge("stdio rpath wpath cpath id flock tty chown"); |
| 478 | |
| 479 | /* Load affirmative flag options. */ |
| 480 | for( i=0; i<count(flagDefs); ++i ){ |
| 481 | if( (command==CHANGES || !(flagDefs[i].mask & C_CLASSIFY)) |
| 482 | && find_option(flagDefs[i].option, 0, 0) ){ |
| 483 |