Fossil SCM
Added $LOGNAME to the list of environment variables checkes for the user name, per report from Will Parsons.
Commit
5741754ed28f881b7fe2fd6a68c96efbe8d78e7c
Parent
14779a31ec6e05a…
2 files changed
+3
+6
-2
M
src/db.c
+3
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -1249,10 +1249,13 @@ | ||
| 1249 | 1249 | if( zUser==0 ){ |
| 1250 | 1250 | #if defined(_WIN32) |
| 1251 | 1251 | zUser = fossil_getenv("USERNAME"); |
| 1252 | 1252 | #else |
| 1253 | 1253 | zUser = fossil_getenv("USER"); |
| 1254 | + if( zUser==0 ){ | |
| 1255 | + zUser = fossil_getenv("LOGNAME"); | |
| 1256 | + } | |
| 1254 | 1257 | #endif |
| 1255 | 1258 | } |
| 1256 | 1259 | if( zUser==0 ){ |
| 1257 | 1260 | zUser = "root"; |
| 1258 | 1261 | } |
| 1259 | 1262 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -1249,10 +1249,13 @@ | |
| 1249 | if( zUser==0 ){ |
| 1250 | #if defined(_WIN32) |
| 1251 | zUser = fossil_getenv("USERNAME"); |
| 1252 | #else |
| 1253 | zUser = fossil_getenv("USER"); |
| 1254 | #endif |
| 1255 | } |
| 1256 | if( zUser==0 ){ |
| 1257 | zUser = "root"; |
| 1258 | } |
| 1259 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -1249,10 +1249,13 @@ | |
| 1249 | if( zUser==0 ){ |
| 1250 | #if defined(_WIN32) |
| 1251 | zUser = fossil_getenv("USERNAME"); |
| 1252 | #else |
| 1253 | zUser = fossil_getenv("USER"); |
| 1254 | if( zUser==0 ){ |
| 1255 | zUser = fossil_getenv("LOGNAME"); |
| 1256 | } |
| 1257 | #endif |
| 1258 | } |
| 1259 | if( zUser==0 ){ |
| 1260 | zUser = "root"; |
| 1261 | } |
| 1262 |
+6
-2
| --- src/user.c | ||
| +++ src/user.c | ||
| @@ -311,13 +311,15 @@ | ||
| 311 | 311 | ** |
| 312 | 312 | ** (4) Try the FOSSIL_USER environment variable. |
| 313 | 313 | ** |
| 314 | 314 | ** (5) Try the USER environment variable. |
| 315 | 315 | ** |
| 316 | -** (6) Try the USERNAME environment variable. | |
| 316 | +** (6) Try the LOGNAME environment variable. | |
| 317 | +** | |
| 318 | +** (7) Try the USERNAME environment variable. | |
| 317 | 319 | ** |
| 318 | -** (7) Check if the user can be extracted from the remote URL. | |
| 320 | +** (8) Check if the user can be extracted from the remote URL. | |
| 319 | 321 | ** |
| 320 | 322 | ** The user name is stored in g.zLogin. The uid is in g.userUid. |
| 321 | 323 | */ |
| 322 | 324 | void user_select(void){ |
| 323 | 325 | if( g.userUid ) return; |
| @@ -334,10 +336,12 @@ | ||
| 334 | 336 | if( attempt_user(db_get("default-user", 0)) ) return; |
| 335 | 337 | |
| 336 | 338 | if( attempt_user(fossil_getenv("FOSSIL_USER")) ) return; |
| 337 | 339 | |
| 338 | 340 | if( attempt_user(fossil_getenv("USER")) ) return; |
| 341 | + | |
| 342 | + if( attempt_user(fossil_getenv("LOGNAME")) ) return; | |
| 339 | 343 | |
| 340 | 344 | if( attempt_user(fossil_getenv("USERNAME")) ) return; |
| 341 | 345 | |
| 342 | 346 | url_parse(0, 0); |
| 343 | 347 | if( g.urlUser && attempt_user(g.urlUser) ) return; |
| 344 | 348 |
| --- src/user.c | |
| +++ src/user.c | |
| @@ -311,13 +311,15 @@ | |
| 311 | ** |
| 312 | ** (4) Try the FOSSIL_USER environment variable. |
| 313 | ** |
| 314 | ** (5) Try the USER environment variable. |
| 315 | ** |
| 316 | ** (6) Try the USERNAME environment variable. |
| 317 | ** |
| 318 | ** (7) Check if the user can be extracted from the remote URL. |
| 319 | ** |
| 320 | ** The user name is stored in g.zLogin. The uid is in g.userUid. |
| 321 | */ |
| 322 | void user_select(void){ |
| 323 | if( g.userUid ) return; |
| @@ -334,10 +336,12 @@ | |
| 334 | if( attempt_user(db_get("default-user", 0)) ) return; |
| 335 | |
| 336 | if( attempt_user(fossil_getenv("FOSSIL_USER")) ) return; |
| 337 | |
| 338 | if( attempt_user(fossil_getenv("USER")) ) return; |
| 339 | |
| 340 | if( attempt_user(fossil_getenv("USERNAME")) ) return; |
| 341 | |
| 342 | url_parse(0, 0); |
| 343 | if( g.urlUser && attempt_user(g.urlUser) ) return; |
| 344 |
| --- src/user.c | |
| +++ src/user.c | |
| @@ -311,13 +311,15 @@ | |
| 311 | ** |
| 312 | ** (4) Try the FOSSIL_USER environment variable. |
| 313 | ** |
| 314 | ** (5) Try the USER environment variable. |
| 315 | ** |
| 316 | ** (6) Try the LOGNAME environment variable. |
| 317 | ** |
| 318 | ** (7) Try the USERNAME environment variable. |
| 319 | ** |
| 320 | ** (8) Check if the user can be extracted from the remote URL. |
| 321 | ** |
| 322 | ** The user name is stored in g.zLogin. The uid is in g.userUid. |
| 323 | */ |
| 324 | void user_select(void){ |
| 325 | if( g.userUid ) return; |
| @@ -334,10 +336,12 @@ | |
| 336 | if( attempt_user(db_get("default-user", 0)) ) return; |
| 337 | |
| 338 | if( attempt_user(fossil_getenv("FOSSIL_USER")) ) return; |
| 339 | |
| 340 | if( attempt_user(fossil_getenv("USER")) ) return; |
| 341 | |
| 342 | if( attempt_user(fossil_getenv("LOGNAME")) ) return; |
| 343 | |
| 344 | if( attempt_user(fossil_getenv("USERNAME")) ) return; |
| 345 | |
| 346 | url_parse(0, 0); |
| 347 | if( g.urlUser && attempt_user(g.urlUser) ) return; |
| 348 |