svn commit: samba r7303 - in branches/SAMBA_4_0/source: . auth/kerberos kdc smbd

[metze at samba.org]

Author: metze
Date: 2005-06-05 12:10:40 +0000 (Sun, 05 Jun 2005)
New Revision: 7303

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=7303

Log:
autodetect the libkdc and our kdc support

btw: I use this for configuring heimdal

>>>
CONFIG="CFLAGS=\"-g -O -Wall -Wstrict-prototypes -Wpointer-arith -Wcast-align -Wwrite-strings -Wdeclaration-after-statement\" \
	CC=gcc-4.0 \
	./configure -C --prefix=$HOME/prefix/heimdal-test \
	--sysconfdir=/etc \
	--enable-shared=no \
	--with-ldb=$HOME/prefix/ldb \
	--without-openldap \
	--without-openssl $@"

echo $CONFIG
eval $CONFIG
>>>

maybe you also want to use --disable-berkeley-db

metze
Added:
   branches/SAMBA_4_0/source/kdc/config.m4
Removed:
   branches/SAMBA_4_0/source/smbd/config.m4
Modified:
   branches/SAMBA_4_0/source/auth/kerberos/config.m4
   branches/SAMBA_4_0/source/configure.in
   branches/SAMBA_4_0/source/kdc/config.mk


Changeset:
Modified: branches/SAMBA_4_0/source/auth/kerberos/config.m4
===================================================================
--- branches/SAMBA_4_0/source/auth/kerberos/config.m4	2005-06-05 12:06:39 UTC (rev 7302)
+++ branches/SAMBA_4_0/source/auth/kerberos/config.m4	2005-06-05 12:10:40 UTC (rev 7303)
@@ -176,8 +176,6 @@
 		with_krb5_support="no"
 	fi
 
-	AC_CHECK_HEADERS(kdc.h)
-
 	CFLAGS=$ac_save_CFLAGS
 	CPPFLAGS=$ac_save_CPPFLAGS
 	LDFLAGS=$ac_save_LDFLAGS
@@ -204,9 +202,6 @@
  	AC_CHECK_LIB_EXT(com_err, KRB5_LIBS, _et_list)
 	AC_CHECK_LIB_EXT(k5crypto, KRB5_LIBS, krb5_encrypt_data)
 
-	AC_CHECK_LIB_EXT(kdc, KRB5_LIBS, krb5_kdc_default_config)
-	AC_CHECK_LIB_EXT(hdb, KRB5_LIBS, hdb_generate_key_set_password)
-
 	# Heimdal checks.
 	# But only if we didn't have a krb5-config to tell us this already
 	if test x"$FOUND_KRB5_VIA_CONFIG" != x"yes"; then
@@ -499,6 +494,33 @@
 		with_krb5_support=no 
 	fi
 
+	# checks if we have access to a libkdc
+	# and can use it for our builtin kdc server_service
+	KDC_CFLAGS=""
+	KDC_CPPFLAGS=""
+	KDC_DLFLAGS=""
+	KDC_LIBS=""
+	AC_CHECK_HEADERS(kdc.h)
+	AC_CHECK_LIB_EXT(kdc, KDC_LIBS, krb5_kdc_default_config)
+	AC_CHECK_LIB_EXT(hdb, KDC_LIBS, hdb_generate_key_set_password)
+
+	AC_MSG_CHECKING(whether libkdc is used)
+	if test x"$ac_cv_header_kdc_h" = x"yes"; then
+		if test x"$ac_cv_lib_ext_kdc_krb5_kdc_default_config" = x"yes"; then
+	   		if test x"$ac_cv_lib_ext_hdb_hdb_generate_key_set_password" = x"yes"; then
+				SMB_EXT_LIB_ENABLE(KDC,YES)
+				AC_MSG_RESULT(yes)
+				echo "KDC_LIBS:     ${KDC_LIBS}"
+			else
+				AC_MSG_RESULT(no)
+			fi
+		else
+			AC_MSG_RESULT(no)
+		fi
+	else
+		AC_MSG_RESULT(no)
+	fi
+
 	CFLAGS=$ac_save_CFLAGS
 	CPPFLAGS=$ac_save_CPPFLAGS
 	LDFLAGS=$ac_save_LDFLAGS
@@ -513,5 +535,4 @@
 fi
 
 SMB_EXT_LIB(KRB5,[${KRB5_LIBS}],[${KRB5_CFLAGS}],[${KRB5_CPPFLAGS}],[${KRB5_LDFLAGS}])
-
-
+SMB_EXT_LIB(KDC,[${KDC_LIBS}],[${KDC_CFLAGS}],[${KDC_CPPFLAGS}],[${KDC_LDFLAGS}])

Modified: branches/SAMBA_4_0/source/configure.in
===================================================================
--- branches/SAMBA_4_0/source/configure.in	2005-06-05 12:06:39 UTC (rev 7302)
+++ branches/SAMBA_4_0/source/configure.in	2005-06-05 12:10:40 UTC (rev 7303)
@@ -31,7 +31,7 @@
 sinclude(lib/socket_wrapper/config.m4)
 sinclude(web_server/config.m4)
 sinclude(auth/config.m4)
-sinclude(smbd/config.m4)
+sinclude(kdc/config.m4)
 
 ALLLIBS_LIBS="$LIBS"
 ALLLIBS_CFLAGS="$CFLAGS"

Copied: branches/SAMBA_4_0/source/kdc/config.m4 (from rev 7226, branches/SAMBA_4_0/source/smbd/config.m4)
===================================================================
--- branches/SAMBA_4_0/source/smbd/config.m4	2005-06-03 13:04:44 UTC (rev 7226)
+++ branches/SAMBA_4_0/source/kdc/config.m4	2005-06-05 12:10:40 UTC (rev 7303)
@@ -0,0 +1,5 @@
+SMB_MODULE_DEFAULT(server_service_kdc, NOT)
+
+if test t$SMB_EXT_LIB_ENABLE_KDC = tYES; then
+	SMB_MODULE_DEFAULT(server_service_kdc, STATIC)
+fi

Modified: branches/SAMBA_4_0/source/kdc/config.mk
===================================================================
--- branches/SAMBA_4_0/source/kdc/config.mk	2005-06-05 12:06:39 UTC (rev 7302)
+++ branches/SAMBA_4_0/source/kdc/config.mk	2005-06-05 12:10:40 UTC (rev 7303)
@@ -7,6 +7,6 @@
 		kdc/kdc.o \
 		kdc/hdb-ldb.o
 REQUIRED_SUBSYSTEMS = \
-		SOCKET
+		LDB EXT_LIB_KRB5 EXT_LIB_KDC
 # End SUBSYSTEM KDC
 #######################

Deleted: branches/SAMBA_4_0/source/smbd/config.m4
===================================================================
--- branches/SAMBA_4_0/source/smbd/config.m4	2005-06-05 12:06:39 UTC (rev 7302)
+++ branches/SAMBA_4_0/source/smbd/config.m4	2005-06-05 12:10:40 UTC (rev 7303)
@@ -1 +0,0 @@
-SMB_MODULE_DEFAULT(server_service_kdc, NOT)