This commit was manufactured by cvs2svn to create tag 'v1_63_0_816'.

[gikonavigoeson/gikonavi.git] / Trip.pas

diff --git a/Trip.pas b/Trip.pas
index 1d6d242..262268f 100644 (file)
--- a/Trip.pas
+++ b/Trip.pas
@@ -494,18 +494,18 @@ begin
             Result := '???';
         end else begin
             convpw := '';
-            // \90¶\83L\81[\95û\8e®
-            if pw[ 0 ] = '#' then begin
-                get_pw_salt(pw, convpw, salt);
-            end;
             if (pw[ 0 ] = '#') and (Length(pw) >= 20) then begin
                 // \8f«\97\88\82Ì\8ag\92£\97p
                 Result := '???';
-            end else if Length(convpw) = 0 then begin
-                // \90¶\83L\81[\95û\8e®\83G\83\89\81[
-                Result := '???';
-            end else if Length(convpw) = 8 then begin
-                Result := Copy( crypt_r( PChar(convpw), salt, s ), 4, 100 );
+            end else if pw[ 0 ] = '#' then begin
+                // \90¶\83L\81[\95û\8e®
+                get_pw_salt(pw, convpw, salt);
+                if Length(convpw) = 0 then begin
+                    // \90¶\83L\81[\95û\8e®\83G\83\89\81[
+                    Result := '???';
+                end else if Length(convpw) = 8 then begin
+                    Result := Copy( crypt_r( PChar(convpw), salt, s ), 4, 100 );
+                end
             end else begin
                 // \90V\95û\8e®
                 StringHashSHA1(digest, pw);