Differences From:

File src/db.c part of check-in [9de6abab2a] - Miscellaneous cosmetic changes by eric on 2008-11-15 14:18:09. [view]

To:

File src/db.c part of check-in [0c6ea0d93f] - When creating a new repository or cloning a repository, print the initial administrator password on standard output. This is intended to help new users figure out how to log in. Ticket ca08d51f19 by drh on 2008-11-20 01:07:10. [view]

@@ -852,9 +852,9 @@
 
 /*
 ** Create the default user accounts in the USER table.
 */
-void db_create_default_users(void){
+void db_create_default_users(int setupUserOnly){
   const char *zUser;
   zUser = db_get("default-user", 0);
   if( zUser==0 ){
 #ifdef __MINGW32__
@@ -867,18 +867,20 @@
     zUser = "root";
   }
   db_multi_exec(
      "INSERT INTO user(login, pw, cap, info)"
-     "VALUES(%Q,'','s','')", zUser
+     "VALUES(%Q,lower(hex(randomblob(3))),'s','')", zUser
   );
-  db_multi_exec(
-     "INSERT INTO user(login,pw,cap,info)"
-     "   VALUES('anonymous','anonymous','ghknw','Anon');"
-     "INSERT INTO user(login,pw,cap,info)"
-     "   VALUES('nobody','','jor','Nobody');"
-     "INSERT INTO user(login,pw,cap,info)"
-     "   VALUES('developer','','deipt','Dev');"
-  );
+  if( !setupUserOnly ){
+    db_multi_exec(
+       "INSERT INTO user(login,pw,cap,info)"
+       "   VALUES('anonymous','anonymous','ghknw','Anon');"
+       "INSERT INTO user(login,pw,cap,info)"
+       "   VALUES('nobody','','jor','Nobody');"
+       "INSERT INTO user(login,pw,cap,info)"
+       "   VALUES('developer','','deipt','Dev');"
+    );
+  }
 }
 
 /*
 ** Fill an empty repository database with the basic information for a
@@ -906,9 +908,9 @@
     );
   }
   if( !db_is_global("autosync") ) db_set_int("autosync", 1, 0);
   if( !db_is_global("localauth") ) db_set_int("localauth", 0, 0);
-  db_create_default_users();
+  db_create_default_users(0);
   user_select();
 
   if (makeInitialVersion){
     blob_zero(&manifest);
@@ -936,8 +938,9 @@
 ** This command is distinct from "clone".  The "clone" command makes
 ** a copy of an existing project.  This command starts a new project.
 */
 void create_repository_cmd(void){
+  char *zPassword;
   if( g.argc!=3 ){
     usage("REPOSITORY-NAME");
   }
   db_create_repository(g.argv[2]);
@@ -947,9 +950,10 @@
   db_initial_setup(1, 1);
   db_end_transaction(0);
   printf("project-id: %s\n", db_get("project-code", 0));
   printf("server-id:  %s\n", db_get("server-code", 0));
-  printf("admin-user: %s (no password set yet!)\n", g.zLogin);
+  zPassword = db_text(0, "SELECT pw FROM user WHERE login=%Q", g.zLogin);
+  printf("admin-user: %s (initial password is \"%s\")\n", g.zLogin, zPassword);
   printf("baseline:   %s\n", db_text(0, "SELECT uuid FROM blob"));
 }
 
 /*