The branch, v4-0-test has been updated
via 10db07c69addce6e90851fb55738d5f9e142946b (commit)
via 6ec3887aee9bbb9c182ab966d37212edeaa16b5a (commit)
via 49e01d00bded74190c8e3049ac5883fe211e86fd (commit)
via 694f5124a523538117bf5d35be1a2d4f275ad0c2 (commit)
via f19d2182b802a49449cbb9e4e6334f223ceb284d (commit)
via 16147753adcdbdc0ee9faa16fafb1c74240a6858 (commit)
from b395cd7acdb3ca5b25368fbbad0606efe4699d04 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit 10db07c69addce6e90851fb55738d5f9e142946b
Author: Stefan Metzmacher <[EMAIL PROTECTED]>
Date: Fri Aug 1 17:24:24 2008 +0200
kdc: use mostly only public kerberos headers
We shoule avoid using the private heimdal function
_krb5_principalname2krb5_principal()
metze
commit 6ec3887aee9bbb9c182ab966d37212edeaa16b5a
Author: Stefan Metzmacher <[EMAIL PROTECTED]>
Date: Fri Aug 1 16:59:40 2008 +0200
auth/kerberos: we don't need to include heimdal private headers
metze
commit 49e01d00bded74190c8e3049ac5883fe211e86fd
Author: Stefan Metzmacher <[EMAIL PROTECTED]>
Date: Fri Aug 1 16:58:01 2008 +0200
gensec_gssapi: include <gssapi/gssapi.h>
metze
commit 694f5124a523538117bf5d35be1a2d4f275ad0c2
Author: Stefan Metzmacher <[EMAIL PROTECTED]>
Date: Fri Aug 1 16:57:00 2008 +0200
heimdal_build: we should only use PRIVATE_DEPENDENCIES
metze
commit f19d2182b802a49449cbb9e4e6334f223ceb284d
Author: Stefan Metzmacher <[EMAIL PROTECTED]>
Date: Fri Aug 1 16:53:52 2008 +0200
build: autogenerate heimdal basics
metze
commit 16147753adcdbdc0ee9faa16fafb1c74240a6858
Author: Stefan Metzmacher <[EMAIL PROTECTED]>
Date: Fri Aug 1 16:52:12 2008 +0200
build: autogenarate VPATH by configure
metze
-----------------------------------------------------------------------
Summary of changes:
source/Makefile | 4 +--
source/auth/gensec/gensec_gssapi.c | 2 +-
source/auth/kerberos/krb5_init_context.c | 2 -
source/build/m4/env.m4 | 3 ++
source/heimdal_build/asn1_deps.pl | 1 +
source/heimdal_build/et_deps.pl | 1 +
source/heimdal_build/internal.m4 | 4 +++
source/heimdal_build/internal.mk | 31 ++++++++---------------------
source/heimdal_build/krb5/windc_plugin.h | 1 +
source/kdc/config.mk | 6 ++--
source/kdc/kdc.h | 6 ++--
source/kdc/kpasswdd.c | 6 +++-
source/main.mk | 1 -
source/static_deps.mk | 27 +-------------------------
14 files changed, 32 insertions(+), 63 deletions(-)
create mode 100644 source/heimdal_build/krb5/windc_plugin.h
Changeset truncated at 500 lines:
diff --git a/source/Makefile b/source/Makefile
index fba06cc..b0aa009 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -10,8 +10,6 @@ include mkconfig.mk
pidldir := $(srcdir)/pidl
-VPATH =
$(builddir):$(srcdir):$(srcdir)/heimdal_build:$(heimdalsrcdir)/lib/asn1:$(heimdalsrcdir)/lib/krb5:$(heimdalsrcdir)/lib/gssapi:$(heimdalsrcdir)/lib/hdb:$(heimdalsrcdir)/lib/roken:$(heimdalsrcdir)/lib/des
-
BASEDIR = $(prefix)
TORTUREDIR = $(libdir)/torture
SWATDIR = $(datadir)/swat
@@ -138,7 +136,7 @@ libraries:: $(STATIC_LIBS) $(SHARED_LIBS)
modules:: $(PLUGINS)
headers:: $(PUBLIC_HEADERS) $(DEFAULT_HEADERS)
manpages:: $(MANPAGES)
-all:: showflags $(ALL_PREDEP) bin/asn1_compile bin/compile_et binaries modules
pythonmods libraries headers
+all:: showflags $(ALL_PREDEP) binaries modules pythonmods libraries headers
everything:: all
LD_LIBPATH_OVERRIDE = $(LIB_PATH_VAR)=$(builddir)/bin/shared
diff --git a/source/auth/gensec/gensec_gssapi.c
b/source/auth/gensec/gensec_gssapi.c
index 205d8a0..bb44c75 100644
--- a/source/auth/gensec/gensec_gssapi.c
+++ b/source/auth/gensec/gensec_gssapi.c
@@ -24,7 +24,6 @@
#include "includes.h"
#include "lib/events/events.h"
#include "system/kerberos.h"
-#include "heimdal/lib/gssapi/gssapi/gssapi.h"
#include "auth/kerberos/kerberos.h"
#include "librpc/gen_ndr/krb5pac.h"
#include "auth/auth.h"
@@ -37,6 +36,7 @@
#include "auth/gensec/gensec_proto.h"
#include "param/param.h"
#include "auth/session_proto.h"
+#include <gssapi/gssapi.h>
enum gensec_gssapi_sasl_state
{
diff --git a/source/auth/kerberos/krb5_init_context.c
b/source/auth/kerberos/krb5_init_context.c
index 02d8cd0..82e42a4 100644
--- a/source/auth/kerberos/krb5_init_context.c
+++ b/source/auth/kerberos/krb5_init_context.c
@@ -22,13 +22,11 @@
#include "includes.h"
#include "system/kerberos.h"
-#include "heimdal/lib/krb5/krb5_locl.h"
#include "auth/kerberos/kerberos.h"
#include "lib/socket/socket.h"
#include "lib/stream/packet.h"
#include "system/network.h"
#include "lib/events/events.h"
-#include "roken.h"
#include "param/param.h"
#include "libcli/resolve/resolve.h"
diff --git a/source/build/m4/env.m4 b/source/build/m4/env.m4
index 9510a8e..6c040b9 100644
--- a/source/build/m4/env.m4
+++ b/source/build/m4/env.m4
@@ -16,6 +16,9 @@ export builddir;
AC_SUBST(datarootdir)
+AC_SUBST(VPATH)
+VPATH="\$(builddir):\$(srcdir)"
+
SMB_VERSION_STRING=`cat ${srcdir}/version.h | grep
'SAMBA_VERSION_OFFICIAL_STRING' | cut -d '"' -f2`
echo "SAMBA VERSION: ${SMB_VERSION_STRING}"
diff --git a/source/heimdal_build/asn1_deps.pl
b/source/heimdal_build/asn1_deps.pl
index 6b7181c..6c4d10d 100755
--- a/source/heimdal_build/asn1_deps.pl
+++ b/source/heimdal_build/asn1_deps.pl
@@ -29,6 +29,7 @@ if (not defined $options) {
my $header = "$dirname/$prefix.h";
+print "basics:: $header\n";
print "$header: \$(heimdalsrcdir)/$file \$(ASN1C)\n";
print "[EMAIL PROTECTED] \"Compiling ASN1 file \$(heimdalsrcdir)/$file\"\n";
print "[EMAIL PROTECTED](heimdalbuildsrcdir)/asn1_compile_wrapper.sh
\$(builddir) $dirname \$(ASN1C) \$(call abspath,\$(heimdalsrcdir)/$file)
$prefix $options\n\n";
diff --git a/source/heimdal_build/et_deps.pl b/source/heimdal_build/et_deps.pl
index 5032d47..5914425 100755
--- a/source/heimdal_build/et_deps.pl
+++ b/source/heimdal_build/et_deps.pl
@@ -8,6 +8,7 @@ my $basename = basename($file);
my $header = "$dirname/$basename"; $header =~ s/\.et$/.h/;
my $source = "$dirname/$basename"; $source =~ s/\.et$/.c/;
+print "basics:: $header\n";
print "$header $source: \$(heimdalsrcdir)/$file \$(ET_COMPILER)\n";
print "[EMAIL PROTECTED] \"Compiling error table $file\"\n";
print "[EMAIL PROTECTED](heimdalbuildsrcdir)/et_compile_wrapper.sh
\$(builddir) $dirname \$(ET_COMPILER) \$(call abspath,\$(heimdalsrcdir)/$file)
$source\n\n";
diff --git a/source/heimdal_build/internal.m4 b/source/heimdal_build/internal.m4
index e1e495d..f83fdf7 100644
--- a/source/heimdal_build/internal.m4
+++ b/source/heimdal_build/internal.m4
@@ -255,3 +255,7 @@ if test t$ac_cv_func_getprogname != tyes; then
SMB_ENABLE(HEIMDAL_ROKEN_GETPROGNAME, YES)
SMB_ENABLE(HEIMDAL_ROKEN_GETPROGNAME_H, YES)
fi
+
+VPATH="$VPATH:\$(HEIMDAL_VPATH)"
+
+SMB_INCLUDE_MK(heimdal_build/internal.mk)
diff --git a/source/heimdal_build/internal.mk b/source/heimdal_build/internal.mk
index 264a5c2..3fb97fe 100644
--- a/source/heimdal_build/internal.mk
+++ b/source/heimdal_build/internal.mk
@@ -1,11 +1,13 @@
heimdalbuildsrcdir = $(heimdalsrcdir)/../heimdal_build
+HEIMDAL_VPATH =
$(heimdalbuildsrcdir):$(heimdalsrcdir)/lib/asn1:$(heimdalsrcdir)/lib/krb5:$(heimdalsrcdir)/lib/gssapi:$(heimdalsrcdir)/lib/hdb:$(heimdalsrcdir)/lib/roken:$(heimdalsrcdir)/lib/des
+
#######################
# Start SUBSYSTEM HEIMDAL_KDC
[SUBSYSTEM::HEIMDAL_KDC]
CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/kdc
-PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_KRB5 HEIMDAL_HDB
HEIMDAL_HEIM_ASN1 HEIMDAL_DIGEST_ASN1 HEIMDAL_KX509_ASN1
-PUBLIC_DEPENDENCIES = HEIMDAL_NTLM HEIMDAL_HCRYPTO
+PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_KRB5 HEIMDAL_HDB
HEIMDAL_HEIM_ASN1 \
+ HEIMDAL_DIGEST_ASN1 HEIMDAL_KX509_ASN1 HEIMDAL_NTLM
HEIMDAL_HCRYPTO
# End SUBSYSTEM HEIMDAL_KDC
#######################
@@ -61,8 +63,7 @@ HEIMDAL_HDB_OBJ_FILES = \
# Start SUBSYSTEM HEIMDAL_GSSAPI
[SUBSYSTEM::HEIMDAL_GSSAPI]
CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/gssapi
-I$(heimdalsrcdir)/lib/gssapi/gssapi -I$(heimdalsrcdir)/lib/gssapi/spnego
-I$(heimdalsrcdir)/lib/gssapi/krb5 -I$(heimdalsrcdir)/lib/gssapi/mech
-PRIVATE_DEPENDENCIES = HEIMDAL_HCRYPTO HEIMDAL_HEIM_ASN1 HEIMDAL_SPNEGO_ASN1
-PUBLIC_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_KRB5
+PRIVATE_DEPENDENCIES = HEIMDAL_HCRYPTO HEIMDAL_HEIM_ASN1 HEIMDAL_SPNEGO_ASN1
HEIMDAL_ROKEN HEIMDAL_KRB5
# End SUBSYSTEM HEIMDAL_GSSAPI
#######################
@@ -180,8 +181,8 @@ HEIMDAL_GSSAPI_OBJ_FILES = \
# Start SUBSYSTEM HEIMDAL_KRB5
[SUBSYSTEM::HEIMDAL_KRB5]
CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/krb5
-I$(heimdalsrcdir)/lib/asn1 -I$(heimdalsrcdir)/lib/com_err
-PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_PKINIT_ASN1 HEIMDAL_WIND
-PUBLIC_DEPENDENCIES = HEIMDAL_KRB5_ASN1 HEIMDAL_GLUE HEIMDAL_HX509
HEIMDAL_HCRYPTO
+PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_PKINIT_ASN1 HEIMDAL_WIND \
+ HEIMDAL_KRB5_ASN1 HEIMDAL_GLUE HEIMDAL_HX509 HEIMDAL_HCRYPTO
# End SUBSYSTEM HEIMDAL_KRB5
#######################
@@ -431,7 +432,7 @@ $(HEIMDAL_ROKEN_GETPROGNAME_H_OBJ_FILES):
CFLAGS+=-I$(heimdalbuildsrcdir) -I$(he
# Start SUBSYSTEM HEIMDAL_ROKEN
[SUBSYSTEM::HEIMDAL_ROKEN]
CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/roken
-I$(socketwrappersrcdir)
-PUBLIC_DEPENDENCIES = \
+PRIVATE_DEPENDENCIES = \
HEIMDAL_ROKEN_GETPROGNAME \
HEIMDAL_ROKEN_CLOSEFROM \
RESOLV \
@@ -476,7 +477,7 @@ HEIMDAL_ROKEN_OBJ_FILES = \
# Start SUBSYSTEM HEIMDAL_GLUE
[SUBSYSTEM::HEIMDAL_GLUE]
CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/krb5
-I$(heimdalsrcdir)/lib/asn1 -I$(heimdalsrcdir)/lib/com_err
-PUBLIC_DEPENDENCIES = LIBNETIF LIBSAMBA-HOSTCONFIG
+PRIVATE_DEPENDENCIES = LIBNETIF LIBSAMBA-HOSTCONFIG
# End SUBSYSTEM HEIMDAL_GLUE
#######################
@@ -586,9 +587,6 @@ mkinclude perl_path_wrapper.sh asn1_deps.pl
lib/hx509/ocsp.asn1 ocsp_asn1 \$\(he
mkinclude perl_path_wrapper.sh asn1_deps.pl lib/asn1/kx509.asn1 kx509_asn1
\$\(heimdalsrcdir\)/lib/asn1|
mkinclude perl_path_wrapper.sh asn1_deps.pl lib/hx509/pkcs10.asn1 pkcs10_asn1
\$\(heimdalsrcdir\)/lib/hx509 --preserve-binary=CertificationRequestInfo|
-#
-# Ensure to update ./static_deps.mk when you add a new entry here!
-#
mkinclude perl_path_wrapper.sh et_deps.pl lib/asn1/asn1_err.et
\$\(heimdalsrcdir\)/lib/asn1|
mkinclude perl_path_wrapper.sh et_deps.pl lib/hdb/hdb_err.et
\$\(heimdalsrcdir\)/lib/hdb|
mkinclude perl_path_wrapper.sh et_deps.pl lib/krb5/heim_err.et
\$\(heimdalsrcdir\)/lib/krb5|
@@ -603,17 +601,6 @@ clean::
@-rm -f bin/compile_et bin/asn1_compile
#######################
-# Start SUBSYSTEM HEIMDAL
-[SUBSYSTEM::HEIMDAL]
-CFLAGS = -I$(heimdalbuildsrcdir)
-PUBLIC_DEPENDENCIES = \
- HEIMDAL_GSSAPI HEIMDAL_KRB5
-# End SUBSYSTEM HEIMDAL
-#######################
-
-HEIMDAL_OBJ_FILES = $(heimdalsrcdir)/lib/vers/print_version.o
-
-#######################
# Start BINARY compile_et
[BINARY::samba4kinit]
PRIVATE_DEPENDENCIES = HEIMDAL_KRB5 HEIMDAL_NTLM
diff --git a/source/heimdal_build/krb5/windc_plugin.h
b/source/heimdal_build/krb5/windc_plugin.h
new file mode 100644
index 0000000..1df5fd3
--- /dev/null
+++ b/source/heimdal_build/krb5/windc_plugin.h
@@ -0,0 +1 @@
+#include "heimdal/kdc/windc_plugin.h"
diff --git a/source/kdc/config.mk b/source/kdc/config.mk
index b3b8b21..2c96e22 100644
--- a/source/kdc/config.mk
+++ b/source/kdc/config.mk
@@ -6,7 +6,7 @@
INIT_FUNCTION = server_service_kdc_init
SUBSYSTEM = smbd
PRIVATE_DEPENDENCIES = \
- LIBLDB HEIMDAL HEIMDAL_KDC HEIMDAL_HDB SAMDB
+ HEIMDAL_KDC HDB_LDB
# End SUBSYSTEM KDC
#######################
@@ -17,8 +17,8 @@ KDC_OBJ_FILES = $(addprefix $(kdcsrcdir)/, kdc.o kpasswdd.o)
[SUBSYSTEM::HDB_LDB]
CFLAGS = -Iheimdal/kdc -Iheimdal/lib/hdb
PRIVATE_DEPENDENCIES = \
- LIBLDB auth_sam auth_sam_reply HEIMDAL CREDENTIALS \
- HEIMDAL_HDB_ASN1
+ LIBLDB auth_sam auth_sam_reply CREDENTIALS \
+ HEIMDAL_HDB
# End SUBSYSTEM KDC
#######################
diff --git a/source/kdc/kdc.h b/source/kdc/kdc.h
index 0943de4..7e82ad2 100644
--- a/source/kdc/kdc.h
+++ b/source/kdc/kdc.h
@@ -22,9 +22,9 @@
#include "system/kerberos.h"
#include "auth/kerberos/kerberos.h"
-#include "heimdal/kdc/kdc.h"
-#include "heimdal/lib/hdb/hdb.h"
-#include "heimdal/kdc/windc_plugin.h"
+#include <kdc.h>
+#include <hdb.h>
+#include <krb5/windc_plugin.h>
#include "kdc/pac_glue.h"
struct kdc_server;
diff --git a/source/kdc/kpasswdd.c b/source/kdc/kpasswdd.c
index b42769c..55dadd9 100644
--- a/source/kdc/kpasswdd.c
+++ b/source/kdc/kpasswdd.c
@@ -27,8 +27,6 @@
#include "system/network.h"
#include "lib/util/dlinklist.h"
#include "lib/ldb/include/ldb.h"
-#include "heimdal/lib/krb5/krb5_locl.h"
-#include "heimdal/lib/krb5/krb5-private.h"
#include "auth/gensec/gensec.h"
#include "auth/credentials/credentials.h"
#include "auth/credentials/credentials_krb5.h"
@@ -40,6 +38,10 @@
#include "param/param.h"
#include "kdc/kdc.h"
+/* TODO: remove this */
+#include "heimdal/lib/krb5/krb5_locl.h"
+#include "heimdal/lib/krb5/krb5-private.h"
+
/* hold information about one kdc socket */
struct kpasswd_socket {
struct socket_context *sock;
diff --git a/source/main.mk b/source/main.mk
index f0ce968..28db54c 100644
--- a/source/main.mk
+++ b/source/main.mk
@@ -1,5 +1,4 @@
mkinclude dynconfig/config.mk
-mkinclude heimdal_build/internal.mk
mkinclude config.mk
mkinclude dsdb/config.mk
mkinclude smbd/config.mk
diff --git a/source/static_deps.mk b/source/static_deps.mk
index 085eae9..2768ea8 100644
--- a/source/static_deps.mk
+++ b/source/static_deps.mk
@@ -13,30 +13,5 @@ include/includes.h: \
$(libcharsetsrcdir)/charset.h \
$(gen_ndrsrcdir)/misc.h
-heimdal_basics: \
- $(heimdalsrcdir)/lib/hdb/hdb_asn1.h \
- $(heimdalsrcdir)/lib/gssapi/spnego_asn1.h \
- $(heimdalsrcdir)/lib/gssapi/gssapi_asn1.h \
- $(heimdalsrcdir)/lib/asn1/krb5_asn1.h \
- $(heimdalsrcdir)/lib/asn1/asn1_err.h \
- $(heimdalsrcdir)/lib/asn1/digest_asn1.h \
- $(heimdalsrcdir)/lib/asn1/pkcs8_asn1.h \
- $(heimdalsrcdir)/lib/asn1/pkcs9_asn1.h \
- $(heimdalsrcdir)/lib/asn1/pkcs12_asn1.h \
- $(heimdalsrcdir)/lib/asn1/cms_asn1.h \
- $(heimdalsrcdir)/lib/asn1/rfc2459_asn1.h \
- $(heimdalsrcdir)/lib/asn1/pkinit_asn1.h \
- $(heimdalsrcdir)/lib/asn1/kx509_asn1.h \
- $(heimdalsrcdir)/lib/hx509/ocsp_asn1.h \
- $(heimdalsrcdir)/lib/hx509/pkcs10_asn1.h \
- $(heimdalsrcdir)/lib/hdb/hdb_err.h \
- $(heimdalsrcdir)/lib/krb5/heim_err.h \
- $(heimdalsrcdir)/lib/krb5/k524_err.h \
- $(heimdalsrcdir)/lib/krb5/krb_err.h \
- $(heimdalsrcdir)/lib/krb5/krb5_err.h \
- $(heimdalsrcdir)/lib/gssapi/gkrb5_err.h \
- $(heimdalsrcdir)/lib/hx509/hx509_err.h \
- $(heimdalsrcdir)/lib/wind/wind_err.h
-
proto::
-basics:: include/includes.h idl proto heimdal_basics
+basics:: include/includes.h idl proto
--
Samba Shared Repository
