server session BUGFIX where crypt_r is not available

Mislav Novakovic · Mislav Novakovic · commit ebf4bd7f0261 · 2017-08-03T17:35:01.000+02:00
Signed-off-by: Mislav Novakovic &lt;mislav.novakovic@sartura.hr&gt;
diff --git a/src/session_server_ssh.c b/src/session_server_ssh.c
@@ -751,7 +751,9 @@ static int
 auth_password_compare_pwd(const char *pass_hash, const char *pass_clear)
 {
     char *new_pass_hash;
+#if defined(HAVE_CRYPT_R)
     struct crypt_data cdata;
+#endif
 
     if (!pass_hash[0]) {
         if (!pass_clear[0]) {
@@ -764,8 +766,12 @@ auth_password_compare_pwd(const char *pass_hash, const char *pass_clear)
         }
     }
 
+#if defined(HAVE_CRYPT_R)
     cdata.initialized = 0;
     new_pass_hash = crypt_r(pass_clear, pass_hash, &cdata);
+#else
+    new_pass_hash = crypt(pass_clear, pass_hash);
+#endif
     return strcmp(new_pass_hash, pass_hash);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -751,7 +751,9 @@ static int`
`751`	`751`	`auth_password_compare_pwd(const char pass_hash, const char pass_clear)`
`752`	`752`	`{`
`753`	`753`	`char *new_pass_hash;`
	`754`	`+#if defined(HAVE_CRYPT_R)`
`754`	`755`	`struct crypt_data cdata;`
	`756`	`+#endif`
`755`	`757`
`756`	`758`	`if (!pass_hash[0]) {`
`757`	`759`	`if (!pass_clear[0]) {`
`@@ -764,8 +766,12 @@ auth_password_compare_pwd(const char pass_hash, const char pass_clear)`
`764`	`766`	`}`
`765`	`767`	`}`
`766`	`768`
	`769`	`+#if defined(HAVE_CRYPT_R)`
`767`	`770`	`cdata.initialized = 0;`
`768`	`771`	`new_pass_hash = crypt_r(pass_clear, pass_hash, &cdata);`
	`772`	`+#else`
	`773`	`+ new_pass_hash = crypt(pass_clear, pass_hash);`
	`774`	`+#endif`
`769`	`775`	`return strcmp(new_pass_hash, pass_hash);`
`770`	`776`	`}`
`771`	`777`