[1945] in Moira Commits
/svn/moira r4084 - in trunk/moira: . incremental incremental/kerberos
daemon@ATHENA.MIT.EDU (Garry Zacheiss)
Thu Nov 1 23:20:00 2012
Date: Thu, 1 Nov 2012 23:19:52 -0400
From: Garry Zacheiss <zacheiss@MIT.EDU>
Message-Id: <201211020319.qA23JqMx004211@drugstore.mit.edu>
To: moira-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: zacheiss
Date: 2012-11-01 23:19:52 -0400 (Thu, 01 Nov 2012)
New Revision: 4084
Added:
trunk/moira/incremental/kerberos/
trunk/moira/incremental/kerberos/Makefile.in
trunk/moira/incremental/kerberos/kerberos.c
Modified:
trunk/moira/configure
trunk/moira/configure.in
trunk/moira/incremental/Makefile.in
trunk/moira/libtool
Log:
Add kerberos incremental to disable/reenable principals on account deactivation/reactivation.
Modified: trunk/moira/configure
===================================================================
--- trunk/moira/configure 2012-08-06 15:54:53 UTC (rev 4083)
+++ trunk/moira/configure 2012-11-02 03:19:52 UTC (rev 4084)
@@ -464,7 +464,7 @@
#endif"
ac_subdirs_all="$ac_subdirs_all util/et"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os SO_LDFLAGS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB EGREP LN_S ECHO AR ac_ct_AR STRIP ac_ct_STRIP CPP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL SET_MAKE mrbindir subdirs COM_ERR_SUBDIR COMPILE_ET target target_cpu target_vendor target_os REG_SVR_DEFS REG_SVR_INCLUDES REG_SVR_LIBS RSAREF_CPPFLAGS RSAREF_LIBS RSAREF_SUBDIRS RSAREF_LIBDEP PRO_C PRO_C_DEFS PRO_C_INCLUDES PRO_C_OPTS SQL_LIBS SVRSUBDIRS JAVA_CPPFLAGS WEBMOIRA_SUBDIRS LDAP_CPPFLAGS LDAP_LIBS WINAD_SUBDIRS AFS_CPPFLAGS!
AFS_PRO_C_INCLUDES AFS_LIBS AFS_DIR AFS_SUBDIRS AFS_SYNCDIR READLINE_CPPFLAGS READLINE_LIBS CURSES_CPPFLAGS CURSES_LIBS CURSES_SUBDIRS MR_LIBDEP KLIBS LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os SO_LDFLAGS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB EGREP LN_S ECHO AR ac_ct_AR STRIP ac_ct_STRIP CPP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL SET_MAKE mrbindir subdirs COM_ERR_SUBDIR COMPILE_ET target target_cpu target_vendor target_os REG_SVR_DEFS REG_SVR_INCLUDES REG_SVR_LIBS KERBEROS_SUBDIRS RSAREF_CPPFLAGS RSAREF_LIBS RSAREF_SUBDIRS RSAREF_LIBDEP PRO_C PRO_C_DEFS PRO_C_INCLUDES PRO_C_OPTS SQL_LIBS SVRSUBDIRS JAVA_CPPFLAGS WEBMOIRA_SUBDIRS LDAP_CPPFLAGS LDAP_LIBS WINAD_SUB!
DIRS AFS_CPPFLAGS AFS_PRO_C_INCLUDES AFS_LIBS AFS_DIR AFS_SUBDIRS AFS_SYNCDIR READLINE_CPPFLAGS READLINE_LIBS CURSES_CPPFLAGS CURSES_LIBS CURSES_SUBDIRS MR_LIBDEP KLIBS LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -19725,6 +19725,8 @@
KRB5_LIBS="-lkrb5 -l${crypto} -lcom_err -lresolv"
REG_SVR_LIBS="$REG_SVR_LIBS -lkadm5clnt -lgssapi_krb5 -lgssrpc -lkrb5 -l${crypto} -lresolv"
+ KERBEROS_OUTPUT_FILES="incremental/kerberos/Makefile"
+ KERBEROS_SUBDIRS="kerberos"
else
REG_SVR_DEFS=-DKRB4
REG_SVR_LIBS=-lkadm
@@ -19739,6 +19741,7 @@
+
# Hesiod support
echo "$as_me:$LINENO: checking for Hesiod" >&5
echo $ECHO_N "checking for Hesiod... $ECHO_C" >&6
@@ -21614,7 +21617,7 @@
LIBS="$MR_LIBDEP $KLIBS"
- ac_config_files="$ac_config_files Makefile lib/Makefile include/Makefile clients/Makefile clients/lib/Makefile clients/addusr/Makefile clients/blanche/Makefile clients/chfn/Makefile clients/chpobox/Makefile clients/chsh/Makefile clients/eunice/Makefile clients/mailmaint/Makefile clients/mitch/Makefile clients/moira/Makefile clients/mrcheck/Makefile clients/mrtest/Makefile clients/stanley/Makefile clients/stella/Makefile update/Makefile man/Makefile $WEBMOIRA_OUTPUT_FILES $SERVER_OUTPUT_FILES $WINAD_OUTPUT_FILES $AFS_OUTPUT_FILES $RSAREF_OUTPUT_FILES"
+ ac_config_files="$ac_config_files Makefile lib/Makefile include/Makefile clients/Makefile clients/lib/Makefile clients/addusr/Makefile clients/blanche/Makefile clients/chfn/Makefile clients/chpobox/Makefile clients/chsh/Makefile clients/eunice/Makefile clients/mailmaint/Makefile clients/mitch/Makefile clients/moira/Makefile clients/mrcheck/Makefile clients/mrtest/Makefile clients/stanley/Makefile clients/stella/Makefile update/Makefile man/Makefile $WEBMOIRA_OUTPUT_FILES $SERVER_OUTPUT_FILES $WINAD_OUTPUT_FILES $AFS_OUTPUT_FILES $KERBEROS_OUTPUT_FILES $RSAREF_OUTPUT_FILES"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
@@ -22190,6 +22193,7 @@
"$SERVER_OUTPUT_FILES" ) CONFIG_FILES="$CONFIG_FILES $SERVER_OUTPUT_FILES" ;;
"$WINAD_OUTPUT_FILES" ) CONFIG_FILES="$CONFIG_FILES $WINAD_OUTPUT_FILES" ;;
"$AFS_OUTPUT_FILES" ) CONFIG_FILES="$CONFIG_FILES $AFS_OUTPUT_FILES" ;;
+ "$KERBEROS_OUTPUT_FILES" ) CONFIG_FILES="$CONFIG_FILES $KERBEROS_OUTPUT_FILES" ;;
"$RSAREF_OUTPUT_FILES" ) CONFIG_FILES="$CONFIG_FILES $RSAREF_OUTPUT_FILES" ;;
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
@@ -22323,6 +22327,7 @@
s,@REG_SVR_DEFS@,$REG_SVR_DEFS,;t t
s,@REG_SVR_INCLUDES@,$REG_SVR_INCLUDES,;t t
s,@REG_SVR_LIBS@,$REG_SVR_LIBS,;t t
+s,@KERBEROS_SUBDIRS@,$KERBEROS_SUBDIRS,;t t
s,@RSAREF_CPPFLAGS@,$RSAREF_CPPFLAGS,;t t
s,@RSAREF_LIBS@,$RSAREF_LIBS,;t t
s,@RSAREF_SUBDIRS@,$RSAREF_SUBDIRS,;t t
Modified: trunk/moira/configure.in
===================================================================
--- trunk/moira/configure.in 2012-08-06 15:54:53 UTC (rev 4083)
+++ trunk/moira/configure.in 2012-11-02 03:19:52 UTC (rev 4084)
@@ -165,6 +165,8 @@
MR_DEFINE(HAVE_KRB5)
KRB5_LIBS="-lkrb5 -l${crypto} -lcom_err -lresolv"
REG_SVR_LIBS="$REG_SVR_LIBS -lkadm5clnt -lgssapi_krb5 -lgssrpc -lkrb5 -l${crypto} -lresolv"
+ KERBEROS_OUTPUT_FILES="incremental/kerberos/Makefile"
+ KERBEROS_SUBDIRS="kerberos"
else
REG_SVR_DEFS=-DKRB4
REG_SVR_LIBS=-lkadm
@@ -178,6 +180,7 @@
AC_SUBST(REG_SVR_DEFS)
AC_SUBST(REG_SVR_INCLUDES)
AC_SUBST(REG_SVR_LIBS)
+AC_SUBST(KERBEROS_SUBDIRS)
# Hesiod support
AC_MSG_CHECKING(for Hesiod)
@@ -499,4 +502,4 @@
clients/stanley/Makefile clients/stella/Makefile \
update/Makefile man/Makefile $WEBMOIRA_OUTPUT_FILES \
$SERVER_OUTPUT_FILES $WINAD_OUTPUT_FILES \
- $AFS_OUTPUT_FILES $RSAREF_OUTPUT_FILES)
+ $AFS_OUTPUT_FILES $KERBEROS_OUTPUT_FILES $RSAREF_OUTPUT_FILES)
Modified: trunk/moira/incremental/Makefile.in
===================================================================
--- trunk/moira/incremental/Makefile.in 2012-08-06 15:54:53 UTC (rev 4083)
+++ trunk/moira/incremental/Makefile.in 2012-11-02 03:19:52 UTC (rev 4084)
@@ -19,7 +19,7 @@
BUILDTOP=..
mrbindir=@mrbindir@
-SUBDIRS=@AFS_SUBDIRS@ @WINAD_SUBDIRS@
+SUBDIRS=@AFS_SUBDIRS@ @WINAD_SUBDIRS@ @KERBEROS_SUBDIRS@
.SUFFIXES: .pc
Modified: trunk/moira/libtool
===================================================================
--- trunk/moira/libtool 2012-08-06 15:54:53 UTC (rev 4083)
+++ trunk/moira/libtool 2012-11-02 03:19:52 UTC (rev 4084)
@@ -1,4 +1,4 @@
-#! /bin/bash
+#! /bin/sh
# libtoolT - Provide generalized library-building support services.
# Generated automatically by (GNU )
@@ -44,10 +44,10 @@
# ### BEGIN LIBTOOL CONFIG
-# Libtool was configured on host contents-vnder-pressvre:
+# Libtool was configured on host this-too-shall-pass.MIT.EDU:
# Shell to use when invoking shell scripts.
-SHELL="/bin/bash"
+SHELL="/bin/sh"
# Whether or not to build shared libraries.
build_libtool_libs=yes
@@ -66,7 +66,7 @@
# The host system.
host_alias=
-host=x86_64-unknown-linux-gnu
+host=x86_64-redhat-linux-gnu
# An echo program that does not interpret backslashes.
echo="echo"
@@ -319,7 +319,7 @@
sys_lib_search_path_spec="/lib64 /usr/lib64 /usr/local/lib64"
# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 include /etc/ld.so.conf.d/*.conf "
+sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 include ld.so.conf.d/*.conf "
# Fix the shell variable $srcfile for the compiler.
fix_srcfile_path=""
@@ -6769,10 +6769,10 @@
# End:
# ### BEGIN LIBTOOL TAG CONFIG: CXX
-# Libtool was configured on host contents-vnder-pressvre:
+# Libtool was configured on host this-too-shall-pass.MIT.EDU:
# Shell to use when invoking shell scripts.
-SHELL="/bin/bash"
+SHELL="/bin/sh"
# Whether or not to build shared libraries.
build_libtool_libs=yes
@@ -6791,7 +6791,7 @@
# The host system.
host_alias=
-host=x86_64-unknown-linux-gnu
+host=x86_64-redhat-linux-gnu
# An echo program that does not interpret backslashes.
echo="echo"
@@ -6942,11 +6942,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects="/usr/lib/gcc/x86_64-linux-gnu/4.4.3/../../../../lib/crti.o /usr/lib/gcc/x86_64-linux-gnu/4.4.3/crtbeginS.o"
+predep_objects="/usr/lib/gcc/x86_64-redhat-linux/4.1.2/../../../../lib64/crti.o /usr/lib/gcc/x86_64-redhat-linux/4.1.2/crtbeginS.o"
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects="/usr/lib/gcc/x86_64-linux-gnu/4.4.3/crtendS.o /usr/lib/gcc/x86_64-linux-gnu/4.4.3/../../../../lib/crtn.o"
+postdep_objects="/usr/lib/gcc/x86_64-redhat-linux/4.1.2/crtendS.o /usr/lib/gcc/x86_64-redhat-linux/4.1.2/../../../../lib64/crtn.o"
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -6958,7 +6958,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path="-L/usr/lib/gcc/x86_64-linux-gnu/4.4.3 -L/usr/lib/gcc/x86_64-linux-gnu/4.4.3 -L/usr/lib/gcc/x86_64-linux-gnu/4.4.3/../../../../lib -L/lib/../lib -L/usr/lib/../lib -L/usr/lib/gcc/x86_64-linux-gnu/4.4.3/../../.."
+compiler_lib_search_path="-L/usr/lib/gcc/x86_64-redhat-linux/4.1.2 -L/usr/lib/gcc/x86_64-redhat-linux/4.1.2 -L/usr/lib/gcc/x86_64-redhat-linux/4.1.2/../../../../lib64 -L/lib/../lib64 -L/usr/lib/../lib64"
# Method to check whether dependent libraries are shared objects.
deplibs_check_method="pass_all"
@@ -7041,7 +7041,7 @@
sys_lib_search_path_spec="/lib64 /usr/lib64 /usr/local/lib64"
# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 include /etc/ld.so.conf.d/*.conf "
+sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 include ld.so.conf.d/*.conf "
# Fix the shell variable $srcfile for the compiler.
fix_srcfile_path=""
@@ -7065,10 +7065,10 @@
# ### BEGIN LIBTOOL TAG CONFIG: F77
-# Libtool was configured on host contents-vnder-pressvre:
+# Libtool was configured on host this-too-shall-pass.MIT.EDU:
# Shell to use when invoking shell scripts.
-SHELL="/bin/bash"
+SHELL="/bin/sh"
# Whether or not to build shared libraries.
build_libtool_libs=yes
@@ -7087,7 +7087,7 @@
# The host system.
host_alias=
-host=x86_64-unknown-linux-gnu
+host=x86_64-redhat-linux-gnu
# An echo program that does not interpret backslashes.
echo="echo"
@@ -7100,7 +7100,7 @@
LTCC="gcc"
# A language-specific compiler.
-CC="f95"
+CC="g77"
# Is the compiler the GNU C compiler?
with_gcc=yes
@@ -7340,7 +7340,7 @@
sys_lib_search_path_spec="/lib64 /usr/lib64 /usr/local/lib64"
# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 include /etc/ld.so.conf.d/*.conf "
+sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 include ld.so.conf.d/*.conf "
# Fix the shell variable $srcfile for the compiler.
fix_srcfile_path=""
