Merge pull request #45 from mcnewton/build-tidy

Couple of minor build tidyness issues

diff --git a/raddb/policy.conf b/raddb/policy.conf
index 7a64ac8..13afd59 100644 (file)
--- a/raddb/policy.conf
+++ b/raddb/policy.conf
@@ -335,7 +335,7 @@ policy {
        }
 
        #  Assign compatibility data to request for sqlippool
-       dhcp_sqlippool.postauth {
+       dhcp_sqlippool.post-auth {
 
 
                #  Do some minor hacks to the request so that it looks

diff --git a/scripts/boiler.mk b/scripts/boiler.mk
index b150b1c..6888f86 100644 (file)
--- a/scripts/boiler.mk
+++ b/scripts/boiler.mk
@@ -88,7 +88,6 @@ define FILTER_DEPENDS
          -e 's,^$${BUILD_DIR},$$$${BUILD_DIR},' \
          -e 's, $${BUILD_DIR}/make/include/[^ :]*,,' \
          -e 's, $${BUILD_DIR}, $$$${BUILD_DIR},' \
-         -e '/^$$$$/ d' \
          < $${BUILD_DIR}/objs/$$*.d | sed -e '$$$$!N; /^\(.*\)\n\1$$$$/!P; D' \
          >  $${BUILD_DIR}/make/src/$$*.mk
        @sed -e 's/#.*//' \
@@ -98,7 +97,6 @@ define FILTER_DEPENDS
          -e 's, $${BUILD_DIR}/make/include/[^ :]*,,' \
          -e 's/^[^:]*: *//' \
          -e 's/ *\\$$$$//' \
-         -e '/^$$$$/ d' \
          -e 's/$$$$/ :/' \
          < $${BUILD_DIR}/objs/$$*.d | sed -e '$$$$!N; /^\(.*\)\n\1$$$$/!P; D' \
         >> $${BUILD_DIR}/make/src/$$*.mk

diff --git a/scripts/install.mk b/scripts/install.mk
index 10b3474..c659c0a 100644 (file)
--- a/scripts/install.mk
+++ b/scripts/install.mk
@@ -36,7 +36,7 @@ define ADD_INSTALL_RULE.exe
 
     # Install executable ${1}
     $${${1}_INSTALLDIR}/$(notdir ${1}): $${${1}_BUILD}/$${RELINK}${1}
-       @echo INSTALL $${${1}_INSTALLDIR}
+       @echo INSTALL ${1}
        @$${PROGRAM_INSTALL} -d -m 755 $${${1}_INSTALLDIR}
        @$${PROGRAM_INSTALL} -c -m 755 $${BUILD_DIR}/bin/$${RELINK}${1} $${${1}_INSTALLDIR}/
        @$${${1}_POSTINSTALL}

diff --git a/scripts/jlibtool.c b/scripts/jlibtool.c
index 606d46d..8db049d 100644 (file)
--- a/scripts/jlibtool.c
+++ b/scripts/jlibtool.c
@@ -287,7 +287,7 @@ typedef struct {
 } command_t;
 
 #ifdef RPATH
-void add_rpath(count_chars *cc, const char *path);
+static void add_rpath(count_chars *cc, const char *path);
 #endif
 
 static void usage(int code)

diff --git a/src/all.mk b/src/all.mk
index 1591b7b..25f8239 100644 (file)
--- a/src/all.mk
+++ b/src/all.mk
@@ -1,11 +1,14 @@
 # add this dependency BEFORE including the other submakefiles.
-all: ${BUILD_DIR}/make/include/freeradius-devel
+all: ${BUILD_DIR}/make/include/freeradius-devel src/freeradius-devel
 
 #TARGET        := src/freeradius-devel
 
 # Ensure that the devel files have access to radpaths.h
 ${BUILD_DIR}/make/include/freeradius-devel: src/include/radpaths.h
-       [ -e $@ ] || (mkdir -p $(dir $@) && ln -s ${top_builddir}/src/include $@)
+       @[ -e $@ ] || (mkdir -p $(dir $@) && ln -s ${top_builddir}/src/include $@)
+
+src/freeradius-devel: src/include/radpaths.h
+       @[ -e $@ ] || ln -s include $@
 
 SUBMAKEFILES := include/all.mk lib/all.mk modules/all.mk main/all.mk
 

diff --git a/src/include/all.mk b/src/include/all.mk
index 93597c4..c645d40 100644 (file)
--- a/src/include/all.mk
+++ b/src/include/all.mk
@@ -36,5 +36,5 @@ ${SRC_INCLUDE_DIR}/:
 # install the headers by re-writing the local files
 ${SRC_INCLUDE_DIR}/%.h: ${top_srcdir}/src/include/%.h
        @echo INSTALL $(notdir $<)
-       @sed 's/^#include <freeradius-devel/#include <freeradius/' < $^ > $@
+       @sed 's/^#include <freeradius-devel/#include <freeradius/' < $< > $@
        @chmod 644 $@

diff --git a/src/main/radclient.mk b/src/main/radclient.mk
index 1b72ac1..7750683 100644 (file)
--- a/src/main/radclient.mk
+++ b/src/main/radclient.mk
@@ -2,6 +2,8 @@ TGT_PREREQS := libfreeradius-radius.a
 SRC_CFLAGS := -I${top_srcdir}/src/modules/rlm_mschap
 SRC_CFLAGS     += -DRADIUSD_VERSION=\"${RADIUSD_VERSION}\"
 
+TGT_LDLIBS := $(LIBS)
+
 SOURCES        := radclient.c ${top_srcdir}/src/modules/rlm_mschap/smbdes.c \
           ${top_srcdir}/src/modules/rlm_mschap/mschap.c
 

diff --git a/src/main/radiusd.mk b/src/main/radiusd.mk
index c9304ea..d39d3a4 100644 (file)
--- a/src/main/radiusd.mk
+++ b/src/main/radiusd.mk
@@ -12,7 +12,7 @@ SRC_CFLAGS    += -DRADIUSD_VERSION=\"${RADIUSD_VERSION}\"
 SRC_CFLAGS     += $(OPENSSL_INCLUDE)
 TGT_INSTALLDIR  := ${sbindir}
 TGT_LDLIBS     := $(OPENSSL_LIBS)
-TGT_LDFLAGS     := -framework DirectoryService
+TGT_LDFLAGS     := $(LIBS) $(LCRYPT)
 
 TGT_PREREQS    := libfreeradius-radius.a $(filter rlm_%,${ALL_TGTS})
 

diff --git a/src/main/tls.c b/src/main/tls.c
index 9fc2c3d..c0ab5e2 100644 (file)
--- a/src/main/tls.c
+++ b/src/main/tls.c
@@ -1073,10 +1073,12 @@ static int ocsp_check(X509_STORE *store, X509 *issuer_cert, X509 *client_cert,
        int status ;
        ASN1_GENERALIZEDTIME *rev, *thisupd, *nextupd;
        int reason;
+#if OPENSSL_VERSION_NUMBER >= 0x1000003f
        OCSP_REQ_CTX *ctx;
        int rc;
        struct timeval now;
        struct timeval when;
+#endif
 
        /*
         * Create OCSP Request
@@ -1108,7 +1110,17 @@ static int ocsp_check(X509_STORE *store, X509 *issuer_cert, X509 *client_cert,
        bio_out = BIO_new_fp(stdout, BIO_NOCLOSE);
 
        BIO_set_conn_port(cbio, port);
-
+#if OPENSSL_VERSION_NUMBER < 0x1000003f
+       BIO_do_connect(cbio);
+ 
+       /* Send OCSP request and wait for response */
+       resp = OCSP_sendreq_bio(cbio, path, req);
+       if (!resp) {
+               radlog(L_ERR, "Error: Couldn't get OCSP response");
+               ocsp_ok = 2;
+               goto ocsp_end;
+       }
+#else
        if (conf->ocsp_timeout)
                BIO_set_nbio(cbio, 1);
 
@@ -1151,6 +1163,7 @@ static int ocsp_check(X509_STORE *store, X509 *issuer_cert, X509 *client_cert,
                ocsp_ok = 2;
                goto ocsp_end;
        }
+#endif
 
        /* Verify OCSP response status */
        status = OCSP_response_status(resp);

diff --git a/src/modules/rlm_eap/radeapclient.mk b/src/modules/rlm_eap/radeapclient.mk
index fde6d9c..d19e606 100644 (file)
--- a/src/modules/rlm_eap/radeapclient.mk
+++ b/src/modules/rlm_eap/radeapclient.mk
@@ -1,4 +1,4 @@
-TARGET   := radeapclient
+TARGET   := 
 SOURCES := radeapclient.c
 
 TGT_PREREQS := libfreeradius-radius.a libfreeradius-eap.a

diff --git a/src/modules/rlm_mschap/smbencrypt.mk b/src/modules/rlm_mschap/smbencrypt.mk
index 1208eb1..04e927b 100644 (file)
--- a/src/modules/rlm_mschap/smbencrypt.mk
+++ b/src/modules/rlm_mschap/smbencrypt.mk
@@ -1,4 +1,6 @@
 TGT_PREREQS := libfreeradius-radius.a
 SOURCES := smbencrypt.c smbdes.c
 
+TGT_LDLIBS := $(LIBS)
+
 TARGET := smbencrypt