Fossil

Diff
Login

Diff

Differences From Artifact [fe24fc18f0]:

To Artifact [d8864d4601]:


156
157
158
159
160
161
162
163
164

165
166
167
168
169
170
171
      blob_reset(&fn);
    }
    db_multi_exec(
      "REPLACE INTO config(name,value,mtime)"
      " VALUES('server-code', lower(hex(randomblob(20))), now());"
    );
    url_enable_proxy(0);
    url_get_password_if_needed();
    clone_ssh_db_set_options();

    g.xlinkClusterOnly = 1;
    nErr = client_sync(SYNC_CLONE | bPrivate,CONFIGSET_ALL,0);
    g.xlinkClusterOnly = 0;
    verify_cancel();
    db_end_transaction(0);
    db_close(1);
    if( nErr ){







<

>







156
157
158
159
160
161
162

163
164
165
166
167
168
169
170
171
      blob_reset(&fn);
    }
    db_multi_exec(
      "REPLACE INTO config(name,value,mtime)"
      " VALUES('server-code', lower(hex(randomblob(20))), now());"
    );
    url_enable_proxy(0);

    clone_ssh_db_set_options();
    url_get_password_if_needed();
    g.xlinkClusterOnly = 1;
    nErr = client_sync(SYNC_CLONE | bPrivate,CONFIGSET_ALL,0);
    g.xlinkClusterOnly = 0;
    verify_cancel();
    db_end_transaction(0);
    db_close(1);
    if( nErr ){
211
212
213
214
215
216
217

218
219
220
221
222
223
224
225
226
227
228
229
230

}

/*
** Set SSH options discovered in global variables (set from command line 
** options).
*/
void clone_ssh_db_set_options(void){

  if( g.zSshFossilCmd && g.zSshFossilCmd[0] ){
    db_set("ssh-fossil", g.zSshFossilCmd, 0);
  }
  if( g.zSshCmd && g.zSshCmd[0] ){
    db_set("ssh-command", g.zSshCmd, 0);
  }
  if( g.zFossilUser && g.zFossilUser[0] ){
    db_set("ssh-fossil-user", g.zFossilUser, 0);
  }
  if( g.zSshUseHttp && g.zSshUseHttp[0] ){
    db_set_int("ssh-use-http", is_truth(g.zSshUseHttp), 0);
  }
}








>
|
|
|
|
|
|
|
|
|
|
|
|
|
>
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
}

/*
** Set SSH options discovered in global variables (set from command line 
** options).
*/
void clone_ssh_db_set_options(void){
  if( g.urlIsSsh ){
    if( g.zSshFossilCmd && g.zSshFossilCmd[0] ){
      db_set("ssh-fossil", g.zSshFossilCmd, 0);
    }
    if( g.zSshCmd && g.zSshCmd[0] ){
      db_set("ssh-command", g.zSshCmd, 0);
    }
    if( g.zFossilUser && g.zFossilUser[0] ){
      db_set("ssh-fossil-user", g.zFossilUser, 0);
    }
    if( g.zSshUseHttp && g.zSshUseHttp[0] ){
      db_set_int("ssh-use-http", is_truth(g.zSshUseHttp), 0);
    }
  }
}