diff options
| author | markm <markm@FreeBSD.org> | 1999-09-19 22:00:58 +0000 |
|---|---|---|
| committer | markm <markm@FreeBSD.org> | 1999-09-19 22:00:58 +0000 |
| commit | 170f347106454c60c4298a0542c314e4bff3af2b (patch) | |
| tree | 08e652e7a0b27ee00b193ec1cf0a7d3f9b111e63 /kerberosIV | |
| parent | 7df5ada37cd843e2315a1c078071854d0c566837 (diff) | |
| download | FreeBSD-src-170f347106454c60c4298a0542c314e4bff3af2b.zip FreeBSD-src-170f347106454c60c4298a0542c314e4bff3af2b.tar.gz | |
Fixes for new Kerberos4. Userland to follow.
Diffstat (limited to 'kerberosIV')
25 files changed, 633 insertions, 301 deletions
diff --git a/kerberosIV/Makefile.inc b/kerberosIV/Makefile.inc index b9a5a17..f4e8bb2 100644 --- a/kerberosIV/Makefile.inc +++ b/kerberosIV/Makefile.inc @@ -2,7 +2,7 @@ .if !defined(DISTRIBUTION) -DISTRIBUTION= krb +DISTRIBUTION= krb4 .if !defined(INCLUDEOBJDIR) @@ -16,6 +16,12 @@ INCLUDEOBJDIR= ${.CURDIR}/../../include .endif .if exists(${.OBJDIR}/../../lib/libacl) +ROKENOBJDIR= ${.OBJDIR}/../../../kerberosIV/lib/libroken +.else +ROKENOBJDIR= ${.CURDIR}/../../../kerberosIV/lib/libroken +.endif + +.if exists(${.OBJDIR}/../../lib/libacl) ACLOBJDIR= ${.OBJDIR}/../../lib/libacl .else ACLOBJDIR= ${.CURDIR}/../../lib/libacl @@ -66,8 +72,8 @@ TELNETOBJDIR= ${.CURDIR}/../../lib/libtelnet CFLAGS+= -I${.CURDIR}/../../include -Wall -DHAVE_CONFIG_H \ -I${INCLUDEOBJDIR} -DBINDIR=\"/usr/bin\" -DSBINDIR=\"/usr/sbin\" -#${INCLUDEOBJDIR}/protos.h: ${KRB4DIR}/include/protos.H -# cd ${INCLUDEOBJDIR} ; ln -sf ${.ALLSRC} ${.TARGET} +protos.h: ${KRB4DIR}/include/protos.H + ln -sf ${.ALLSRC} ${.TARGET} COMPILE_ET= compile_et diff --git a/kerberosIV/include/Makefile b/kerberosIV/include/Makefile index a744304..3ec5c9a 100644 --- a/kerberosIV/include/Makefile +++ b/kerberosIV/include/Makefile @@ -9,10 +9,3 @@ INCLUDEOBJDIR= ${.CURDIR}/../include depend lint tags: .include <bsd.prog.mk> - -#${INCLUDEOBJDIR}/protos.h: ${KRB4DIR}/include/protos.H -# cd ${INCLUDEOBJDIR} ; ln -sf ${.ALLSRC} ${.TARGET} - -#all: ${INCLUDEOBJDIR}/protos.h - -#CLEANFILES= ${INCLUDEOBJDIR}/protos.h diff --git a/kerberosIV/include/config.h b/kerberosIV/include/config.h index 86f3614..200dced 100644 --- a/kerberosIV/include/config.h +++ b/kerberosIV/include/config.h @@ -1,6 +1,11 @@ +/* include/config.h. Hand tweaked by MarkM. */ /* include/config.h. Generated automatically by configure. */ /* include/config.h.in. Generated automatically from configure.in by autoheader. */ +/* $FreeBSD$ */ + +#define KRB4 1 + /* Define if using alloca.c. */ /* #undef C_ALLOCA */ @@ -26,6 +31,9 @@ /* Define if your struct stat has st_blksize. */ #define HAVE_ST_BLKSIZE 1 +/* Define as __inline if that's what the C compiler calls it. */ +/* #undef inline */ + /* Define to `long' if <sys/types.h> doesn't define. */ /* #undef off_t */ @@ -69,105 +77,8 @@ /* Define if the X Window System is missing or not being used. */ /* #undef X_DISPLAY_MISSING */ -/* Define this if RETSIGTYPE == void */ -#define VOID_RETSIGTYPE 1 - -/* Define this if struct utmp have ut_user */ -/* #undef HAVE_UT_USER */ - -/* Define this if struct utmp have ut_host */ -#define HAVE_UT_HOST 1 - -/* Define this if struct utmp have ut_addr */ -/* #undef HAVE_UT_ADDR */ - -/* Define this if struct utmp have ut_type */ -/* #undef HAVE_UT_TYPE */ - -/* Define this if struct utmp have ut_pid */ -/* #undef HAVE_UT_PID */ - -/* Define this if struct utmp have ut_id */ -/* #undef HAVE_UT_ID */ - -/* Define this if struct utmpx have ut_syslen */ -/* #undef HAVE_UT_SYSLEN */ - -/* Define this if struct winsize is declared in sys/termios.h */ -#define HAVE_STRUCT_WINSIZE 1 - -/* Define this if struct winsize have ws_xpixel */ -#define HAVE_WS_XPIXEL 1 - -/* Define this if struct winsize have ws_ypixel */ -#define HAVE_WS_YPIXEL 1 - -/* Define this to be the directory where the dictionary for cracklib */ -/* resides */ -/* #undef DICTPATH */ - -/* Define this if you want to use SOCKS v5 */ -/* #undef SOCKS */ - -/* Define this to the path of the mail spool directory */ -/* #undef KRB4_MAILDIR */ - -/* Define this if `struct sockaddr' includes sa_len */ -#define SOCKADDR_HAS_SA_LEN 1 - -/* Define this if `struct siaentity' includes ouid */ -/* #undef SIAENTITY_HAS_OUID */ - -/* Define if getlogin has POSIX flavour, as opposed to BSD */ -/* #undef POSIX_GETLOGIN */ - -/* Define if getpwnam_r has POSIX flavour */ -/* #undef POSIX_GETPWNAM_R */ - -/* define if getcwd() is broken (such as in SunOS) */ -/* #undef BROKEN_GETCWD */ - -/* define if the system is missing a prototype for crypt() */ -/* #undef NEED_CRYPT_PROTO */ - -/* define if the system is missing a prototype for strtok_r() */ -/* #undef NEED_STRTOK_R_PROTO */ - -/* define if /bin/ls takes -A */ -#define HAVE_LS_A 1 - -/* define if you have h_errno */ -#define HAVE_H_ERRNO 1 - -/* define if you have h_errlist but not hstrerror */ -#define HAVE_H_ERRLIST 1 - -/* define if you have h_nerr but not hstrerror */ -#define HAVE_H_NERR 1 - -/* define if your system doesn't declare h_errlist */ -/* #undef HAVE_H_ERRLIST_DECLARATION */ - -/* define if your system doesn't declare h_nerr */ -/* #undef HAVE_H_NERR_DECLARATION */ - -/* define this if you need a declaration for h_errno */ -#define HAVE_H_ERRNO_DECLARATION 1 - -/* define if you need a declaration for optarg */ -/* #undef HAVE_OPTARG_DECLARATION */ - -/* define if you need a declaration for optind */ -/* #undef HAVE_OPTIND_DECLARATION */ - -/* define if you need a declaration for opterr */ -/* #undef HAVE_OPTERR_DECLARATION */ - -/* define if you need a declaration for optopt */ -/* #undef HAVE_OPTOPT_DECLARATION */ - -/* define if you need a declaration for __progname */ -/* #undef HAVE___PROGNAME_DECLARATION */ +/* Define if you have the XauFileName function. */ +#define HAVE_XAUFILENAME 1 /* Define if you have the XauReadAuth function. */ #define HAVE_XAUREADAUTH 1 @@ -182,7 +93,7 @@ /* #undef HAVE__SCRSIZE */ /* Define if you have the _setsid function. */ -/* #undef HAVE__SETSID */ +#define HAVE__SETSID 1 /* Define if you have the _stricmp function. */ /* #undef HAVE__STRICMP */ @@ -193,17 +104,23 @@ /* Define if you have the asprintf function. */ #define HAVE_ASPRINTF 1 +/* Define if you have the atexit function. */ +#define HAVE_ATEXIT 1 + /* Define if you have the chown function. */ #define HAVE_CHOWN 1 +/* Define if you have the chroot function. */ +#define HAVE_CHROOT 1 + +/* Define if you have the crypt function. */ +#define HAVE_CRYPT 1 + /* Define if you have the daemon function. */ #define HAVE_DAEMON 1 -/* Define if you have the dbm_firstkey function. */ -#define HAVE_DBM_FIRSTKEY 1 - -/* Define if you have the dbopen function. */ -#define HAVE_DBOPEN 1 +/* Define if you have the dlopen function. */ +/* #undef HAVE_DLOPEN */ /* Define if you have the dn_expand function. */ #define HAVE_DN_EXPAND 1 @@ -217,6 +134,9 @@ /* Define if you have the errx function. */ #define HAVE_ERRX 1 +/* Define if you have the fattach function. */ +/* #undef HAVE_FATTACH */ + /* Define if you have the fchmod function. */ #define HAVE_FCHMOD 1 @@ -229,6 +149,9 @@ /* Define if you have the flock function. */ #define HAVE_FLOCK 1 +/* Define if you have the fnmatch function. */ +#define HAVE_FNMATCH 1 + /* Define if you have the forkpty function. */ #define HAVE_FORKPTY 1 @@ -244,6 +167,15 @@ /* Define if you have the getdtablesize function. */ #define HAVE_GETDTABLESIZE 1 +/* Define if you have the getegid function. */ +#define HAVE_GETEGID 1 + +/* Define if you have the geteuid function. */ +#define HAVE_GETEUID 1 + +/* Define if you have the getgid function. */ +#define HAVE_GETGID 1 + /* Define if you have the gethostbyname function. */ #define HAVE_GETHOSTBYNAME 1 @@ -253,6 +185,9 @@ /* Define if you have the getlogin function. */ #define HAVE_GETLOGIN 1 +/* Define if you have the getmsg function. */ +/* #undef HAVE_GETMSG */ + /* Define if you have the getopt function. */ #define HAVE_GETOPT 1 @@ -265,6 +200,9 @@ /* Define if you have the getpwnam_r function. */ /* #undef HAVE_GETPWNAM_R */ +/* Define if you have the getrlimit function. */ +#define HAVE_GETRLIMIT 1 + /* Define if you have the getservbyname function. */ #define HAVE_GETSERVBYNAME 1 @@ -280,6 +218,9 @@ /* Define if you have the gettimeofday function. */ #define HAVE_GETTIMEOFDAY 1 +/* Define if you have the gettosbyname function. */ +/* #undef HAVE_GETTOSBYNAME */ + /* Define if you have the getudbnam function. */ /* #undef HAVE_GETUDBNAM */ @@ -328,6 +269,12 @@ /* Define if you have the odm_initialize function. */ /* #undef HAVE_ODM_INITIALIZE */ +/* Define if you have the on_exit function. */ +/* #undef HAVE_ON_EXIT */ + +/* Define if you have the parsetos function. */ +/* #undef HAVE_PARSETOS */ + /* Define if you have the ptsname function. */ /* #undef HAVE_PTSNAME */ @@ -346,6 +293,9 @@ /* Define if you have the readline function. */ #define HAVE_READLINE 1 +/* Define if you have the readv function. */ +#define HAVE_READV 1 + /* Define if you have the res_search function. */ #define HAVE_RES_SEARCH 1 @@ -403,8 +353,11 @@ /* Define if you have the setutent function. */ /* #undef HAVE_SETUTENT */ -/* Define if you have the snprintf function. */ -#define HAVE_SNPRINTF 1 +/* Define if you have the sgi_getcapabilitybyname function. */ +/* #undef HAVE_SGI_GETCAPABILITYBYNAME */ + +/* Define if you have the sigaction function. */ +#define HAVE_SIGACTION 1 /* Define if you have the socket function. */ #define HAVE_SOCKET 1 @@ -424,9 +377,18 @@ /* Define if you have the strlwr function. */ /* #undef HAVE_STRLWR */ +/* Define if you have the strncasecmp function. */ +#define HAVE_STRNCASECMP 1 + +/* Define if you have the strndup function. */ +/* #undef HAVE_STRNDUP */ + /* Define if you have the strnlen function. */ /* #undef HAVE_STRNLEN */ +/* Define if you have the strsep function. */ +#define HAVE_STRSEP 1 + /* Define if you have the strtok_r function. */ #define HAVE_STRTOK_R 1 @@ -436,6 +398,12 @@ /* Define if you have the swab function. */ #define HAVE_SWAB 1 +/* Define if you have the sysconf function. */ +#define HAVE_SYSCONF 1 + +/* Define if you have the sysctl function. */ +#define HAVE_SYSCTL 1 + /* Define if you have the syslog function. */ #define HAVE_SYSLOG 1 @@ -478,6 +446,9 @@ /* Define if you have the vsnprintf function. */ #define HAVE_VSNPRINTF 1 +/* Define if you have the vsyslog function. */ +#define HAVE_VSYSLOG 1 + /* Define if you have the vwarn function. */ #define HAVE_VWARN 1 @@ -490,6 +461,9 @@ /* Define if you have the warnx function. */ #define HAVE_WARNX 1 +/* Define if you have the writev function. */ +#define HAVE_WRITEV 1 + /* Define if you have the yp_get_default_domain function. */ #define HAVE_YP_GET_DEFAULT_DOMAIN 1 @@ -505,18 +479,24 @@ /* Define if you have the <arpa/telnet.h> header file. */ #define HAVE_ARPA_TELNET_H 1 -/* Define if you have the <bind/bitypes.h> header file. */ -/* #undef HAVE_BIND_BITYPES_H */ - /* Define if you have the <bsd/bsd.h> header file. */ /* #undef HAVE_BSD_BSD_H */ /* Define if you have the <bsdsetjmp.h> header file. */ /* #undef HAVE_BSDSETJMP_H */ +/* Define if you have the <capability.h> header file. */ +/* #undef HAVE_CAPABILITY_H */ + /* Define if you have the <crypt.h> header file. */ /* #undef HAVE_CRYPT_H */ +/* Define if you have the <curses.h> header file. */ +#define HAVE_CURSES_H 1 + +/* Define if you have the <db.h> header file. */ +#define HAVE_DB_H 1 + /* Define if you have the <dbm.h> header file. */ /* #undef HAVE_DBM_H */ @@ -526,18 +506,33 @@ /* Define if you have the <err.h> header file. */ #define HAVE_ERR_H 1 +/* Define if you have the <errno.h> header file. */ +#define HAVE_ERRNO_H 1 + /* Define if you have the <fcntl.h> header file. */ #define HAVE_FCNTL_H 1 +/* Define if you have the <fnmatch.h> header file. */ +#define HAVE_FNMATCH_H 1 + /* Define if you have the <grp.h> header file. */ #define HAVE_GRP_H 1 +/* Define if you have the <inttypes.h> header file. */ +#define HAVE_INTTYPES_H 1 + /* Define if you have the <io.h> header file. */ /* #undef HAVE_IO_H */ /* Define if you have the <lastlog.h> header file. */ /* #undef HAVE_LASTLOG_H */ +/* Define if you have the <libutil.h> header file. */ +#define HAVE_LIBUTIL_H 1 + +/* Define if you have the <limits.h> header file. */ +#define HAVE_LIMITS_H 1 + /* Define if you have the <login.h> header file. */ /* #undef HAVE_LOGIN_H */ @@ -589,11 +584,14 @@ /* Define if you have the <rpcsvc/dbm.h> header file. */ /* #undef HAVE_RPCSVC_DBM_H */ +/* Define if you have the <rpcsvc/ypclnt.h> header file. */ +#define HAVE_RPCSVC_YPCLNT_H 1 + /* Define if you have the <sac.h> header file. */ /* #undef HAVE_SAC_H */ /* Define if you have the <security/pam_modules.h> header file. */ -/* #undef HAVE_SECURITY_PAM_MODULES_H */ +#define HAVE_SECURITY_PAM_MODULES_H 1 /* Define if you have the <shadow.h> header file. */ /* #undef HAVE_SHADOW_H */ @@ -604,18 +602,21 @@ /* Define if you have the <signal.h> header file. */ #define HAVE_SIGNAL_H 1 +/* Define if you have the <standards.h> header file. */ +/* #undef HAVE_STANDARDS_H */ + /* Define if you have the <stropts.h> header file. */ /* #undef HAVE_STROPTS_H */ /* Define if you have the <sys/bitypes.h> header file. */ /* #undef HAVE_SYS_BITYPES_H */ +/* Define if you have the <sys/capability.h> header file. */ +/* #undef HAVE_SYS_CAPABILITY_H */ + /* Define if you have the <sys/category.h> header file. */ /* #undef HAVE_SYS_CATEGORY_H */ -/* Define if you have the <sys/cdefs.h> header file. */ -#define HAVE_SYS_CDEFS_H 1 - /* Define if you have the <sys/file.h> header file. */ #define HAVE_SYS_FILE_H 1 @@ -640,6 +641,9 @@ /* Define if you have the <sys/proc.h> header file. */ #define HAVE_SYS_PROC_H 1 +/* Define if you have the <sys/pty.h> header file. */ +/* #undef HAVE_SYS_PTY_H */ + /* Define if you have the <sys/ptyio.h> header file. */ /* #undef HAVE_SYS_PTYIO_H */ @@ -712,6 +716,12 @@ /* Define if you have the <syslog.h> header file. */ #define HAVE_SYSLOG_H 1 +/* Define if you have the <term.h> header file. */ +#define HAVE_TERM_H 1 + +/* Define if you have the <termcap.h> header file. */ +#define HAVE_TERMCAP_H 1 + /* Define if you have the <termio.h> header file. */ /* #undef HAVE_TERMIO_H */ @@ -754,9 +764,6 @@ /* Define if you have the <wait.h> header file. */ /* #undef HAVE_WAIT_H */ -/* Define if you have the <winsock.h> header file. */ -/* #undef HAVE_WINSOCK_H */ - /* Define if you have the X11 library (-lX11). */ /* #undef HAVE_LIBX11 */ @@ -769,14 +776,20 @@ /* Define if you have the cfg library (-lcfg). */ /* #undef HAVE_LIBCFG */ +/* Define if you have the crypt library (-lcrypt). */ +#define HAVE_LIBCRYPT 1 + +/* Define if you have the curses library (-lcurses). */ +/* #undef HAVE_LIBCURSES */ + +/* Define if you have the dl library (-ldl). */ +/* #undef HAVE_LIBDL */ + /* Define if you have the edit library (-ledit). */ #define HAVE_LIBEDIT 1 -/* Define if you have the gdbm library (-lgdbm). */ -/* #undef HAVE_LIBGDBM */ - -/* Define if you have the ndbm library (-lndbm). */ -/* #undef HAVE_LIBNDBM */ +/* Define if you have the ncurses library (-lncurses). */ +/* #undef HAVE_LIBNCURSES */ /* Define if you have the nsl library (-lnsl). */ /* #undef HAVE_LIBNSL */ @@ -805,6 +818,244 @@ /* Define if you have the util library (-lutil). */ #define HAVE_LIBUTIL 1 +/* Name of package */ +#define PACKAGE "krb4" + +/* Version number of package */ +#define VERSION "0.10pre3" + +/* Define to what version of SunOS you are running. */ +/* #undef SunOS */ + +/* Define if you have the socks package. */ +/* #undef SOCKS */ + +/* Define to enable old kdestroy behavior. */ +/* #undef LEGACY_KDESTROY */ + +/* Define if you want to match subdomains. */ +/* #undef MATCH_SUBDOMAINS */ + +/* Define this to be the directory where the + dictionary for cracklib resides. */ +/* #undef DICTPATH */ + +/* Define this to the path of the mail spool directory. */ +/* #undef KRB4_MAILDIR */ + +/* Define this to the kerberos database directory. */ +/* #undef DB_DIR */ + +/* Define to enable new master key code. */ +#define RANDOM_MKEY 1 + +/* Define this to the location of the master key. */ +#define MKEYFILE "file" + +/* Define to enable basic OSF C2 support. */ +/* #undef HAVE_OSFC2 */ + +/* Define if you don't want to use mmap. */ +/* #undef NO_MMAP */ + +/* Define if you don't wan't support for AFS. */ +#define NO_AFS 1 + +/* Set this to the type of des-quad-cheksum to use. */ +#define DES_QUAD_DEFAULT DES_QUAD_GUESS + +/* Define if you have the readline package. */ +/* #undef READLINE */ + +/* Define if you have the hesiod package. */ +/* #undef HESIOD */ + +/* define if your compiler has __attribute__ */ +#define HAVE___ATTRIBUTE__ 1 + +/* Huh? */ +/* #undef HAVE_STRANGE_INT8_T */ + +/* Define if NDBM really is DB (creates files ending in .db). */ +#define HAVE_NEW_DB 1 + +/* Define if you have NDBM (and not DBM) */ +#define NDBM 1 + +/* define if you have a working snprintf */ +#define HAVE_SNPRINTF 1 + +/* define if the system is missing a prototype for snprintf() */ +/* #undef NEED_SNPRINTF_PROTO */ + +/* define if you have a glob() that groks + GLOB_BRACE, GLOB_NOCHECK, GLOB_QUOTE, and GLOB_TILDE */ +#define HAVE_GLOB 1 + +/* define if the system is missing a prototype for glob() */ +/* #undef NEED_GLOB_PROTO */ + +/* Define if getpwnam_r has POSIX flavour. */ +/* #undef POSIX_GETPWNAM_R */ + +/* Define if getlogin has POSIX flavour (and not BSD). */ +/* #undef POSIX_GETLOGIN */ + +/* define if the system is missing a prototype for hstrerror() */ +/* #undef NEED_HSTRERROR_PROTO */ + +/* define if the system is missing a prototype for gethostname() */ +/* #undef NEED_GETHOSTNAME_PROTO */ + +/* define if the system is missing a prototype for mkstemp() */ +/* #undef NEED_MKSTEMP_PROTO */ + +/* define if the system is missing a prototype for inet_aton() */ +/* #undef NEED_INET_ATON_PROTO */ + +/* Define if realloc(NULL, X) doesn't work. */ +/* #undef BROKEN_REALLOC */ + +/* Define if getcwd is broken (like in SunOS 4). */ +/* #undef BROKEN_GETCWD */ + +/* define if prototype of gethostbyname is compatible with + struct hostent *gethostbyname(const char *) */ +#define GETHOSTBYNAME_PROTO_COMPATIBLE 1 + +/* define if prototype of gethostbyaddr is compatible with + struct hostent *gethostbyaddr(const void *, size_t, int) */ +/* #undef GETHOSTBYADDR_PROTO_COMPATIBLE */ + +/* define if prototype of getservbyname is compatible with + struct servent *getservbyname(const char *, const char *) */ +#define GETSERVBYNAME_PROTO_COMPATIBLE 1 + +/* define if prototype of openlog is compatible with + void openlog(const char *, int, int) */ +#define OPENLOG_PROTO_COMPATIBLE 1 + +/* define if the system is missing a prototype for crypt() */ +/* #undef NEED_CRYPT_PROTO */ + +/* define if the system is missing a prototype for fclose() */ +/* #undef NEED_FCLOSE_PROTO */ + +/* define if the system is missing a prototype for strtok_r() */ +/* #undef NEED_STRTOK_R_PROTO */ + +/* define if the system is missing a prototype for strsep() */ +/* #undef NEED_STRSEP_PROTO */ + +/* define if the system is missing a prototype for getusershell() */ +/* #undef NEED_GETUSERSHELL_PROTO */ + +/* define if the system is missing a prototype for utime() */ +/* #undef NEED_UTIME_PROTO */ + +/* define if you have h_errno */ +#define HAVE_H_ERRNO 1 + +/* define if your system declares h_errno */ +#define HAVE_H_ERRNO_DECLARATION 1 + +/* define if you have h_errlist */ +#define HAVE_H_ERRLIST 1 + +/* define if your system declares h_errlist */ +/* #undef HAVE_H_ERRLIST_DECLARATION */ + +/* define if you have h_nerr */ +#define HAVE_H_NERR 1 + +/* define if your system declares h_nerr */ +/* #undef HAVE_H_NERR_DECLARATION */ + +/* define if you have __progname */ +#define HAVE___PROGNAME 1 + +/* define if your system declares __progname */ +/* #undef HAVE___PROGNAME_DECLARATION */ + +/* define if your system declares optarg */ +/* #undef HAVE_OPTARG_DECLARATION */ + +/* define if your system declares optind */ +/* #undef HAVE_OPTIND_DECLARATION */ + +/* define if your system declares opterr */ +/* #undef HAVE_OPTERR_DECLARATION */ + +/* define if your system declares optopt */ +/* #undef HAVE_OPTOPT_DECLARATION */ + +/* define if your system declares environ */ +/* #undef HAVE_ENVIRON_DECLARATION */ + +/* Define if RETSIGTYPE == void. */ +#define VOID_RETSIGTYPE 1 + +/* Define if struct utmp has field ut_addr. */ +/* #undef HAVE_STRUCT_UTMP_UT_ADDR */ + +/* Define if struct utmp has field ut_host. */ +#define HAVE_STRUCT_UTMP_UT_HOST 1 + +/* Define if struct utmp has field ut_id. */ +/* #undef HAVE_STRUCT_UTMP_UT_ID */ + +/* Define if struct utmp has field ut_pid. */ +/* #undef HAVE_STRUCT_UTMP_UT_PID */ + +/* Define if struct utmp has field ut_type. */ +/* #undef HAVE_STRUCT_UTMP_UT_TYPE */ + +/* Define if struct utmp has field ut_user. */ +/* #undef HAVE_STRUCT_UTMP_UT_USER */ + +/* Define if struct utmpx has field ut_exit. */ +/* #undef HAVE_STRUCT_UTMPX_UT_EXIT */ + +/* Define if struct utmpx has field ut_syslen. */ +/* #undef HAVE_STRUCT_UTMPX_UT_SYSLEN */ + +/* define if you have struct spwd */ +/* #undef HAVE_STRUCT_SPWD */ + +/* define if struct winsize is declared in sys/termios.h */ +#define HAVE_STRUCT_WINSIZE 1 + +/* define if struct winsize has ws_xpixel */ +#define HAVE_WS_XPIXEL 1 + +/* define if struct winsize has ws_ypixel */ +#define HAVE_WS_YPIXEL 1 + +/* Define this to what the type ssize_t should be. */ +/* #undef ssize_t */ + +/* Define if struct sockaddr has field sa_len. */ +#define HAVE_STRUCT_SOCKADDR_SA_LEN 1 + +/* Define if SIAENTITY has field ouid. */ +/* #undef HAVE_SIAENTITY_OUID */ + +/* Define if you have a working getmsg. */ +/* #undef HAVE_GETMSG */ + +/* Define if el_init takes four arguments. */ +/* #undef HAVE_FOUR_VALUED_EL_INIT */ + +/* Define if you have a readline function. */ +#define HAVE_READLINE 1 + +/* Define if you have working stream ptys. */ +/* #undef STREAMSPTY */ + +/* Define if /bin/ls has a `-A' flag. */ +#define HAVE_LS_A 1 + + #define HAVE_INT8_T 1 #define HAVE_INT16_T 1 #define HAVE_INT32_T 1 @@ -814,6 +1065,13 @@ #define HAVE_U_INT32_T 1 #define HAVE_U_INT64_T 1 +/* This for compat with heimdal (or something) */ +#define KRB_PUT_INT(f, t, l, s) krb_put_int((f), (t), (l), (s)) + +#define HAVE_KRB_ENABLE_DEBUG 1 + +#define HAVE_KRB_DISABLE_DEBUG 1 + #define RCSID(msg) \ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg } @@ -821,14 +1079,7 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg } * Set ORGANIZATION to be the desired organization string printed * by the 'kinit' program. It may have spaces. */ -#define ORGANIZATION "eBones International" - -#if 0 -#define BINDIR "/usr/athena/bin" -#define LIBDIR "/usr/athena/lib" -#define LIBEXECDIR "/usr/athena/libexec" -#define SBINDIR "/usr/athena/sbin" -#endif +#define ORGANIZATION "FreeBSD Inc." #if 0 #define KRB_CNF_FILES { "/etc/krb.conf", "/etc/kerberosIV/krb.conf", 0} @@ -851,86 +1102,12 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg } #define MaxHostNameLen (64+4) #define MaxPathLen (1024+4) -/* - * Define NDBM if you are using the 4.3 ndbm library (which is part of - * libc). If not defined, 4.2 dbm will be assumed. - */ -#if defined(HAVE_DBM_FIRSTKEY) -#define NDBM -#endif - -/* ftp stuff -------------------------------------------------- */ - -#define KERBEROS - -/* telnet stuff ----------------------------------------------- */ - -/* define this if you have kerberos 4 */ -#define KRB4 1 - -/* define this if you want encryption */ -#define ENCRYPTION 1 - -/* define this if you want authentication */ -#define AUTHENTICATION 1 - -#if defined(ENCRYPTION) && !defined(AUTHENTICATION) -#define AUTHENTICATION 1 -#endif - -/* Set this if you want des encryption */ -#define DES_ENCRYPTION 1 - -/* Set this to the default system lead string for telnetd - * can contain %-escapes: %s=sysname, %m=machine, %r=os-release - * %v=os-version, %t=tty, %h=hostname, %d=date and time - */ -/* #undef USE_IM */ - -/* define this if you want diagnostics in telnetd */ -#define DIAGNOSTICS 1 - -/* define this if you want support for broken ENV_{VALUE,VAR} systems */ -/* #undef ENV_HACK */ - -/* */ -#define OLD_ENVIRON 1 - -/* Used with login -p */ -/* #undef LOGIN_ARGS */ - -/* Define if there are working stream ptys */ -/* #undef STREAMSPTY */ - -/* set this to a sensible login */ -#ifndef LOGIN_PATH -#define LOGIN_PATH BINDIR "/login" -#endif - - /* ------------------------------------------------------------ */ -/* - * Define this if your ndbm-library really is berkeley db and creates - * files that ends in .db. - */ -#define HAVE_NEW_DB 1 - -/* Define this if you have a working getmsg */ -/* #undef HAVE_GETMSG */ - -/* Define to enable new master key code */ -/* #undef RANDOM_MKEY */ - -/* Location of the master key file, default value lives in <kdc.h> */ -/* #undef MKEYFILE */ - -/* Define if you don't want support for afs, might be a good idea on - AIX if you don't have afs */ -#define NO_AFS 1 - -/* Define if you have a readline compatible library */ -#define HAVE_READLINE 1 +#ifdef BROKEN_REALLOC +#define realloc(X, Y) isoc_realloc((X), (Y)) +#define isoc_realloc(X, Y) ((X) ? realloc((X), (Y)) : malloc(Y)) +#endif #ifdef VOID_RETSIGTYPE #define SIGRETURN(x) return @@ -938,37 +1115,25 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg } #define SIGRETURN(x) return (RETSIGTYPE)(x) #endif -/* Define this if your compiler supports '#pragma weak' */ -#define HAVE_PRAGMA_WEAK 1 - /* Temporary fixes for krb_{rd,mk}_safe */ #define DES_QUAD_GUESS 0 #define DES_QUAD_NEW 1 #define DES_QUAD_OLD 2 -/* Set this to one of the constants above to specify default checksum - type to emit */ -#define DES_QUAD_DEFAULT DES_QUAD_GUESS +/* + * All these are system-specific defines that I would rather not have at all. + */ /* * AIX braindamage! */ #if _AIX #define _ALL_SOURCE -#define _POSIX_SOURCE -/* this is left for hysteric reasons :-) */ -#define unix /* well, ok... */ -#endif - -/* - * SunOS braindamage! (Sun include files are generally braindead) - */ -#if (defined(sun) || defined(__sun)) -#if defined(__svr4__) || defined(__SVR4) -#define SunOS 5 -#else -#define SunOS 4 -#endif +/* XXX this is gross, but kills about a gazillion warnings */ +struct ether_addr; +struct sockaddr; +struct sockaddr_dl; +struct sockaddr_in; #endif #if defined(__sgi) || defined(sgi) @@ -983,3 +1148,21 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg } #if IRIX == 4 && !defined(__STDC__) #define __STDC__ 0 #endif + +/* + * Defining this enables lots of useful (and used) extensions on + * glibc-based systems such as Linux + */ + +#define _GNU_SOURCE + +/* some strange OS/2 stuff. From <d96-mst@nada.kth.se> */ + +#ifdef __EMX__ +#define _EMX_TCPIP +#define MAIL_USE_SYSTEM_LOCK +#endif + +#ifdef ROKEN_RENAME +#include "roken_rename.h" +#endif diff --git a/kerberosIV/include/roken.h b/kerberosIV/include/roken.h new file mode 100755 index 0000000..851f006 --- /dev/null +++ b/kerberosIV/include/roken.h @@ -0,0 +1,116 @@ +/* This is an OS dependent, generated file */ +/* Generated by Mark Murray */ + +#ifndef __ROKEN_H__ +#define __ROKEN_H__ + +/* -*- C -*- */ +/* + * Copyright (c) 1995, 1996, 1997, 1998, 1999 Kungliga Tekniska Högskolan + * (Royal Institute of Technology, Stockholm, Sweden). + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the Kungliga Tekniska + * Högskolan and its contributors. + * + * 4. Neither the name of the Institute nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +/* $Id: roken.h.in,v 1.113.2.1 1999/07/22 03:20:59 assar Exp $ */ +/* $FreeBSD$ */ + +#include <sys/param.h> +#include <sys/types.h> +#include <sys/socket.h> +#include <sys/stat.h> +#include <netinet/in.h> +#include <sys/uio.h> +#include <sys/ioctl.h> +#include <sys/time.h> +#include <err.h> +#include <errno.h> +#include <fcntl.h> +#include <grp.h> +#include <signal.h> +#include <stdarg.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <syslog.h> +#include <termios.h> +#include <time.h> +#include <unistd.h> +#include <paths.h> +#include <pwd.h> + +#define ROKEN_LIB_FUNCTION + +#include <roken-common.h> + +int strcpy_truncate (char *dst, const char *src, size_t dst_sz); +int strcat_truncate (char *dst, const char *src, size_t dst_sz); + +struct passwd *k_getpwnam (char *user); +struct passwd *k_getpwuid (uid_t uid); + +const char *get_default_username (void); +time_t tm2time (struct tm tm, int local); +int unix_verify_user(char *user, char *password); +void inaddr2str(struct in_addr addr, char *s, size_t len); +void mini_inetd (int port); +int roken_concat (char *s, size_t len, ...); +size_t roken_mconcat (char **s, size_t max_len, ...); +int roken_vconcat (char *s, size_t len, va_list args); +size_t roken_vmconcat (char **s, size_t max_len, va_list args); +ssize_t net_write (int fd, const void *buf, size_t nbytes); +ssize_t net_read (int fd, void *buf, size_t nbytes); +int issuid(void); +int get_window_size(int fd, struct winsize *); +extern char *optarg; +extern int optind; +extern int opterr; +extern const char *__progname; +extern char **environ; + +/* + * kludges and such + */ + +int roken_gethostby_setup(const char*, const char*); +struct hostent* roken_gethostbyname(const char*); +struct hostent* roken_gethostbyaddr(const void*, size_t, int); + +#define roken_getservbyname(x,y) getservbyname(x,y) + +#define roken_openlog(a,b,c) openlog(a,b,c) + +void set_progname(char *argv0); + +#endif /* __ROKEN_H__ */ diff --git a/kerberosIV/include/version.h b/kerberosIV/include/version.h index ae8ca52..5127bc9 100644 --- a/kerberosIV/include/version.h +++ b/kerberosIV/include/version.h @@ -1,2 +1,3 @@ -char *krb4_long_version = "@(#)$Version: krb4-0.9.6 by root on greenpeace.grondar.za (i386-unknown-freebsd3.0) Sun Jun 22 18:14:59 SAT 1997 $"; -char *krb4_version = "krb4-0.9.6"; +/* $FreeBSD$ */ +char *krb4_long_version = "@(#)$Version: krb4-0.10pre3 by root on greenpeace.grondar.za (i386-unknown-freebsd4.0) Wed Aug 18 19:04:21 SAST 1999 $"; +char *krb4_version = "krb4-0.10pre3"; diff --git a/kerberosIV/lib/libacl/Makefile b/kerberosIV/lib/libacl/Makefile index 74a987e..3710b2f 100644 --- a/kerberosIV/lib/libacl/Makefile +++ b/kerberosIV/lib/libacl/Makefile @@ -2,11 +2,12 @@ LIB= acl CFLAGS+= -I${KRB4DIR}/include \ - -I${INCLUDEOBJDIR} \ - -I${KRB4DIR}/lib/roken \ + -I${KRB4DIR}/lib/acl \ -I${KRB4DIR}/lib/krb \ - -I${KRB4DIR}/lib/acl -SRCS= acl_files.c + -I${KRB4DIR}/lib/roken \ + -I${INCLUDEOBJDIR} \ + -I${.OBJDIR} +SRCS= acl_files.c protos.h MAN3= ${KRB4DIR}/man/acl_check.3 MLINKS= acl_check.3 acl_canonicalize_principal.3 \ acl_check.3 acl_exact_match.3 \ diff --git a/kerberosIV/lib/libkadm/Makefile b/kerberosIV/lib/libkadm/Makefile index ba33c27..819fab8 100644 --- a/kerberosIV/lib/libkadm/Makefile +++ b/kerberosIV/lib/libkadm/Makefile @@ -3,15 +3,16 @@ LIB= kadm CFLAGS+= -I${KRB4DIR}/include \ -I${INCLUDEOBJDIR} \ - -I${KRB4DIR}/lib/roken \ -I${KRB4DIR}/lib/krb \ -I${KRB4DIR}/lib/kdb \ -I${KRB4DIR}/lib/kadm \ + -I${KRB4DIR}/lib/roken \ -I${KRBOBJDIR} \ - -I${KADMOBJDIR} + -I${KADMOBJDIR} \ + -I${.OBJDIR} SRCS= kadm_cli_wrap.c kadm_stream.c kadm_supp.c \ ${KADMOBJDIR}/kadm_err.c ${KADMOBJDIR}/kadm_err.h \ - ${KRBOBJDIR}/krb_err.h + ${KRBOBJDIR}/krb_err.h check_password.c protos.h INCLUDES= ${KRB4DIR}/lib/kadm/kadm.h ${KADMOBJDIR}/kadm_err.h diff --git a/kerberosIV/lib/libkafs/Makefile b/kerberosIV/lib/libkafs/Makefile index a49606a..368e80b 100644 --- a/kerberosIV/lib/libkafs/Makefile +++ b/kerberosIV/lib/libkafs/Makefile @@ -6,7 +6,8 @@ CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/lib/roken \ -I${KRB4DIR}/lib/krb \ -I${KRB4DIR}/lib/kafs -SRCS= afssys.c afskrb.c +SRCS= afssys.c afskrb.c common.c issuid.c \ + strcpy_truncate.c strcat_truncate.c MAN3= ${KRB4DIR}/man/kafs.3 MLINKS= kafs.3 k_hasafs.3 kafs.3 k_afsklog.3 kafs.3 k_afsklog_uid.3 \ kafs.3 k_pioctl.3 kafs.3 k_unlog.3 kafs.3 k_setpag.3 \ @@ -18,3 +19,4 @@ INCLUDES= ${KRB4DIR}/lib/kafs/kafs.h .include <bsd.lib.mk> .PATH: ${KRB4DIR}/lib/kafs +.PATH: ${KRB4DIR}/lib/roken diff --git a/kerberosIV/lib/libkdb/Makefile b/kerberosIV/lib/libkdb/Makefile index 5a67333..1e3878a 100644 --- a/kerberosIV/lib/libkdb/Makefile +++ b/kerberosIV/lib/libkdb/Makefile @@ -8,7 +8,7 @@ CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/lib/kdb \ -I${KADMOBJDIR} SRCS= krb_cache.c krb_kdb_utils.c copykey.c krb_lib.c krb_dbm.c \ - print_princ.c base64.c + print_princ.c INCLUDES= ${KRB4DIR}/lib/kdb/kdc.h ${KRB4DIR}/lib/kdb/krb_db.h diff --git a/kerberosIV/lib/libkrb/Makefile b/kerberosIV/lib/libkrb/Makefile index 3544daf..1d547a9 100644 --- a/kerberosIV/lib/libkrb/Makefile +++ b/kerberosIV/lib/libkrb/Makefile @@ -3,30 +3,32 @@ LIB= krb CFLAGS+= -I${KRB4DIR}/include \ -I${INCLUDEOBJDIR} \ - -I${KRB4DIR}/lib/roken \ -I${KRB4DIR}/lib/krb \ - -I${KRBOBJDIR} + -I${KRB4DIR}/lib/roken \ + -I${KRBOBJDIR} \ + -I${.OBJDIR} DPADD+= ${LIBCRYPT} LDADD+= -lcrypt -SRCS= cr_err_reply.c create_auth_reply.c create_ciph.c \ - create_death_packet.c create_ticket.c dest_tkt.c get_in_tkt.c \ - get_svc_in_tkt.c getrealm.c k_localtime.c krb_err_txt.c \ - krb_get_in_tkt.c kuserok.c parse_name.c kntoln.c mk_auth.c \ - krb_check_auth.c mk_err.c mk_safe.c rd_err.c rd_safe.c \ - recvauth.c mk_priv.c rd_req.c decomp_ticket.c lifetime.c \ - month_sname.c stime.c read_service_key.c getst.c sendauth.c \ - netread.c netwrite.c rd_priv.c krb_equiv.c str2key.c \ - get_ad_tkt.c mk_req.c get_cred.c get_tf_realm.c \ - get_tf_fullname.c one.c save_credentials.c send_to_kdc.c \ - get_host.c get_krbrlm.c k_gethostname.c tf_util.c \ - debug_decl.c k_flock.c tkt_string.c getaddrs.c \ - k_getsockinst.c k_getport.c lsb_addr_comp.c name2name.c \ - get_default_principal.c realm_parse.c verify_user.c \ - rw.c kdc_reply.c encrypt_ktext.c swab.c gettimeofday.c \ - check_time.c krb_err.c et_list.c resolve.c unparse_name.c \ - logging.c k_concat.c \ - snprintf.c strdup.c strcasecmp.c \ - ${KRBOBJDIR}/krb_err.h +SRCS= check_time.c cr_err_reply.c create_auth_reply.c create_ciph.c \ + create_death_packet.c create_ticket.c debug_decl.c \ + decomp_ticket.c dest_tkt.c encrypt_ktext.c extra.c \ + get_ad_tkt.c getfile.c get_cred.c get_default_principal.c \ + get_host.c get_in_tkt.c get_krbrlm.c get_svc_in_tkt.c \ + get_tf_fullname.c get_tf_realm.c getaddrs.c getrealm.c getst.c \ + k_getport.c k_getsockinst.c k_localtime.c kdc_reply.c kntoln.c \ + krb_check_auth.c krb_equiv.c krb_err_txt.c \ + krb_get_in_tkt.c kuserok.c lifetime.c logging.c \ + lsb_addr_comp.c mk_auth.c mk_err.c mk_priv.c mk_req.c \ + mk_safe.c month_sname.c name2name.c krb_net_read.c \ + krb_net_write.c one.c parse_name.c rd_err.c rd_priv.c rd_req.c \ + rd_safe.c read_service_key.c realm_parse.c recvauth.c rw.c \ + save_credentials.c send_to_kdc.c sendauth.c solaris_compat.c \ + stime.c str2key.c tf_util.c time.c tkt_string.c unparse_name.c \ + verify_user.c base64.c concat.c flock.c gethostname.c \ + gettimeofday.c getuid.c net_read.c net_write.c resolve.c \ + snprintf.c strcasecmp.c strcat_truncate.c strcpy_truncate.c \ + strdup.c strncasecmp.c strnlen.c strtok_r.c swab.c \ + ${KRBOBJDIR}/krb_err.c ${KRBOBJDIR}/krb_err.h protos.h MAN3= ${KRB4DIR}/man/kerberos.3 \ ${KRB4DIR}/man/krb_realmofhost.3 \ ${KRB4DIR}/man/krb_sendauth.3 \ @@ -59,6 +61,7 @@ MLINKS= kerberos.3 krb_mk_req.3 \ tf_util.3 tf_close.3 INCLUDES= ${KRB4DIR}/lib/krb/krb.h ${KRB4DIR}/lib/krb/klog.h \ + ${KRB4DIR}/lib/krb/krb-protos.h \ ${KRB4DIR}/lib/krb/prot.h ${KRBOBJDIR}/krb_err.h .include <bsd.lib.mk> diff --git a/kerberosIV/lib/libroken/Makefile b/kerberosIV/lib/libroken/Makefile index 4e00a20..48ac484 100644 --- a/kerberosIV/lib/libroken/Makefile +++ b/kerberosIV/lib/libroken/Makefile @@ -3,10 +3,15 @@ LIB= roken CFLAGS+= -I${KRB4DIR}/include \ -I${INCLUDEOBJDIR} \ - -I${KRB4DIR}/lib/roken -SRCS= k_getpwuid.c k_getpwnam.c signal.c tm2time.c \ - verify.c inaddr2str.c mini_inetd.c get_window_size.c \ - warnerr.c snprintf.c strlwr.c strnlen.c strupr.c + -I${KRB4DIR}/lib/roken \ + -I${.OBJDIR} +SRCS= base64.c concat.c emalloc.c eread.c erealloc.c estrdup.c \ + ewrite.c get_default_username.c get_window_size.c getarg.c \ + inaddr2str.c issuid.c k_getpwnam.c k_getpwuid.c mini_inetd.c \ + net_read.c net_write.c parse_time.c parse_units.c \ + print_version.c resolve.c roken_gethostby.c warnerr.c \ + strcat_truncate.c strcpy_truncate.c signal.c simple_exec.c \ + strupr.c tm2time.c print_version.h NOPIC= yes install: @@ -14,3 +19,11 @@ install: .include <bsd.lib.mk> .PATH: ${KRB4DIR}/lib/roken + +print_version.h: make-print-version + ./make-print-version print_version.h + +make-print-version: make-print-version.c + ${CC} ${CFLAGS} -o ${.TARGET} ${.OODATE} + +CLEANFILES+= make-print-version print_version.h diff --git a/kerberosIV/lib/libsl/Makefile b/kerberosIV/lib/libsl/Makefile index 18d82bf..8f0fff2 100644 --- a/kerberosIV/lib/libsl/Makefile +++ b/kerberosIV/lib/libsl/Makefile @@ -2,10 +2,10 @@ LIB= sl CFLAGS+= -I${KRB4DIR}/include \ - -I${INCLUDEOBJDIR} \ + -I${KRB4DIR}/lib/sl \ -I${KRB4DIR}/lib/roken \ - -I${KRB4DIR}/lib/sl -SRCS= sl.c + -I${INCLUDEOBJDIR} +SRCS= sl.c ss.c strtok_r.c NOPIC= yes install: @@ -13,3 +13,4 @@ install: .include <bsd.lib.mk> .PATH: ${KRB4DIR}/lib/sl +.PATH: ${KRB4DIR}/lib/roken diff --git a/kerberosIV/libexec/kpropd/Makefile b/kerberosIV/libexec/kpropd/Makefile index 02cda9a..e4a4172 100644 --- a/kerberosIV/libexec/kpropd/Makefile +++ b/kerberosIV/libexec/kpropd/Makefile @@ -2,14 +2,15 @@ PROG= kpropd MAN8= ${KRB4DIR}/man/kpropd.8 -SRCS= kpropd.c +SRCS= kpropd.c protos.h CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/lib/roken \ -I${KRB4DIR}/lib/kdb \ -I${KRB4DIR}/lib/krb \ -I${KRB4DIR}/slave \ -I${INCLOBJDIR} \ - -I${.CURDIR}/../include + -I${.CURDIR}/../include \ + -I${.OBJDIR} LDADD= -L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -ldes -lcrypt \ -lcom_err DPADD= ${LIBROKEN} ${LIBKRB} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR} diff --git a/kerberosIV/usr.bin/kadmin/Makefile b/kerberosIV/usr.bin/kadmin/Makefile index e7af692..a22ecb1 100644 --- a/kerberosIV/usr.bin/kadmin/Makefile +++ b/kerberosIV/usr.bin/kadmin/Makefile @@ -2,7 +2,7 @@ PROG= kadmin MAN8= ${KRB4DIR}/man/kadmin.8 -SRCS= kadmin.c new_pwd.c \ +SRCS= kadmin.c new_pwd.c random_password.c \ ${KADMOBJDIR}/kadm_err.h ${KRBOBJDIR}/krb_err.h CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/lib/roken \ diff --git a/kerberosIV/usr.bin/kdestroy/Makefile b/kerberosIV/usr.bin/kdestroy/Makefile index 3923592..33dcd6d 100644 --- a/kerberosIV/usr.bin/kdestroy/Makefile +++ b/kerberosIV/usr.bin/kdestroy/Makefile @@ -2,14 +2,15 @@ PROG= kdestroy MAN1= ${KRB4DIR}/man/kdestroy.1 -SRCS= kdestroy.c +SRCS= kdestroy.c protos.h CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/lib/roken \ -I${KRB4DIR}/lib/kafs \ -I${KRB4DIR}/lib/kadm \ -I${KRB4DIR}/lib/kdb \ -I${KRB4DIR}/lib/krb \ - -I${KRB4DIR}/kuser + -I${KRB4DIR}/kuser \ + -I${.OBJDIR} LDADD= -L${ROKENOBJDIR} -lroken \ -L${KAFSOBJDIR} -lkafs -L${KRBOBJDIR} -lkrb -ldes -lcrypt \ -lcom_err diff --git a/kerberosIV/usr.bin/kinit/Makefile b/kerberosIV/usr.bin/kinit/Makefile index 5970e65..2476f91 100644 --- a/kerberosIV/usr.bin/kinit/Makefile +++ b/kerberosIV/usr.bin/kinit/Makefile @@ -2,13 +2,14 @@ PROG= kinit MAN1= ${KRB4DIR}/man/kinit.1 -SRCS= kinit.c +SRCS= kinit.c protos.h CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/lib/roken \ -I${KRB4DIR}/lib/kadm \ -I${KRB4DIR}/lib/kdb \ -I${KRB4DIR}/lib/krb \ - -I${KRB4DIR}/kuser + -I${KRB4DIR}/kuser \ + -I${.OBJDIR} LDADD= -L${ROKENOBJDIR} -lroken \ -L${KRBOBJDIR} -lkrb -ldes -lcrypt -lcom_err DPADD= ${LIBROKEN} ${LIBKRB} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR} diff --git a/kerberosIV/usr.bin/klist/Makefile b/kerberosIV/usr.bin/klist/Makefile index 857f220..2e0c0c0 100644 --- a/kerberosIV/usr.bin/klist/Makefile +++ b/kerberosIV/usr.bin/klist/Makefile @@ -2,14 +2,15 @@ PROG= klist MAN1= ${KRB4DIR}/man/klist.1 -SRCS= klist.c +SRCS= klist.c protos.h CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/lib/roken \ -I${KRB4DIR}/lib/kafs \ -I${KRB4DIR}/lib/kadm \ -I${KRB4DIR}/lib/kdb \ -I${KRB4DIR}/lib/krb \ - -I${KRB4DIR}/kuser + -I${KRB4DIR}/kuser \ + -I${.OBJDIR} LDADD= -L${ROKENOBJDIR} -lroken \ -L${KAFSOBJDIR} -lkafs -L${KRBOBJDIR} -lkrb -ldes -lcrypt \ -lcom_err diff --git a/kerberosIV/usr.sbin/ext_srvtab/Makefile b/kerberosIV/usr.sbin/ext_srvtab/Makefile index dc78c15..46ea9c6 100644 --- a/kerberosIV/usr.sbin/ext_srvtab/Makefile +++ b/kerberosIV/usr.sbin/ext_srvtab/Makefile @@ -2,14 +2,15 @@ PROG= ext_srvtab MAN8= ${KRB4DIR}/man/ext_srvtab.8 -SRCS= ext_srvtab.c +SRCS= ext_srvtab.c protos.h CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/lib/roken \ -I${KRB4DIR}/admin \ -I${KRB4DIR}/lib/kadm \ -I${KRB4DIR}/lib/kdb \ -I${KRB4DIR}/lib/krb \ - -I${.CURDIR}/../include + -I${.CURDIR}/../include \ + -I${.OBJDIR} LDADD= -L${ROKENOBJDIR} -lroken \ -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt \ -lcom_err diff --git a/kerberosIV/usr.sbin/kdb_destroy/Makefile b/kerberosIV/usr.sbin/kdb_destroy/Makefile index 80ff59f..30bfae2 100644 --- a/kerberosIV/usr.sbin/kdb_destroy/Makefile +++ b/kerberosIV/usr.sbin/kdb_destroy/Makefile @@ -2,14 +2,15 @@ PROG= kdb_destroy MAN8= ${KRB4DIR}/man/kdb_destroy.8 -SRCS= kdb_destroy.c +SRCS= kdb_destroy.c protos.h CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/lib/roken \ -I${KRB4DIR}/lib/kadm \ -I${KRB4DIR}/lib/kdb \ -I${KRB4DIR}/lib/krb \ -I${KRB4DIR}/admin \ - -I${.CURDIR}/../include + -I${.CURDIR}/../include \ + -I${.OBJDIR} LDADD= -L${ROKENOBJDIR} -lroken \ -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt \ -lcom_err diff --git a/kerberosIV/usr.sbin/kdb_edit/Makefile b/kerberosIV/usr.sbin/kdb_edit/Makefile index 73b4511..203768c 100644 --- a/kerberosIV/usr.sbin/kdb_edit/Makefile +++ b/kerberosIV/usr.sbin/kdb_edit/Makefile @@ -2,14 +2,15 @@ PROG= kdb_edit MAN8= ${KRB4DIR}/man/kdb_edit.8 -SRCS= kdb_edit.c +SRCS= kdb_edit.c protos.h CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/lib/roken \ -I${KRB4DIR}/lib/kadm \ -I${KRB4DIR}/lib/kdb \ -I${KRB4DIR}/lib/krb \ -I${KRB4DIR}/admin \ - -I${.CURDIR}/../include + -I${.CURDIR}/../include \ + -I${.OBJDIR} LDADD= -L${ROKENOBJDIR} -lroken \ -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt \ -lcom_err diff --git a/kerberosIV/usr.sbin/kdb_init/Makefile b/kerberosIV/usr.sbin/kdb_init/Makefile index 4899930..3649a62 100644 --- a/kerberosIV/usr.sbin/kdb_init/Makefile +++ b/kerberosIV/usr.sbin/kdb_init/Makefile @@ -2,14 +2,15 @@ PROG= kdb_init MAN8= ${KRB4DIR}/man/kdb_init.8 -SRCS= kdb_init.c +SRCS= kdb_init.c protos.h CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/lib/roken \ -I${KRB4DIR}/lib/kadm \ -I${KRB4DIR}/lib/kdb \ -I${KRB4DIR}/lib/krb \ -I${KRB4DIR}/admin \ - -I${.CURDIR}/../include + -I${.CURDIR}/../include \ + -I${.OBJDIR} LDADD= -L${ROKENOBJDIR} -lroken \ -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt \ -lcom_err diff --git a/kerberosIV/usr.sbin/kdb_util/Makefile b/kerberosIV/usr.sbin/kdb_util/Makefile index a0eb41f..d08aea9 100644 --- a/kerberosIV/usr.sbin/kdb_util/Makefile +++ b/kerberosIV/usr.sbin/kdb_util/Makefile @@ -2,14 +2,15 @@ PROG= kdb_util MAN8= ${KRB4DIR}/man/kdb_util.8 -SRCS= kdb_util.c +SRCS= kdb_util.c protos.h CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/lib/roken \ -I${KRB4DIR}/lib/kadm \ -I${KRB4DIR}/lib/kdb \ -I${KRB4DIR}/lib/krb \ -I${KRB4DIR}/admin \ - -I${.CURDIR}/../include + -I${.CURDIR}/../include \ + -I${.OBJDIR} LDADD= -L${ROKENOBJDIR} -lroken \ -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt \ -lcom_err diff --git a/kerberosIV/usr.sbin/kerberos/Makefile b/kerberosIV/usr.sbin/kerberos/Makefile index 61239ba..885125a 100644 --- a/kerberosIV/usr.sbin/kerberos/Makefile +++ b/kerberosIV/usr.sbin/kerberos/Makefile @@ -13,7 +13,8 @@ CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/lib/krb \ -I${KADMOBJDIR} \ -I${KRBOBJDIR} \ - -I${.CURDIR}/../include + -I${.CURDIR}/../include \ + -I${.OBJDIR} LDADD= -L${ROKENOBJDIR} -lroken \ -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt \ -lcom_err diff --git a/kerberosIV/usr.sbin/kprop/Makefile b/kerberosIV/usr.sbin/kprop/Makefile index 71ae73f..185a67b 100644 --- a/kerberosIV/usr.sbin/kprop/Makefile +++ b/kerberosIV/usr.sbin/kprop/Makefile @@ -2,14 +2,15 @@ PROG= kprop MAN8= ${KRB4DIR}/man/kprop.8 -SRCS= kprop.c +SRCS= kprop.c protos.h CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/lib/roken \ -I${KRB4DIR}/lib/kdb \ -I${KRB4DIR}/lib/krb \ -I${KRB4DIR}/slave \ -I${INCLOBJDIR} \ - -I${.CURDIR}/../include + -I${.CURDIR}/../include \ + -I${.OBJDIR} LDADD= -L${ROKENOBJDIR} -lroken -L${KRBOBJDIR} -lkrb -ldes -lcrypt \ -lcom_err DPADD= ${LIBROKEN} ${LIBKRB} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR} diff --git a/kerberosIV/usr.sbin/kstash/Makefile b/kerberosIV/usr.sbin/kstash/Makefile index 6d6dea1..b05ae5d 100644 --- a/kerberosIV/usr.sbin/kstash/Makefile +++ b/kerberosIV/usr.sbin/kstash/Makefile @@ -2,14 +2,15 @@ PROG= kstash MAN8= ${KRB4DIR}/man/kstash.8 -SRCS= kstash.c +SRCS= kstash.c protos.h CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/lib/roken \ -I${KRB4DIR}/lib/krb \ -I${KRB4DIR}/admin \ -I${KRB4DIR}/lib/kadm \ -I${KRB4DIR}/lib/kdb \ - -I${.CURDIR}/../include + -I${.CURDIR}/../include \ + -I${.OBJDIR} LDADD= -L${ROKENOBJDIR} -lroken \ -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb -ldes -lcrypt \ -lcom_err |
