Fossil SCM

Merge in SSH open fossil compatibility changes.

amb 2013-07-23 07:25 ssh-shared-account merge
Commit f4e882f5d3e7be5bf0f833eb886da39083b2eea0
Parent f38f76cf0155985…
4 files changed +7 +7 +6 -1 +6 -1
~ src/sync.c ~ src/sync.c ~ src/xfer.c ~ src/xfer.c
M src/sync.c
+7
--- src/sync.c
+++ src/sync.c
@@ -48,13 +48,20 @@
4848
 }
4949
 }else{
5050
 /* Autosync defaults on. To make it default off, "return" here. */
5151
 }
5252
 url_parse(0, URL_REMEMBER);
53
+ if( g.urlIsSsh ){
54
+ clone_ssh_db_options();
55
+ }
5356
 if( g.urlProtocol==0 ) return 0;
5457
 if( ( g.urlUser!=0 || g.zFossilUser!=0 ) && g.urlPasswd==0 ){
5558
 g.urlPasswd = unobscure(db_get("last-sync-pw", 0));
59
+ }
60
+ if( g.urlIsSsh && g.urlPasswd==0 ){
61
+ g.urlFlags |= URL_PROMPT_PW;
62
+ url_prompt_for_password();
5663
 }
5764
 #if 0 /* Disabled for now */
5865
 if( (flags & AUTOSYNC_PULL)!=0 && db_get_boolean("auto-shun",1) ){
5966
 /* When doing an automatic pull, also automatically pull shuns from
6067
 ** the server if pull_shuns is enabled.
6168
--- src/sync.c
+++ src/sync.c
@@ -48,13 +48,20 @@
48 }
49 }else{
50 /* Autosync defaults on. To make it default off, "return" here. */
51 }
52 url_parse(0, URL_REMEMBER);
 
 
 
53 if( g.urlProtocol==0 ) return 0;
54 if( ( g.urlUser!=0 || g.zFossilUser!=0 ) && g.urlPasswd==0 ){
55 g.urlPasswd = unobscure(db_get("last-sync-pw", 0));
 
 
 
 
56 }
57 #if 0 /* Disabled for now */
58 if( (flags & AUTOSYNC_PULL)!=0 && db_get_boolean("auto-shun",1) ){
59 /* When doing an automatic pull, also automatically pull shuns from
60 ** the server if pull_shuns is enabled.
61
--- src/sync.c
+++ src/sync.c
@@ -48,13 +48,20 @@
48 }
49 }else{
50 /* Autosync defaults on. To make it default off, "return" here. */
51 }
52 url_parse(0, URL_REMEMBER);
53 if( g.urlIsSsh ){
54 clone_ssh_db_options();
55 }
56 if( g.urlProtocol==0 ) return 0;
57 if( ( g.urlUser!=0 || g.zFossilUser!=0 ) && g.urlPasswd==0 ){
58 g.urlPasswd = unobscure(db_get("last-sync-pw", 0));
59 }
60 if( g.urlIsSsh && g.urlPasswd==0 ){
61 g.urlFlags |= URL_PROMPT_PW;
62 url_prompt_for_password();
63 }
64 #if 0 /* Disabled for now */
65 if( (flags & AUTOSYNC_PULL)!=0 && db_get_boolean("auto-shun",1) ){
66 /* When doing an automatic pull, also automatically pull shuns from
67 ** the server if pull_shuns is enabled.
68
M src/sync.c
+7
--- src/sync.c
+++ src/sync.c
@@ -48,13 +48,20 @@
4848
 }
4949
 }else{
5050
 /* Autosync defaults on. To make it default off, "return" here. */
5151
 }
5252
 url_parse(0, URL_REMEMBER);
53
+ if( g.urlIsSsh ){
54
+ clone_ssh_db_options();
55
+ }
5356
 if( g.urlProtocol==0 ) return 0;
5457
 if( ( g.urlUser!=0 || g.zFossilUser!=0 ) && g.urlPasswd==0 ){
5558
 g.urlPasswd = unobscure(db_get("last-sync-pw", 0));
59
+ }
60
+ if( g.urlIsSsh && g.urlPasswd==0 ){
61
+ g.urlFlags |= URL_PROMPT_PW;
62
+ url_prompt_for_password();
5663
 }
5764
 #if 0 /* Disabled for now */
5865
 if( (flags & AUTOSYNC_PULL)!=0 && db_get_boolean("auto-shun",1) ){
5966
 /* When doing an automatic pull, also automatically pull shuns from
6067
 ** the server if pull_shuns is enabled.
6168
--- src/sync.c
+++ src/sync.c
@@ -48,13 +48,20 @@
48 }
49 }else{
50 /* Autosync defaults on. To make it default off, "return" here. */
51 }
52 url_parse(0, URL_REMEMBER);
 
 
 
