[SCM] Samba Shared Repository - branch v4-0-test updated -
release-4-0-0alpha5-403-gd3e939b
Stefan Metzmacher
metze at samba.org
Tue Aug 26 16:46:14 GMT 2008
The branch, v4-0-test has been updated
via d3e939bf75fb85cf0eb3551856e161e3e58c0031 (commit)
via 848067033c40c3a4681f196ac5da289cd488d962 (commit)
via 95135ade447e04329afa7581c66c4df8de63ca24 (commit)
via 4314df3561dfe60228db0af220549300b0137c85 (commit)
via 1c7bb21bd85900206e9ad831bc4795c1f765a9aa (commit)
via 65057f17b0d9e83f1b775afdeb7ea91ce0e52cd1 (commit)
via 585e5360e2d9f722e80850eb86c3d4253530e8ba (commit)
via 8ed040c8c4bed082ab74ab267090b35bb57db3f3 (commit)
from 66d8da17a4c3543e133452f9a87702a2a8fb609c (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit d3e939bf75fb85cf0eb3551856e161e3e58c0031
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Aug 26 15:30:18 2008 +0200
heimdal_build: split heimdal/lib/asn1 file lists
metze
commit 848067033c40c3a4681f196ac5da289cd488d962
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Aug 26 11:57:29 2008 +0200
heimdal_build: split handwritten and generated hx509 file lists
metze
commit 95135ade447e04329afa7581c66c4df8de63ca24
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Aug 26 11:56:37 2008 +0200
heimdal_build: split out gssapi_spnego and gssapi_krb5 file lists
metze
commit 4314df3561dfe60228db0af220549300b0137c85
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Aug 26 12:19:52 2008 +0200
heimdal_build: add a fake sqlite keytab implementation
This remove a difference against lorikeet-heimdal.
metze
commit 1c7bb21bd85900206e9ad831bc4795c1f765a9aa
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Aug 26 11:42:13 2008 +0200
heimdal_build: split glue.c into krb5 and gssapi parts
metze
commit 65057f17b0d9e83f1b775afdeb7ea91ce0e52cd1
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Aug 25 16:12:42 2008 +0200
kdc: move references to heimdal internals into heimdal_build/kpasswd-glue.h
metze
commit 585e5360e2d9f722e80850eb86c3d4253530e8ba
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Aug 26 12:25:54 2008 +0200
Revert "gsskrb5: add support for DCE_STYLE and des and des3 keys"
This reverts commit 86848dd0f217774faed81af8fbf68618013e20a1.
This should come back via a merge from heimdal's trunk later.
metze
commit 8ed040c8c4bed082ab74ab267090b35bb57db3f3
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Aug 26 12:23:13 2008 +0200
Revert "gsskrb5: always return an acceptor subkey"
This reverts commit 6a8b07c39558f240b89e833ecba15d8b9fc020e8.
This isn't strictly needed and will come back in the next merge
from heimdal's trunk.
metze
-----------------------------------------------------------------------
Summary of changes:
.../heimdal/lib/gssapi/krb5/accept_sec_context.c | 22 +---
source/heimdal/lib/gssapi/krb5/unwrap.c | 52 ++-----
source/heimdal/lib/gssapi/krb5/wrap.c | 34 +---
source/heimdal/lib/krb5/context.c | 2 -
source/heimdal_build/glue.c | 65 --------
source/heimdal_build/gssapi-glue.c | 27 ++++
source/heimdal_build/internal.mk | 161 ++++++++++----------
source/heimdal_build/kpasswdd-glue.h | 3 +
source/heimdal_build/krb5-glue.c | 80 ++++++++++
source/kdc/kpasswdd.c | 3 +-
10 files changed, 217 insertions(+), 232 deletions(-)
delete mode 100644 source/heimdal_build/glue.c
create mode 100644 source/heimdal_build/gssapi-glue.c
create mode 100644 source/heimdal_build/kpasswdd-glue.h
create mode 100644 source/heimdal_build/krb5-glue.c
Changeset truncated at 500 lines:
diff --git a/source/heimdal/lib/gssapi/krb5/accept_sec_context.c b/source/heimdal/lib/gssapi/krb5/accept_sec_context.c
index a6f0f31..8dbd087 100644
--- a/source/heimdal/lib/gssapi/krb5/accept_sec_context.c
+++ b/source/heimdal/lib/gssapi/krb5/accept_sec_context.c
@@ -520,30 +520,16 @@ gsskrb5_acceptor_start(OM_uint32 * minor_status,
if(ctx->flags & GSS_C_MUTUAL_FLAG) {
krb5_data outbuf;
- int use_subkey = 0;
_gsskrb5i_is_cfx(ctx, &is_cfx);
if (is_cfx != 0
|| (ap_options & AP_OPTS_USE_SUBKEY)) {
- use_subkey = 1;
- } else {
- krb5_keyblock *rkey;
- kret = krb5_auth_con_getremotesubkey(context, ctx->auth_context, &rkey);
- if (kret == 0) {
- kret = krb5_auth_con_setlocalsubkey(context, ctx->auth_context, rkey);
- if (kret == 0) {
- use_subkey = 1;
- }
- krb5_free_keyblock(context, rkey);
- }
- }
- if (use_subkey) {
+ kret = krb5_auth_con_addflags(context,
+ ctx->auth_context,
+ KRB5_AUTH_CONTEXT_USE_SUBKEY,
+ NULL);
ctx->more_flags |= ACCEPTOR_SUBKEY;
- krb5_auth_con_addflags(context,
- ctx->auth_context,
- KRB5_AUTH_CONTEXT_USE_SUBKEY,
- NULL);
}
kret = krb5_mk_rep(context,
diff --git a/source/heimdal/lib/gssapi/krb5/unwrap.c b/source/heimdal/lib/gssapi/krb5/unwrap.c
index c287469..eec4078 100644
--- a/source/heimdal/lib/gssapi/krb5/unwrap.c
+++ b/source/heimdal/lib/gssapi/krb5/unwrap.c
@@ -59,17 +59,10 @@ unwrap_des
OM_uint32 ret;
int cstate;
int cmp;
- int token_len;
-
- if (IS_DCE_STYLE(context_handle)) {
- token_len = 22 + 8 + 15; /* 45 */
- } else {
- token_len = input_message_buffer->length;
- }
p = input_message_buffer->value;
ret = _gsskrb5_verify_header (&p,
- token_len,
+ input_message_buffer->length,
"\x02\x01",
GSS_KRB5_MECHANISM);
if (ret)
@@ -112,17 +105,12 @@ unwrap_des
memset (deskey, 0, sizeof(deskey));
memset (&schedule, 0, sizeof(schedule));
}
-
- if (IS_DCE_STYLE(context_handle)) {
- padlength = 0;
- } else {
- /* check pad */
- ret = _gssapi_verify_pad(input_message_buffer,
- input_message_buffer->length - len,
- &padlength);
- if (ret)
- return ret;
- }
+ /* check pad */
+ ret = _gssapi_verify_pad(input_message_buffer,
+ input_message_buffer->length - len,
+ &padlength);
+ if (ret)
+ return ret;
MD5_Init (&md5);
MD5_Update (&md5, p - 24, 8);
@@ -207,17 +195,10 @@ unwrap_des3
krb5_crypto crypto;
Checksum csum;
int cmp;
- int token_len;
-
- if (IS_DCE_STYLE(context_handle)) {
- token_len = 34 + 8 + 15; /* 57 */
- } else {
- token_len = input_message_buffer->length;
- }
p = input_message_buffer->value;
ret = _gsskrb5_verify_header (&p,
- token_len,
+ input_message_buffer->length,
"\x02\x01",
GSS_KRB5_MECHANISM);
if (ret)
@@ -264,17 +245,12 @@ unwrap_des3
memcpy (p, tmp.data, tmp.length);
krb5_data_free(&tmp);
}
-
- if (IS_DCE_STYLE(context_handle)) {
- padlength = 0;
- } else {
- /* check pad */
- ret = _gssapi_verify_pad(input_message_buffer,
- input_message_buffer->length - len,
- &padlength);
- if (ret)
- return ret;
- }
+ /* check pad */
+ ret = _gssapi_verify_pad(input_message_buffer,
+ input_message_buffer->length - len,
+ &padlength);
+ if (ret)
+ return ret;
/* verify sequence number */
diff --git a/source/heimdal/lib/gssapi/krb5/wrap.c b/source/heimdal/lib/gssapi/krb5/wrap.c
index bedeace..6d00f2a 100644
--- a/source/heimdal/lib/gssapi/krb5/wrap.c
+++ b/source/heimdal/lib/gssapi/krb5/wrap.c
@@ -210,19 +210,10 @@ wrap_des
int32_t seq_number;
size_t len, total_len, padlength, datalen;
- if (IS_DCE_STYLE(ctx)) {
- padlength = 0;
- datalen = input_message_buffer->length;
- len = 22 + 8;
- _gsskrb5_encap_length (len, &len, &total_len, GSS_KRB5_MECHANISM);
- total_len += datalen;
- datalen += 8;
- } else {
- padlength = 8 - (input_message_buffer->length % 8);
- datalen = input_message_buffer->length + padlength + 8;
- len = datalen + 22;
- _gsskrb5_encap_length (len, &len, &total_len, GSS_KRB5_MECHANISM);
- }
+ padlength = 8 - (input_message_buffer->length % 8);
+ datalen = input_message_buffer->length + padlength + 8;
+ len = datalen + 22;
+ _gsskrb5_encap_length (len, &len, &total_len, GSS_KRB5_MECHANISM);
output_message_buffer->length = total_len;
output_message_buffer->value = malloc (total_len);
@@ -345,19 +336,10 @@ wrap_des3
Checksum cksum;
krb5_data encdata;
- if (IS_DCE_STYLE(ctx)) {
- padlength = 0;
- datalen = input_message_buffer->length;
- len = 34 + 8;
- _gsskrb5_encap_length (len, &len, &total_len, GSS_KRB5_MECHANISM);
- total_len += datalen;
- datalen += 8;
- } else {
- padlength = 8 - (input_message_buffer->length % 8);
- datalen = input_message_buffer->length + padlength + 8;
- len = datalen + 34;
- _gsskrb5_encap_length (len, &len, &total_len, GSS_KRB5_MECHANISM);
- }
+ padlength = 8 - (input_message_buffer->length % 8);
+ datalen = input_message_buffer->length + padlength + 8;
+ len = datalen + 34;
+ _gsskrb5_encap_length (len, &len, &total_len, GSS_KRB5_MECHANISM);
output_message_buffer->length = total_len;
output_message_buffer->value = malloc (total_len);
diff --git a/source/heimdal/lib/krb5/context.c b/source/heimdal/lib/krb5/context.c
index 543dba3..9f17b8c 100644
--- a/source/heimdal/lib/krb5/context.c
+++ b/source/heimdal/lib/krb5/context.c
@@ -246,9 +246,7 @@ krb5_init_context(krb5_context *context)
krb5_cc_register(p, &krb5_acc_ops, TRUE);
krb5_cc_register(p, &krb5_fcc_ops, TRUE);
krb5_cc_register(p, &krb5_mcc_ops, TRUE);
-#if 0
krb5_cc_register(p, &krb5_scc_ops, TRUE);
-#endif
#ifdef HAVE_KCM
krb5_cc_register(p, &krb5_kcm_ops, TRUE);
#endif
diff --git a/source/heimdal_build/glue.c b/source/heimdal_build/glue.c
deleted file mode 100644
index 07062ae..0000000
--- a/source/heimdal_build/glue.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- Unix SMB/CIFS implementation.
-
- provide glue functions between heimdal and samba
-
- Copyright (C) Andrew Tridgell 2005
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "includes.h"
-#include "system/network.h"
-#include "system/kerberos.h"
-#include "lib/socket/netif.h"
-#include "param/param.h"
-
-/**
- get the list of IP addresses for configured interfaces
-*/
-krb5_error_code KRB5_LIB_FUNCTION krb5_get_all_client_addrs(krb5_context context, krb5_addresses *res)
-{
- int i;
- struct interface *ifaces;
-
- load_interfaces(NULL, lp_interfaces(global_loadparm), &ifaces);
-
- res->len = iface_count(ifaces);
- res->val = malloc_array_p(HostAddress, res->len);
- if (res->val == NULL) {
- talloc_free(ifaces);
- return ENOMEM;
- }
- for (i=0;i<res->len;i++) {
- const char *ip = iface_n_ip(ifaces, i);
- res->val[i].addr_type = AF_INET;
- res->val[i].address.length = 4;
- res->val[i].address.data = malloc(4);
- if (res->val[i].address.data == NULL) {
- talloc_free(ifaces);
- return ENOMEM;
- }
- ((struct in_addr *)res->val[i].address.data)->s_addr = inet_addr(ip);
- }
-
- talloc_free(ifaces);
-
- return 0;
-}
-
-
-void *__gss_ntlm_initialize(void)
-{
- return NULL;
-}
diff --git a/source/heimdal_build/gssapi-glue.c b/source/heimdal_build/gssapi-glue.c
new file mode 100644
index 0000000..0885c21
--- /dev/null
+++ b/source/heimdal_build/gssapi-glue.c
@@ -0,0 +1,27 @@
+/*
+ Unix SMB/CIFS implementation.
+
+ provide glue functions between heimdal and samba
+
+ Copyright (C) Andrew Tridgell 2005
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "lib/replace/replace.h"
+
+void *__gss_ntlm_initialize(void)
+{
+ return NULL;
+}
diff --git a/source/heimdal_build/internal.mk b/source/heimdal_build/internal.mk
index 8c576bd..3553d9e 100644
--- a/source/heimdal_build/internal.mk
+++ b/source/heimdal_build/internal.mk
@@ -67,7 +67,64 @@ PRIVATE_DEPENDENCIES = HEIMDAL_HCRYPTO HEIMDAL_HEIM_ASN1 HEIMDAL_SPNEGO_ASN1 HEI
# End SUBSYSTEM HEIMDAL_GSSAPI
#######################
+HEIMDAL_GSSAPI_SPNEGO_OBJ_FILES = \
+ $(heimdalsrcdir)/lib/gssapi/spnego/init_sec_context.o \
+ $(heimdalsrcdir)/lib/gssapi/spnego/external.o \
+ $(heimdalsrcdir)/lib/gssapi/spnego/compat.o \
+ $(heimdalsrcdir)/lib/gssapi/spnego/context_stubs.o \
+ $(heimdalsrcdir)/lib/gssapi/spnego/cred_stubs.o \
+ $(heimdalsrcdir)/lib/gssapi/spnego/accept_sec_context.o \
+
+HEIMDAL_GSSAPI_KRB5_OBJ_FILES = \
+ $(heimdalsrcdir)/lib/gssapi/krb5/copy_ccache.o \
+ $(heimdalsrcdir)/lib/gssapi/krb5/delete_sec_context.o \
+ $(heimdalsrcdir)/lib/gssapi/krb5/init_sec_context.o \
+ $(heimdalsrcdir)/lib/gssapi/krb5/context_time.o \
+ $(heimdalsrcdir)/lib/gssapi/krb5/init.o \
+ $(heimdalsrcdir)/lib/gssapi/krb5/address_to_krb5addr.o \
+ $(heimdalsrcdir)/lib/gssapi/krb5/get_mic.o \
+ $(heimdalsrcdir)/lib/gssapi/krb5/inquire_context.o \
+ $(heimdalsrcdir)/lib/gssapi/krb5/add_cred.o \
+ $(heimdalsrcdir)/lib/gssapi/krb5/inquire_cred.o \
+ $(heimdalsrcdir)/lib/gssapi/krb5/inquire_cred_by_oid.o \
+ $(heimdalsrcdir)/lib/gssapi/krb5/inquire_cred_by_mech.o \
+ $(heimdalsrcdir)/lib/gssapi/krb5/inquire_mechs_for_name.o \
+ $(heimdalsrcdir)/lib/gssapi/krb5/inquire_names_for_mech.o \
+ $(heimdalsrcdir)/lib/gssapi/krb5/indicate_mechs.o \
+ $(heimdalsrcdir)/lib/gssapi/krb5/inquire_sec_context_by_oid.o \
+ $(heimdalsrcdir)/lib/gssapi/krb5/export_sec_context.o \
+ $(heimdalsrcdir)/lib/gssapi/krb5/import_sec_context.o \
+ $(heimdalsrcdir)/lib/gssapi/krb5/duplicate_name.o \
+ $(heimdalsrcdir)/lib/gssapi/krb5/import_name.o \
+ $(heimdalsrcdir)/lib/gssapi/krb5/compare_name.o \
+ $(heimdalsrcdir)/lib/gssapi/krb5/export_name.o \
+ $(heimdalsrcdir)/lib/gssapi/krb5/canonicalize_name.o \
+ $(heimdalsrcdir)/lib/gssapi/krb5/unwrap.o \
+ $(heimdalsrcdir)/lib/gssapi/krb5/wrap.o \
+ $(heimdalsrcdir)/lib/gssapi/krb5/release_name.o \
+ $(heimdalsrcdir)/lib/gssapi/krb5/cfx.o \
+ $(heimdalsrcdir)/lib/gssapi/krb5/8003.o \
+ $(heimdalsrcdir)/lib/gssapi/krb5/arcfour.o \
+ $(heimdalsrcdir)/lib/gssapi/krb5/encapsulate.o \
+ $(heimdalsrcdir)/lib/gssapi/krb5/display_name.o \
+ $(heimdalsrcdir)/lib/gssapi/krb5/sequence.o \
+ $(heimdalsrcdir)/lib/gssapi/krb5/display_status.o \
+ $(heimdalsrcdir)/lib/gssapi/krb5/release_buffer.o \
+ $(heimdalsrcdir)/lib/gssapi/krb5/external.o \
+ $(heimdalsrcdir)/lib/gssapi/krb5/compat.o \
+ $(heimdalsrcdir)/lib/gssapi/krb5/acquire_cred.o \
+ $(heimdalsrcdir)/lib/gssapi/krb5/release_cred.o \
+ $(heimdalsrcdir)/lib/gssapi/krb5/set_cred_option.o \
+ $(heimdalsrcdir)/lib/gssapi/krb5/decapsulate.o \
+ $(heimdalsrcdir)/lib/gssapi/krb5/verify_mic.o \
+ $(heimdalsrcdir)/lib/gssapi/krb5/accept_sec_context.o \
+ $(heimdalsrcdir)/lib/gssapi/krb5/set_sec_context_option.o \
+ $(heimdalsrcdir)/lib/gssapi/krb5/process_context_token.o \
+ $(heimdalsrcdir)/lib/gssapi/krb5/prf.o
+
HEIMDAL_GSSAPI_OBJ_FILES = \
+ $(HEIMDAL_GSSAPI_SPNEGO_OBJ_FILES) \
+ $(HEIMDAL_GSSAPI_KRB5_OBJ_FILES) \
$(heimdalsrcdir)/lib/gssapi/mech/context.o \
$(heimdalsrcdir)/lib/gssapi/mech/gss_krb5.o \
$(heimdalsrcdir)/lib/gssapi/mech/gss_mech_switch.o \
@@ -124,65 +181,15 @@ HEIMDAL_GSSAPI_OBJ_FILES = \
$(heimdalsrcdir)/lib/gssapi/mech/gss_set_cred_option.o \
$(heimdalsrcdir)/lib/gssapi/mech/gss_pseudo_random.o \
$(heimdalsrcdir)/lib/gssapi/asn1_GSSAPIContextToken.o \
- $(heimdalsrcdir)/lib/gssapi/spnego/init_sec_context.o \
- $(heimdalsrcdir)/lib/gssapi/spnego/external.o \
- $(heimdalsrcdir)/lib/gssapi/spnego/compat.o \
- $(heimdalsrcdir)/lib/gssapi/spnego/context_stubs.o \
- $(heimdalsrcdir)/lib/gssapi/spnego/cred_stubs.o \
- $(heimdalsrcdir)/lib/gssapi/spnego/accept_sec_context.o \
- $(heimdalsrcdir)/lib/gssapi/krb5/copy_ccache.o \
- $(heimdalsrcdir)/lib/gssapi/krb5/delete_sec_context.o \
- $(heimdalsrcdir)/lib/gssapi/krb5/init_sec_context.o \
- $(heimdalsrcdir)/lib/gssapi/krb5/context_time.o \
- $(heimdalsrcdir)/lib/gssapi/krb5/init.o \
- $(heimdalsrcdir)/lib/gssapi/krb5/address_to_krb5addr.o \
- $(heimdalsrcdir)/lib/gssapi/krb5/get_mic.o \
- $(heimdalsrcdir)/lib/gssapi/krb5/inquire_context.o \
- $(heimdalsrcdir)/lib/gssapi/krb5/add_cred.o \
- $(heimdalsrcdir)/lib/gssapi/krb5/inquire_cred.o \
- $(heimdalsrcdir)/lib/gssapi/krb5/inquire_cred_by_oid.o \
- $(heimdalsrcdir)/lib/gssapi/krb5/inquire_cred_by_mech.o \
- $(heimdalsrcdir)/lib/gssapi/krb5/inquire_mechs_for_name.o \
- $(heimdalsrcdir)/lib/gssapi/krb5/inquire_names_for_mech.o \
- $(heimdalsrcdir)/lib/gssapi/krb5/indicate_mechs.o \
- $(heimdalsrcdir)/lib/gssapi/krb5/inquire_sec_context_by_oid.o \
- $(heimdalsrcdir)/lib/gssapi/krb5/export_sec_context.o \
- $(heimdalsrcdir)/lib/gssapi/krb5/import_sec_context.o \
- $(heimdalsrcdir)/lib/gssapi/krb5/duplicate_name.o \
- $(heimdalsrcdir)/lib/gssapi/krb5/import_name.o \
- $(heimdalsrcdir)/lib/gssapi/krb5/compare_name.o \
- $(heimdalsrcdir)/lib/gssapi/krb5/export_name.o \
- $(heimdalsrcdir)/lib/gssapi/krb5/canonicalize_name.o \
- $(heimdalsrcdir)/lib/gssapi/krb5/unwrap.o \
- $(heimdalsrcdir)/lib/gssapi/krb5/wrap.o \
- $(heimdalsrcdir)/lib/gssapi/krb5/release_name.o \
- $(heimdalsrcdir)/lib/gssapi/krb5/cfx.o \
- $(heimdalsrcdir)/lib/gssapi/krb5/8003.o \
- $(heimdalsrcdir)/lib/gssapi/krb5/arcfour.o \
- $(heimdalsrcdir)/lib/gssapi/krb5/encapsulate.o \
- $(heimdalsrcdir)/lib/gssapi/krb5/display_name.o \
- $(heimdalsrcdir)/lib/gssapi/krb5/sequence.o \
- $(heimdalsrcdir)/lib/gssapi/krb5/display_status.o \
- $(heimdalsrcdir)/lib/gssapi/krb5/release_buffer.o \
- $(heimdalsrcdir)/lib/gssapi/krb5/external.o \
- $(heimdalsrcdir)/lib/gssapi/krb5/compat.o \
- $(heimdalsrcdir)/lib/gssapi/krb5/acquire_cred.o \
- $(heimdalsrcdir)/lib/gssapi/krb5/release_cred.o \
- $(heimdalsrcdir)/lib/gssapi/krb5/set_cred_option.o \
- $(heimdalsrcdir)/lib/gssapi/krb5/decapsulate.o \
- $(heimdalsrcdir)/lib/gssapi/krb5/verify_mic.o \
- $(heimdalsrcdir)/lib/gssapi/krb5/accept_sec_context.o \
- $(heimdalsrcdir)/lib/gssapi/krb5/set_sec_context_option.o \
- $(heimdalsrcdir)/lib/gssapi/krb5/process_context_token.o \
- $(heimdalsrcdir)/lib/gssapi/krb5/prf.o
-
+ $(heimdalbuildsrcdir)/gssapi-glue.o
#######################
# 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 \
- HEIMDAL_KRB5_ASN1 HEIMDAL_GLUE HEIMDAL_HX509 HEIMDAL_HCRYPTO
+ HEIMDAL_KRB5_ASN1 HEIMDAL_HX509 HEIMDAL_HCRYPTO \
+ LIBNETIF LIBSAMBA-HOSTCONFIG
PUBLIC_DEPENDENCIES = HEIMDAL_COM_ERR
# End SUBSYSTEM HEIMDAL_KRB5
#######################
@@ -273,7 +280,8 @@ HEIMDAL_KRB5_OBJ_FILES = \
$(heimdalsrcdir)/lib/krb5/krb5_err.o \
$(heimdalsrcdir)/lib/krb5/heim_err.o \
$(heimdalsrcdir)/lib/krb5/k524_err.o \
- $(heimdalsrcdir)/lib/krb5/krb_err.o
+ $(heimdalsrcdir)/lib/krb5/krb_err.o \
+ $(heimdalbuildsrcdir)/krb5-glue.o
#######################
# Start SUBSYSTEM HEIMDAL_HEIM_ASN1
@@ -283,7 +291,7 @@ PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_COM_ERR
# End SUBSYSTEM HEIMDAL_KRB5
#######################
-HEIMDAL_HEIM_ASN1_OBJ_FILES = \
+HEIMDAL_HEIM_ASN1_DER_OBJ_FILES = \
$(heimdalsrcdir)/lib/asn1/der_get.o \
$(heimdalsrcdir)/lib/asn1/der_put.o \
$(heimdalsrcdir)/lib/asn1/der_free.o \
@@ -291,6 +299,9 @@ HEIMDAL_HEIM_ASN1_OBJ_FILES = \
$(heimdalsrcdir)/lib/asn1/der_length.o \
$(heimdalsrcdir)/lib/asn1/der_copy.o \
$(heimdalsrcdir)/lib/asn1/der_cmp.o \
+
+HEIMDAL_HEIM_ASN1_OBJ_FILES = \
+ $(HEIMDAL_HEIM_ASN1_DER_OBJ_FILES) \
$(heimdalsrcdir)/lib/asn1/extra.o \
$(heimdalsrcdir)/lib/asn1/timegm.o \
$(heimdalsrcdir)/lib/asn1/asn1_err.o
@@ -360,7 +371,7 @@ PRIVATE_DEPENDENCIES = \
# End SUBSYSTEM HEIMDAL_HX509
#######################
-HEIMDAL_HX509_OBJ_FILES = \
+HEIMDAL_HX509_OBJH_FILES = \
$(heimdalsrcdir)/lib/hx509/ca.o \
$(heimdalsrcdir)/lib/hx509/cert.o \
$(heimdalsrcdir)/lib/hx509/cms.o \
@@ -384,10 +395,13 @@ HEIMDAL_HX509_OBJ_FILES = \
$(heimdalsrcdir)/lib/hx509/req.o \
$(heimdalsrcdir)/lib/hx509/revoke.o \
$(heimdalsrcdir)/lib/hx509/sel.o \
- $(heimdalsrcdir)/lib/hx509/sel-lex.o \
- $(heimdalsrcdir)/lib/hx509/sel-gram.o \
$(heimdalsrcdir)/lib/hx509/hx509_err.o
+HEIMDAL_HX509_OBJG_FILES = \
+ $(heimdalsrcdir)/lib/hx509/sel-lex.o \
+ $(heimdalsrcdir)/lib/hx509/sel-gram.o
+
+HEIMDAL_HX509_OBJ_FILES = $(HEIMDAL_HX509_OBJH_FILES) $(HEIMDAL_HX509_OBJG_FILES)
#######################
# Start SUBSYSTEM HEIMDAL_WIND
@@ -475,16 +489,6 @@ HEIMDAL_ROKEN_OBJ_FILES = \
$(heimdalbuildsrcdir)/replace.o
#######################
-# Start SUBSYSTEM HEIMDAL_GLUE
-[SUBSYSTEM::HEIMDAL_GLUE]
-CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/krb5 -I$(heimdalsrcdir)/lib/asn1 -I$(heimdalsrcdir)/lib/com_err
-PRIVATE_DEPENDENCIES = LIBNETIF LIBSAMBA-HOSTCONFIG
-# End SUBSYSTEM HEIMDAL_GLUE
--
Samba Shared Repository
More information about the samba-cvs
mailing list