Fix compiling with --disable-crypto and/or --disable-ssl

PATCH In review David Sommerseth 3 participants 3 messages Dec 14, 2011 – Dec 15, 2011

Share & tools

David Sommerseth

author

2011-12-14 17:15 UTC #0 lore raw

PATCH 1/1 Fix compiling with --disable-crypto and/or --disable-ssl

The checks introduced in commit 0f2bc0dd92f43c91e33bba8a66b06b98f281efc1 didn't properly remove checks if crypto or SSL was disabled at compile time.

Signed-off-by David Sommerseth <[email protected]...>

---
 options.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

options.c +5 -5

index 27193ff..736495e 100644
@@ -2691,10 +2691,11 @@ options_postprocess_filechecks (struct options *options)
   errs |= check_file_access (CHKACC_FILE, options->management_user_pass, R_OK,
                              "--management user/password file");
 #endif /* ENABLE_MANAGEMENT */
+#if P2MP
   if( options->auth_user_pass_file && strcmp(options->auth_user_pass_file, "stdin") != 0 )
     errs |= check_file_access (CHKACC_FILE, options->auth_user_pass_file, R_OK,
                                "--auth-user-pass");
-
+#endif /* P2MP */
 
   /* ** System related ** */
   errs |= check_file_access (CHKACC_FILE, options->chroot_dir,

@@ -2709,15 +2710,14 @@ options_postprocess_filechecks (struct options *options)
                              R_OK|W_OK, "--status");
 
   /* ** Config related ** */
-#ifdef USE_CRYPTO
+#ifdef USE_SSL
   errs |= check_file_access (CHKACC_FILE, options->tls_export_cert,
                              R_OK|W_OK|X_OK, "--tls-export-cert");
-#endif /* USE_CRYPTO */
+#endif /* USE_SSL */
+#if P2MP_SERVER
   errs |= check_file_access (CHKACC_FILE, options->client_config_dir,
                              R_OK|X_OK, "--client-config-dir");
-
   /* ** Script hooks ** */
-#if P2MP_SERVER
   errs |= check_file_access (CHKACC_FILE, options->client_connect_script,
                              R_OK|X_OK, "--client-connect script");
   errs |= check_file_access (CHKACC_FILE, options->client_disconnect_script,

Signature · 1 line

1.7.4.4

Gert Doering

2011-12-14 18:27 UTC #1 lore raw

Hi,

Quoted 2 lines · David Sommerseth

The checks introduced in commit 0f2bc0dd92f43c91e33bba8a66b06b98f281efc1 didn't properly remove checks if crypto or SSL was disabled at compile time.

ACK. Nasty #idef's, good that we have Buildbot to tell us :-)

gert

Signature · 4 lines

USENET is *not* the non-clickable part of WWW!
                                                           //www.muc.de/~gert/
Gert Doering - Munich, Germany                             [email protected]...
fax: +49-89-35655025                        [email protected]...

David Sommerseth

2011-12-15 10:46 UTC #2 lore raw

In reply to David Sommerseth

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 6 lines · David Sommerseth

The checks introduced in commit 0f2bc0dd92f43c91e33bba8a66b06b98f281efc1 didn't properly remove checks if crypto or SSL was disabled at compile time.
Signed-off-by David Sommerseth <[email protected]...> --- options.c |
10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)

Applied and pushed to master branches on testing and stable git trees.

commit 1d5c4433cdb7ab0a9d9f7496e6dc2cee189d375f

Author: David Sommerseth <[email protected]...>
Date:   Wed Dec 14 18:12:23 2011 +0100

    Signed-off-by: David Sommerseth <[email protected]...>
    Acked-by: Gert Doering <[email protected]...>

kind regards,

David Sommerseth
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk7p0AEACgkQDC186MBRfrp+kwCeKejrGoNeKoofE3mgZOsin+Dp cTkAnRiZRAj+x+qT3V1/pumqoXAf/mrz
=yPJD
-----END PGP SIGNATURE-----