Permalink
Browse files

compile-time fix for non-sockets builds.

For non-sockets builds, we had the wrong sense of a compile-time test.
This would've caused pftool to spew warnings about reading the
~/.awsAuth file, but was hidden by the same thing that required
erasureUtils 54bea71ba066.  Unhidden by that, and now fixed by this.
  • Loading branch information...
jti-lanl committed Nov 1, 2018
1 parent 479108c commit d707b2f017a8180bd26f865b8db273cefd40dd2e
Showing with 7 additions and 5 deletions.
  1. +5 −2 configure.ac
  2. +1 −1 fuse/src/dal.c
  3. +1 −2 fuse/src/dal.h
@@ -212,13 +212,16 @@ AS_IF([test x"$enable_mc" = xsockets],
[AC_CHECK_LIB([ne], [udal_skt_fd_init], , AC_ERROR(m4_normalize[
libne was not built with --enable-sockets
You must either rebuild libne with --enable-sockets
or build marfs without --enable-mc=sockets])) ],
or build marfs without --enable-mc=sockets])) ])
AS_IF([test x"$enable_mc" = xyes],
[AC_CHECK_LIB([ne], [udal_non_socket_build], , AC_ERROR(m4_normalize[
libne was built with --enable-sockets
You must either rebuild libne without --enable-sockets
or build marfs with --enable-mc=sockets])) ])

AC_CHECK_LIB([ne], [ne_open], , AC_ERROR([libne is needed for an MC build]))

AS_IF([test x"$enable_mc" != xno],
[AC_CHECK_LIB([ne], [ne_open], , AC_ERROR([libne is needed for an MC build])) ])



@@ -819,7 +819,7 @@ int mc_config(struct DAL* dal,
SEM_INIT(&config->lock, 0, 1);
}

#if (SOCKETS != SKT_rdma) && S3_AUTH
#if (SOCKETS == SKT_rdma) && S3_AUTH
// To allow generating per-connection auth-signatures, capture the S3
// credentials up front, while we have access to the AWS config file
// (i.e. before de-escalation). If mc_user is null, skt_auth_install()
@@ -99,8 +99,7 @@ OF SUCH DAMAGE.
#include <stdio.h>

#if USE_MC

# include "skt_config.h" // libne configure-time #defines, like S3_AUTH
# include "udal_config.h" // libne configure-time #defines, like S3_AUTH
# if S3_AUTH
# include <aws4c.h>
# endif

0 comments on commit d707b2f

Please sign in to comment.