sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-24 21:49:29 +03:00
Code Activity

r8161: Update Samba4 for the new Heimdal update.

Browse Source 
Andrew Bartlett
This commit is contained in:
Andrew Bartlett
2005-07-05 10:05:40 +00:00
committed by Gerald (Jerry) Carter
parent cfb7245597
commit 6a9b637327
5 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/heimdal_build/config.m4
View File

@ -14,7 +14,7 @@ SMB_BINARY_ENABLE(compile_et, NO)
# of the samba source tree
if test -d heimdal; then
AC_DEFINE(HAVE_KRB5,1,[Whether kerberos is available])
CFLAGS="${CFLAGS} -Iheimdal_build -Iheimdal/lib/krb5 -Iheimdal/lib/gssapi -Iheimdal/lib/asn1 -Iheimdal/lib/com_err -Iheimdal/lib/hdb"
CFLAGS="${CFLAGS} -Iheimdal_build -Iheimdal/lib/krb5 -Iheimdal/lib/gssapi -Iheimdal/lib/asn1 -Iheimdal/lib/com_err -Iheimdal/lib/hdb -Iheimdal/kdc"
HAVE_KRB5=YES
SMB_MODULE_DEFAULT(KERBEROS_LIB, STATIC)
SMB_BINARY_ENABLE(asn1_compile, YES)

1
source/heimdal_build/config.mk
View File

@ -285,6 +285,7 @@ ADD_OBJ_FILES = \
heimdal/lib/roken/strlwr.o \
heimdal/lib/roken/strsep_copy.o \
heimdal/lib/roken/strupr.o \
heimdal/lib/roken/strpool.o \
heimdal/lib/roken/getifaddrs.o
NOPROTO = YES
# End SUBSYSTEM HEIMDAL_ROKEN

2
source/include/system/kerberos.h
View File

@ -20,6 +20,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#ifdef HAVE_KRB5
/* Whether the krb5_address struct has a addrtype property */
/* #undef HAVE_ADDRTYPE_IN_KRB5_ADDRESS */
/* Whether the krb5_address struct has a addr_type property */
@ -123,7 +124,6 @@
/* Whether krb5_princ_realm returns krb5_realm or krb5_data */
#define KRB5_PRINC_REALM_RETURNS_REALM 1
#ifdef HAVE_KRB5
#include "heimdal/lib/krb5/krb5.h"
#include "heimdal/lib/gssapi/gssapi.h"
#include "heimdal/lib/com_err/com_err.h"

2
source/kdc/kdc.c
View File

@ -250,7 +250,7 @@ static void kdc_task_init(struct task_server *task)
kdc->task = task;
/* Setup the KDC configuration */
kdc->config = talloc(kdc, struct krb5_kdc_configuration);
kdc->config = talloc(kdc, krb5_kdc_configuration);
if (!kdc->config) {
task_server_terminate(task, "kdc: out of memory");
return;

2
source/kdc/kdc.h
View File

@ -42,7 +42,7 @@ struct kdc_reply {
*/
struct kdc_server {
struct task_server *task;
struct krb5_kdc_configuration *config;
krb5_kdc_configuration *config;
struct smb_krb5_context *smb_krb5_context;
};