mischief/openbsd-src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2025-01-10 06:47:55 -08:00
Code

fixes for heimdal 0.7.2

Browse Source
This commit is contained in:
biorn 2006-04-14 08:28:54 +00:00
parent 46084eb796
commit b39fd03dfa
8 changed files with 645 additions and 457 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kerberosV/Makefile.inc
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.inc,v 1.9 2003/07/14 16:14:43 mho Exp $
# $OpenBSD: Makefile.inc,v 1.10 2006/04/14 08:28:54 biorn Exp $
KRB5DIR = ${.CURDIR}/${KRBDEPTH}
KRB5SRC = ${.CURDIR}/${KRBDEPTH}/src
@ -7,7 +7,8 @@ CFLAGS += -DHAVE_CONFIG_H -DBINDIR=\"/usr/bin\" -DSBINDIR=\"/usr/sbin\"\
-DLIBEXECDIR=\"/usr/libexec\" -DSYSCONFDIR=\"/etc/kerberosV\" \
-I${DESTDIR}/usr/include/kerberosV \
-I${KRB5DIR}/include -I${KRB5SRC}/lib/roken\
-I${KRB5SRC}/include -I${KRB5SRC}/lib/sl
-I${KRB5SRC}/include -I${KRB5SRC}/lib/sl \
-I${KRB5SRC}/lib/krb5
CFLAGS+= -Wall
.include <bsd.own.mk> # for 'NOPIC' definition
.if !defined(NOPIC)

1045
kerberosV/include/config.h
View File

File diff suppressed because it is too large Load Diff

3
kerberosV/include/crypto-headers.h
View File

@ -3,7 +3,10 @@
#define OPENSSL_DES_LIBDES_COMPATIBILITY
#include <openssl/des.h>
#include <openssl/rc4.h>
#include <openssl/rc2.h>
#include <openssl/md4.h>
#include <openssl/md5.h>
#include <openssl/sha.h>
#include <openssl/aes.h>
#include <openssl/ui.h>
#endif /* __crypto_headers_h__ */

4
kerberosV/include/version.h
View File

@ -1,2 +1,2 @@
char *heimdal_long_version = "@(#)$Version: heimdal-0.6.3/OpenBSD";
char *heimdal_version = "heimdal-0.6.3/OpenBSD";
char *heimdal_long_version = "@(#)$Version: heimdal-0.7.2/OpenBSD";
char *heimdal_version = "heimdal-0.7.2/OpenBSD";

3
kerberosV/libexec/kdc/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.11 2003/07/14 16:14:44 mho Exp $
# $OpenBSD: Makefile,v 1.12 2006/04/14 08:28:55 biorn Exp $
KRBDEPTH=../..
.include <${.CURDIR}/../../Makefile.inc>
@ -9,6 +9,7 @@ MAN= ${PROG}.8
SRCS= 524.c \
config.c \
connect.c \
kaserver.c \
kdc_locl.h \
kerberos5.c \
kerberos4.c \

4
kerberosV/openbsd-vers/print_version.c
View File

@ -32,13 +32,13 @@
*/
#if 0
RCSID("$Id: print_version.c,v 1.2 2004/10/29 16:25:46 biorn Exp $");
RCSID("$Id: print_version.c,v 1.3 2006/04/14 08:28:55 biorn Exp $");
#endif
#include <stdio.h>
#define VERSIONLIST { "heimdal-0.6.3/OpenBSD", }
#define VERSIONLIST { "heimdal-0.7.2/OpenBSD", }
#define PACKAGE_BUGREPORT "bugs@openbsd.org"
char *__progname;

24
kerberosV/usr.sbin/kadmin/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.14 2004/06/04 23:45:19 biorn Exp $
# $OpenBSD: Makefile,v 1.15 2006/04/14 08:28:55 biorn Exp $
KRBDEPTH=../..
.include <${.CURDIR}/../../Makefile.inc>
@ -15,13 +15,17 @@ SRCS= ank.c \
get.c \
init.c \
kadmin.c \
kadmin-commands.c \
kadmin-commands.h \
kadmin_locl.h \
load.c \
mod.c \
rename.c \
util.c \
pw_quality.c \
random_password.c \
kadmin_locl.h \
sl.c
rename.c \
sl.c \
stash.c \
util.c
SRCS+= ${PRINTVER}
SRCS+= tm2time.c
@ -29,7 +33,15 @@ SRCS+= tm2time.c
.PATH: ${KRB5SRC}/lib/sl
.PATH: ${ROKENSRC}
CFLAGS+=-I${KRB5SRC}/lib/krb5 -I${KRB5SRC}/lib/kadm5
slc: slc-gram.o slc-lex.o ${PRINTVER}
$(CC) -o slc $> -lkrb5 -lcrypto
SLC= slc
kadmin: kadmin-commands.h
kadmin-commands.c kadmin-commands.h: kadmin-commands.in $(SLC)
./$(SLC) $(KRB5SRC)/kadmin/kadmin-commands.in
CFLAGS+=-I${KRB5SRC}/lib/krb5 -I${KRB5SRC}/lib/kadm5 -I.
DPADD+= ${LIBREADLINE} ${LIBCURSES} ${LIBKADM5SRV} ${LIBKADM5CLNT} \
${LIBKRB5} ${LIBCRYPTO} ${LIBDES}

14
kerberosV/usr.sbin/ktutil/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.11 2004/06/04 23:45:30 biorn Exp $
# $OpenBSD: Makefile,v 1.12 2006/04/14 08:28:55 biorn Exp $
KRBDEPTH=../..
.include <${.CURDIR}/../../Makefile.inc>
@ -11,6 +11,7 @@ SRCS= add.c \
copy.c \
get.c \
ktutil.c \
ktutil-commands.c \
list.c \
purge.c \
remove.c \
@ -21,7 +22,16 @@ SRCS+= ${PRINTVER}
.PATH: ${KRB5SRC}/admin
.PATH: ${KRB5SRC}/lib/sl
CFLAGS+=-I${KRB5SRC}/lib/krb5 -I${KRB5SRC}/lib/kadm5
slc: slc-gram.o slc-lex.o ${PRINTVER}
$(CC) -o slc $> -lkrb5 -lcrypto
SLC= slc
ktutil: ktutil-commands.h
ktutil-commands.c ktutil-commands.h: ktutil-commands.in $(SLC)
./$(SLC) $(KRB5SRC)/admin/ktutil-commands.in
CFLAGS+=-I${KRB5SRC}/lib/krb5 -I${KRB5SRC}/lib/kadm5 -I.
DPADD+= ${LIBREADLINE} ${LIBCURSES} ${LIBKADM5CLNT} ${LIBKRB5} \
${LIBCRYPTO} ${LIBDES}