53 if( g.urlProtocol==0 ) return 0;
54 if( ( g.urlUser!=0 || g.zFossilUser!=0 ) && g.urlPasswd==0 ){
55 g.urlPasswd = unobscure(db_get("last-sync-pw", 0));
 
 
 
 
56 }
57 #if 0 /* Disabled for now */
58 if( (flags & AUTOSYNC_PULL)!=0 && db_get_boolean("auto-shun",1) ){
59 /* When doing an automatic pull, also automatically pull shuns from
60 ** the server if pull_shuns is enabled.
61
--- src/sync.c
+++ src/sync.c
@@ -48,13 +48,20 @@
48 }
49 }else{
50 /* Autosync defaults on. To make it default off, "return" here. */
51 }
52 url_parse(0, URL_REMEMBER);
53 if( g.urlIsSsh ){
54 clone_ssh_db_options();
55 }
56 if( g.urlProtocol==0 ) return 0;
57 if( ( g.urlUser!=0 || g.zFossilUser!=0 ) && g.urlPasswd==0 ){
58 g.urlPasswd = unobscure(db_get("last-sync-pw", 0));
59 }
60 if( g.urlIsSsh && g.urlPasswd==0 ){
61 g.urlFlags |= URL_PROMPT_PW;
62 url_prompt_for_password();
63 }
64 #if 0 /* Disabled for now */
65 if( (flags & AUTOSYNC_PULL)!=0 && db_get_boolean("auto-shun",1) ){
66 /* When doing an automatic pull, also automatically pull shuns from
67 ** the server if pull_shuns is enabled.
68
M src/xfer.c
+6 -1
--- src/xfer.c
+++ src/xfer.c
@@ -1743,11 +1743,16 @@
17431743
 fossil_print("Error: %s\n", zMsg);
17441744
 if( fossil_strcmp(zMsg, "login failed")==0 ){
17451745
 if( nCycle<2 ){
17461746
 g.urlPasswd = 0;
17471747
 go = 1;
1748
- if( g.cgiOutput==0 ) url_prompt_for_password();
1748
+ if( g.cgiOutput==0 ){
1749
+ if( g.urlIsSsh ){
1750
+ g.urlFlags |= URL_PROMPT_PW;
1751
+ }
1752
+ url_prompt_for_password();
1753
+ }
17491754
 }
17501755
 }else{
17511756
 blob_appendf(&xfer.err, "server says: %s\n", zMsg);
17521757
 nErr++;
17531758
 }
17541759
--- src/xfer.c
+++ src/xfer.c
@@ -1743,11 +1743,16 @@
1743 fossil_print("Error: %s\n", zMsg);
1744 if( fossil_strcmp(zMsg, "login failed")==0 ){
1745 if( nCycle<2 ){
1746 g.urlPasswd = 0;
1747 go = 1;
1748 if( g.cgiOutput==0 ) url_prompt_for_password();
 
 
 
 
 
1749 }
1750 }else{
1751 blob_appendf(&xfer.err, "server says: %s\n", zMsg);
1752 nErr++;
1753 }
1754
--- src/xfer.c
+++ src/xfer.c
@@ -1743,11 +1743,16 @@
1743 fossil_print("Error: %s\n", zMsg);
1744 if( fossil_strcmp(zMsg, "login failed")==0 ){
1745 if( nCycle<2 ){
1746 g.urlPasswd = 0;
1747 go = 1;
1748 if( g.cgiOutput==0 ){
1749 if( g.urlIsSsh ){
1750 g.urlFlags |= URL_PROMPT_PW;
1751 }
1752 url_prompt_for_password();
1753 }
1754 }
1755 }else{
1756 blob_appendf(&xfer.err, "server says: %s\n", zMsg);
1757 nErr++;
1758 }
1759
M src/xfer.c
+6 -1
--- src/xfer.c
+++ src/xfer.c
@@ -1743,11 +1743,16 @@
17431743
 fossil_print("Error: %s\n", zMsg);
17441744
 if( fossil_strcmp(zMsg, "login failed")==0 ){
17451745
 if( nCycle<2 ){
17461746
 g.urlPasswd = 0;
17471747
 go = 1;
1748
- if( g.cgiOutput==0 ) url_prompt_for_password();
1748
+ if( g.cgiOutput==0 ){
1749
+ if( g.urlIsSsh ){
1750
+ g.urlFlags |= URL_PROMPT_PW;
1751
+ }
1752
+ url_prompt_for_password();
1753
+ }
17491754
 }
17501755
 }else{
17511756
 blob_appendf(&xfer.err, "server says: %s\n", zMsg);
17521757
 nErr++;
17531758
 }
17541759
--- src/xfer.c
+++ src/xfer.c
@@ -1743,11 +1743,16 @@
1743 fossil_print("Error: %s\n", zMsg);
1744 if( fossil_strcmp(zMsg, "login failed")==0 ){
1745 if( nCycle<2 ){
1746 g.urlPasswd = 0;
1747 go = 1;
1748 if( g.cgiOutput==0 ) url_prompt_for_password();
 
 
 
 
 
1749 }
1750 }else{
1751 blob_appendf(&xfer.err, "server says: %s\n", zMsg);
1752 nErr++;
1753 }
1754
--- src/xfer.c
+++ src/xfer.c
@@ -1743,11 +1743,16 @@
1743 fossil_print("Error: %s\n", zMsg);
1744 if( fossil_strcmp(zMsg, "login failed")==0 ){
1745 if( nCycle<2 ){
1746 g.urlPasswd = 0;
1747 go = 1;
1748 if( g.cgiOutput==0 ){
1749 if( g.urlIsSsh ){
1750 g.urlFlags |= URL_PROMPT_PW;
1751 }
1752 url_prompt_for_password();
1753 }
1754 }
1755 }else{
1756 blob_appendf(&xfer.err, "server says: %s\n", zMsg);
1757 nErr++;
1758 }
1759

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button