Fossil SCM
Change db_create_default_users() to align its use of environment variables to set the user name to match user_select(), and try all variables on both Unix and Windows.
Commit
ace9e00f965b187b717c871ccf6a2225f1d1faa4
Parent
a56f2089497d6fc…
1 file changed
+6
-7
M
src/db.c
+6
-7
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -1519,18 +1519,17 @@ | ||
| 1519 | 1519 | } |
| 1520 | 1520 | if( zUser==0 ){ |
| 1521 | 1521 | zUser = fossil_getenv("FOSSIL_USER"); |
| 1522 | 1522 | } |
| 1523 | 1523 | if( zUser==0 ){ |
| 1524 | -#if defined(_WIN32) | |
| 1525 | - zUser = fossil_getenv("USERNAME"); | |
| 1526 | -#else | |
| 1527 | 1524 | zUser = fossil_getenv("USER"); |
| 1528 | - if( zUser==0 ){ | |
| 1529 | - zUser = fossil_getenv("LOGNAME"); | |
| 1530 | - } | |
| 1531 | -#endif | |
| 1525 | + } | |
| 1526 | + if( zUser==0 ){ | |
| 1527 | + zUser = fossil_getenv("LOGNAME"); | |
| 1528 | + } | |
| 1529 | + if( zUser==0 ){ | |
| 1530 | + zUser = fossil_getenv("USERNAME"); | |
| 1532 | 1531 | } |
| 1533 | 1532 | if( zUser==0 ){ |
| 1534 | 1533 | zUser = "root"; |
| 1535 | 1534 | } |
| 1536 | 1535 | db_multi_exec( |
| 1537 | 1536 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -1519,18 +1519,17 @@ | |
| 1519 | } |
| 1520 | if( zUser==0 ){ |
| 1521 | zUser = fossil_getenv("FOSSIL_USER"); |
| 1522 | } |
| 1523 | if( zUser==0 ){ |
| 1524 | #if defined(_WIN32) |
| 1525 | zUser = fossil_getenv("USERNAME"); |
| 1526 | #else |
| 1527 | zUser = fossil_getenv("USER"); |
| 1528 | if( zUser==0 ){ |
| 1529 | zUser = fossil_getenv("LOGNAME"); |
| 1530 | } |
| 1531 | #endif |
| 1532 | } |
| 1533 | if( zUser==0 ){ |
| 1534 | zUser = "root"; |
| 1535 | } |
| 1536 | db_multi_exec( |
| 1537 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -1519,18 +1519,17 @@ | |
| 1519 | } |
| 1520 | if( zUser==0 ){ |
| 1521 | zUser = fossil_getenv("FOSSIL_USER"); |
| 1522 | } |
| 1523 | if( zUser==0 ){ |
| 1524 | zUser = fossil_getenv("USER"); |
| 1525 | } |
| 1526 | if( zUser==0 ){ |
| 1527 | zUser = fossil_getenv("LOGNAME"); |
| 1528 | } |
| 1529 | if( zUser==0 ){ |
| 1530 | zUser = fossil_getenv("USERNAME"); |
| 1531 | } |
| 1532 | if( zUser==0 ){ |
| 1533 | zUser = "root"; |
| 1534 | } |
| 1535 | db_multi_exec( |
| 1536 |