Fossil SCM
In "fossil server --create", don't create "admin" user with "admin" password, but print the random-generated password
Commit
2ec9af63bdf19f75e0da164cd48ca53a067a815d
Parent
e315ec84109a2ed…
1 file changed
+7
-2
+7
-2
| --- src/main.c | ||
| +++ src/main.c | ||
| @@ -2046,16 +2046,21 @@ | ||
| 2046 | 2046 | if( isDir==1 ){ |
| 2047 | 2047 | g.zRepositoryName = mprintf("%s", zRepo); |
| 2048 | 2048 | file_simplify_name(g.zRepositoryName, -1, 0); |
| 2049 | 2049 | }else{ |
| 2050 | 2050 | if( isDir==0 && fCreate ){ |
| 2051 | + const char *zPassword; | |
| 2051 | 2052 | db_create_repository(zRepo); |
| 2052 | 2053 | db_open_repository(zRepo); |
| 2053 | 2054 | db_begin_transaction(); |
| 2054 | - db_initial_setup(0,"now","admin"); | |
| 2055 | - db_multi_exec("UPDATE user SET pw='admin' WHERE login='admin'"); | |
| 2055 | + db_initial_setup(0,"now",0); | |
| 2056 | 2056 | db_end_transaction(0); |
| 2057 | + fossil_print("project-id: %s\n", db_get("project-code", 0)); | |
| 2058 | + fossil_print("server-id: %s\n", db_get("server-code", 0)); | |
| 2059 | + zPassword = db_text(0, "SELECT pw FROM user WHERE login=%Q", g.zLogin); | |
| 2060 | + fossil_print("admin-user: %s (initial password is \"%s\")\n", | |
| 2061 | + g.zLogin, zPassword); | |
| 2057 | 2062 | cache_initialize(); |
| 2058 | 2063 | g.zLogin = 0; |
| 2059 | 2064 | g.userUid = 0; |
| 2060 | 2065 | }else{ |
| 2061 | 2066 | db_open_repository(zRepo); |
| 2062 | 2067 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -2046,16 +2046,21 @@ | |
| 2046 | if( isDir==1 ){ |
| 2047 | g.zRepositoryName = mprintf("%s", zRepo); |
| 2048 | file_simplify_name(g.zRepositoryName, -1, 0); |
| 2049 | }else{ |
| 2050 | if( isDir==0 && fCreate ){ |
| 2051 | db_create_repository(zRepo); |
| 2052 | db_open_repository(zRepo); |
| 2053 | db_begin_transaction(); |
| 2054 | db_initial_setup(0,"now","admin"); |
| 2055 | db_multi_exec("UPDATE user SET pw='admin' WHERE login='admin'"); |
| 2056 | db_end_transaction(0); |
| 2057 | cache_initialize(); |
| 2058 | g.zLogin = 0; |
| 2059 | g.userUid = 0; |
| 2060 | }else{ |
| 2061 | db_open_repository(zRepo); |
| 2062 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -2046,16 +2046,21 @@ | |
| 2046 | if( isDir==1 ){ |
| 2047 | g.zRepositoryName = mprintf("%s", zRepo); |
| 2048 | file_simplify_name(g.zRepositoryName, -1, 0); |
| 2049 | }else{ |
| 2050 | if( isDir==0 && fCreate ){ |
| 2051 | const char *zPassword; |
| 2052 | db_create_repository(zRepo); |
| 2053 | db_open_repository(zRepo); |
| 2054 | db_begin_transaction(); |
| 2055 | db_initial_setup(0,"now",0); |
| 2056 | db_end_transaction(0); |
| 2057 | fossil_print("project-id: %s\n", db_get("project-code", 0)); |
| 2058 | fossil_print("server-id: %s\n", db_get("server-code", 0)); |
| 2059 | zPassword = db_text(0, "SELECT pw FROM user WHERE login=%Q", g.zLogin); |
| 2060 | fossil_print("admin-user: %s (initial password is \"%s\")\n", |
| 2061 | g.zLogin, zPassword); |
| 2062 | cache_initialize(); |
| 2063 | g.zLogin = 0; |
| 2064 | g.userUid = 0; |
| 2065 | }else{ |
| 2066 | db_open_repository(zRepo); |
| 2067 |