Fossil SCM
Fix a bug in login.
Commit
947842fb0ba593e4781b689ebbe880ed9989350b
Parent
1a4dd313a8300cb…
1 file changed
+7
-3
+7
-3
| --- src/login.c | ||
| +++ src/login.c | ||
| @@ -203,19 +203,23 @@ | ||
| 203 | 203 | g.isAnon = 0; |
| 204 | 204 | } |
| 205 | 205 | |
| 206 | 206 | /* Check the login cookie to see if it matches a known valid user. |
| 207 | 207 | */ |
| 208 | - if( uid==0 && (zCookie = P(login_cookie_name()))!=0 ){ | |
| 209 | - uid = db_int(0, | |
| 210 | - "SELECT 1 FROM user" | |
| 208 | + if( uid==0 ){ | |
| 209 | + if( (zCookie = P(login_cookie_name()))!=0 ){ | |
| 210 | + uid = db_int(0, | |
| 211 | + "SELECT uid FROM user" | |
| 211 | 212 | " WHERE uid=%d" |
| 212 | 213 | " AND cookie=%Q" |
| 213 | 214 | " AND ipaddr=%Q" |
| 214 | 215 | " AND cexpire>julianday('now')", |
| 215 | 216 | atoi(zCookie), zCookie, zRemoteAddr |
| 216 | 217 | ); |
| 218 | + }else{ | |
| 219 | + uid = db_int(0, "SELECT uid FROM user WHERE login='anonymous'"); | |
| 220 | + } | |
| 217 | 221 | } |
| 218 | 222 | |
| 219 | 223 | if( uid==0 ){ |
| 220 | 224 | g.isAnon = 1; |
| 221 | 225 | g.zLogin = ""; |
| 222 | 226 |
| --- src/login.c | |
| +++ src/login.c | |
| @@ -203,19 +203,23 @@ | |
| 203 | g.isAnon = 0; |
| 204 | } |
| 205 | |
| 206 | /* Check the login cookie to see if it matches a known valid user. |
| 207 | */ |
| 208 | if( uid==0 && (zCookie = P(login_cookie_name()))!=0 ){ |
| 209 | uid = db_int(0, |
| 210 | "SELECT 1 FROM user" |
| 211 | " WHERE uid=%d" |
| 212 | " AND cookie=%Q" |
| 213 | " AND ipaddr=%Q" |
| 214 | " AND cexpire>julianday('now')", |
| 215 | atoi(zCookie), zCookie, zRemoteAddr |
| 216 | ); |
| 217 | } |
| 218 | |
| 219 | if( uid==0 ){ |
| 220 | g.isAnon = 1; |
| 221 | g.zLogin = ""; |
| 222 |
| --- src/login.c | |
| +++ src/login.c | |
| @@ -203,19 +203,23 @@ | |
| 203 | g.isAnon = 0; |
| 204 | } |
| 205 | |
| 206 | /* Check the login cookie to see if it matches a known valid user. |
| 207 | */ |
| 208 | if( uid==0 ){ |
| 209 | if( (zCookie = P(login_cookie_name()))!=0 ){ |
| 210 | uid = db_int(0, |
| 211 | "SELECT uid FROM user" |
| 212 | " WHERE uid=%d" |
| 213 | " AND cookie=%Q" |
| 214 | " AND ipaddr=%Q" |
| 215 | " AND cexpire>julianday('now')", |
| 216 | atoi(zCookie), zCookie, zRemoteAddr |
| 217 | ); |
| 218 | }else{ |
| 219 | uid = db_int(0, "SELECT uid FROM user WHERE login='anonymous'"); |
| 220 | } |
| 221 | } |
| 222 | |
| 223 | if( uid==0 ){ |
| 224 | g.isAnon = 1; |
| 225 | g.zLogin = ""; |
| 226 |