[1952] in Moira Commits
/svn/moira r4091 - in trunk/moira: . reg_svr
daemon@ATHENA.MIT.EDU (Garry Zacheiss)
Fri Jan 18 10:35:48 2013
Date: Fri, 18 Jan 2013 10:35:41 -0500
From: Garry Zacheiss <zacheiss@MIT.EDU>
Message-Id: <201301181535.r0IFZfFM029067@drugstore.mit.edu>
To: moira-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: zacheiss
Date: 2013-01-18 10:35:41 -0500 (Fri, 18 Jan 2013)
New Revision: 4091
Modified:
trunk/moira/configure
trunk/moira/configure.in
trunk/moira/reg_svr/kerberos.c
trunk/moira/reg_svr/protocol.c
trunk/moira/reg_svr/reg_svr.h
Log:
Build reg_svr without krb4 DES implementation; use OpenSSL.
Modified: trunk/moira/configure
===================================================================
--- trunk/moira/configure 2013-01-02 17:17:05 UTC (rev 4090)
+++ trunk/moira/configure 2013-01-18 15:35:41 UTC (rev 4091)
@@ -1040,6 +1040,7 @@
--with-com_err=PREFIX Specify location of com_err
--with-krb4=PREFIX Specify location of krb4
--with-krb5=PREFIX Specify location of krb5
+ --with-openssl=PREFIX Specify location of openssl
--with-hesiod=PREFIX Specify location of Hesiod
--with-zephyr=PREFIX Specify location of Zephyr
--with-rsaref=PREFIX Specify location of RSAREF
@@ -3262,7 +3263,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 3265 "configure"' > conftest.$ac_ext
+ echo '#line 3266 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -4725,7 +4726,7 @@
# Provide some information about the compiler.
-echo "$as_me:4728:" \
+echo "$as_me:4729:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -5759,11 +5760,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:5762: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:5763: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:5766: \$? = $ac_status" >&5
+ echo "$as_me:5767: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -5992,11 +5993,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:5995: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:5996: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:5999: \$? = $ac_status" >&5
+ echo "$as_me:6000: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -6052,11 +6053,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6055: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6056: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:6059: \$? = $ac_status" >&5
+ echo "$as_me:6060: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -7386,7 +7387,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 7389 "configure"' > conftest.$ac_ext
+ echo '#line 7390 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -8257,7 +8258,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 8260 "configure"
+#line 8261 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -8355,7 +8356,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 8358 "configure"
+#line 8359 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10534,11 +10535,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10537: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10538: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:10541: \$? = $ac_status" >&5
+ echo "$as_me:10542: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -10594,11 +10595,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10597: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10598: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:10601: \$? = $ac_status" >&5
+ echo "$as_me:10602: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -11105,7 +11106,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 11108 "configure"' > conftest.$ac_ext
+ echo '#line 11109 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -11976,7 +11977,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11979 "configure"
+#line 11980 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12074,7 +12075,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 12077 "configure"
+#line 12078 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12901,11 +12902,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12904: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12905: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:12908: \$? = $ac_status" >&5
+ echo "$as_me:12909: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -12961,11 +12962,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12964: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12965: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:12968: \$? = $ac_status" >&5
+ echo "$as_me:12969: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14275,7 +14276,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 14278 "configure"' > conftest.$ac_ext
+ echo '#line 14279 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -15016,11 +15017,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15019: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15020: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15023: \$? = $ac_status" >&5
+ echo "$as_me:15024: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -15249,11 +15250,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15252: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15253: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15256: \$? = $ac_status" >&5
+ echo "$as_me:15257: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -15309,11 +15310,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15312: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15313: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15316: \$? = $ac_status" >&5
+ echo "$as_me:15317: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -16643,7 +16644,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 16646 "configure"' > conftest.$ac_ext
+ echo '#line 16647 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -17514,7 +17515,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 17517 "configure"
+#line 17518 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -17612,7 +17613,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 17615 "configure"
+#line 17616 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -19738,10 +19739,45 @@
esac
fi
+echo "$as_me:$LINENO: checking for OpenSSL" >&5
+echo $ECHO_N "checking for OpenSSL... $ECHO_C" >&6
+# Check whether --with-openssl or --without-openssl was given.
+if test "${with_openssl+set}" = set; then
+ withval="$with_openssl"
+ openssl="$withval"
+else
+ openssl=no
+fi;
+echo "$as_me:$LINENO: result: $openssl" >&5
+echo "${ECHO_T}$openssl" >&6
+if test "$openssl" != no; then
+ if test "$openssl" != yes; then
+ REG_SVR_INCLUDES=-I$openssl/include
+ REG_SVR_LIBS=-L$openssl/lib
+ case $PRO_C_INCLUDES in
+ *-I$openssl/include*) ;;
+ *) PRO_C_INCLUDES=$PRO_C_INCLUDES\ -I$openssl/include ;;
+ esac
+ else
+ REG_SVR_INCLUDES=-I/usr/include/openssl
+ case $PRO_C_INCLUDES in
+ *INCLUDE=/usr/include/openssl*) ;;
+ *) PRO_C_INCLUDES=$PRO_C_INCLUDES\ INCLUDE=/usr/include/openssl ;;
+ esac
+
+ fi
+ REG_SVR_LIBS="$REG_SVR_LIBS -lssl -lcrypto"
+fi
+
+
+
+
+
+
# Hesiod support
echo "$as_me:$LINENO: checking for Hesiod" >&5
echo $ECHO_N "checking for Hesiod... $ECHO_C" >&6
Modified: trunk/moira/configure.in
===================================================================
--- trunk/moira/configure.in 2013-01-02 17:17:05 UTC (rev 4090)
+++ trunk/moira/configure.in 2013-01-18 15:35:41 UTC (rev 4091)
@@ -177,6 +177,24 @@
darwin*) KRB5_LIBS="$KRB5_LIBS -framework Kerberos"
esac
fi
+
+AC_MSG_CHECKING(for OpenSSL)
+AC_ARG_WITH(openssl,
+ [ --with-openssl=PREFIX Specify location of openssl],
+ [openssl="$withval"], [openssl=no])
+AC_MSG_RESULT($openssl)
+if test "$openssl" != no; then
+ if test "$openssl" != yes; then
+ REG_SVR_INCLUDES=-I$openssl/include
+ REG_SVR_LIBS=-L$openssl/lib
+ MR_EXTEND(PRO_C_INCLUDES, -I$openssl/include)
+ else
+ REG_SVR_INCLUDES=-I/usr/include/openssl
+ MR_EXTEND(PRO_C_INCLUDES, INCLUDE=/usr/include/openssl)
+ fi
+ REG_SVR_LIBS="$REG_SVR_LIBS -lssl -lcrypto"
+fi
+
AC_SUBST(REG_SVR_DEFS)
AC_SUBST(REG_SVR_INCLUDES)
AC_SUBST(REG_SVR_LIBS)
Modified: trunk/moira/reg_svr/kerberos.c
===================================================================
--- trunk/moira/reg_svr/kerberos.c 2013-01-02 17:17:05 UTC (rev 4090)
+++ trunk/moira/reg_svr/kerberos.c 2013-01-18 15:35:41 UTC (rev 4091)
@@ -51,7 +51,6 @@
code = krb5_init_context(&context);
if (code)
return code;
- krb_set_tkt_string("/tmp/tkt_ureg");
return 0;
}
Modified: trunk/moira/reg_svr/protocol.c
===================================================================
--- trunk/moira/reg_svr/protocol.c 2013-01-02 17:17:05 UTC (rev 4090)
+++ trunk/moira/reg_svr/protocol.c 2013-01-18 15:35:41 UTC (rev 4091)
@@ -22,7 +22,7 @@
#include <unistd.h>
#include <com_err.h>
-#include <des.h>
+#include <openssl/des.h>
/* RSARef includes */
#include "global.h"
Modified: trunk/moira/reg_svr/reg_svr.h
===================================================================
--- trunk/moira/reg_svr/reg_svr.h 2013-01-02 17:17:05 UTC (rev 4090)
+++ trunk/moira/reg_svr/reg_svr.h 2013-01-18 15:35:41 UTC (rev 4091)
@@ -1,5 +1,5 @@
#include <sys/time.h>
-#include <des.h>
+#include <openssl/des.h>
typedef struct reg_client {
int fd; /* socket */
