Project

General

Profile

0004-server.c-show-correct-crypt-support-result_patch.txt

mackyle, 2015-12-03 22:42

 
1
From 3d26623f42826ea08b899320388acdec38023f7a Mon Sep 17 00:00:00 2001
2
From: "Kyle J. McKay" <mackyle@gmail.com>
3
Date: Thu, 3 Dec 2015 11:20:32 -0800
4
Subject: [PATCH] server.c: show correct crypt support result
5

    
6
If the crypt function is available as part of the standard
7
system library, then HAVE_LIBCRYPT will not be set, but
8
HAVE_CRYPT or HAVE_CRYPT_R will.
9

    
10
Make server.c test HAVE_CRYPT, HAVE_CRYPT_R  and HAVE_LIBCRYPT
11
to determine the correct value of crypt support.
12

    
13
Signed-off-by: Kyle J. McKay
14
---
15
 src/server.c | 2 +-
16
 1 file changed, 1 insertion(+), 1 deletion(-)
17

    
18
diff --git a/src/server.c b/src/server.c
19
index d79594cd..e096de1b 100644
20
--- a/src/server.c
21
+++ b/src/server.c
22
@@ -454,7 +454,7 @@ static void show_features (void) {
23
 #else
24
       "\t- bzip2 support\n"
25
 #endif
26
-#ifdef HAVE_LIBCRYPT
27
+#if defined(HAVE_CRYPT) || defined(HAVE_CRYPT_R) || defined(HAVE_LIBCRYPT)
28
       "\t+ crypt support\n"
29
 #else
30
       "\t- crypt support\n"
31
-- 
32
2.4.10
33