Merge branch 'master' of gitlab.pcloud.com:pcloud/synclib

Author: virco

pdiff.c

@@ -169,7 +169,8 @@ static psync_socket *get_connected_socket(){
   int saveauth, isbusiness, cryptosetup;
   auth=user=pass=NULL;
   psync_is_business = 0;
-  while (1){
+  int digest = 1;
+  while (1){    
     psync_free(auth);
     psync_free(user);
     psync_free(pass);
@@ -197,8 +198,22 @@ static psync_socket *get_connected_socket(){
       continue;
     }
     device=psync_deviceid();
-    if (user && pass)
-      res=get_userinfo_user_pass(sock, user, pass, device);
+
+    if (user && pass && pass[0])
+      if (digest)
+        res=get_userinfo_user_pass(sock, user, pass, device);
+      else
+      {
+        binparam params[]={P_STR("timeformat", "timestamp"),
+                         P_STR("username", user),
+                         P_STR("password", pass),
+                         P_STR("device", device),
+                         P_BOOL("getauth", 1),
+                         P_BOOL("cryptokeyssign", 1),
+                         P_BOOL("getapiserver", 1),
+                         P_NUM("os", P_OS_ID)};
+      res=send_command(sock, "userinfo", params);
+      }
     else {
       binparam params[]={P_STR("timeformat", "timestamp"),
                          P_STR("auth", auth),

psynclib.c

@@ -292,14 +292,16 @@ void psync_set_user_pass(const char *username, const char *password, int save){
   clear_db(save);
   if (save){
     psync_set_string_value("user", username);
-    psync_set_string_value("pass", password);
+    if (password && password[0])
+      psync_set_string_value("pass", password);
   }
   else{
     pthread_mutex_lock(&psync_my_auth_mutex);
     psync_free(psync_my_user);
     psync_my_user=psync_strdup(username);
     psync_free(psync_my_pass);
-    psync_my_pass=psync_strdup(password);
+    if (password && password[0])
+      psync_my_pass=psync_strdup(password);
     pthread_mutex_unlock(&psync_my_auth_mutex);
   }
   psync_set_status(PSTATUS_TYPE_AUTH, PSTATUS_AUTH_PROVIDED);