CVS commit: src/crypto/external/bsd/heimdal/dist/lib/hx509
Module Name:src
Committed By: christos
Date: Sun Jun 20 12:01:07 UTC 2021
Modified Files:
src/crypto/external/bsd/heimdal/dist/lib/hx509: sel-gram.y sel-lex.l
sel.c sel.h
Removed Files:
src/crypto/external/bsd/heimdal/dist/lib/hx509: sel-gram.c sel-gram.h
sel-lex.c
Log Message:
remove generated files, custom #define prefixes to hide lex/yacc symbols
and yywrap.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r0 \
src/crypto/external/bsd/heimdal/dist/lib/hx509/sel-gram.c \
src/crypto/external/bsd/heimdal/dist/lib/hx509/sel-gram.h \
src/crypto/external/bsd/heimdal/dist/lib/hx509/sel-lex.c
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/dist/lib/hx509/sel-gram.y \
src/crypto/external/bsd/heimdal/dist/lib/hx509/sel-lex.l
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/dist/lib/hx509/sel.c
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/heimdal/dist/lib/hx509/sel.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/dist/lib/hx509/sel-gram.y
diff -u src/crypto/external/bsd/heimdal/dist/lib/hx509/sel-gram.y:1.3 src/crypto/external/bsd/heimdal/dist/lib/hx509/sel-gram.y:1.4
--- src/crypto/external/bsd/heimdal/dist/lib/hx509/sel-gram.y:1.3 Sun Dec 15 17:50:50 2019
+++ src/crypto/external/bsd/heimdal/dist/lib/hx509/sel-gram.y Sun Jun 20 08:01:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sel-gram.y,v 1.3 2019/12/15 22:50:50 christos Exp $ */
+/* $NetBSD: sel-gram.y,v 1.4 2021/06/20 12:01:07 christos Exp $ */
/*
* Copyright (c) 2017 Kungliga Tekniska Högskolan
@@ -41,19 +41,6 @@
#include
#include
-#if !defined(yylex)
-#define yylex _hx509_sel_yylex
-#define yywrap _hx509_sel_yywrap
-#endif
-#if !defined(yyparse)
-#define yyparse _hx509_sel_yyparse
-#define yyerror _hx509_sel_yyerror
-#define yylval _hx509_sel_yylval
-#define yychar _hx509_sel_yychar
-#define yydebug _hx509_sel_yydebug
-#define yynerrs _hx509_sel_yynerrs
-#endif
-
%}
%union {
Index: src/crypto/external/bsd/heimdal/dist/lib/hx509/sel-lex.l
diff -u src/crypto/external/bsd/heimdal/dist/lib/hx509/sel-lex.l:1.3 src/crypto/external/bsd/heimdal/dist/lib/hx509/sel-lex.l:1.4
--- src/crypto/external/bsd/heimdal/dist/lib/hx509/sel-lex.l:1.3 Sun Dec 15 17:50:50 2019
+++ src/crypto/external/bsd/heimdal/dist/lib/hx509/sel-lex.l Sun Jun 20 08:01:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sel-lex.l,v 1.3 2019/12/15 22:50:50 christos Exp $ */
+/* $NetBSD: sel-lex.l,v 1.4 2021/06/20 12:01:07 christos Exp $ */
%{
/*
@@ -72,6 +72,8 @@ struct hx_expr_input _hx509_expr_input;
#undef ECHO
%}
+
+%option noyywrap
%%
TRUE { return kw_TRUE; }
@@ -82,12 +84,12 @@ IN { return kw_IN; }
TAILMATCH { return kw_TAILMATCH; }
[A-Za-z][-A-Za-z0-9_]* {
- yylval.string = strdup ((const char *)yytext);
+ _hx509_sel_yylval.string = strdup ((const char *)_hx509_sel_yytext);
return IDENTIFIER;
}
-"\"" { yylval.string = handle_string(); return STRING; }
+"\"" { _hx509_sel_yylval.string = handle_string(); return STRING; }
\n { ++lineno; }
-[,.!={}()%] { return *yytext; }
+[,.!={}()%] { return *_hx509_sel_yytext; }
[ \t] ;
%%
@@ -122,16 +124,6 @@ handle_string(void)
return strdup(x);
}
-#if !defined(yywrap)
-#define yywrap _hx509_sel_yywrap
-#endif
-
-int
-yywrap ()
-{
- return 1;
-}
-
static int
lex_input(char *buf, int max_size)
{
Index: src/crypto/external/bsd/heimdal/dist/lib/hx509/sel.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/hx509/sel.c:1.2 src/crypto/external/bsd/heimdal/dist/lib/hx509/sel.c:1.3
--- src/crypto/external/bsd/heimdal/dist/lib/hx509/sel.c:1.2 Sat Jan 28 16:31:48 2017
+++ src/crypto/external/bsd/heimdal/dist/lib/hx509/sel.c Sun Jun 20 08:01:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sel.c,v 1.2 2017/01/28 21:31:48 christos Exp $ */
+/* $NetBSD: sel.c,v 1.3 2021/06/20 12:01:07 christos Exp $ */
/*
* Copyright (c) 2008 Kungliga Tekniska Högskolan
@@ -219,7 +219,7 @@ _hx509_expr_parse(const char *buf)
_hx509_expr_input.error = NULL;
}
-yyparse();
+_hx509_sel_yyparse();
return _hx509_expr_input.expr;
}
Index: src/crypto/external/bsd/heimdal/dist/lib/hx509/sel.h
diff -u src/crypto/external/bsd/heimdal/dist/lib/hx509/sel.h:1.5 src/crypto/external/bsd/heimdal/dist/lib/hx509/sel.h:1.6
--- src/crypto/external/bsd/heimdal/dist/lib/hx509/sel.h:1.5 Sun Dec 15 17:50:50 2019
+++ src/crypto/external/bsd/heimdal/dist/lib/hx509/sel.h Sun Jun 20 08:01:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sel.h,v 1.5 2019/12/15 22:50:50 christos Exp $ */
+/* $NetBSD: sel.h,v 1.6 2021/06/20 12:01:07 christos Exp $ */
/*
* Copyright (c) 2008 Kungliga Tekniska Högskolan
@@ -69,20 +69,6 @@ struct hx_expr_input {
extern struct hx_expr_input _hx509_expr_input;
-#if !defined(yylex)
-#define yylex _hx509_sel_yylex
-#define yywrap _hx509_sel_yywrap
-#endif
-#if !defined(yyparse)
-
CVS commit: src/crypto/external/bsd/heimdal/lib/libhx509
Module Name:src
Committed By: christos
Date: Sun Jun 20 10:38:54 UTC 2021
Modified Files:
src/crypto/external/bsd/heimdal/lib/libhx509: Makefile
Log Message:
hide yyerrflag, yyval; centralize lex and yacc settings
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/heimdal/lib/libhx509/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/lib/libhx509/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libhx509/Makefile:1.6 src/crypto/external/bsd/heimdal/lib/libhx509/Makefile:1.7
--- src/crypto/external/bsd/heimdal/lib/libhx509/Makefile:1.6 Sat Feb 3 22:19:51 2018
+++ src/crypto/external/bsd/heimdal/lib/libhx509/Makefile Sun Jun 20 06:38:54 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2018/02/04 03:19:51 christos Exp $
+# $NetBSD: Makefile,v 1.7 2021/06/20 10:38:54 christos Exp $
NOLINT= # defined
@@ -19,6 +19,8 @@ LIBDPLIBS+= asn1 ${HEIMBASE}/lib/libasn1
wind ${HEIMBASE}/lib/libwind
YHEADER=1
+YPREFIX= _hx509_sel_yy
+LPREFIX= _hx509_sel_yy
INCSDIR= /usr/include/krb5
INCS+= hx509.h hx509-protos.h ${ASN1_INCS} ${COMPILE_ET_INCS}
@@ -56,7 +58,6 @@ SRCS=\
softp11.c \
${BUILT_SOURCES}
-LPREFIX= _hx509_sel_yy
CPPFLAGS+=\
-I${HEIMDIST}/lib/hx509/ref \
CVS commit: src/crypto/external/bsd/heimdal
Module Name:src
Committed By: mrg
Date: Thu Jul 23 07:53:35 UTC 2020
Modified Files:
src/crypto/external/bsd/heimdal: Makefile.inc
src/crypto/external/bsd/heimdal/bin/krb5-config: Makefile
Log Message:
move $VERSION from Makefile.inc into the single Makefile that uses it.
this should do two nice things:
- eliminate "nbsed" missing messages in builds
- slightly speed up the build by removing a few dozen exec sed calls
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/heimdal/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/heimdal/bin/krb5-config/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/Makefile.inc
diff -u src/crypto/external/bsd/heimdal/Makefile.inc:1.5 src/crypto/external/bsd/heimdal/Makefile.inc:1.6
--- src/crypto/external/bsd/heimdal/Makefile.inc:1.5 Tue Dec 17 00:17:00 2019
+++ src/crypto/external/bsd/heimdal/Makefile.inc Thu Jul 23 07:53:35 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.5 2019/12/17 00:17:00 christos Exp $
+# $NetBSD: Makefile.inc,v 1.6 2020/07/23 07:53:35 mrg Exp $
HEIMBASE?= ${NETBSDSRCDIR}/crypto/external/bsd/heimdal
HEIMDIST= ${HEIMBASE}/dist
@@ -16,8 +16,6 @@ LIBIPC_PIC= ${LIBIPCDIR}/libipc.a
LIBIPC_PIC= ${LIBIPCDIR}/libipc_pic.a
.endif
-VERSION!= ${TOOL_SED} -ne 's/.*PACKAGE_VERSION[ ]*"\([0-9.]*\)"/\1/p' ${.PARSEDIR}/include/config.h
-
.if ${USETOOLS} != "yes"
COMPILEETOBJ!= cd ${HEIMBASE}/lib/libcom_err/compile_et && ${PRINTOBJDIR}
TOOL_COMPILE_ET= ${COMPILEETOBJ}/compile_et
Index: src/crypto/external/bsd/heimdal/bin/krb5-config/Makefile
diff -u src/crypto/external/bsd/heimdal/bin/krb5-config/Makefile:1.4 src/crypto/external/bsd/heimdal/bin/krb5-config/Makefile:1.5
--- src/crypto/external/bsd/heimdal/bin/krb5-config/Makefile:1.4 Tue Dec 17 00:16:26 2019
+++ src/crypto/external/bsd/heimdal/bin/krb5-config/Makefile Thu Jul 23 07:53:35 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2019/12/17 00:16:26 christos Exp $
+# $NetBSD: Makefile,v 1.5 2020/07/23 07:53:35 mrg Exp $
.include
.include <${.CURDIR}/../../Makefile.inc>
@@ -10,6 +10,8 @@ MAN= krb5-config.1
CLEANFILES+= krb5-config
+VERSION!= ${TOOL_SED} -ne 's/.*PACKAGE_VERSION[ ]*"\([0-9.]*\)"/\1/p' ${HEIMBASE}/include/config.h
+
krb5-config: krb5-config.in
${TOOL_SED} \
-e "s!@PACKAGE\@!heimdal!g" \
CVS commit: src/crypto/external/bsd/heimdal
Module Name:src
Committed By: christos
Date: Tue Dec 17 00:17:00 UTC 2019
Modified Files:
src/crypto/external/bsd/heimdal: Makefile.inc
Log Message:
Find and set a version to a make(1) variable.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/heimdal/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/Makefile.inc
diff -u src/crypto/external/bsd/heimdal/Makefile.inc:1.4 src/crypto/external/bsd/heimdal/Makefile.inc:1.5
--- src/crypto/external/bsd/heimdal/Makefile.inc:1.4 Sat Feb 3 22:19:51 2018
+++ src/crypto/external/bsd/heimdal/Makefile.inc Mon Dec 16 19:17:00 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.4 2018/02/04 03:19:51 christos Exp $
+# $NetBSD: Makefile.inc,v 1.5 2019/12/17 00:17:00 christos Exp $
HEIMBASE?= ${NETBSDSRCDIR}/crypto/external/bsd/heimdal
HEIMDIST= ${HEIMBASE}/dist
@@ -16,6 +16,8 @@ LIBIPC_PIC= ${LIBIPCDIR}/libipc.a
LIBIPC_PIC= ${LIBIPCDIR}/libipc_pic.a
.endif
+VERSION!= ${TOOL_SED} -ne 's/.*PACKAGE_VERSION[ ]*"\([0-9.]*\)"/\1/p' ${.PARSEDIR}/include/config.h
+
.if ${USETOOLS} != "yes"
COMPILEETOBJ!= cd ${HEIMBASE}/lib/libcom_err/compile_et && ${PRINTOBJDIR}
TOOL_COMPILE_ET= ${COMPILEETOBJ}/compile_et
CVS commit: src/crypto/external/bsd/heimdal/bin/krb5-config
Module Name:src
Committed By: christos
Date: Tue Dec 17 00:16:26 UTC 2019
Modified Files:
src/crypto/external/bsd/heimdal/bin/krb5-config: Makefile
Log Message:
PR/54773: David Shao: krb5-config.in needs to be evaluated by the shell now
in order to work. Perhaps it is better to keep a local modified copy that
does not need this treatment...
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/bin/krb5-config/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/bin/krb5-config/Makefile
diff -u src/crypto/external/bsd/heimdal/bin/krb5-config/Makefile:1.3 src/crypto/external/bsd/heimdal/bin/krb5-config/Makefile:1.4
--- src/crypto/external/bsd/heimdal/bin/krb5-config/Makefile:1.3 Thu Apr 24 09:50:53 2014
+++ src/crypto/external/bsd/heimdal/bin/krb5-config/Makefile Mon Dec 16 19:16:26 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2014/04/24 13:50:53 pettai Exp $
+# $NetBSD: Makefile,v 1.4 2019/12/17 00:16:26 christos Exp $
.include
.include <${.CURDIR}/../../Makefile.inc>
@@ -11,8 +11,9 @@ MAN= krb5-config.1
CLEANFILES+= krb5-config
krb5-config: krb5-config.in
- ${TOOL_SED} -e "s!@PACKAGE\@!heimdal!g" \
- -e "s!@VERSION\@!1.5.3!g" \
+ ${TOOL_SED} \
+ -e "s!@PACKAGE\@!heimdal!g" \
+ -e "s!@VERSION\@!${VERSION}!g" \
-e "s!@prefix\@!/!g" \
-e "s!@exec_prefix\@!/!g" \
-e "s!@libdir\@!/usr/lib!g" \
@@ -26,7 +27,7 @@ krb5-config: krb5-config.in
-e "s!@LIB_pkinit\@!-lhx509!g" \
-e "s!@PTHREAD_LIBADD\@!!g" \
-e "s!@LIBS\@!!g" \
- ${HEIMDIST}/tools/krb5-config.in > $@
+ ${HEIMDIST}/tools/krb5-config.in | sh > $@
chmod +x $@
.include
CVS commit: src/crypto/external/bsd/heimdal/lib/libkadm5srv
Module Name:src
Committed By: martin
Date: Thu Jul 12 11:13:50 UTC 2018
Modified Files:
src/crypto/external/bsd/heimdal/lib/libkadm5srv: Makefile
Log Message:
Provide an explicit dependency on heimbase
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/heimdal/lib/libkadm5srv/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/lib/libkadm5srv/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libkadm5srv/Makefile:1.4 src/crypto/external/bsd/heimdal/lib/libkadm5srv/Makefile:1.5
--- src/crypto/external/bsd/heimdal/lib/libkadm5srv/Makefile:1.4 Sat Jan 28 21:31:52 2017
+++ src/crypto/external/bsd/heimdal/lib/libkadm5srv/Makefile Thu Jul 12 11:13:50 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2017/01/28 21:31:52 christos Exp $
+# $NetBSD: Makefile,v 1.5 2018/07/12 11:13:50 martin Exp $
USE_FORT?= yes # network protocol library
@@ -15,7 +15,8 @@ CPPFLAGS+= -I${HEIMDIST}/lib/krb5
LIBDPLIBS+= krb5 ${.CURDIR}/../libkrb5 \
com_err ${.CURDIR}/../libcom_err \
hdb ${.CURDIR}/../libhdb \
- roken ${.CURDIR}/../libroken
+ roken ${.CURDIR}/../libroken \
+ heimbase ${.CURDIR}/../libheimbase
HEIMSRCS= kadm5_err.et
CVS commit: src/crypto/external/bsd/heimdal/lib/libgssapi
Module Name:src
Committed By: martin
Date: Tue Jul 10 13:17:36 UTC 2018
Modified Files:
src/crypto/external/bsd/heimdal/lib/libgssapi: Makefile
Log Message:
Explicit heimbase dependency (similar to other recent MKREPRO fixes)
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile:1.4 src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile:1.5
--- src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile:1.4 Thu Apr 24 13:50:53 2014
+++ src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile Tue Jul 10 13:17:36 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2014/04/24 13:50:53 pettai Exp $
+# $NetBSD: Makefile,v 1.5 2018/07/10 13:17:36 martin Exp $
USE_FORT?= yes# network protocol library
@@ -17,6 +17,7 @@ LIBDPLIBS+= krb5 ${HEIMBASE}/lib/libkrb
asn1 ${HEIMBASE}/lib/libasn1 \
com_err ${HEIMBASE}/lib/libcom_err \
roken ${HEIMBASE}/lib/libroken \
+ heimbase ${HEIMBASE}/lib/libheimbase \
heimntlm ${HEIMBASE}/lib/libheimntlm \
crypto ${SSLBASE}/lib/libcrypto
CVS commit: src/crypto/external/bsd/heimdal/lib/libkdc
Module Name:src
Committed By: martin
Date: Fri Jul 6 08:54:30 UTC 2018
Modified Files:
src/crypto/external/bsd/heimdal/lib/libkdc: Makefile
Log Message:
Explicit libheimbase dependency, similar to Christos' change to
libheimntlm/Makefile, hopefully fixing another MKREPRO fallout.
XXX pullup 8
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/lib/libkdc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/lib/libkdc/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libkdc/Makefile:1.3 src/crypto/external/bsd/heimdal/lib/libkdc/Makefile:1.4
--- src/crypto/external/bsd/heimdal/lib/libkdc/Makefile:1.3 Sat Jan 28 21:31:52 2017
+++ src/crypto/external/bsd/heimdal/lib/libkdc/Makefile Fri Jul 6 08:54:30 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2017/01/28 21:31:52 christos Exp $
+# $NetBSD: Makefile,v 1.4 2018/07/06 08:54:30 martin Exp $
.include
.include <${.CURDIR}/../../Makefile.inc>
@@ -15,6 +15,7 @@ LIBDPLIBS+= krb5 ${.CURDIR}/../libkrb5
hdb ${.CURDIR}/../libhdb \
hx509 ${.CURDIR}/../libhx509 \
asn1 ${.CURDIR}/../libasn1 \
+ heimbase ${.CURDIR}/../libheimbase \
heimntlm ${.CURDIR}/../libheimntlm \
roken ${.CURDIR}/../libroken
CVS commit: src/crypto/external/bsd/heimdal/lib/libheimntlm
Module Name:src
Committed By: martin
Date: Fri Jul 6 08:31:43 UTC 2018
Modified Files:
src/crypto/external/bsd/heimdal/lib/libheimntlm: Makefile
Log Message:
Add explicit path to libwind - patch from Christos, may fix some MKREPRO
fallout. XXX pullup 8
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/lib/libheimntlm/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/lib/libheimntlm/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libheimntlm/Makefile:1.2 src/crypto/external/bsd/heimdal/lib/libheimntlm/Makefile:1.3
--- src/crypto/external/bsd/heimdal/lib/libheimntlm/Makefile:1.2 Wed Sep 11 23:04:09 2013
+++ src/crypto/external/bsd/heimdal/lib/libheimntlm/Makefile Fri Jul 6 08:31:43 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2013/09/11 23:04:09 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2018/07/06 08:31:43 martin Exp $
USE_FORT?= yes # cryptographic software
@@ -15,7 +15,8 @@ LIBDPLIBS+= asn1 ${.CURDIR}/../libasn1 \
com_err ${.CURDIR}/../libcom_err \
crypto ${SSLBASE}/lib/libcrypto \
krb5 ${.CURDIR}/../libkrb5 \
- roken ${.CURDIR}/../libroken
+ roken ${.CURDIR}/../libroken \
+ wind ${.CURDIR}/../libwind
HEIMSRCS= ntlm_err.et ntlm.c
CVS commit: src/crypto/external/bsd/heimdal/dist/lib/krb5
Module Name:src
Committed By: kamil
Date: Sat Jun 16 18:51:36 UTC 2018
Modified Files:
src/crypto/external/bsd/heimdal/dist/lib/krb5: config_file.c
Log Message:
Do not reference buffer after the code scope {}
rk_getpwuid_r() returns a pointer pwd->pw_dir to a buffer pwbuf[].
It's not safe to store another a copy of pwd->pw_dir in outter scope and
use it out of the scope where there exists pwbuf[].
This fixes a problem reported by ASan under MKSANITIZER.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/dist/lib/krb5/config_file.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/dist/lib/krb5/config_file.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/krb5/config_file.c:1.3 src/crypto/external/bsd/heimdal/dist/lib/krb5/config_file.c:1.4
--- src/crypto/external/bsd/heimdal/dist/lib/krb5/config_file.c:1.3 Fri Sep 8 15:29:43 2017
+++ src/crypto/external/bsd/heimdal/dist/lib/krb5/config_file.c Sat Jun 16 18:51:36 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: config_file.c,v 1.3 2017/09/08 15:29:43 christos Exp $ */
+/* $NetBSD: config_file.c,v 1.4 2018/06/16 18:51:36 kamil Exp $ */
/*
* Copyright (c) 1997 - 2004 Kungliga Tekniska Högskolan
@@ -430,6 +430,8 @@ krb5_config_parse_file_multi (krb5_conte
if (ISTILDE(fname[0]) && ISPATHSEP(fname[1])) {
#ifndef KRB5_USE_PATH_TOKENS
const char *home = NULL;
+ struct passwd pw, *pwd = NULL;
+ char pwbuf[2048];
if (!_krb5_homedir_access(context)) {
krb5_set_error_message(context, EPERM,
@@ -441,9 +443,6 @@ krb5_config_parse_file_multi (krb5_conte
home = getenv("HOME");
if (home == NULL) {
- struct passwd pw, *pwd = NULL;
- char pwbuf[2048];
-
if (rk_getpwuid_r(getuid(), &pw, pwbuf, sizeof(pwbuf), &pwd) == 0)
home = pwd->pw_dir;
}
CVS commit: src/crypto/external/bsd/heimdal/dist/kdc
Module Name:src
Committed By: spz
Date: Sun Apr 29 05:36:04 UTC 2018
Modified Files:
src/crypto/external/bsd/heimdal/dist/kdc: connect.c
Log Message:
avoid busy-waiting on a dead child
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/dist/kdc/connect.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/dist/kdc/connect.c
diff -u src/crypto/external/bsd/heimdal/dist/kdc/connect.c:1.2 src/crypto/external/bsd/heimdal/dist/kdc/connect.c:1.3
--- src/crypto/external/bsd/heimdal/dist/kdc/connect.c:1.2 Sat Jan 28 21:31:44 2017
+++ src/crypto/external/bsd/heimdal/dist/kdc/connect.c Sun Apr 29 05:36:04 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: connect.c,v 1.2 2017/01/28 21:31:44 christos Exp $ */
+/* $NetBSD: connect.c,v 1.3 2018/04/29 05:36:04 spz Exp $ */
/*
* Copyright (c) 1997-2005 Kungliga Tekniska Högskolan
@@ -1193,7 +1193,7 @@ start_kdc(krb5_context context,
break;
default:
for (i=0; i < max_kdcs; i++) {
-if (pids[i] == 0) {
+if (pids[i] < 1) {
pids[i] = pid;
break;
}
CVS commit: src/crypto/external/bsd/heimdal/dist/kcm
Module Name:src
Committed By: christos
Date: Fri Apr 6 19:57:03 UTC 2018
Modified Files:
src/crypto/external/bsd/heimdal/dist/kcm: glue.c
Log Message:
- use c99 initializers
- add kdc offset functions
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/dist/kcm/glue.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/dist/kcm/glue.c
diff -u src/crypto/external/bsd/heimdal/dist/kcm/glue.c:1.2 src/crypto/external/bsd/heimdal/dist/kcm/glue.c:1.3
--- src/crypto/external/bsd/heimdal/dist/kcm/glue.c:1.2 Sat Jan 28 16:31:44 2017
+++ src/crypto/external/bsd/heimdal/dist/kcm/glue.c Fri Apr 6 15:57:03 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: glue.c,v 1.2 2017/01/28 21:31:44 christos Exp $ */
+/* $NetBSD: glue.c,v 1.3 2018/04/06 19:57:03 christos Exp $ */
/*
* Copyright (c) 2005, PADL Software Pty Ltd.
@@ -34,7 +34,7 @@
#include "kcm_locl.h"
-__RCSID("$NetBSD: glue.c,v 1.2 2017/01/28 21:31:44 christos Exp $");
+__RCSID("$NetBSD: glue.c,v 1.3 2018/04/06 19:57:03 christos Exp $");
/*
* Server-side loopback glue for credentials cache operations; this
@@ -248,33 +248,60 @@ kcmss_get_version(krb5_context context,
return 0;
}
+static krb5_error_code
+kcmss_get_kdc_sec_offset(krb5_context context,
+ krb5_ccache id,
+ krb5_deltat *t)
+{
+kcm_ccache c = KCMCACHE(id);
+
+KCM_ASSERT_VALID(c);
+
+*t = c->kdc_offset;
+
+return 0;
+}
+
+static krb5_error_code
+kcmss_set_kdc_sec_offset(krb5_context context,
+ krb5_ccache id, krb5_deltat t)
+{
+kcm_ccache c = KCMCACHE(id);
+
+KCM_ASSERT_VALID(c);
+
+c->kdc_offset = t;
+
+return 0;
+}
+
static const krb5_cc_ops krb5_kcmss_ops = {
-KRB5_CC_OPS_VERSION,
-"KCM",
-kcmss_get_name,
-kcmss_resolve,
-kcmss_gen_new,
-kcmss_initialize,
-kcmss_destroy,
-kcmss_close,
-kcmss_store_cred,
-kcmss_retrieve,
-kcmss_get_principal,
-kcmss_get_first,
-kcmss_get_next,
-kcmss_end_get,
-kcmss_remove_cred,
-kcmss_set_flags,
-kcmss_get_version,
-NULL,
-NULL,
-NULL,
-NULL,
-NULL,
-NULL,
-NULL,
-NULL,
-NULL,
+.version = KRB5_CC_OPS_VERSION,
+.prefix = "KCM",
+.get_name = kcmss_get_name,
+.resolve = kcmss_resolve,
+.gen_new = kcmss_gen_new,
+.init = kcmss_initialize,
+.destroy = kcmss_destroy,
+.close = kcmss_close,
+.store = kcmss_store_cred,
+.retrieve = kcmss_retrieve,
+.get_princ = kcmss_get_principal,
+.get_first = kcmss_get_first,
+.get_next = kcmss_get_next,
+.end_get = kcmss_end_get,
+.remove_cred = kcmss_remove_cred,
+.set_flags = kcmss_set_flags,
+.get_version = kcmss_get_version,
+.get_cache_first = NULL,
+.get_cache_next = NULL,
+.end_cache_get = NULL,
+.move = NULL,
+.get_default_name = NULL,
+.set_default = NULL,
+.lastchange = NULL,
+.set_kdc_offset = kcmss_set_kdc_sec_offset,
+.get_kdc_offset = kcmss_get_kdc_sec_offset,
};
krb5_error_code
CVS commit: src/crypto/external/bsd/heimdal/dist/kcm
Module Name:src Committed By: christos Date: Fri Apr 6 19:56:43 UTC 2018 Modified Files: src/crypto/external/bsd/heimdal/dist/kcm: cache.c Log Message: don't forget to initialize the kdc_offset (it was random before) To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/dist/kcm/cache.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/heimdal/dist/kcm/cache.c diff -u src/crypto/external/bsd/heimdal/dist/kcm/cache.c:1.3 src/crypto/external/bsd/heimdal/dist/kcm/cache.c:1.4 --- src/crypto/external/bsd/heimdal/dist/kcm/cache.c:1.3 Sat Jan 28 16:31:44 2017 +++ src/crypto/external/bsd/heimdal/dist/kcm/cache.c Fri Apr 6 15:56:43 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: cache.c,v 1.3 2017/01/28 21:31:44 christos Exp $ */ +/* $NetBSD: cache.c,v 1.4 2018/04/06 19:56:43 christos Exp $ */ /* * Copyright (c) 2005, PADL Software Pty Ltd. @@ -324,6 +324,7 @@ kcm_ccache_alloc(krb5_context context, slot->key.keytab = NULL; slot->tkt_life = 0; slot->renew_life = 0; +slot->kdc_offset = 0; if (new_slot) ccache_head = slot;
CVS commit: src/crypto/external/bsd/heimdal
Module Name:src
Committed By: mrg
Date: Tue Mar 13 03:06:51 UTC 2018
Modified Files:
src/crypto/external/bsd/heimdal: Makefile.rules.inc
Log Message:
add *template.x to CLEANFILES.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/heimdal/Makefile.rules.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/Makefile.rules.inc
diff -u src/crypto/external/bsd/heimdal/Makefile.rules.inc:1.8 src/crypto/external/bsd/heimdal/Makefile.rules.inc:1.9
--- src/crypto/external/bsd/heimdal/Makefile.rules.inc:1.8 Sat Jan 28 21:31:43 2017
+++ src/crypto/external/bsd/heimdal/Makefile.rules.inc Tue Mar 13 03:06:51 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rules.inc,v 1.8 2017/01/28 21:31:43 christos Exp $
+# $NetBSD: Makefile.rules.inc,v 1.9 2018/03/13 03:06:51 mrg Exp $
SRCS+= ${HEIMSRCS:N*.et:N*.in:N*.asn1}
@@ -23,6 +23,7 @@ ASN1_OPTS.${src} ?= --one-code-file
CLEANFILES+=\
${src:.asn1=_asn1_files} \
${src:.asn1=_asn1-template.c} \
+ ${src:.asn1=_asn1-template.x} \
${ASN1_FILES.${src}} \
${ASN1_FILES.${src}:.x=.c} \
${src:.asn1=_asn1.h} \
CVS commit: src/crypto/external/bsd/heimdal/dist
Module Name:src
Committed By: christos
Date: Fri Feb 9 23:22:13 UTC 2018
Modified Files:
src/crypto/external/bsd/heimdal/dist/kdc: pkinit.c
src/crypto/external/bsd/heimdal/dist/lib/krb5: pkinit.c
Log Message:
fix BN_to_integer to get rid of __UNCONST. Trick question:
How many BN_to_integer implementations does Heimdal contain (I only fixed 2).
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/dist/kdc/pkinit.c
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/dist/lib/krb5/pkinit.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/dist/kdc/pkinit.c
diff -u src/crypto/external/bsd/heimdal/dist/kdc/pkinit.c:1.3 src/crypto/external/bsd/heimdal/dist/kdc/pkinit.c:1.4
--- src/crypto/external/bsd/heimdal/dist/kdc/pkinit.c:1.3 Mon Feb 5 11:00:52 2018
+++ src/crypto/external/bsd/heimdal/dist/kdc/pkinit.c Fri Feb 9 18:22:12 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pkinit.c,v 1.3 2018/02/05 16:00:52 christos Exp $ */
+/* $NetBSD: pkinit.c,v 1.4 2018/02/09 23:22:12 christos Exp $ */
/*
* Copyright (c) 2003 - 2016 Kungliga Tekniska Högskolan
@@ -813,7 +813,7 @@ out:
*/
static krb5_error_code
-BN_to_integer(krb5_context context, BIGNUM *bn, heim_integer *integer)
+BN_to_integer(krb5_context context, const BIGNUM *bn, heim_integer *integer)
{
integer->length = BN_num_bytes(bn);
integer->data = malloc(integer->length);
@@ -1038,7 +1038,7 @@ pk_mk_pa_reply_dh(krb5_context context,
#else
DH_get0_key(kdc_dh, &pub_key, NULL);
#endif
- ret = BN_to_integer(context, __UNCONST(pub_key), &i);
+ ret = BN_to_integer(context, pub_key, &i);
if (ret)
return ret;
Index: src/crypto/external/bsd/heimdal/dist/lib/krb5/pkinit.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/krb5/pkinit.c:1.3 src/crypto/external/bsd/heimdal/dist/lib/krb5/pkinit.c:1.4
--- src/crypto/external/bsd/heimdal/dist/lib/krb5/pkinit.c:1.3 Mon Feb 5 11:00:53 2018
+++ src/crypto/external/bsd/heimdal/dist/lib/krb5/pkinit.c Fri Feb 9 18:22:13 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pkinit.c,v 1.3 2018/02/05 16:00:53 christos Exp $ */
+/* $NetBSD: pkinit.c,v 1.4 2018/02/09 23:22:13 christos Exp $ */
/*
* Copyright (c) 2003 - 2016 Kungliga Tekniska Högskolan
@@ -82,7 +82,7 @@ _krb5_pk_cert_free(struct krb5_pk_cert *
}
static krb5_error_code
-BN_to_integer(krb5_context context, BIGNUM *bn, heim_integer *integer)
+BN_to_integer(krb5_context context, const BIGNUM *bn, heim_integer *integer)
{
integer->length = BN_num_bytes(bn);
integer->data = malloc(integer->length);
@@ -481,12 +481,12 @@ build_auth_pack(krb5_context context,
DH_get0_pqg(dh, &p, &q, &g);
#endif
- ret = BN_to_integer(context, __UNCONST(p), &dp.p);
+ ret = BN_to_integer(context, p, &dp.p);
if (ret) {
free_DomainParameters(&dp);
return ret;
}
- ret = BN_to_integer(context, __UNCONST(g), &dp.g);
+ ret = BN_to_integer(context, g, &dp.g);
if (ret) {
free_DomainParameters(&dp);
return ret;
@@ -496,7 +496,7 @@ build_auth_pack(krb5_context context,
free_DomainParameters(&dp);
return ENOMEM;
}
- ret = BN_to_integer(context, __UNCONST(q), dp.q);
+ ret = BN_to_integer(context, q, dp.q);
if (ret) {
free_DomainParameters(&dp);
return ret;
@@ -527,7 +527,7 @@ build_auth_pack(krb5_context context,
#else
DH_get0_key(dh, &pub_key, NULL);
#endif
- ret = BN_to_integer(context, __UNCONST(pub_key), &dh_pub_key);
+ ret = BN_to_integer(context, pub_key, &dh_pub_key);
if (ret)
return ret;
CVS commit: src/crypto/external/bsd/heimdal/dist
Module Name:src
Committed By: christos
Date: Mon Feb 5 16:00:53 UTC 2018
Modified Files:
src/crypto/external/bsd/heimdal/dist/include: crypto-headers.h
src/crypto/external/bsd/heimdal/dist/kdc: digest.c kx509.c pkinit.c
src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5: arcfour.c
get_mic.c unwrap.c verify_mic.c wrap.c
src/crypto/external/bsd/heimdal/dist/lib/gssapi/ntlm: crypto.c
src/crypto/external/bsd/heimdal/dist/lib/hx509: crypto.c hxtool.c
ks_file.c ks_p11.c
src/crypto/external/bsd/heimdal/dist/lib/kafs: rxkad_kdf.c
src/crypto/external/bsd/heimdal/dist/lib/krb5: crypto-aes-sha1.c
crypto-arcfour.c crypto-des-common.c crypto-des.c crypto-des3.c
crypto-evp.c crypto.h pkinit.c sp800-108-kdf.c
src/crypto/external/bsd/heimdal/dist/lib/ntlm: ntlm.c
Log Message:
port to openssl-1.1
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/dist/include/crypto-headers.h
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/dist/kdc/digest.c \
src/crypto/external/bsd/heimdal/dist/kdc/kx509.c \
src/crypto/external/bsd/heimdal/dist/kdc/pkinit.c
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/arcfour.c \
src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/get_mic.c \
src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/unwrap.c \
src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/wrap.c
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/verify_mic.c
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/dist/lib/gssapi/ntlm/crypto.c
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/dist/lib/hx509/crypto.c \
src/crypto/external/bsd/heimdal/dist/lib/hx509/hxtool.c \
src/crypto/external/bsd/heimdal/dist/lib/hx509/ks_file.c \
src/crypto/external/bsd/heimdal/dist/lib/hx509/ks_p11.c
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/dist/lib/kafs/rxkad_kdf.c
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/dist/lib/krb5/crypto-aes-sha1.c \
src/crypto/external/bsd/heimdal/dist/lib/krb5/crypto-arcfour.c \
src/crypto/external/bsd/heimdal/dist/lib/krb5/crypto-des-common.c \
src/crypto/external/bsd/heimdal/dist/lib/krb5/crypto-des.c \
src/crypto/external/bsd/heimdal/dist/lib/krb5/crypto-evp.c \
src/crypto/external/bsd/heimdal/dist/lib/krb5/crypto.h \
src/crypto/external/bsd/heimdal/dist/lib/krb5/pkinit.c \
src/crypto/external/bsd/heimdal/dist/lib/krb5/sp800-108-kdf.c
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/heimdal/dist/lib/krb5/crypto-des3.c
cvs rdiff -u -r1.1.1.3 -r1.2 \
src/crypto/external/bsd/heimdal/dist/lib/ntlm/ntlm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/dist/include/crypto-headers.h
diff -u src/crypto/external/bsd/heimdal/dist/include/crypto-headers.h:1.2 src/crypto/external/bsd/heimdal/dist/include/crypto-headers.h:1.3
--- src/crypto/external/bsd/heimdal/dist/include/crypto-headers.h:1.2 Sat Jan 28 16:31:44 2017
+++ src/crypto/external/bsd/heimdal/dist/include/crypto-headers.h Mon Feb 5 11:00:52 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: crypto-headers.h,v 1.2 2017/01/28 21:31:44 christos Exp $ */
+/* $NetBSD: crypto-headers.h,v 1.3 2018/02/05 16:00:52 christos Exp $ */
#ifndef __crypto_header__
#define __crypto_header__
@@ -28,9 +28,11 @@
#include
#include
#include
-#ifndef BN_is_negative
-#define BN_set_negative(bn, flag) ((bn)->neg=(flag)?1:0)
-#define BN_is_negative(bn) ((bn)->neg != 0)
+#if OPENSSL_VERSION_NUMBER < 0x1010UL
+# ifndef BN_is_negative
+# define BN_set_negative(bn, flag) ((bn)->neg=(flag)?1:0)
+# define BN_is_negative(bn) ((bn)->neg != 0)
+# endif
#endif
#else /* !HAVE_HCRYPTO_W_OPENSSL */
Index: src/crypto/external/bsd/heimdal/dist/kdc/digest.c
diff -u src/crypto/external/bsd/heimdal/dist/kdc/digest.c:1.2 src/crypto/external/bsd/heimdal/dist/kdc/digest.c:1.3
--- src/crypto/external/bsd/heimdal/dist/kdc/digest.c:1.2 Sat Jan 28 16:31:44 2017
+++ src/crypto/external/bsd/heimdal/dist/kdc/digest.c Mon Feb 5 11:00:52 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: digest.c,v 1.2 2017/01/28 21:31:44 christos Exp $ */
+/* $NetBSD: digest.c,v 1.3 2018/02/05 16:00:52 christos Exp $ */
/*
* Copyright (c) 2006 - 2007 Kungliga Tekniska Högskolan
@@ -377,8 +377,8 @@ _kdc_do_digest(krb5_context context,
case choice_DigestReqInner_init: {
unsigned char server_nonce[16], identifier;
- RAND_pseudo_bytes(&identifier, sizeof(identifier));
- RAND_pseudo_bytes(server_nonce, sizeof(server_nonce));
+ RAND_bytes(&identifier, sizeof(identifier));
+ RAND_bytes(server_nonce, sizeof(server_nonce));
server_nonce[0] = kdc_time & 0xff;
server_nonce[1] = (kdc_time >> 8) & 0xff;
@@ -1340,7 +1340,7 @@ _kdc_do_diges
CVS commit: src/crypto/external/bsd/heimdal
Module Name:src
Committed By: christos
Date: Fri Sep 8 15:29:44 UTC 2017
Modified Files:
src/crypto/external/bsd/heimdal/dist: configure.ac
src/crypto/external/bsd/heimdal/dist/kcm: client.c config.c
src/crypto/external/bsd/heimdal/dist/lib/hx509: softp11.c
src/crypto/external/bsd/heimdal/dist/lib/krb5: config_file.c
get_default_principal.c
src/crypto/external/bsd/heimdal/dist/lib/roken: getxxyyy.c roken.h.in
src/crypto/external/bsd/heimdal/include: config.h roken.h
Added Files:
src/crypto/external/bsd/heimdal/dist/cf: check-getpwuid_r-posix.m4
Log Message:
Use getpwuid_r instead of getpwuid, so that we don't trash getpw*() internal
buffers.
kde does (kdm/client/backend.c):
p = getpwnam();
pam_setcred() (which calls getpwuid in pam_afslog);
setusercontext(...,p,p->pw_uid,...) (now with trashed p data...)
XXX: pullups.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/dist/configure.ac
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/heimdal/dist/cf/check-getpwuid_r-posix.m4
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/dist/kcm/client.c \
src/crypto/external/bsd/heimdal/dist/kcm/config.c
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/dist/lib/hx509/softp11.c
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/dist/lib/krb5/config_file.c \
src/crypto/external/bsd/heimdal/dist/lib/krb5/get_default_principal.c
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/dist/lib/roken/getxxyyy.c
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/heimdal/dist/lib/roken/roken.h.in
cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/heimdal/include/config.h
cvs rdiff -u -r1.7 -r1.8 src/crypto/external/bsd/heimdal/include/roken.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/dist/configure.ac
diff -u src/crypto/external/bsd/heimdal/dist/configure.ac:1.2 src/crypto/external/bsd/heimdal/dist/configure.ac:1.3
--- src/crypto/external/bsd/heimdal/dist/configure.ac:1.2 Sat Jan 28 16:31:43 2017
+++ src/crypto/external/bsd/heimdal/dist/configure.ac Fri Sep 8 11:29:43 2017
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-AC_REVISION($Revision: 1.2 $)
+AC_REVISION($Revision: 1.3 $)
AC_PREREQ(2.62)
test -z "$CFLAGS" && CFLAGS="-g"
AC_INIT([Heimdal],[7.99.1],[https://github.com/heimdal/heimdal/issues])
@@ -514,6 +514,7 @@ KRB_CAPABILITIES
rk_DLADDR
AC_CHECK_GETPWNAM_R_POSIX
+AC_CHECK_GETPWUID_R_POSIX
dnl detect doors on solaris
if test "$enable_pthread_support" != no; then
Index: src/crypto/external/bsd/heimdal/dist/kcm/client.c
diff -u src/crypto/external/bsd/heimdal/dist/kcm/client.c:1.2 src/crypto/external/bsd/heimdal/dist/kcm/client.c:1.3
--- src/crypto/external/bsd/heimdal/dist/kcm/client.c:1.2 Sat Jan 28 16:31:44 2017
+++ src/crypto/external/bsd/heimdal/dist/kcm/client.c Fri Sep 8 11:29:43 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: client.c,v 1.2 2017/01/28 21:31:44 christos Exp $ */
+/* $NetBSD: client.c,v 1.3 2017/09/08 15:29:43 christos Exp $ */
/*
* Copyright (c) 2005, PADL Software Pty Ltd.
@@ -174,8 +174,10 @@ kcm_ccache_new_client(krb5_context conte
if (matches == 0)
matches = sscanf(name,"%ld",&uid);
if (matches == 1) {
- struct passwd *pwd = getpwuid(uid);
- if (pwd != NULL) {
+ struct passwd pw, *pwd = NULL;
+ char pwbuf[2048];
+
+ if (rk_getpwuid_r(getuid(), &pw, pwbuf, sizeof(pwbuf), &pwd) == 0) {
gid_t gid = pwd->pw_gid;
kcm_chown(context, client, ccache, uid, gid);
}
Index: src/crypto/external/bsd/heimdal/dist/kcm/config.c
diff -u src/crypto/external/bsd/heimdal/dist/kcm/config.c:1.2 src/crypto/external/bsd/heimdal/dist/kcm/config.c:1.3
--- src/crypto/external/bsd/heimdal/dist/kcm/config.c:1.2 Sat Jan 28 16:31:44 2017
+++ src/crypto/external/bsd/heimdal/dist/kcm/config.c Fri Sep 8 11:29:43 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: config.c,v 1.2 2017/01/28 21:31:44 christos Exp $ */
+/* $NetBSD: config.c,v 1.3 2017/09/08 15:29:43 christos Exp $ */
/*
* Copyright (c) 2005, PADL Software Pty Ltd.
@@ -159,28 +159,33 @@ static int parse_owners(kcm_ccache ccach
{
uid_t uid = 0;
gid_t gid = 0;
-struct passwd *pw;
struct group *gr;
int uid_p = 0;
int gid_p = 0;
+struct passwd pw, *pwd = NULL;
+char pwbuf[2048];
if (system_user != NULL) {
if (isdigit((unsigned char)system_user[0])) {
- pw = getpwuid(atoi(system_user));
+ if (rk_getpwuid_r(atoi(system_user), &pw, pwbuf, sizeof(pwbuf),
+ &pwd) != 0)
+ pwd = NULL;
} else {
- pw = getpwnam(system_user);
+ if (rk_getpwnam_r(system_user, &pw, pwbuf, sizeof(pwbuf),
+ &pwd) != 0)
+ pwd = NULL;
}
- if (pw == NULL) {
+ if (pwd == NULL) {
return errno;
}
- system_user = strdup(pw->pw_nam
CVS commit: src/crypto/external/bsd/heimdal/dist/lib/gssapi/mech
Module Name:src Committed By: christos Date: Fri Sep 8 14:57:44 UTC 2017 Modified Files: src/crypto/external/bsd/heimdal/dist/lib/gssapi/mech: gss_pname_to_uid.c Log Message: This is why we have libroken... To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_pname_to_uid.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_pname_to_uid.c diff -u src/crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_pname_to_uid.c:1.2 src/crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_pname_to_uid.c:1.3 --- src/crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_pname_to_uid.c:1.2 Sat Jan 28 16:31:46 2017 +++ src/crypto/external/bsd/heimdal/dist/lib/gssapi/mech/gss_pname_to_uid.c Fri Sep 8 10:57:44 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: gss_pname_to_uid.c,v 1.2 2017/01/28 21:31:46 christos Exp $ */ +/* $NetBSD: gss_pname_to_uid.c,v 1.3 2017/09/08 14:57:44 christos Exp $ */ /* * Copyright (c) 2011, PADL Software Pty Ltd. @@ -150,12 +150,8 @@ gss_pname_to_uid(OM_uint32 *minor_status OM_uint32 major, tmpMinor; gss_buffer_desc localname = GSS_C_EMPTY_BUFFER; char *szLocalname; -#ifdef POSIX_GETPWNAM_R char pwbuf[2048]; struct passwd pw, *pwd; -#else -struct passwd *pwd; -#endif major = gss_localname(minor_status, pname, mech_type, &localname); if (GSS_ERROR(major)) @@ -171,12 +167,8 @@ gss_pname_to_uid(OM_uint32 *minor_status memcpy(szLocalname, localname.value, localname.length); szLocalname[localname.length] = '\0'; -#ifdef POSIX_GETPWNAM_R -if (getpwnam_r(szLocalname, &pw, pwbuf, sizeof(pwbuf), &pwd) != 0) +if (rk_getpwnam_r(szLocalname, &pw, pwbuf, sizeof(pwbuf), &pwd) != 0) pwd = NULL; -#else -pwd = getpwnam(szLocalname); -#endif gss_release_buffer(&tmpMinor, &localname); free(szLocalname);
CVS commit: src/crypto/external/bsd/heimdal/dist/lib/krb5
Module Name:src
Committed By: christos
Date: Fri Sep 8 14:52:50 UTC 2017
Modified Files:
src/crypto/external/bsd/heimdal/dist/lib/krb5: kuserok.c
Log Message:
always use rk_getpwnam_r...
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/dist/lib/krb5/kuserok.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/dist/lib/krb5/kuserok.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/krb5/kuserok.c:1.2 src/crypto/external/bsd/heimdal/dist/lib/krb5/kuserok.c:1.3
--- src/crypto/external/bsd/heimdal/dist/lib/krb5/kuserok.c:1.2 Sat Jan 28 16:31:49 2017
+++ src/crypto/external/bsd/heimdal/dist/lib/krb5/kuserok.c Fri Sep 8 10:52:50 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: kuserok.c,v 1.2 2017/01/28 21:31:49 christos Exp $ */
+/* $NetBSD: kuserok.c,v 1.3 2017/09/08 14:52:50 christos Exp $ */
/*
* Copyright (c) 1997 - 2005 Kungliga Tekniska Högskolan
@@ -625,7 +625,7 @@ kuserok_user_k5login_plug_f(void *plug_c
if (!_krb5_homedir_access(context))
return KRB5_PLUGIN_NO_HANDLE;
- if (getpwnam_r(luser, &pw, pwbuf, sizeof(pwbuf), &pwd) != 0) {
+ if (rk_getpwnam_r(luser, &pw, pwbuf, sizeof(pwbuf), &pwd) != 0) {
krb5_set_error_message(context, errno, "User unknown (getpwnam_r())");
return KRB5_PLUGIN_NO_HANDLE;
}
CVS commit: src/crypto/external/bsd/heimdal/dist/lib/krb5
Module Name:src
Committed By: christos
Date: Tue Jul 11 21:52:55 UTC 2017
Modified Files:
src/crypto/external/bsd/heimdal/dist/lib/krb5: ticket.c
Log Message:
fix typo.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/dist/lib/krb5/ticket.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/dist/lib/krb5/ticket.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/krb5/ticket.c:1.3 src/crypto/external/bsd/heimdal/dist/lib/krb5/ticket.c:1.4
--- src/crypto/external/bsd/heimdal/dist/lib/krb5/ticket.c:1.3 Tue Jul 11 13:45:31 2017
+++ src/crypto/external/bsd/heimdal/dist/lib/krb5/ticket.c Tue Jul 11 17:52:54 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ticket.c,v 1.3 2017/07/11 17:45:31 christos Exp $ */
+/* $NetBSD: ticket.c,v 1.4 2017/07/11 21:52:54 christos Exp $ */
/*
* Copyright (c) 1997 - 2001 Kungliga Tekniska Högskolan
@@ -708,7 +708,7 @@ _krb5_extract_ticket(krb5_context contex
ret = _krb5_principalname2krb5_principal (context,
&tmp_principal,
rep->enc_part.sname,
- rep->enc_part.realm);
+ rep->enc_part.srealm);
if (ret)
goto out;
if((flags & EXTRACT_TICKET_ALLOW_SERVER_MISMATCH) == 0){
CVS commit: src/crypto/external/bsd/heimdal/dist/lib/krb5
Module Name:src
Committed By: christos
Date: Tue Jul 11 17:45:32 UTC 2017
Modified Files:
src/crypto/external/bsd/heimdal/dist/lib/krb5: ticket.c
Log Message:
https://orpheus-lyre.info/design/index.html
https://github.com/heimdal/heimdal/commit/6dd3eb836bbb80a00ffced4ad57077a1cdf227ea
In _krb5_extract_ticket() the KDC-REP service name must be obtained from
encrypted version stored in 'enc_part' instead of the unencrypted version
stored in 'ticket'. Use of the unecrypted version provides an
opportunity for successful server impersonation and other attacks.
Identified by Jeffrey Altman, Viktor Duchovni and Nico Williams.
XXX: pullup 6, 7, 8.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/dist/lib/krb5/ticket.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/dist/lib/krb5/ticket.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/krb5/ticket.c:1.2 src/crypto/external/bsd/heimdal/dist/lib/krb5/ticket.c:1.3
--- src/crypto/external/bsd/heimdal/dist/lib/krb5/ticket.c:1.2 Sat Jan 28 16:31:49 2017
+++ src/crypto/external/bsd/heimdal/dist/lib/krb5/ticket.c Tue Jul 11 13:45:31 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ticket.c,v 1.2 2017/01/28 21:31:49 christos Exp $ */
+/* $NetBSD: ticket.c,v 1.3 2017/07/11 17:45:31 christos Exp $ */
/*
* Copyright (c) 1997 - 2001 Kungliga Tekniska Högskolan
@@ -707,8 +707,8 @@ _krb5_extract_ticket(krb5_context contex
/* check server referral and save principal */
ret = _krb5_principalname2krb5_principal (context,
&tmp_principal,
- rep->kdc_rep.ticket.sname,
- rep->kdc_rep.ticket.realm);
+ rep->enc_part.sname,
+ rep->enc_part.realm);
if (ret)
goto out;
if((flags & EXTRACT_TICKET_ALLOW_SERVER_MISMATCH) == 0){
CVS commit: src/crypto/external/bsd/heimdal/lib/libasn1
Module Name:src Committed By: christos Date: Tue Feb 21 16:07:17 UTC 2017 Modified Files: src/crypto/external/bsd/heimdal/lib/libasn1: Makefile Log Message: reproduced also on the regular (not -m32) build. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/heimdal/lib/libasn1/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/heimdal/lib/libasn1/Makefile diff -u src/crypto/external/bsd/heimdal/lib/libasn1/Makefile:1.4 src/crypto/external/bsd/heimdal/lib/libasn1/Makefile:1.5 --- src/crypto/external/bsd/heimdal/lib/libasn1/Makefile:1.4 Fri Feb 10 23:56:37 2017 +++ src/crypto/external/bsd/heimdal/lib/libasn1/Makefile Tue Feb 21 11:07:17 2017 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2017/02/11 04:56:37 christos Exp $ +# $NetBSD: Makefile,v 1.5 2017/02/21 16:07:17 christos Exp $ USE_FORT?= yes # network protocol library @@ -81,6 +81,5 @@ SUBDIR= asn1_compile # function orders and since the profile code uses the function # number for label generation, we end up with one of two different # label orders. Disabling ASLR or optimization fixes it. -# This happens only with -m32... COPTS.asn1_krb5_asn1.c+=-O0 .endif
CVS commit: src/crypto/external/bsd/heimdal/lib/libasn1
Module Name:src
Committed By: christos
Date: Sat Feb 11 04:56:37 UTC 2017
Modified Files:
src/crypto/external/bsd/heimdal/lib/libasn1: Makefile
Log Message:
Add hack for profiling bimodal label generation with -m32 on sparc64
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/lib/libasn1/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/lib/libasn1/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libasn1/Makefile:1.3 src/crypto/external/bsd/heimdal/lib/libasn1/Makefile:1.4
--- src/crypto/external/bsd/heimdal/lib/libasn1/Makefile:1.3 Sat Jan 28 16:31:51 2017
+++ src/crypto/external/bsd/heimdal/lib/libasn1/Makefile Fri Feb 10 23:56:37 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2017/01/28 21:31:51 christos Exp $
+# $NetBSD: Makefile,v 1.4 2017/02/11 04:56:37 christos Exp $
USE_FORT?= yes # network protocol library
@@ -68,8 +68,19 @@ ${ASN1COMPILEOBJ}/asn1_compile: try_to_b
SUBDIR= asn1_compile
.endif
+
.include <${HEIMBASE}/Makefile.rules.inc>
.include
.if ${USETOOLS} != "yes"
.include
.endif
+
+.if ${MACHINE_ARCH} == "sparc64"
+# Or anything else that uses PROFILE_HOOK with gcc.
+# What happens is that we end up generating one of two different
+# function orders and since the profile code uses the function
+# number for label generation, we end up with one of two different
+# label orders. Disabling ASLR or optimization fixes it.
+# This happens only with -m32...
+COPTS.asn1_krb5_asn1.c+=-O0
+.endif
CVS commit: src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon
Module Name:src Committed By: christos Date: Mon Jan 30 20:27:58 UTC 2017 Modified Files: src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon: accept_sec_context.c acquire_cred.c add_cred.c canonicalize_name.c compare_name.c display_name.c duplicate_name.c export_name.c init_sec_context.c inquire_cred.c inquire_cred_by_mech.c inquire_mechs_for_name.c Log Message: minimize changes with branch To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/accept_sec_context.c \ src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/acquire_cred.c \ src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/add_cred.c \ src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/canonicalize_name.c \ src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/compare_name.c \ src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/display_name.c \ src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/duplicate_name.c \ src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/export_name.c \ src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/init_sec_context.c \ src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/inquire_cred.c \ src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/inquire_cred_by_mech.c \ src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/inquire_mechs_for_name.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/accept_sec_context.c diff -u src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/accept_sec_context.c:1.2 src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/accept_sec_context.c:1.3 --- src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/accept_sec_context.c:1.2 Sat Jan 28 16:31:46 2017 +++ src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/accept_sec_context.c Mon Jan 30 15:27:58 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: accept_sec_context.c,v 1.2 2017/01/28 21:31:46 christos Exp $ */ +/* $NetBSD: accept_sec_context.c,v 1.3 2017/01/30 20:27:58 christos Exp $ */ /* * Copyright (c) 2009 Kungliga Tekniska Högskolan @@ -45,7 +45,7 @@ OM_uint32 _netlogon_accept_sec_context (OM_uint32 * minor_status, gss_ctx_id_t * context_handle, - const gss_cred_id_t acceptor_cred_handle, + gss_const_cred_id_t acceptor_cred_handle, const gss_buffer_t input_token_buffer, const gss_channel_bindings_t input_chan_bindings, gss_name_t * src_name, Index: src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/acquire_cred.c diff -u src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/acquire_cred.c:1.2 src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/acquire_cred.c:1.3 --- src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/acquire_cred.c:1.2 Sat Jan 28 16:31:46 2017 +++ src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/acquire_cred.c Mon Jan 30 15:27:58 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: acquire_cred.c,v 1.2 2017/01/28 21:31:46 christos Exp $ */ +/* $NetBSD: acquire_cred.c,v 1.3 2017/01/30 20:27:58 christos Exp $ */ /* * Copyright (c) 2010 Kungliga Tekniska Högskolan @@ -40,7 +40,7 @@ OM_uint32 _netlogon_acquire_cred(OM_uint32 * min_stat, - const gss_name_t desired_name, + gss_const_name_t desired_name, OM_uint32 time_req, const gss_OID_set desired_mechs, gss_cred_usage_t cred_usage, @@ -84,7 +84,7 @@ _netlogon_acquire_cred(OM_uint32 * min_s OM_uint32 _netlogon_acquire_cred_ex(gss_status_id_t status, - const gss_name_t desired_name, + gss_const_name_t desired_name, OM_uint32 flags, OM_uint32 time_req, gss_cred_usage_t cred_usage, Index: src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/add_cred.c diff -u src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/add_cred.c:1.2 src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/add_cred.c:1.3 --- src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/add_cred.c:1.2 Sat Jan 28 16:31:46 2017 +++ src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/add_cred.c Mon Jan 30 15:27:58 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: add_cred.c,v 1.2 2017/01/28 21:31:46 christos Exp $ */ +/* $NetBSD: add_cred.c,v 1.3 2017/01/30 20:27:58 christos Exp $ */ /* * Copyright (c) 2010 Kungliga Tekniska Högskolan @@ -39,8 +39,8 @@ OM_uint32 _netlogon_add_cred ( OM_uint32 *minor_status, - const gss_cred_id_t input_cred_handle, - const gss_name_tdesired_name, + gss_const_cred_id_t input_cred_handle, + gss_const_name_tdesired_name, const gss_OID desired_mech,
CVS commit: src/crypto/external/bsd/heimdal/dist/lib/krb5
Module Name:src Committed By: christos Date: Mon Jan 30 18:59:04 UTC 2017 Modified Files: src/crypto/external/bsd/heimdal/dist/lib/krb5: context.c Log Message: fix deleted line. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ src/crypto/external/bsd/heimdal/dist/lib/krb5/context.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/heimdal/dist/lib/krb5/context.c diff -u src/crypto/external/bsd/heimdal/dist/lib/krb5/context.c:1.5 src/crypto/external/bsd/heimdal/dist/lib/krb5/context.c:1.6 --- src/crypto/external/bsd/heimdal/dist/lib/krb5/context.c:1.5 Sat Jan 28 16:31:49 2017 +++ src/crypto/external/bsd/heimdal/dist/lib/krb5/context.c Mon Jan 30 13:59:04 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: context.c,v 1.5 2017/01/28 21:31:49 christos Exp $ */ +/* $NetBSD: context.c,v 1.6 2017/01/30 18:59:04 christos Exp $ */ /* * Copyright (c) 1997 - 2010 Kungliga Tekniska Högskolan @@ -506,6 +506,7 @@ copy_etypes (krb5_context context, *ret_enctypes = malloc(sizeof(enctypes[0]) * i); if (*ret_enctypes == NULL) + return krb5_enomem(context); memcpy(*ret_enctypes, enctypes, sizeof(enctypes[0]) * i); return 0; }
CVS commit: src/crypto/external/bsd/heimdal/dist/lib/krb5
Module Name:src Committed By: christos Date: Mon Jan 30 00:25:15 UTC 2017 Modified Files: src/crypto/external/bsd/heimdal/dist/lib/krb5: send_to_kdc.c Log Message: fix printf args To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 \ src/crypto/external/bsd/heimdal/dist/lib/krb5/send_to_kdc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/heimdal/dist/lib/krb5/send_to_kdc.c diff -u src/crypto/external/bsd/heimdal/dist/lib/krb5/send_to_kdc.c:1.6 src/crypto/external/bsd/heimdal/dist/lib/krb5/send_to_kdc.c:1.7 --- src/crypto/external/bsd/heimdal/dist/lib/krb5/send_to_kdc.c:1.6 Sun Jan 29 13:58:08 2017 +++ src/crypto/external/bsd/heimdal/dist/lib/krb5/send_to_kdc.c Sun Jan 29 19:25:15 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: send_to_kdc.c,v 1.6 2017/01/29 18:58:08 christos Exp $ */ +/* $NetBSD: send_to_kdc.c,v 1.7 2017/01/30 00:25:15 christos Exp $ */ /* * Copyright (c) 1997 - 2002 Kungliga Tekniska Högskolan @@ -1248,7 +1248,7 @@ out: _krb5_debug(context, 1, "%s %s done: %d hosts %lu packets %lu:" " wc: %jd.%06ld nr: %jd.%06ld kh: %jd.%06ld tid: %08x", - realm, ret, __func__, + __func__, realm, ret, ctx->stats.num_hosts, ctx->stats.sent_packets, (intmax_t)stop_time.tv_sec, (long)stop_time.tv_usec,
CVS commit: src/crypto/external/bsd/heimdal
Module Name:src
Committed By: christos
Date: Sun Jan 29 22:09:06 UTC 2017
Modified Files:
src/crypto/external/bsd/heimdal/libexec: Makefile.inc
src/crypto/external/bsd/heimdal/sbin: Makefile.inc
Log Message:
need libutil for pidfile
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/heimdal/libexec/Makefile.inc
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/sbin/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/libexec/Makefile.inc
diff -u src/crypto/external/bsd/heimdal/libexec/Makefile.inc:1.4 src/crypto/external/bsd/heimdal/libexec/Makefile.inc:1.5
--- src/crypto/external/bsd/heimdal/libexec/Makefile.inc:1.4 Sat Jan 28 16:31:53 2017
+++ src/crypto/external/bsd/heimdal/libexec/Makefile.inc Sun Jan 29 17:09:06 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.4 2017/01/28 21:31:53 christos Exp $
+# $NetBSD: Makefile.inc,v 1.5 2017/01/29 22:09:06 christos Exp $
BINDIR=/usr/libexec
@@ -6,10 +6,10 @@ LDADD+= -lheimntlm -lkrb5 -lhx509 -lheim
LDADD+= -lasn1 -lcom_err -lroken ${LIBVERS}
LDADD+= -lwind
LDADD+= -lcrypto -lcrypt
-LDADD+= -lsqlite3
+LDADD+= -lsqlite3 -lutil
DPADD+= ${LIBKRB5} ${LIBHX509}
DPADD+= ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN} ${LIBVERS}
DPADD+= ${LIBHEIMBASE} ${LIBHEIMNTLM} ${LIBWIND}
DPADD+= ${LIBCRYPTO} ${LIBCRYPT}
-DPADD+= ${LIBSQLITE3}
+DPADD+= ${LIBSQLITE3} ${LIBUTIL}
Index: src/crypto/external/bsd/heimdal/sbin/Makefile.inc
diff -u src/crypto/external/bsd/heimdal/sbin/Makefile.inc:1.3 src/crypto/external/bsd/heimdal/sbin/Makefile.inc:1.4
--- src/crypto/external/bsd/heimdal/sbin/Makefile.inc:1.3 Sat Jan 28 16:31:53 2017
+++ src/crypto/external/bsd/heimdal/sbin/Makefile.inc Sun Jan 29 17:09:06 2017
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile.inc,v 1.3 2017/01/28 21:31:53 christos Exp $
+# $NetBSD: Makefile.inc,v 1.4 2017/01/29 22:09:06 christos Exp $
BINDIR=/usr/sbin
LDADD+= -lkrb5 -lhx509 -lasn1 -lwind
LDADD+= -lcom_err -lroken -lheimbase ${LIBVERS}
LDADD+= -lcrypto -lcrypt
-LDADD+= -lsqlite3
+LDADD+= -lsqlite3 -lutil
DPADD+= ${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBWIND}
DPADD+= ${LIBCOM_ERR} ${LIBROKEN} ${LIBHEIMBASE} ${LIBVERS}
DPADD+= ${LIBCRYPTO} ${LIBCRYPT}
-DPADD+= ${LIBSQLITE3}
+DPADD+= ${LIBSQLITE3} ${LIBUTIL}
CVS commit: src/crypto/external/bsd/heimdal/include
Module Name:src Committed By: christos Date: Sun Jan 29 19:38:38 UTC 2017 Modified Files: src/crypto/external/bsd/heimdal/include: roken.h Log Message: this is not needed anymore To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/heimdal/include/roken.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/heimdal/include/roken.h diff -u src/crypto/external/bsd/heimdal/include/roken.h:1.6 src/crypto/external/bsd/heimdal/include/roken.h:1.7 --- src/crypto/external/bsd/heimdal/include/roken.h:1.6 Sun Jan 29 14:38:00 2017 +++ src/crypto/external/bsd/heimdal/include/roken.h Sun Jan 29 14:38:38 2017 @@ -99,7 +99,7 @@ typedef int rk_socket_t; -#include "roken-common.h" +#include ROKEN_CPP_START
CVS commit: src/crypto/external/bsd/heimdal/include
Module Name:src Committed By: christos Date: Sun Jan 29 19:38:00 UTC 2017 Modified Files: src/crypto/external/bsd/heimdal/include: roken.h Log Message: include roken-common.h directly. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/heimdal/include/roken.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/heimdal/include/roken.h diff -u src/crypto/external/bsd/heimdal/include/roken.h:1.5 src/crypto/external/bsd/heimdal/include/roken.h:1.6 --- src/crypto/external/bsd/heimdal/include/roken.h:1.5 Sat Jan 28 16:31:51 2017 +++ src/crypto/external/bsd/heimdal/include/roken.h Sun Jan 29 14:38:00 2017 @@ -99,7 +99,7 @@ typedef int rk_socket_t; -#include +#include "roken-common.h" ROKEN_CPP_START
CVS commit: src/crypto/external/bsd/heimdal/dist/lib
Module Name:src Committed By: christos Date: Sun Jan 29 19:23:28 UTC 2017 Modified Files: src/crypto/external/bsd/heimdal/dist/lib/asn1: gen_locl.h main.c src/crypto/external/bsd/heimdal/dist/lib/roken: getarg.c Log Message: prefer some local include files for tools build To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/heimdal/dist/lib/asn1/gen_locl.h \ src/crypto/external/bsd/heimdal/dist/lib/asn1/main.c cvs rdiff -u -r1.4 -r1.5 \ src/crypto/external/bsd/heimdal/dist/lib/roken/getarg.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/heimdal/dist/lib/asn1/gen_locl.h diff -u src/crypto/external/bsd/heimdal/dist/lib/asn1/gen_locl.h:1.2 src/crypto/external/bsd/heimdal/dist/lib/asn1/gen_locl.h:1.3 --- src/crypto/external/bsd/heimdal/dist/lib/asn1/gen_locl.h:1.2 Sat Jan 28 16:31:45 2017 +++ src/crypto/external/bsd/heimdal/dist/lib/asn1/gen_locl.h Sun Jan 29 14:23:28 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: gen_locl.h,v 1.2 2017/01/28 21:31:45 christos Exp $ */ +/* $NetBSD: gen_locl.h,v 1.3 2017/01/29 19:23:28 christos Exp $ */ /* * Copyright (c) 1997-2005 Kungliga Tekniska Högskolan @@ -52,8 +52,8 @@ #include #include "hash.h" #include "symbol.h" -#include -#include +#include "asn1-common.h" +#include "der.h" #include "der-private.h" void generate_type (const Symbol *); Index: src/crypto/external/bsd/heimdal/dist/lib/asn1/main.c diff -u src/crypto/external/bsd/heimdal/dist/lib/asn1/main.c:1.2 src/crypto/external/bsd/heimdal/dist/lib/asn1/main.c:1.3 --- src/crypto/external/bsd/heimdal/dist/lib/asn1/main.c:1.2 Sat Jan 28 16:31:45 2017 +++ src/crypto/external/bsd/heimdal/dist/lib/asn1/main.c Sun Jan 29 14:23:28 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.2 2017/01/28 21:31:45 christos Exp $ */ +/* $NetBSD: main.c,v 1.3 2017/01/29 19:23:28 christos Exp $ */ /* * Copyright (c) 1997-2005 Kungliga Tekniska Högskolan @@ -34,7 +34,7 @@ */ #include "gen_locl.h" -#include +#include "getarg.h" #include "lex.h" extern FILE *yyin; Index: src/crypto/external/bsd/heimdal/dist/lib/roken/getarg.c diff -u src/crypto/external/bsd/heimdal/dist/lib/roken/getarg.c:1.4 src/crypto/external/bsd/heimdal/dist/lib/roken/getarg.c:1.5 --- src/crypto/external/bsd/heimdal/dist/lib/roken/getarg.c:1.4 Sat Jan 28 16:31:50 2017 +++ src/crypto/external/bsd/heimdal/dist/lib/roken/getarg.c Sun Jan 29 14:23:28 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: getarg.c,v 1.4 2017/01/28 21:31:50 christos Exp $ */ +/* $NetBSD: getarg.c,v 1.5 2017/01/29 19:23:28 christos Exp $ */ /* * Copyright (c) 1997 - 2002 Kungliga Tekniska Högskolan @@ -39,7 +39,7 @@ #include #include #include -#include +#include #define ISFLAG(X) ((X).type == arg_flag || (X).type == arg_negative_flag)
CVS commit: src/crypto/external/bsd/heimdal/dist/lib/krb5
Module Name:src Committed By: christos Date: Sun Jan 29 18:58:08 UTC 2017 Modified Files: src/crypto/external/bsd/heimdal/dist/lib/krb5: send_to_kdc.c Log Message: missing quote To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ src/crypto/external/bsd/heimdal/dist/lib/krb5/send_to_kdc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/heimdal/dist/lib/krb5/send_to_kdc.c diff -u src/crypto/external/bsd/heimdal/dist/lib/krb5/send_to_kdc.c:1.5 src/crypto/external/bsd/heimdal/dist/lib/krb5/send_to_kdc.c:1.6 --- src/crypto/external/bsd/heimdal/dist/lib/krb5/send_to_kdc.c:1.5 Sun Jan 29 13:57:06 2017 +++ src/crypto/external/bsd/heimdal/dist/lib/krb5/send_to_kdc.c Sun Jan 29 13:58:08 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: send_to_kdc.c,v 1.5 2017/01/29 18:57:06 christos Exp $ */ +/* $NetBSD: send_to_kdc.c,v 1.6 2017/01/29 18:58:08 christos Exp $ */ /* * Copyright (c) 1997 - 2002 Kungliga Tekniska Högskolan @@ -1246,7 +1246,7 @@ out: } _krb5_debug(context, 1, - "%s %s done: %d hosts %lu packets %lu: + "%s %s done: %d hosts %lu packets %lu:" " wc: %jd.%06ld nr: %jd.%06ld kh: %jd.%06ld tid: %08x", realm, ret, __func__, ctx->stats.num_hosts, ctx->stats.sent_packets,
CVS commit: src/crypto/external/bsd/heimdal/dist/lib/krb5
Module Name:src Committed By: christos Date: Sun Jan 29 18:57:06 UTC 2017 Modified Files: src/crypto/external/bsd/heimdal/dist/lib/krb5: send_to_kdc.c Log Message: fix printf format To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/crypto/external/bsd/heimdal/dist/lib/krb5/send_to_kdc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/heimdal/dist/lib/krb5/send_to_kdc.c diff -u src/crypto/external/bsd/heimdal/dist/lib/krb5/send_to_kdc.c:1.4 src/crypto/external/bsd/heimdal/dist/lib/krb5/send_to_kdc.c:1.5 --- src/crypto/external/bsd/heimdal/dist/lib/krb5/send_to_kdc.c:1.4 Sat Jan 28 16:31:49 2017 +++ src/crypto/external/bsd/heimdal/dist/lib/krb5/send_to_kdc.c Sun Jan 29 13:57:06 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: send_to_kdc.c,v 1.4 2017/01/28 21:31:49 christos Exp $ */ +/* $NetBSD: send_to_kdc.c,v 1.5 2017/01/29 18:57:06 christos Exp $ */ /* * Copyright (c) 1997 - 2002 Kungliga Tekniska Högskolan @@ -1246,12 +1246,16 @@ out: } _krb5_debug(context, 1, - "krb5_sendto_context %s done: %d hosts %lu packets %lu wc: %ld.%06ld nr: %ld.%06ld kh: %ld.%06ld tid: %08x", - realm, ret, + "%s %s done: %d hosts %lu packets %lu: + " wc: %jd.%06ld nr: %jd.%06ld kh: %jd.%06ld tid: %08x", + realm, ret, __func__, ctx->stats.num_hosts, ctx->stats.sent_packets, - stop_time.tv_sec, (long)stop_time.tv_usec, - ctx->stats.name_resolution.tv_sec, (long)ctx->stats.name_resolution.tv_usec, - ctx->stats.krbhst.tv_sec, (long)ctx->stats.krbhst.tv_usec, ctx->stid); + (intmax_t)stop_time.tv_sec, + (long)stop_time.tv_usec, + (intmax_t)ctx->stats.name_resolution.tv_sec, + (long)ctx->stats.name_resolution.tv_usec, + (intmax_t)ctx->stats.krbhst.tv_sec, + (long)ctx->stats.krbhst.tv_usec, ctx->stid); if (freectx)
CVS commit: src/crypto/external/bsd/heimdal/lib/libkrb5
Module Name:src
Committed By: christos
Date: Sun Jan 29 15:42:58 UTC 2017
Modified Files:
src/crypto/external/bsd/heimdal/lib/libkrb5: Makefile
Log Message:
Include sqlite3 to the dependent libraries
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile:1.10 src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile:1.11
--- src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile:1.10 Sat Jan 28 17:25:44 2017
+++ src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile Sun Jan 29 10:42:58 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2017/01/28 22:25:44 christos Exp $
+# $NetBSD: Makefile,v 1.11 2017/01/29 15:42:58 christos Exp $
USE_FORT?= yes # network protocol library
@@ -15,14 +15,16 @@ WARNS?= 0
LIB= krb5
-LIBDPLIBS+= hx509 ${HEIMBASE}/lib/libhx509 \
- crypto ${SSLBASE}/lib/libcrypto \
- asn1 ${HEIMBASE}/lib/libasn1 \
- com_err ${HEIMBASE}/lib/libcom_err \
- roken ${HEIMBASE}/lib/libroken \
- wind ${HEIMBASE}/lib/libwind \
- heimbase ${HEIMBASE}/lib/libheimbase \
- crypt ${NETBSDSRCDIR}/lib/libcrypt
+LIBDPLIBS+= \
+ hx509 ${HEIMBASE}/lib/libhx509 \
+ crypto ${SSLBASE}/lib/libcrypto \
+ asn1 ${HEIMBASE}/lib/libasn1 \
+ com_err ${HEIMBASE}/lib/libcom_err \
+ roken ${HEIMBASE}/lib/libroken \
+ wind ${HEIMBASE}/lib/libwind \
+ heimbase ${HEIMBASE}/lib/libheimbase \
+ sqlite3 ${NETBSDSRCDIR}/external/public-domain/sqlite/lib \
+ crypt ${NETBSDSRCDIR}/lib/libcrypt
HEIMSRCS= krb_err.et krb5_err.et heim_err.et k524_err.et
CVS commit: src/crypto/external/bsd/heimdal/include
Module Name:src Committed By: christos Date: Sun Jan 29 01:46:17 UTC 2017 Modified Files: src/crypto/external/bsd/heimdal/include: config.h Log Message: override arc4* for tools build. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/crypto/external/bsd/heimdal/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/heimdal/include/config.h diff -u src/crypto/external/bsd/heimdal/include/config.h:1.7 src/crypto/external/bsd/heimdal/include/config.h:1.8 --- src/crypto/external/bsd/heimdal/include/config.h:1.7 Sat Jan 28 16:31:51 2017 +++ src/crypto/external/bsd/heimdal/include/config.h Sat Jan 28 20:46:16 2017 @@ -3,12 +3,14 @@ #if HAVE_NBTOOL_CONFIG_H #include "nbtool_config.h" -#endif +#define arc4random random +#define arc4random_stir() srandom(time(NULL)) #undef PACKAGE_NAME #undef PACKAGE_STRING #undef PACKAGE_TARNAME #undef PACKAGE_VERSION #undef PACKAGE_BUGREPORT +#endif #ifndef RCSID #define RCSID(msg) \
CVS commit: src/crypto/external/bsd/heimdal/dist/lib/asn1
Module Name:src
Committed By: christos
Date: Sun Jan 29 01:46:37 UTC 2017
Modified Files:
src/crypto/external/bsd/heimdal/dist/lib/asn1: gen.c
Log Message:
handle our basename.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/heimdal/dist/lib/asn1/gen.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/dist/lib/asn1/gen.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/asn1/gen.c:1.4 src/crypto/external/bsd/heimdal/dist/lib/asn1/gen.c:1.5
--- src/crypto/external/bsd/heimdal/dist/lib/asn1/gen.c:1.4 Sat Jan 28 16:31:45 2017
+++ src/crypto/external/bsd/heimdal/dist/lib/asn1/gen.c Sat Jan 28 20:46:37 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: gen.c,v 1.4 2017/01/28 21:31:45 christos Exp $ */
+/* $NetBSD: gen.c,v 1.5 2017/01/29 01:46:37 christos Exp $ */
/*
* Copyright (c) 1997 - 2005 Kungliga Tekniska Högskolan
@@ -38,7 +38,7 @@
#include "gen_locl.h"
#include
-__RCSID("$NetBSD: gen.c,v 1.4 2017/01/28 21:31:45 christos Exp $");
+__RCSID("$NetBSD: gen.c,v 1.5 2017/01/29 01:46:37 christos Exp $");
FILE *privheaderfile, *headerfile, *codefile, *logfile, *templatefile;
@@ -153,10 +153,12 @@ init_generate (const char *filename, con
/* template file */
if (asprintf(&template, "%s-template.x", headerbase) < 0 || template == NULL)
errx(1, "malloc");
+char *copy = estrdup(filename);
+char *bn = basename(copy);
fprintf (headerfile,
"/* Generated from %s */\n"
"/* Do not edit */\n\n",
- basename(filename));
+ bn);
fprintf (headerfile,
"#ifndef __%s_h__\n"
"#define __%s_h__\n\n", headerbase, headerbase);
@@ -273,8 +275,9 @@ init_generate (const char *filename, con
"#include \n"
"#include \n"
"#include \n",
- basename(filename),
+ bn,
type_file_string);
+free(copy);
fprintf (templatefile,
"#include <%s>\n"
@@ -364,6 +367,8 @@ generate_header_of_codefile(const char *
fprintf(logfile, "%s ", filename);
free(filename);
filename = NULL;
+char *copy = estrdup(orig_filename);
+char *bn = basename(copy);
fprintf (codefile,
"/* Generated from %s */\n"
"/* Do not edit */\n\n"
@@ -375,8 +380,9 @@ generate_header_of_codefile(const char *
"#include \n"
"#include \n"
"#include \n",
- basename(orig_filename),
+ bn,
type_file_string);
+free(copy);
fprintf (codefile,
"#include \"%s\"\n"
CVS commit: src/crypto/external/bsd/heimdal/lib/libkrb5
Module Name:src
Committed By: christos
Date: Sat Jan 28 22:25:44 UTC 2017
Modified Files:
src/crypto/external/bsd/heimdal/lib/libkrb5: Makefile
Log Message:
Use ${TOOL_SED} and resolve paths properly.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile:1.9 src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile:1.10
--- src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile:1.9 Sat Jan 28 16:31:52 2017
+++ src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile Sat Jan 28 17:25:44 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2017/01/28 21:31:52 christos Exp $
+# $NetBSD: Makefile,v 1.10 2017/01/28 22:25:44 christos Exp $
USE_FORT?= yes # network protocol library
@@ -540,10 +540,11 @@ INFOFLAGS= -I. -I${HEIMDIST}/doc
heimdal.texi: vars.texi
vars.texi: vars.tin
- < ${HEIMDIST}/doc/vars.tin > $@ \
- sed -e 's,[@]dbdir[@],/var/heimdal,g' \
- -e 's,[@]dbtype[@],db1,g'
- -e 's,[@]PACKAGE_VERSION[@],7.1.0,g'
+ @${TOOL_SED} -e 's,[@]dbdir[@],/var/heimdal,g' \
+ -e 's,[@]dbtype[@],db1,g' \
+ -e 's,[@]PACKAGE_VERSION[@],7.1.0,g' \
+ < ${.ALLSRC} > ${.TARGET}
+
CLEANFILES+= vars.texi
CVS commit: src/crypto/external/bsd/heimdal
Module Name:src Committed By: christos Date: Sat Jan 28 21:31:53 UTC 2017 Modified Files: src/crypto/external/bsd/heimdal: Makefile.rules.inc heimdal2netbsd src/crypto/external/bsd/heimdal/bin: Makefile.inc src/crypto/external/bsd/heimdal/bin/kcc: Makefile src/crypto/external/bsd/heimdal/dist: NEWS configure.ac src/crypto/external/bsd/heimdal/dist/admin: add.c change.c copy.c destroy.c get.c ktutil.1 ktutil.c ktutil_locl.h list.c purge.c remove.c rename.c src/crypto/external/bsd/heimdal/dist/cf: roken-frag.m4 version-script.m4 src/crypto/external/bsd/heimdal/dist/doc: ack.texi apps.texi copyright.texi heimdal.hhp heimdal.texi hx509.hhp hx509.texi install.texi intro.texi kerberos4.texi migration.texi misc.texi programming.texi setup.texi whatis.texi win2k.texi src/crypto/external/bsd/heimdal/dist/include: bits.c crypto-headers.h heim_threads.h krb5-types.cross src/crypto/external/bsd/heimdal/dist/kadmin: add-random-users.c add_enctype.c ank.c check.c cpw.c del.c del_enctype.c dump.c ext.c get.c init.c kadm_conn.c kadmin.1 kadmin.c kadmin_locl.h kadmind.8 kadmind.c load.c mod.c pw_quality.c random_password.c rename.c rpc.c server.c stash.c test_util.c util.c src/crypto/external/bsd/heimdal/dist/kcm: acl.c acquire.c cache.c client.c config.c connect.c events.c glue.c headers.h kcm.8 kcm_locl.h log.c main.c protocol.c renew.c sessions.c src/crypto/external/bsd/heimdal/dist/kdc: announce.c config.c connect.c default_config.c digest-service.c digest.c fast.c headers.h hprop.8 hprop.c hprop.h hpropd.8 hpropd.c kdc-replay.c kdc-tester.c kdc.8 kdc.h kdc_locl.h kerberos5.c krb5tgs.c kstash.8 kstash.c kx509.c log.c main.c misc.c mit_dump.c pkinit-ec.c pkinit.c process.c rx.h set_dbinfo.c string2key.8 string2key.c windc.c windc_plugin.h src/crypto/external/bsd/heimdal/dist/kpasswd: kpasswd-generator.c kpasswd.1 kpasswd.c kpasswd_locl.h kpasswdd.8 kpasswdd.c src/crypto/external/bsd/heimdal/dist/kuser: copy_cred_cache.1 copy_cred_cache.c generate-requests.c heimtools.c kcpytkt.c kdecode_ticket.c kdeltkt.c kdestroy.1 kdestroy.c kdigest.8 kdigest.c kgetcred.1 kgetcred.c kimpersonate.8 kimpersonate.c kinit.1 kinit.c klist.1 klist.c kswitch.1 kswitch.c kuser_locl.h kverify.c kvno.c src/crypto/external/bsd/heimdal/dist/lib/asn1: asn1-common.h asn1-template.h asn1_gen.c asn1_print.c asn1_queue.h asn1parse.y check-ber.c check-common.c check-common.h check-der.c check-gen.c check-template.c check-timegm.c der.c der.h der_cmp.c der_copy.c der_format.c der_free.c der_get.c der_length.c der_locl.h der_put.c extra.c fuzzer.c gen.c gen_copy.c gen_decode.c gen_encode.c gen_free.c gen_glue.c gen_length.c gen_locl.h gen_seq.c gen_template.c hash.c hash.h heim_asn1.h lex.h lex.l main.c roken_rename.h symbol.c symbol.h template.c timegm.c src/crypto/external/bsd/heimdal/dist/lib/base: array.c baselocl.h bool.c bsearch.c data.c db.c dict.c dll.c error.c heimbase.c heimbase.h heimbasepriv.h heimqueue.h json.c null.c number.c roken_rename.h string.c test_base.c src/crypto/external/bsd/heimdal/dist/lib/com_err: com_err.3 com_err.c com_err.h com_right.h compile_et.c compile_et.h error.c lex.h lex.l parse.y roken_rename.h src/crypto/external/bsd/heimdal/dist/lib/gssapi: gss_acquire_cred.3 gssapi.3 gssapi.h gssapi_mech.h gsstool.c test_acquire_cred.c test_add_store_cred.c test_common.c test_common.h test_context.c test_cred.c test_kcred.c test_names.c test_ntlm.c test_oid.c src/crypto/external/bsd/heimdal/dist/lib/gssapi/gssapi: gssapi.h gssapi_krb5.h gssapi_netlogon.h gssapi_ntlm.h gssapi_oid.h gssapi_spnego.h src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5: 8003.c accept_sec_context.c acquire_cred.c add_cred.c address_to_krb5addr.c aeap.c arcfour.c authorize_localname.c canonicalize_name.c ccache_name.c cfx.c cfx.h compare_name.c compat.c context_time.c copy_ccache.c creds.c decapsulate.c delete_sec_context.c display_name.c display_status.c duplicate_name.c encapsulate.c export_name.c export_sec_context.c external.c get_mic.c gsskrb5_locl.h import_name.c import_sec_context.c indicate_mechs.c init.c init_sec_context.c inquire_context.c inquire_cred.c inquire_cred_by_mech.c inquire_cred_by_oid.c inquire_mechs_for_name.c inquire_names_for_mech.c inqui
CVS commit: src/crypto/external/bsd/heimdal
Module Name:src
Committed By: christos
Date: Fri Jan 27 18:02:09 UTC 2017
Modified Files:
src/crypto/external/bsd/heimdal: heimdal2netbsd
Log Message:
Strip first otherwise we end up with __RCSID("NetBSD")
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/heimdal/heimdal2netbsd
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/heimdal2netbsd
diff -u src/crypto/external/bsd/heimdal/heimdal2netbsd:1.6 src/crypto/external/bsd/heimdal/heimdal2netbsd:1.7
--- src/crypto/external/bsd/heimdal/heimdal2netbsd:1.6 Tue Apr 22 10:07:31 2014
+++ src/crypto/external/bsd/heimdal/heimdal2netbsd Fri Jan 27 13:02:09 2017
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# $NetBSD: heimdal2netbsd,v 1.6 2014/04/22 14:07:31 pettai Exp $
+# $NetBSD: heimdal2netbsd,v 1.7 2017/01/27 18:02:09 christos Exp $
#
# Copyright (c) 2011 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -184,16 +184,16 @@ find $d -type f -print | xargs egrep -l
echo froze NetBSD RCSID for $f
done
+### Remove the $'s around RCS tags
+cleantags $d
+
# Convert unexpanded RCSID's to the NetBSD way.
-find $d -type f -print | xargs egrep -l 'RCSID\("\$Id\$"\)' | while read f; do
- sed -e 's/RCSID("\$\Id\$")/__RCSID("\$NetBSD\$")/' \
+find $d -type f -print | xargs egrep -l 'RCSID\("Id"\)' | while read f; do
+ sed -e 's/RCSID("Id")/__RCSID("\$NetBSD\$")/' \
< $f > /tmp/heimdal1f$$ && mv /tmp/heimdal1f$$ $f && \
echo converted RCSID to NetBSD for $f
done
-### Remove the $'s around RCS tags
-cleantags $d
-
### Add our NetBSD RCS Id
find $d -type f -name '*.[chly]' -print | while read c; do
sed 1q < $c | grep -q '\$NetBSD' || (
CVS commit: src/crypto/external/bsd/heimdal/dist/kdc
Module Name:src Committed By: christos Date: Sun Oct 9 15:01:49 UTC 2016 Modified Files: src/crypto/external/bsd/heimdal/dist/kdc: kerberos5.c Log Message: PR/51543: Henning Petersen: replace , with ; To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/heimdal/dist/kdc/kerberos5.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/heimdal/dist/kdc/kerberos5.c diff -u src/crypto/external/bsd/heimdal/dist/kdc/kerberos5.c:1.5 src/crypto/external/bsd/heimdal/dist/kdc/kerberos5.c:1.6 --- src/crypto/external/bsd/heimdal/dist/kdc/kerberos5.c:1.5 Thu Apr 24 09:45:34 2014 +++ src/crypto/external/bsd/heimdal/dist/kdc/kerberos5.c Sun Oct 9 11:01:49 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: kerberos5.c,v 1.5 2014/04/24 13:45:34 pettai Exp $ */ +/* $NetBSD: kerberos5.c,v 1.6 2016/10/09 15:01:49 christos Exp $ */ /* * Copyright (c) 1997-2007 Kungliga Tekniska Högskolan @@ -1455,7 +1455,7 @@ _kdc_as_rep(krb5_context context, e_data.data = buf; e_data.length = len; - e_text ="Need to use PA-ENC-TIMESTAMP/PA-PK-AS-REQ", + e_text ="Need to use PA-ENC-TIMESTAMP/PA-PK-AS-REQ"; ret = KRB5KDC_ERR_PREAUTH_REQUIRED;
CVS commit: src/crypto/external/bsd/heimdal/dist/lib/krb5
Module Name:src Committed By: abhinav Date: Fri Jun 10 18:55:52 UTC 2016 Modified Files: src/crypto/external/bsd/heimdal/dist/lib/krb5: krb5_timeofday.3 Log Message: Fix spelling of the month in the date (sent pull request upstream). To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 \ src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5_timeofday.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5_timeofday.3 diff -u src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5_timeofday.3:1.1.1.2 src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5_timeofday.3:1.2 --- src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5_timeofday.3:1.1.1.2 Thu Apr 14 14:09:23 2011 +++ src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5_timeofday.3 Fri Jun 10 18:55:52 2016 @@ -1,4 +1,4 @@ -.\" $NetBSD: krb5_timeofday.3,v 1.1.1.2 2011/04/14 14:09:23 elric Exp $ +.\" $NetBSD: krb5_timeofday.3,v 1.2 2016/06/10 18:55:52 abhinav Exp $ .\" .\" Id .\" @@ -35,7 +35,7 @@ .\" .\" Id .\" -.Dd Sepember 16, 2006 +.Dd September 16, 2006 .Dt KRB5_TIMEOFDAY 3 .Os .Sh NAME
CVS commit: src/crypto/external/bsd/heimdal/dist/lib/krb5
Module Name:src Committed By: wiz Date: Thu Apr 28 08:18:05 UTC 2016 Modified Files: src/crypto/external/bsd/heimdal/dist/lib/krb5: krb5.conf.5 Log Message: Fix xref. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5.conf.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5.conf.5 diff -u src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5.conf.5:1.4 src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5.conf.5:1.5 --- src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5.conf.5:1.4 Thu Apr 24 13:45:34 2014 +++ src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5.conf.5 Thu Apr 28 08:18:05 2016 @@ -1,4 +1,4 @@ -.\" $NetBSD: krb5.conf.5,v 1.4 2014/04/24 13:45:34 pettai Exp $ +.\" $NetBSD: krb5.conf.5,v 1.5 2016/04/28 08:18:05 wiz Exp $ .\" .\" Copyright (c) 1999 - 2005 Kungliga Tekniska Högskolan .\" (Royal Institute of Technology, Stockholm, Sweden). @@ -259,7 +259,7 @@ Setting this flag to make it store the MIT way, this is default for Heimdal 0.7. .It Li check-rd-req-server If set to "ignore", the framework will ignore any the server input to -.Xr krb5_rd_req 3, +.Xr krb5_rd_req 3 , this is very useful when the GSS-API server input the wrong server name into the gss_accept_sec_context call. .El
CVS commit: src/crypto/external/bsd/heimdal/dist/lib/hdb
Module Name:src
Committed By: pettai
Date: Wed Nov 26 10:12:27 UTC 2014
Modified Files:
src/crypto/external/bsd/heimdal/dist/lib/hdb: keys.c
Log Message:
fix comma error
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/dist/lib/hdb/keys.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/dist/lib/hdb/keys.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/hdb/keys.c:1.2 src/crypto/external/bsd/heimdal/dist/lib/hdb/keys.c:1.3
--- src/crypto/external/bsd/heimdal/dist/lib/hdb/keys.c:1.2 Wed Nov 26 07:39:52 2014
+++ src/crypto/external/bsd/heimdal/dist/lib/hdb/keys.c Wed Nov 26 10:12:27 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: keys.c,v 1.2 2014/11/26 07:39:52 pettai Exp $ */
+/* $NetBSD: keys.c,v 1.3 2014/11/26 10:12:27 pettai Exp $ */
/*
@@ -77,8 +77,8 @@ static const krb5_enctype des_etypes[] =
static const krb5_enctype all_etypes[] = {
ETYPE_AES256_CTS_HMAC_SHA1_96,
-ETYPE_DES3_CBC_SHA1
-ETYPE_ARCFOUR_HMAC_MD5,
+ETYPE_DES3_CBC_SHA1,
+ETYPE_ARCFOUR_HMAC_MD5
};
static krb5_error_code
CVS commit: src/crypto/external/bsd/heimdal/dist/lib/hdb
Module Name:src
Committed By: pettai
Date: Wed Nov 26 07:39:52 UTC 2014
Modified Files:
src/crypto/external/bsd/heimdal/dist/lib/hdb: keys.c
Log Message:
In all_etypes prefer des3-cbc-sha1 over arcfour-hmac-md5 (#24c8bac)
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/crypto/external/bsd/heimdal/dist/lib/hdb/keys.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/dist/lib/hdb/keys.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/hdb/keys.c:1.1.1.2 src/crypto/external/bsd/heimdal/dist/lib/hdb/keys.c:1.2
--- src/crypto/external/bsd/heimdal/dist/lib/hdb/keys.c:1.1.1.2 Thu Apr 24 12:45:28 2014
+++ src/crypto/external/bsd/heimdal/dist/lib/hdb/keys.c Wed Nov 26 07:39:52 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: keys.c,v 1.1.1.2 2014/04/24 12:45:28 pettai Exp $ */
+/* $NetBSD: keys.c,v 1.2 2014/11/26 07:39:52 pettai Exp $ */
/*
@@ -77,8 +77,8 @@ static const krb5_enctype des_etypes[] =
static const krb5_enctype all_etypes[] = {
ETYPE_AES256_CTS_HMAC_SHA1_96,
-ETYPE_ARCFOUR_HMAC_MD5,
ETYPE_DES3_CBC_SHA1
+ETYPE_ARCFOUR_HMAC_MD5,
};
static krb5_error_code
CVS commit: src/crypto/external/bsd/heimdal/lib/libkadm5srv
Module Name:src
Committed By: pettai
Date: Mon Nov 24 10:49:27 UTC 2014
Modified Files:
src/crypto/external/bsd/heimdal/lib/libkadm5srv: Makefile
Log Message:
Add MLINKS
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/lib/libkadm5srv/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/lib/libkadm5srv/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libkadm5srv/Makefile:1.2 src/crypto/external/bsd/heimdal/lib/libkadm5srv/Makefile:1.3
--- src/crypto/external/bsd/heimdal/lib/libkadm5srv/Makefile:1.2 Wed Sep 11 23:04:09 2013
+++ src/crypto/external/bsd/heimdal/lib/libkadm5srv/Makefile Mon Nov 24 10:49:27 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2013/09/11 23:04:09 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2014/11/24 10:49:27 pettai Exp $
USE_FORT?= yes # network protocol library
@@ -48,5 +48,11 @@ SRCS =\
MAN= kadm5_pwcheck.3
+MLINKS= \
+kadm5_pwcheck.3 kadm5_setup_passwd_quality_check.3\
+kadm5_pwcheck.3 kadm5_add_passwd_quality_verifier.3\
+kadm5_pwcheck.3 kadm5_check_password_quality.3\
+kadm5_pwcheck.3 krb5_pwcheck.3\
+
.include <${HEIMBASE}/Makefile.rules.inc>
.include
CVS commit: src/crypto/external/bsd/heimdal/sbin/kdigest
Module Name:src
Committed By: pettai
Date: Sat Nov 22 01:28:13 UTC 2014
Modified Files:
src/crypto/external/bsd/heimdal/sbin/kdigest: Makefile
Log Message:
Add kdigest(8) manpage
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/sbin/kdigest/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/sbin/kdigest/Makefile
diff -u src/crypto/external/bsd/heimdal/sbin/kdigest/Makefile:1.2 src/crypto/external/bsd/heimdal/sbin/kdigest/Makefile:1.3
--- src/crypto/external/bsd/heimdal/sbin/kdigest/Makefile:1.2 Wed May 25 19:21:19 2011
+++ src/crypto/external/bsd/heimdal/sbin/kdigest/Makefile Sat Nov 22 01:28:13 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/05/25 19:21:19 he Exp $
+# $NetBSD: Makefile,v 1.3 2014/11/22 01:28:13 pettai Exp $
.include
.include <${.CURDIR}/../../Makefile.inc>
@@ -6,8 +6,7 @@
.PATH: ${HEIMDIST}/kuser
PROG= kdigest
-# no man-page yet
-MAN=
+MAN= kdigest.8
HEIMSRCS+= kdigest.c kdigest-commands.in
CVS commit: src/crypto/external/bsd/heimdal/dist/kcm
Module Name:src
Committed By: joerg
Date: Thu Jul 24 22:54:10 UTC 2014
Modified Files:
src/crypto/external/bsd/heimdal/dist/kcm: cache.c
Log Message:
Fix size argument of memcmp.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 src/crypto/external/bsd/heimdal/dist/kcm/cache.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/dist/kcm/cache.c
diff -u src/crypto/external/bsd/heimdal/dist/kcm/cache.c:1.1.1.2 src/crypto/external/bsd/heimdal/dist/kcm/cache.c:1.2
--- src/crypto/external/bsd/heimdal/dist/kcm/cache.c:1.1.1.2 Thu Apr 24 12:45:27 2014
+++ src/crypto/external/bsd/heimdal/dist/kcm/cache.c Thu Jul 24 22:54:10 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cache.c,v 1.1.1.2 2014/04/24 12:45:27 pettai Exp $ */
+/* $NetBSD: cache.c,v 1.2 2014/07/24 22:54:10 joerg Exp $ */
/*
* Copyright (c) 2005, PADL Software Pty Ltd.
@@ -104,7 +104,7 @@ kcm_ccache_resolve_by_uuid(krb5_context
for (p = ccache_head; p != NULL; p = p->next) {
if ((p->flags & KCM_FLAGS_VALID) == 0)
continue;
- if (memcmp(p->uuid, uuid, sizeof(uuid)) == 0) {
+ if (memcmp(p->uuid, uuid, sizeof(*uuid)) == 0) {
ret = 0;
break;
}
CVS commit: src/crypto/external/bsd/heimdal/dist/lib/krb5
Module Name:src Committed By: christos Date: Mon May 12 18:46:27 UTC 2014 Modified Files: src/crypto/external/bsd/heimdal/dist/lib/krb5: send_to_kdc.c Log Message: kill extra ) To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/heimdal/dist/lib/krb5/send_to_kdc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/heimdal/dist/lib/krb5/send_to_kdc.c diff -u src/crypto/external/bsd/heimdal/dist/lib/krb5/send_to_kdc.c:1.2 src/crypto/external/bsd/heimdal/dist/lib/krb5/send_to_kdc.c:1.3 --- src/crypto/external/bsd/heimdal/dist/lib/krb5/send_to_kdc.c:1.2 Mon May 12 11:20:41 2014 +++ src/crypto/external/bsd/heimdal/dist/lib/krb5/send_to_kdc.c Mon May 12 14:46:27 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: send_to_kdc.c,v 1.2 2014/05/12 15:20:41 christos Exp $ */ +/* $NetBSD: send_to_kdc.c,v 1.3 2014/05/12 18:46:27 christos Exp $ */ /* * Copyright (c) 1997 - 2002 Kungliga Tekniska Högskolan @@ -62,7 +62,7 @@ timed_connect(int s, struct addrinfo *ad if (flags == -1) return -1; -if (fcntl(s, F_SETFL, flags | O_NONBLOCK)) == -1) +if (fcntl(s, F_SETFL, flags | O_NONBLOCK) == -1) return -1; ret = connect(s, addr->ai_addr, addr->ai_addrlen); if (ret == -1 && errno != EINPROGRESS)
CVS commit: src/crypto/external/bsd/heimdal/dist/kadmin
Module Name:src Committed By: christos Date: Mon May 12 15:34:23 UTC 2014 Modified Files: src/crypto/external/bsd/heimdal/dist/kadmin: rpc.c Log Message: CID 1011266: Unchecked returns To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 \ src/crypto/external/bsd/heimdal/dist/kadmin/rpc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/heimdal/dist/kadmin/rpc.c diff -u src/crypto/external/bsd/heimdal/dist/kadmin/rpc.c:1.1.1.2 src/crypto/external/bsd/heimdal/dist/kadmin/rpc.c:1.2 --- src/crypto/external/bsd/heimdal/dist/kadmin/rpc.c:1.1.1.2 Thu Apr 24 08:45:27 2014 +++ src/crypto/external/bsd/heimdal/dist/kadmin/rpc.c Mon May 12 11:34:23 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: rpc.c,v 1.1.1.2 2014/04/24 12:45:27 pettai Exp $ */ +/* $NetBSD: rpc.c,v 1.2 2014/05/12 15:34:23 christos Exp $ */ /* * Copyright (c) 2008 Kungliga Tekniska Högskolan @@ -465,7 +465,7 @@ ret_principal_ent(krb5_context contextp, ent->max_life = flag; CHECK(krb5_ret_uint32(sp, &flag)); if (flag == 0) - ret_principal_xdr(contextp, sp, &ent->mod_name); + CHECK(ret_principal_xdr(contextp, sp, &ent->mod_name)); CHECK(krb5_ret_uint32(sp, &flag)); ent->mod_date = flag; CHECK(krb5_ret_uint32(sp, &flag));
CVS commit: src/crypto/external/bsd/heimdal/dist/lib/gssapi/ntlm
Module Name:src
Committed By: christos
Date: Mon May 12 15:27:36 UTC 2014
Modified Files:
src/crypto/external/bsd/heimdal/dist/lib/gssapi/ntlm: creds.c
Log Message:
CID 745411: Fix memory leak
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/crypto/external/bsd/heimdal/dist/lib/gssapi/ntlm/creds.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/dist/lib/gssapi/ntlm/creds.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/gssapi/ntlm/creds.c:1.1.1.2 src/crypto/external/bsd/heimdal/dist/lib/gssapi/ntlm/creds.c:1.2
--- src/crypto/external/bsd/heimdal/dist/lib/gssapi/ntlm/creds.c:1.1.1.2 Thu Apr 24 08:45:29 2014
+++ src/crypto/external/bsd/heimdal/dist/lib/gssapi/ntlm/creds.c Mon May 12 11:27:36 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: creds.c,v 1.1.1.2 2014/04/24 12:45:29 pettai Exp $ */
+/* $NetBSD: creds.c,v 1.2 2014/05/12 15:27:36 christos Exp $ */
/*
* Copyright (c) 2006 Kungliga Tekniska Högskolan
@@ -62,8 +62,11 @@ _gss_ntlm_inquire_cred
n->domain = strdup(c->domain);
}
if (n == NULL || n->user == NULL || n->domain == NULL) {
- if (n)
+ if (n) {
free(n->user);
+ free(n->domain);
+ free(n);
+ }
*minor_status = ENOMEM;
return GSS_S_FAILURE;
}
CVS commit: src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5
Module Name:src
Committed By: christos
Date: Mon May 12 15:25:49 UTC 2014
Modified Files:
src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5: verify_mic.c
Log Message:
CID 745439: Fix memory leak
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/verify_mic.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/verify_mic.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/verify_mic.c:1.1.1.2 src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/verify_mic.c:1.2
--- src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/verify_mic.c:1.1.1.2 Thu Apr 24 08:45:29 2014
+++ src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/verify_mic.c Mon May 12 11:25:49 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: verify_mic.c,v 1.1.1.2 2014/04/24 12:45:29 pettai Exp $ */
+/* $NetBSD: verify_mic.c,v 1.2 2014/05/12 15:25:49 christos Exp $ */
/*
* Copyright (c) 1997 - 2003 Kungliga Tekniska Högskolan
@@ -256,7 +256,8 @@ retry:
krb5_crypto_destroy (context, crypto);
ret = krb5_crypto_init(context, key,
ETYPE_DES3_CBC_SHA1, &crypto);
- if (ret){
+ if (ret) {
+ free (tmp);
*minor_status = ret;
return GSS_S_FAILURE;
}
CVS commit: src/crypto/external/bsd/heimdal/dist/lib/krb5
Module Name:src
Committed By: christos
Date: Mon May 12 15:21:46 UTC 2014
Modified Files:
src/crypto/external/bsd/heimdal/dist/lib/krb5: pac.c
Log Message:
CID 745319: Checking the wrong variable for NULL.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/crypto/external/bsd/heimdal/dist/lib/krb5/pac.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/dist/lib/krb5/pac.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/krb5/pac.c:1.1.1.2 src/crypto/external/bsd/heimdal/dist/lib/krb5/pac.c:1.2
--- src/crypto/external/bsd/heimdal/dist/lib/krb5/pac.c:1.1.1.2 Thu Apr 24 08:45:50 2014
+++ src/crypto/external/bsd/heimdal/dist/lib/krb5/pac.c Mon May 12 11:21:46 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: pac.c,v 1.1.1.2 2014/04/24 12:45:50 pettai Exp $ */
+/* $NetBSD: pac.c,v 1.2 2014/05/12 15:21:46 christos Exp $ */
/*
* Copyright (c) 2006 - 2007 Kungliga Tekniska Högskolan
@@ -756,7 +756,7 @@ build_logon_name(krb5_context context,
s2_len = (ucs2_len + 1) * 2;
s2 = malloc(s2_len);
- if (ucs2 == NULL) {
+ if (s2 == NULL) {
free(ucs2);
return krb5_enomem(context);
}
CVS commit: src/crypto/external/bsd/heimdal/dist/lib/krb5
Module Name:src Committed By: christos Date: Mon May 12 15:20:41 UTC 2014 Modified Files: src/crypto/external/bsd/heimdal/dist/lib/krb5: send_to_kdc.c Log Message: CID 745290: check return of fcntl To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 \ src/crypto/external/bsd/heimdal/dist/lib/krb5/send_to_kdc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/heimdal/dist/lib/krb5/send_to_kdc.c diff -u src/crypto/external/bsd/heimdal/dist/lib/krb5/send_to_kdc.c:1.1.1.2 src/crypto/external/bsd/heimdal/dist/lib/krb5/send_to_kdc.c:1.2 --- src/crypto/external/bsd/heimdal/dist/lib/krb5/send_to_kdc.c:1.1.1.2 Thu Apr 24 08:45:51 2014 +++ src/crypto/external/bsd/heimdal/dist/lib/krb5/send_to_kdc.c Mon May 12 11:20:41 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: send_to_kdc.c,v 1.1.1.2 2014/04/24 12:45:51 pettai Exp $ */ +/* $NetBSD: send_to_kdc.c,v 1.2 2014/05/12 15:20:41 christos Exp $ */ /* * Copyright (c) 1997 - 2002 Kungliga Tekniska Högskolan @@ -62,7 +62,8 @@ timed_connect(int s, struct addrinfo *ad if (flags == -1) return -1; -fcntl(s, F_SETFL, flags | O_NONBLOCK); +if (fcntl(s, F_SETFL, flags | O_NONBLOCK)) == -1) + return -1; ret = connect(s, addr->ai_addr, addr->ai_addrlen); if (ret == -1 && errno != EINPROGRESS) return -1; @@ -78,7 +79,8 @@ timed_connect(int s, struct addrinfo *ad if (ret != -1 || errno != EINTR) break; } -fcntl(s, F_SETFL, flags); +if (fcntl(s, F_SETFL, flags) == -1) + return -1; if (ret != 1) return -1;
CVS commit: src/crypto/external/bsd/heimdal/include
Module Name:src
Committed By: pettai
Date: Tue Apr 29 23:18:53 UTC 2014
Modified Files:
src/crypto/external/bsd/heimdal/include: config.h
Log Message:
update VERSION
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/heimdal/include/config.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/include/config.h
diff -u src/crypto/external/bsd/heimdal/include/config.h:1.5 src/crypto/external/bsd/heimdal/include/config.h:1.6
--- src/crypto/external/bsd/heimdal/include/config.h:1.5 Thu Apr 24 13:50:53 2014
+++ src/crypto/external/bsd/heimdal/include/config.h Tue Apr 29 23:18:53 2014
@@ -1532,7 +1532,7 @@ static /**/const char *const rcsid[] = {
/* #undef TM_IN_SYS_TIME */
/* Version number of package */
-#define VERSION "1.5pre1"
+#define VERSION "1.5.3"
/* Define if signal handlers return void. */
#define VOID_RETSIGTYPE 1
CVS commit: src/crypto/external/bsd/heimdal/dist/admin
Module Name:src Committed By: pettai Date: Fri Apr 25 00:26:16 UTC 2014 Modified Files: src/crypto/external/bsd/heimdal/dist/admin: ktutil.8 Log Message: Fix a merge miss To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/dist/admin/ktutil.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/heimdal/dist/admin/ktutil.8 diff -u src/crypto/external/bsd/heimdal/dist/admin/ktutil.8:1.3 src/crypto/external/bsd/heimdal/dist/admin/ktutil.8:1.4 --- src/crypto/external/bsd/heimdal/dist/admin/ktutil.8:1.3 Thu Apr 24 13:45:33 2014 +++ src/crypto/external/bsd/heimdal/dist/admin/ktutil.8 Fri Apr 25 00:26:16 2014 @@ -1,4 +1,4 @@ -.\" $NetBSD: ktutil.8,v 1.3 2014/04/24 13:45:33 pettai Exp $ +.\" $NetBSD: ktutil.8,v 1.4 2014/04/25 00:26:16 pettai Exp $ .\" .\" Copyright (c) 1997-2004 Kungliga Tekniska Högskolan .\" (Royal Institute of Technology, Stockholm, Sweden). @@ -55,7 +55,6 @@ is a program for managing keytabs. Supported options: .Bl -tag -width Ds -.It Fl v , Fl -verbose .It Fl v , Fl Fl verbose Verbose output. .El
CVS commit: src/crypto/external/bsd/heimdal/dist/lib/roken
Module Name:src Committed By: pettai Date: Thu Apr 24 14:49:44 UTC 2014 Modified Files: src/crypto/external/bsd/heimdal/dist/lib/roken: resolve.c Log Message: remove duplicate resolve_free_handle(handle); To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/crypto/external/bsd/heimdal/dist/lib/roken/resolve.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/heimdal/dist/lib/roken/resolve.c diff -u src/crypto/external/bsd/heimdal/dist/lib/roken/resolve.c:1.3 src/crypto/external/bsd/heimdal/dist/lib/roken/resolve.c:1.4 --- src/crypto/external/bsd/heimdal/dist/lib/roken/resolve.c:1.3 Thu Apr 24 13:45:34 2014 +++ src/crypto/external/bsd/heimdal/dist/lib/roken/resolve.c Thu Apr 24 14:49:43 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: resolve.c,v 1.3 2014/04/24 13:45:34 pettai Exp $ */ +/* $NetBSD: resolve.c,v 1.4 2014/04/24 14:49:43 pettai Exp $ */ /* * Copyright (c) 1995 - 2006 Kungliga Tekniska Högskolan @@ -590,7 +590,6 @@ dns_lookup_int(const char *domain, int r len = min(len, size); r = parse_reply(reply, len); -resolve_free_handle(handle); free(reply); resolve_free_handle(handle);
CVS commit: src/crypto/external/bsd/heimdal
Module Name:src
Committed By: pettai
Date: Thu Apr 24 13:50:53 UTC 2014
Modified Files:
src/crypto/external/bsd/heimdal/bin/krb5-config: Makefile
src/crypto/external/bsd/heimdal/include: config.h gsskrb5-private.h
hx509-private.h kdc-private.h krb5-private.h krb5-protos.h
krb5-types.h ntlm-private.h roken.h version.h
src/crypto/external/bsd/heimdal/lib/libgssapi: Makefile
src/crypto/external/bsd/heimdal/lib/libkrb5: Makefile
Log Message:
Update build framework for latest heimdal-1-5-branch
Ok'ed and reviewed by elric@
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/bin/krb5-config/Makefile
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/heimdal/include/config.h
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/heimdal/include/gsskrb5-private.h \
src/crypto/external/bsd/heimdal/include/hx509-private.h \
src/crypto/external/bsd/heimdal/include/kdc-private.h \
src/crypto/external/bsd/heimdal/include/krb5-private.h \
src/crypto/external/bsd/heimdal/include/ntlm-private.h \
src/crypto/external/bsd/heimdal/include/version.h
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/include/krb5-protos.h
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/heimdal/include/krb5-types.h
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/include/roken.h
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile
cvs rdiff -u -r1.7 -r1.8 src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/bin/krb5-config/Makefile
diff -u src/crypto/external/bsd/heimdal/bin/krb5-config/Makefile:1.2 src/crypto/external/bsd/heimdal/bin/krb5-config/Makefile:1.3
--- src/crypto/external/bsd/heimdal/bin/krb5-config/Makefile:1.2 Fri Apr 12 18:08:10 2013
+++ src/crypto/external/bsd/heimdal/bin/krb5-config/Makefile Thu Apr 24 13:50:53 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2013/04/12 18:08:10 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2014/04/24 13:50:53 pettai Exp $
.include
.include <${.CURDIR}/../../Makefile.inc>
@@ -12,7 +12,7 @@ CLEANFILES+= krb5-config
krb5-config: krb5-config.in
${TOOL_SED} -e "s!@PACKAGE\@!heimdal!g" \
- -e "s!@VERSION\@!1.5pre1!g" \
+ -e "s!@VERSION\@!1.5.3!g" \
-e "s!@prefix\@!/!g" \
-e "s!@exec_prefix\@!/!g" \
-e "s!@libdir\@!/usr/lib!g" \
Index: src/crypto/external/bsd/heimdal/include/config.h
diff -u src/crypto/external/bsd/heimdal/include/config.h:1.4 src/crypto/external/bsd/heimdal/include/config.h:1.5
--- src/crypto/external/bsd/heimdal/include/config.h:1.4 Tue Nov 8 22:13:58 2011
+++ src/crypto/external/bsd/heimdal/include/config.h Thu Apr 24 13:50:53 2014
@@ -143,6 +143,9 @@ static /**/const char *const rcsid[] = {
/* Define to 1 if you have the `atexit' function. */
#define HAVE_ATEXIT 1
+/* Define to 1 if you have the `backtrace' function. */
+/* #undef HAVE_BACKTRACE */
+
/* Define to 1 if you have the header file. */
/* #undef HAVE_BIND_BITYPES_H */
@@ -212,6 +215,9 @@ static /**/const char *const rcsid[] = {
/* Define to 1 if you have the header file. */
/* #undef HAVE_DB5_DB_H */
+/* Define to 1 if you have the header file. */
+/* #undef HAVE_DB6_DB_H */
+
/* Define if you have user supplied header location */
/* #undef HAVE_DBHEADER */
@@ -224,9 +230,6 @@ static /**/const char *const rcsid[] = {
/* Define to 1 if you have the `dbopen' function. */
#define HAVE_DBOPEN 1
-/* Define to 1 if you have the header file. */
-/* #undef HAVE_DB_185_H */
-
/* Define to 1 if you have the `db_create' function. */
/* #undef HAVE_DB_CREATE */
@@ -341,6 +344,9 @@ static /**/const char *const rcsid[] = {
/* Define if you have the function `estrdup'. */
#define HAVE_ESTRDUP 1
+/* Define to 1 if you have the header file. */
+#undef HAVE_EXECINFO_H
+
/* Define if you have the function `fchown'. */
#define HAVE_FCHOWN 1
@@ -720,6 +726,9 @@ static /**/const char *const rcsid[] = {
/* Define if you want support for cache in sqlite. */
/* #undef HAVE_SCC */
+/* Define to 1 if you have the header file. */
+/* #undef HAVE_SEARCH_H */
+
/* Define to 1 if you have the header file. */
#define HAVE_SECURITY_PAM_MODULES_H 1
@@ -810,6 +819,9 @@ static /**/const char *const rcsid[] = {
/* Define to 1 if the system has the type `socklen_t'. */
#define HAVE_SOCKLEN_T 1
+/* Define if you want support for sqlite in Heimdal. */
+/* #undef HAVE_SQLITE3 */
+
/* Define to 1 if the system has the type `ssize_t'. */
#define HAVE_SSIZE_T 1
@@ -1101,6 +1113,9 @@ static /**/const char *const rcsid[] = {
/* Define to 1 if you have the header file. */
#define HAVE_SYS_WAIT_H 1
+/* Define to 1 if you have the `tdelete' function. */
+/* #undef HAVE_TDELETE */
+
/* Define to 1 if yo
CVS commit: src/crypto/external/bsd/heimdal
Module Name:src Committed By: pettai Date: Tue Apr 22 14:07:31 UTC 2014 Modified Files: src/crypto/external/bsd/heimdal: heimdal2netbsd Log Message: heimdal's git (master/origin) has moved to github To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/heimdal/heimdal2netbsd Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/heimdal/heimdal2netbsd diff -u src/crypto/external/bsd/heimdal/heimdal2netbsd:1.5 src/crypto/external/bsd/heimdal/heimdal2netbsd:1.6 --- src/crypto/external/bsd/heimdal/heimdal2netbsd:1.5 Sun Apr 6 11:24:25 2014 +++ src/crypto/external/bsd/heimdal/heimdal2netbsd Tue Apr 22 14:07:31 2014 @@ -1,6 +1,6 @@ #! /bin/sh # -# $NetBSD: heimdal2netbsd,v 1.5 2014/04/06 11:24:25 pettai Exp $ +# $NetBSD: heimdal2netbsd,v 1.6 2014/04/22 14:07:31 pettai Exp $ # # Copyright (c) 2011 The NetBSD Foundation, Inc. # All rights reserved. @@ -36,7 +36,7 @@ # $ export SRCDIR=/usr/src # $ export HEIMDAL_SRCDIR=src/crypto/external/bsd/heimdal # $ cd /some/where/temporary -# $ git clone git://svn.h5l.org/heimdal.git +# $ git clone g...@github.com:heimdal/heimdal.git # $ sh $SRCDIR/../$HEIMDAL_SRCDIR/heimdal2netbsd heimdal `pwd` # $ cd $HEIMDAL_SRCDIR/dist # $ cvs -d ... import $HEIMDAL_SRCDIR/dist HEIMDAL head-20110317
CVS commit: src/crypto/external/bsd/heimdal/dist/lib/roken
Module Name:src Committed By: christos Date: Sun Apr 6 14:36:35 UTC 2014 Modified Files: src/crypto/external/bsd/heimdal/dist/lib/roken: resolve.c Log Message: PR/48718: Juergen Hannken-Illjes: Heimdal leaks file descriptors Add missing call to free the resolve handle on success. XXX: pullup 6 To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ src/crypto/external/bsd/heimdal/dist/lib/roken/resolve.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/heimdal/dist/lib/roken/resolve.c diff -u src/crypto/external/bsd/heimdal/dist/lib/roken/resolve.c:1.1.1.1 src/crypto/external/bsd/heimdal/dist/lib/roken/resolve.c:1.2 --- src/crypto/external/bsd/heimdal/dist/lib/roken/resolve.c:1.1.1.1 Wed Apr 13 14:15:42 2011 +++ src/crypto/external/bsd/heimdal/dist/lib/roken/resolve.c Sun Apr 6 10:36:35 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: resolve.c,v 1.1.1.1 2011/04/13 18:15:42 elric Exp $ */ +/* $NetBSD: resolve.c,v 1.2 2014/04/06 14:36:35 christos Exp $ */ /* * Copyright (c) 1995 - 2006 Kungliga Tekniska Högskolan @@ -590,6 +590,7 @@ dns_lookup_int(const char *domain, int r len = min(len, size); r = parse_reply(reply, len); +resolve_free_handle(handle); free(reply); return r; }
CVS commit: src/crypto/external/bsd/heimdal
Module Name:src Committed By: pettai Date: Sun Apr 6 11:24:25 UTC 2014 Modified Files: src/crypto/external/bsd/heimdal: heimdal2netbsd Log Message: fix small nit + missing step To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/heimdal/heimdal2netbsd Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/heimdal/heimdal2netbsd diff -u src/crypto/external/bsd/heimdal/heimdal2netbsd:1.4 src/crypto/external/bsd/heimdal/heimdal2netbsd:1.5 --- src/crypto/external/bsd/heimdal/heimdal2netbsd:1.4 Sat Oct 8 19:30:02 2011 +++ src/crypto/external/bsd/heimdal/heimdal2netbsd Sun Apr 6 11:24:25 2014 @@ -1,6 +1,6 @@ #! /bin/sh # -# $NetBSD: heimdal2netbsd,v 1.4 2011/10/08 19:30:02 christos Exp $ +# $NetBSD: heimdal2netbsd,v 1.5 2014/04/06 11:24:25 pettai Exp $ # # Copyright (c) 2011 The NetBSD Foundation, Inc. # All rights reserved. @@ -37,9 +37,10 @@ # $ export HEIMDAL_SRCDIR=src/crypto/external/bsd/heimdal # $ cd /some/where/temporary # $ git clone git://svn.h5l.org/heimdal.git -# $ sh $SRCDIR/$HEIMDAL_SRCDIR/heimdal2netbsd heimdal `pwd` +# $ sh $SRCDIR/../$HEIMDAL_SRCDIR/heimdal2netbsd heimdal `pwd` # $ cd $HEIMDAL_SRCDIR/dist # $ cvs -d ... import $HEIMDAL_SRCDIR/dist HEIMDAL head-20110317 +# >>> if any conflicts, merge, fix and commit them. # $ cd /some/where/temporary/heimdal # $ autoreconf -f -i # $ ./configure
CVS commit: src/crypto/external/bsd/heimdal/bin/kvno
Module Name:src
Committed By: christos
Date: Tue Apr 1 21:38:44 UTC 2014
Added Files:
src/crypto/external/bsd/heimdal/bin/kvno: Makefile kvno.1
Log Message:
add glue and man
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/crypto/external/bsd/heimdal/bin/kvno/Makefile \
src/crypto/external/bsd/heimdal/bin/kvno/kvno.1
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/crypto/external/bsd/heimdal/bin/kvno/Makefile
diff -u /dev/null src/crypto/external/bsd/heimdal/bin/kvno/Makefile:1.1
--- /dev/null Tue Apr 1 17:38:44 2014
+++ src/crypto/external/bsd/heimdal/bin/kvno/Makefile Tue Apr 1 17:38:44 2014
@@ -0,0 +1,27 @@
+# $NetBSD: Makefile,v 1.1 2014/04/01 21:38:44 christos Exp $
+
+.include
+.include <${.CURDIR}/../../Makefile.inc>
+
+USE_FORT?= yes # cryptographic software
+
+.PATH: ${HEIMDIST}/kuser
+
+PROG= kvno
+
+
+#HEIMSRCS= kcc-commands.in
+
+SRCS= kvno.c
+MAN= kvno.1
+
+CPPFLAGS+= -I${DESTDIR}/usr/include/krb5
+COPTS.kvno.c+= -Wno-deprecated-declarations
+
+LDADD+= -lkafs -lsl
+LDADD+= -ledit -lterminfo
+DPADD+= ${LIBKAFS} ${LIBSL}
+DPADD+= ${LIBEDIT} ${LIBTERMINFO}
+
+.include <${HEIMBASE}/Makefile.rules.inc>
+.include
Index: src/crypto/external/bsd/heimdal/bin/kvno/kvno.1
diff -u /dev/null src/crypto/external/bsd/heimdal/bin/kvno/kvno.1:1.1
--- /dev/null Tue Apr 1 17:38:44 2014
+++ src/crypto/external/bsd/heimdal/bin/kvno/kvno.1 Tue Apr 1 17:38:44 2014
@@ -0,0 +1,59 @@
+.\" $NetBSD: kvno.1,v 1.1 2014/04/01 21:38:44 christos Exp $
+.\"
+.Dd April 1, 2014
+.Dt KVNO 1
+.Os
+.Sh NAME
+.Nm kvno
+.Nd "print the key version numbers for Kerberos principals"
+.Sh SYNOPSIS
+.Nm
+.Oo Fl c cache \*(Ba Xo
+.Fl -cache= Ns Ar cache
+.Xc
+.Oc
+.Oo Fl e Ar enctype \*(Ba Xo
+.Fl -enctype= Ns Ar enctype
+.Xc
+.Oc
+.Oo Fl h \*(Ba Xo
+.Fl -help
+.Xc
+.Oc
+.Oo Fl k Ar keytabname \*(Ba Xo
+.Fl -keytabname= Ns Ar keytabname
+.Xc
+.Oc
+.Oo Fl q \*(Ba Xo
+.Fl -quiet
+.Xc
+.Oc
+.Oo Fl S Ar principal \*(Ba Xo
+.Fl -server= Ns Ar principal
+.Xc
+.Oc
+.Ar service
+.Ar ...
+.Sh DESCRIPTION
+.Nm
+obtains service tickets for the specified Kerberos principals and prints out
+the version number of the each.
+.Pp
+Supported options:
+.Bl -tag -width Ds
+.It Fl c Ar cache , Fl -cache= Ns Ar cache
+the credential cache to use.
+.It Fl e Ar enctype , Fl -enctype= Ns Ar enctype
+encryption type to use.
+.It Fl k Ar keytabname , Fl -keytabname= Ns Ar keytabname
+use the named file as a keytab file.
+.It Fl q , Fl -quiet
+suppress printing.
+.It Fl S Ar principal , Fl -principal= Ns Ar principal
+specify the service name used to obtain a principal.
+.It Fl -help
+print a help message.
+.El
+.Sh SEE ALSO
+.Xr kinit 1 ,
+.Xr klist 1
CVS commit: src/crypto/external/bsd/heimdal/bin
Module Name:src Committed By: christos Date: Tue Apr 1 21:38:26 UTC 2014 Modified Files: src/crypto/external/bsd/heimdal/bin: Makefile Log Message: add kvno To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/heimdal/bin/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/heimdal/bin/Makefile diff -u src/crypto/external/bsd/heimdal/bin/Makefile:1.1 src/crypto/external/bsd/heimdal/bin/Makefile:1.2 --- src/crypto/external/bsd/heimdal/bin/Makefile:1.1 Wed Apr 13 15:16:44 2011 +++ src/crypto/external/bsd/heimdal/bin/Makefile Tue Apr 1 17:38:26 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2011/04/13 19:16:44 elric Exp $ +# $NetBSD: Makefile,v 1.2 2014/04/01 21:38:26 christos Exp $ .include @@ -14,6 +14,7 @@ SUBDIR = \ kinit \ kpasswd \ krb5-config \ + kvno \ string2key \ verify_krb5_conf
CVS commit: src/crypto/external/bsd/heimdal/dist/lib
Module Name:src
Committed By: apb
Date: Thu Mar 27 16:10:46 UTC 2014
Modified Files:
src/crypto/external/bsd/heimdal/dist/lib/hcrypto: engine.c md2.c
src/crypto/external/bsd/heimdal/dist/lib/kadm5: ad.c
src/crypto/external/bsd/heimdal/dist/lib/krb5: test_pknistkdf.c
Log Message:
Fix sizeof errors in memset calls in heimdal.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/crypto/external/bsd/heimdal/dist/lib/hcrypto/engine.c \
src/crypto/external/bsd/heimdal/dist/lib/hcrypto/md2.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/crypto/external/bsd/heimdal/dist/lib/kadm5/ad.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/crypto/external/bsd/heimdal/dist/lib/krb5/test_pknistkdf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/dist/lib/hcrypto/engine.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/hcrypto/engine.c:1.1.1.1 src/crypto/external/bsd/heimdal/dist/lib/hcrypto/engine.c:1.2
--- src/crypto/external/bsd/heimdal/dist/lib/hcrypto/engine.c:1.1.1.1 Wed Apr 13 18:14:49 2011
+++ src/crypto/external/bsd/heimdal/dist/lib/hcrypto/engine.c Thu Mar 27 16:10:45 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: engine.c,v 1.1.1.1 2011/04/13 18:14:49 elric Exp $ */
+/* $NetBSD: engine.c,v 1.2 2014/03/27 16:10:45 apb Exp $ */
/*
* Copyright (c) 2006 Kungliga Tekniska Högskolan
@@ -90,7 +90,7 @@ ENGINE_finish(ENGINE *engine)
if(engine->destroy)
(*engine->destroy)(engine);
-memset(engine, 0, sizeof(engine));
+memset(engine, 0, sizeof(*engine));
engine->references = -1;
Index: src/crypto/external/bsd/heimdal/dist/lib/hcrypto/md2.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/hcrypto/md2.c:1.1.1.1 src/crypto/external/bsd/heimdal/dist/lib/hcrypto/md2.c:1.2
--- src/crypto/external/bsd/heimdal/dist/lib/hcrypto/md2.c:1.1.1.1 Wed Apr 13 18:14:50 2011
+++ src/crypto/external/bsd/heimdal/dist/lib/hcrypto/md2.c Thu Mar 27 16:10:45 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: md2.c,v 1.1.1.1 2011/04/13 18:14:50 elric Exp $ */
+/* $NetBSD: md2.c,v 1.2 2014/03/27 16:10:45 apb Exp $ */
/*
* Copyright (c) 2006 Kungliga Tekniska Högskolan
@@ -132,5 +132,5 @@ MD2_Final (void *res, struct md2 *m)
MD2_Update(m, pad, 16);
memcpy(res, m->state, MD2_DIGEST_LENGTH);
-memset(m, 0, sizeof(m));
+memset(m, 0, sizeof(*m));
}
Index: src/crypto/external/bsd/heimdal/dist/lib/kadm5/ad.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/kadm5/ad.c:1.1.1.1 src/crypto/external/bsd/heimdal/dist/lib/kadm5/ad.c:1.2
--- src/crypto/external/bsd/heimdal/dist/lib/kadm5/ad.c:1.1.1.1 Wed Apr 13 18:15:29 2011
+++ src/crypto/external/bsd/heimdal/dist/lib/kadm5/ad.c Thu Mar 27 16:10:46 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ad.c,v 1.1.1.1 2011/04/13 18:15:29 elric Exp $ */
+/* $NetBSD: ad.c,v 1.2 2014/03/27 16:10:46 apb Exp $ */
/*
* Copyright (c) 2004 Kungliga Tekniska Högskolan
@@ -49,7 +49,7 @@
#include
#endif
-__RCSID("$NetBSD: ad.c,v 1.1.1.1 2011/04/13 18:15:29 elric Exp $");
+__RCSID("$NetBSD: ad.c,v 1.2 2014/03/27 16:10:46 apb Exp $");
#ifdef OPENLDAP
@@ -1289,7 +1289,7 @@ kadm5_ad_randkey_principal(void *server_
password,
principal,
&(*keys)[0]);
- memset(password, 0, sizeof(password));
+ memset(password, 0, plen);
if (ret) {
free(*keys);
*keys = NULL;
Index: src/crypto/external/bsd/heimdal/dist/lib/krb5/test_pknistkdf.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/krb5/test_pknistkdf.c:1.1.1.1 src/crypto/external/bsd/heimdal/dist/lib/krb5/test_pknistkdf.c:1.2
--- src/crypto/external/bsd/heimdal/dist/lib/krb5/test_pknistkdf.c:1.1.1.1 Wed Apr 13 18:15:38 2011
+++ src/crypto/external/bsd/heimdal/dist/lib/krb5/test_pknistkdf.c Thu Mar 27 16:10:46 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: test_pknistkdf.c,v 1.1.1.1 2011/04/13 18:15:38 elric Exp $ */
+/* $NetBSD: test_pknistkdf.c,v 1.2 2014/03/27 16:10:46 apb Exp $ */
/*
* Copyright (c) 2008 Kungliga Tekniska Högskolan
@@ -143,7 +143,7 @@ test_dh2key(krb5_context context, int i,
AlgorithmIdentifier ai;
size_t size;
-memset(&ticket, 0, sizeof(&ticket));
+memset(&ticket, 0, sizeof(ticket));
ai.algorithm = *c->oid;
ai.parameters = NULL;
CVS commit: src/crypto/external/bsd/heimdal
Module Name:src
Committed By: joerg
Date: Tue Mar 4 21:08:08 UTC 2014
Modified Files:
src/crypto/external/bsd/heimdal: Makefile.inc
Log Message:
Disable abs() checking, a lot of computations get implicit truncations
or use unsigned values.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/Makefile.inc
diff -u src/crypto/external/bsd/heimdal/Makefile.inc:1.2 src/crypto/external/bsd/heimdal/Makefile.inc:1.3
--- src/crypto/external/bsd/heimdal/Makefile.inc:1.2 Sat Apr 16 18:41:58 2011
+++ src/crypto/external/bsd/heimdal/Makefile.inc Tue Mar 4 21:08:08 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.2 2011/04/16 18:41:58 he Exp $
+# $NetBSD: Makefile.inc,v 1.3 2014/03/04 21:08:08 joerg Exp $
HEIMBASE?= ${NETBSDSRCDIR}/crypto/external/bsd/heimdal
HEIMDIST= ${HEIMBASE}/dist
@@ -45,3 +45,4 @@ HOST_CPPFLAGS+= -DHAVE_CONFIG_H
CPPFLAGS+= ${.PATH:S/^/-I/}
CPPFLAGS+= -I${HEIMBASE}/include
CPPFLAGS+= -I${HEIMDIST}/include
+CWARNFLAGS.clang+= -Wno-error=absolute-value
CVS commit: src/crypto/external/bsd/heimdal/dist/lib
Module Name:src
Committed By: apb
Date: Sat Jan 18 09:20:36 UTC 2014
Modified Files:
src/crypto/external/bsd/heimdal/dist/lib/asn1: gen.c
src/crypto/external/bsd/heimdal/dist/lib/com_err: compile_et.c
Log Message:
Use basename(filename) in "Generated from %s" comments in output files,
to avoid embedding the path to the build tree.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/crypto/external/bsd/heimdal/dist/lib/asn1/gen.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/crypto/external/bsd/heimdal/dist/lib/com_err/compile_et.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/dist/lib/asn1/gen.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/asn1/gen.c:1.1.1.1 src/crypto/external/bsd/heimdal/dist/lib/asn1/gen.c:1.2
--- src/crypto/external/bsd/heimdal/dist/lib/asn1/gen.c:1.1.1.1 Wed Apr 13 18:14:40 2011
+++ src/crypto/external/bsd/heimdal/dist/lib/asn1/gen.c Sat Jan 18 09:20:36 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: gen.c,v 1.1.1.1 2011/04/13 18:14:40 elric Exp $ */
+/* $NetBSD: gen.c,v 1.2 2014/01/18 09:20:36 apb Exp $ */
/*
* Copyright (c) 1997 - 2005 Kungliga Tekniska Högskolan
@@ -36,8 +36,9 @@
*/
#include "gen_locl.h"
+#include
-__RCSID("$NetBSD: gen.c,v 1.1.1.1 2011/04/13 18:14:40 elric Exp $");
+__RCSID("$NetBSD: gen.c,v 1.2 2014/01/18 09:20:36 apb Exp $");
FILE *privheaderfile, *headerfile, *codefile, *logfile, *templatefile;
@@ -155,7 +156,7 @@ init_generate (const char *filename, con
fprintf (headerfile,
"/* Generated from %s */\n"
"/* Do not edit */\n\n",
- filename);
+ basename(filename));
fprintf (headerfile,
"#ifndef __%s_h__\n"
"#define __%s_h__\n\n", headerbase, headerbase);
@@ -268,7 +269,7 @@ init_generate (const char *filename, con
"#include \n"
"#include \n"
"#include \n",
- filename);
+ basename(filename));
fprintf (templatefile,
"#include <%s>\n"
@@ -366,7 +367,7 @@ generate_header_of_codefile(const char *
"#include \n"
"#include \n"
"#include \n",
- orig_filename);
+ basename(orig_filename));
fprintf (codefile,
"#include <%s>\n"
Index: src/crypto/external/bsd/heimdal/dist/lib/com_err/compile_et.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/com_err/compile_et.c:1.1.1.1 src/crypto/external/bsd/heimdal/dist/lib/com_err/compile_et.c:1.2
--- src/crypto/external/bsd/heimdal/dist/lib/com_err/compile_et.c:1.1.1.1 Wed Apr 13 18:14:43 2011
+++ src/crypto/external/bsd/heimdal/dist/lib/com_err/compile_et.c Sat Jan 18 09:20:36 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: compile_et.c,v 1.1.1.1 2011/04/13 18:14:43 elric Exp $ */
+/* $NetBSD: compile_et.c,v 1.2 2014/01/18 09:20:36 apb Exp $ */
/*
* Copyright (c) 1998-2002 Kungliga Tekniska Högskolan
@@ -39,6 +39,7 @@
#include "compile_et.h"
#include
+#include
#include
#include
@@ -77,7 +78,7 @@ generate_c(void)
if(c_file == NULL)
return 1;
-fprintf(c_file, "/* Generated from %s */\n", filename);
+fprintf(c_file, "/* Generated from %s */\n", basename(filename));
if(id_str)
fprintf(c_file, "/* %s */\n", id_str);
fprintf(c_file, "\n");
@@ -142,7 +143,7 @@ generate_h(void)
if(!isalnum((unsigned char)*p))
*p = '_';
-fprintf(h_file, "/* Generated from %s */\n", filename);
+fprintf(h_file, "/* Generated from %s */\n", basename(filename));
if(id_str)
fprintf(h_file, "/* %s */\n", id_str);
fprintf(h_file, "\n");
CVS commit: src/crypto/external/bsd/heimdal/libexec
Module Name:src
Committed By: joerg
Date: Wed Dec 25 22:21:33 UTC 2013
Modified Files:
src/crypto/external/bsd/heimdal/libexec: Makefile.inc
Log Message:
Resort libraries according to dependencies.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/libexec/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/libexec/Makefile.inc
diff -u src/crypto/external/bsd/heimdal/libexec/Makefile.inc:1.2 src/crypto/external/bsd/heimdal/libexec/Makefile.inc:1.3
--- src/crypto/external/bsd/heimdal/libexec/Makefile.inc:1.2 Wed May 25 19:21:18 2011
+++ src/crypto/external/bsd/heimdal/libexec/Makefile.inc Wed Dec 25 22:21:32 2013
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.inc,v 1.2 2011/05/25 19:21:18 he Exp $
+# $NetBSD: Makefile.inc,v 1.3 2013/12/25 22:21:32 joerg Exp $
BINDIR=/usr/libexec
-LDADD+= -lkrb5 -lhx509
+LDADD+= -lheimntlm -lkrb5 -lhx509 -lheimbase
LDADD+= -lasn1 -lcom_err -lroken ${LIBVERS}
-LDADD+= -lheimbase -lheimntlm -lwind
+LDADD+= -lwind
LDADD+= -lcrypto -lcrypt
DPADD+= ${LIBKRB5} ${LIBHX509}
CVS commit: src/crypto/external/bsd/heimdal/dist/lib/krb5
Module Name:src
Committed By: christos
Date: Thu Nov 14 05:04:24 UTC 2013
Modified Files:
src/crypto/external/bsd/heimdal/dist/lib/krb5: context.c
Log Message:
CID 240779: Wrong sizeof used in allocation
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/dist/lib/krb5/context.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/dist/lib/krb5/context.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/krb5/context.c:1.2 src/crypto/external/bsd/heimdal/dist/lib/krb5/context.c:1.3
--- src/crypto/external/bsd/heimdal/dist/lib/krb5/context.c:1.2 Thu Apr 14 14:02:07 2011
+++ src/crypto/external/bsd/heimdal/dist/lib/krb5/context.c Thu Nov 14 00:04:24 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: context.c,v 1.2 2011/04/14 18:02:07 elric Exp $ */
+/* $NetBSD: context.c,v 1.3 2013/11/14 05:04:24 christos Exp $ */
/*
* Copyright (c) 1997 - 2010 Kungliga Tekniska Högskolan
@@ -433,13 +433,13 @@ copy_etypes (krb5_context context,
;
i++;
-*ret_enctypes = malloc(sizeof(ret_enctypes[0]) * i);
+*ret_enctypes = malloc(sizeof(**ret_enctypes) * i);
if (*ret_enctypes == NULL) {
krb5_set_error_message(context, ENOMEM,
N_("malloc: out of memory", ""));
return ENOMEM;
}
-memcpy(*ret_enctypes, enctypes, sizeof(ret_enctypes[0]) * i);
+memcpy(*ret_enctypes, enctypes, sizeof(**ret_enctypes) * i);
return 0;
}
CVS commit: src/crypto/external/bsd/heimdal/bin/krb5-config
Module Name:src
Committed By: joerg
Date: Fri Apr 12 18:08:10 UTC 2013
Modified Files:
src/crypto/external/bsd/heimdal/bin/krb5-config: Makefile
Log Message:
Don't force pthread linkage.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/heimdal/bin/krb5-config/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/bin/krb5-config/Makefile
diff -u src/crypto/external/bsd/heimdal/bin/krb5-config/Makefile:1.1 src/crypto/external/bsd/heimdal/bin/krb5-config/Makefile:1.2
--- src/crypto/external/bsd/heimdal/bin/krb5-config/Makefile:1.1 Wed Apr 13 19:16:46 2011
+++ src/crypto/external/bsd/heimdal/bin/krb5-config/Makefile Fri Apr 12 18:08:10 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/04/13 19:16:46 elric Exp $
+# $NetBSD: Makefile,v 1.2 2013/04/12 18:08:10 joerg Exp $
.include
.include <${.CURDIR}/../../Makefile.inc>
@@ -24,7 +24,7 @@ krb5-config: krb5-config.in
-e "s!@LIB_dlopen\@!!g" \
-e "s!@LIB_door_create\@!!g" \
-e "s!@LIB_pkinit\@!-lhx509!g" \
- -e "s!@PTHREAD_LIBADD\@!-lpthread!g" \
+ -e "s!@PTHREAD_LIBADD\@!!g" \
-e "s!@LIBS\@!!g" \
${HEIMDIST}/tools/krb5-config.in > $@
chmod +x $@
CVS commit: src/crypto/external/bsd/heimdal
Module Name:src
Committed By: christos
Date: Wed Sep 5 19:31:04 UTC 2012
Modified Files:
src/crypto/external/bsd/heimdal: Makefile.rules.inc
Log Message:
fix MKREPRO build not to put Generated from ${NETBSDSRCDIR} in files.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/heimdal/Makefile.rules.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/Makefile.rules.inc
diff -u src/crypto/external/bsd/heimdal/Makefile.rules.inc:1.6 src/crypto/external/bsd/heimdal/Makefile.rules.inc:1.7
--- src/crypto/external/bsd/heimdal/Makefile.rules.inc:1.6 Sun Jul 31 05:58:19 2011
+++ src/crypto/external/bsd/heimdal/Makefile.rules.inc Wed Sep 5 15:31:04 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rules.inc,v 1.6 2011/07/31 09:58:19 plunky Exp $
+# $NetBSD: Makefile.rules.inc,v 1.7 2012/09/05 19:31:04 christos Exp $
SRCS+= ${HEIMSRCS:N*.et:N*.in:N*.asn1}
@@ -66,10 +66,15 @@ ${src:.asn1=.ts}: ${src} ${TOOL_ASN1_COM
cp ${src:.asn1=_asn1-priv.hx} ${src:.asn1=_asn1-priv.h}
.endif
+.if ${MKREPRO:Uno} == "yes"
+NORMALIZE_SRC=-e "s@${NETBSDSRCDIR}@/usr/src@g"
+.endif
+
.for x2c in ${ASN1_FILES.${src}}
${x2c:.x=.c}: ${x2c}
- @cmp -s ${x2c} ${x2c:.x=.c} 2> /dev/null || cp ${x2c} ${x2c:.x=.c}
-
+ @${TOOL_SED} ${NORMALIZE_SRC} < ${x2c} > ${x2c}.r
+ @cmp -s ${x2c}.r ${x2c:.x=.c} 2> /dev/null || cp ${x2c}.r ${x2c:.x=.c}
+ @rm -f ${x2c}.r
.endfor
.endfor
CVS commit: src/crypto/external/bsd/heimdal/dist/lib/com_err
Module Name:src Committed By: jdf Date: Wed Jul 4 20:46:14 UTC 2012 Modified Files: src/crypto/external/bsd/heimdal/dist/lib/com_err: com_err.3 Log Message: Change little wording error (s/associate/associated/) and formatting error. Patch proposal was sent upstream to Heimdal as well. Patch by jklowden in PR lib/46651. To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 \ src/crypto/external/bsd/heimdal/dist/lib/com_err/com_err.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/heimdal/dist/lib/com_err/com_err.3 diff -u src/crypto/external/bsd/heimdal/dist/lib/com_err/com_err.3:1.1.1.2 src/crypto/external/bsd/heimdal/dist/lib/com_err/com_err.3:1.2 --- src/crypto/external/bsd/heimdal/dist/lib/com_err/com_err.3:1.1.1.2 Thu Apr 14 14:08:23 2011 +++ src/crypto/external/bsd/heimdal/dist/lib/com_err/com_err.3 Wed Jul 4 20:46:14 2012 @@ -1,4 +1,4 @@ -.\" $NetBSD: com_err.3,v 1.1.1.2 2011/04/14 14:08:23 elric Exp $ +.\" $NetBSD: com_err.3,v 1.2 2012/07/04 20:46:14 jdf Exp $ .\" .\" Copyright (c) 2005 Kungliga Tekniska Högskolan .\" (Royal Institute of Technology, Stockholm, Sweden). @@ -136,10 +136,11 @@ This routine provides an interface, equi which may be used by higher-level variadic functions (functions which accept variable numbers of arguments). .It Fn error_message "code" -Returns the character string error message associate with +Returns the character string error message associated with .Fa code . If -.Fa code is associated with an unknown error table, or if +.Fa code +is associated with an unknown error table, or if .Fa code is associated with a known error table but is not in the table, a string of the form `Unknown code NN' is returned, where is
CVS commit: src/crypto/external/bsd/heimdal/dist/lib/krb5
Module Name:src Committed By: njoly Date: Mon Jun 4 14:24:03 UTC 2012 Modified Files: src/crypto/external/bsd/heimdal/dist/lib/krb5: krb5.conf.5 Log Message: Small spacing fix. Unbreaks section in xref. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5.conf.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5.conf.5 diff -u src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5.conf.5:1.2 src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5.conf.5:1.3 --- src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5.conf.5:1.2 Thu Apr 28 14:38:49 2011 +++ src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5.conf.5 Mon Jun 4 14:24:03 2012 @@ -1,4 +1,4 @@ -.\" $NetBSD: krb5.conf.5,v 1.2 2011/04/28 14:38:49 wiz Exp $ +.\" $NetBSD: krb5.conf.5,v 1.3 2012/06/04 14:24:03 njoly Exp $ .\" .\" Copyright (c) 1999 - 2005 Kungliga Tekniska Högskolan .\" (Royal Institute of Technology, Stockholm, Sweden). @@ -252,7 +252,7 @@ Setting this flag to make it store the MIT way, this is default for Heimdal 0.7. .It Li check-rd-req-server If set to "ignore", the framework will ignore any the server input to -.Xr krb5_rd_req 3, +.Xr krb5_rd_req 3 , this is very useful when the GSS-API server input the wrong server name into the gss_accept_sec_context call. .El
CVS commit: src/crypto/external/bsd/heimdal/include
Module Name:src
Committed By: joerg
Date: Tue Nov 8 22:13:58 UTC 2011
Modified Files:
src/crypto/external/bsd/heimdal/include: config.h
Log Message:
Unbreak MKINET6=no
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/include/config.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/include/config.h
diff -u src/crypto/external/bsd/heimdal/include/config.h:1.3 src/crypto/external/bsd/heimdal/include/config.h:1.4
--- src/crypto/external/bsd/heimdal/include/config.h:1.3 Sat Apr 16 17:45:45 2011
+++ src/crypto/external/bsd/heimdal/include/config.h Tue Nov 8 22:13:58 2011
@@ -528,8 +528,10 @@ static /**/const char *const rcsid[] = {
/* Define to 1 if you have the header file. */
/* #undef HAVE_IO_H */
+#if 0
/* Define if you have IPv6. */
#define HAVE_IPV6 1
+#endif
/* Define if you have the function `iruserok'. */
#define HAVE_IRUSEROK 1
CVS commit: src/crypto/external/bsd/heimdal/lib/libvers
Module Name:src
Committed By: elric
Date: Sun Aug 28 11:20:16 UTC 2011
Modified Files:
src/crypto/external/bsd/heimdal/lib/libvers: Makefile
Log Message:
Change the location of version.h from the old Heimdal srcs to the
new srcs.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/heimdal/lib/libvers/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/lib/libvers/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libvers/Makefile:1.1 src/crypto/external/bsd/heimdal/lib/libvers/Makefile:1.2
--- src/crypto/external/bsd/heimdal/lib/libvers/Makefile:1.1 Wed Apr 13 19:16:56 2011
+++ src/crypto/external/bsd/heimdal/lib/libvers/Makefile Sun Aug 28 11:20:16 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/04/13 19:16:56 elric Exp $
+# $NetBSD: Makefile,v 1.2 2011/08/28 11:20:16 elric Exp $
NOLINKLIB= # defined
NOPIC= # defined
@@ -16,9 +16,9 @@
SRCS= print_version.c
DPSRCS= print_version.h
-HOST_CPPFLAGS+= -I${NETBSDSRCDIR}/include/heimdal -DHAVE_CONFIG_H
+HOST_CPPFLAGS+= -I${HEIMBASE}/include -DHAVE_CONFIG_H
-make-print-version.lo: ${NETBSDSRCDIR}/include/heimdal/version.h
+make-print-version.lo: ${HEIMBASE}/include/version.h
make-print-version: make-print-version.lo
${HOST_CC} ${HOST_LDFLAGS} -o ${.TARGET} ${.ALLSRC}
CVS commit: src/crypto/external/bsd/heimdal/lib/libcom_err/compile_et
Module Name:src
Committed By: elric
Date: Sun Aug 28 10:28:36 UTC 2011
Modified Files:
src/crypto/external/bsd/heimdal/lib/libcom_err/compile_et: Makefile
Log Message:
Change the location of version.h from the old Heimdal srcs to the
new srcs.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/lib/libcom_err/compile_et/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/lib/libcom_err/compile_et/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libcom_err/compile_et/Makefile:1.2 src/crypto/external/bsd/heimdal/lib/libcom_err/compile_et/Makefile:1.3
--- src/crypto/external/bsd/heimdal/lib/libcom_err/compile_et/Makefile:1.2 Fri Apr 15 19:41:11 2011
+++ src/crypto/external/bsd/heimdal/lib/libcom_err/compile_et/Makefile Sun Aug 28 10:28:35 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/04/15 19:41:11 elric Exp $
+# $NetBSD: Makefile,v 1.3 2011/08/28 10:28:35 elric Exp $
NOMAN= # defined
@@ -37,7 +37,7 @@
DPSRCS= print_version.h
-make-print-version.lo: ${NETBSDSRCDIR}/include/heimdal/version.h
+make-print-version.lo: ${HEIMBASE}/include/version.h
make-print-version: make-print-version.lo
${HOST_CC} ${HOST_LDFLAGS} -o ${.TARGET} ${.ALLSRC}
CVS commit: src/crypto/external/bsd/heimdal/lib
Module Name:src Committed By: elric Date: Thu Aug 25 00:25:47 UTC 2011 Removed Files: src/crypto/external/bsd/heimdal/lib: Makefile.inc Log Message: This file should not have been imported. To generate a diff of this commit: cvs rdiff -u -r1.1 -r0 src/crypto/external/bsd/heimdal/lib/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/crypto/external/bsd/heimdal/dist/kdc
Module Name:src Committed By: christos Date: Tue Aug 16 02:59:00 UTC 2011 Modified Files: src/crypto/external/bsd/heimdal/dist/kdc: kerberos5.c Log Message: add extra cast for systems where sizeof(time_t) < sizeof(intmax_t) To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/dist/kdc/kerberos5.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/heimdal/dist/kdc/kerberos5.c diff -u src/crypto/external/bsd/heimdal/dist/kdc/kerberos5.c:1.3 src/crypto/external/bsd/heimdal/dist/kdc/kerberos5.c:1.4 --- src/crypto/external/bsd/heimdal/dist/kdc/kerberos5.c:1.3 Mon Aug 15 21:14:57 2011 +++ src/crypto/external/bsd/heimdal/dist/kdc/kerberos5.c Mon Aug 15 22:59:00 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: kerberos5.c,v 1.3 2011/08/16 01:14:57 elric Exp $ */ +/* $NetBSD: kerberos5.c,v 1.4 2011/08/16 02:59:00 christos Exp $ */ /* * Copyright (c) 1997-2007 Kungliga Tekniska Högskolan @@ -1268,7 +1268,7 @@ "client time %s is out by %jd > %jd seconds -- %s", client_time, imaxabs(kdc_time - p.patimestamp), - context->max_skew, + (intmax_t)context->max_skew, client_name); /*
CVS commit: src/crypto/external/bsd/heimdal/dist/kdc
Module Name:src Committed By: elric Date: Tue Aug 16 01:14:58 UTC 2011 Modified Files: src/crypto/external/bsd/heimdal/dist/kdc: kerberos5.c Log Message: We shouldn't cast client_time to (intmax_t) because it is a char * not an integer. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/dist/kdc/kerberos5.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/heimdal/dist/kdc/kerberos5.c diff -u src/crypto/external/bsd/heimdal/dist/kdc/kerberos5.c:1.2 src/crypto/external/bsd/heimdal/dist/kdc/kerberos5.c:1.3 --- src/crypto/external/bsd/heimdal/dist/kdc/kerberos5.c:1.2 Mon Aug 15 21:00:49 2011 +++ src/crypto/external/bsd/heimdal/dist/kdc/kerberos5.c Tue Aug 16 01:14:57 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: kerberos5.c,v 1.2 2011/08/15 21:00:49 christos Exp $ */ +/* $NetBSD: kerberos5.c,v 1.3 2011/08/16 01:14:57 elric Exp $ */ /* * Copyright (c) 1997-2007 Kungliga Tekniska Högskolan @@ -1266,7 +1266,7 @@ kdc_log(context, config, 0, "Too large time skew, " "client time %s is out by %jd > %jd seconds -- %s", - (intmax_t)client_time, + client_time, imaxabs(kdc_time - p.patimestamp), context->max_skew, client_name);
CVS commit: src/crypto/external/bsd/heimdal/dist/kdc
Module Name:src Committed By: christos Date: Mon Aug 15 21:00:50 UTC 2011 Modified Files: src/crypto/external/bsd/heimdal/dist/kdc: kerberos5.c Log Message: use intmax_t to print times. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ src/crypto/external/bsd/heimdal/dist/kdc/kerberos5.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/heimdal/dist/kdc/kerberos5.c diff -u src/crypto/external/bsd/heimdal/dist/kdc/kerberos5.c:1.1.1.1 src/crypto/external/bsd/heimdal/dist/kdc/kerberos5.c:1.2 --- src/crypto/external/bsd/heimdal/dist/kdc/kerberos5.c:1.1.1.1 Wed Apr 13 14:14:37 2011 +++ src/crypto/external/bsd/heimdal/dist/kdc/kerberos5.c Mon Aug 15 17:00:49 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: kerberos5.c,v 1.1.1.1 2011/04/13 18:14:37 elric Exp $ */ +/* $NetBSD: kerberos5.c,v 1.2 2011/08/15 21:00:49 christos Exp $ */ /* * Copyright (c) 1997-2007 Kungliga Tekniska Högskolan @@ -1265,9 +1265,9 @@ ret = KRB5KRB_AP_ERR_SKEW; kdc_log(context, config, 0, "Too large time skew, " - "client time %s is out by %u > %u seconds -- %s", - client_time, - (unsigned)abs(kdc_time - p.patimestamp), + "client time %s is out by %jd > %jd seconds -- %s", + (intmax_t)client_time, + imaxabs(kdc_time - p.patimestamp), context->max_skew, client_name);
CVS commit: src/crypto/external/bsd/heimdal
Module Name:src
Committed By: plunky
Date: Sun Jul 31 09:58:19 UTC 2011
Modified Files:
src/crypto/external/bsd/heimdal: Makefile.rules.inc
src/crypto/external/bsd/heimdal/lib/libgssapi: Makefile
src/crypto/external/bsd/heimdal/lib/libhx509: Makefile
Log Message:
revert previous, actually cleanup the *_asn1-template.c files
in Makefile.rules.inc. They are generated when -one-code-file
is passed.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/heimdal/Makefile.rules.inc
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/heimdal/lib/libhx509/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/Makefile.rules.inc
diff -u src/crypto/external/bsd/heimdal/Makefile.rules.inc:1.5 src/crypto/external/bsd/heimdal/Makefile.rules.inc:1.6
--- src/crypto/external/bsd/heimdal/Makefile.rules.inc:1.5 Wed Jul 27 03:18:52 2011
+++ src/crypto/external/bsd/heimdal/Makefile.rules.inc Sun Jul 31 09:58:19 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rules.inc,v 1.5 2011/07/27 03:18:52 matt Exp $
+# $NetBSD: Makefile.rules.inc,v 1.6 2011/07/31 09:58:19 plunky Exp $
SRCS+= ${HEIMSRCS:N*.et:N*.in:N*.asn1}
@@ -22,6 +22,7 @@
CLEANFILES+=\
${src:.asn1=_asn1_files} \
+ ${src:.asn1=_asn1-template.c} \
${ASN1_FILES.${src}} \
${ASN1_FILES.${src}:.x=.c} \
${src:.asn1=_asn1.h} \
Index: src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile:1.2 src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile:1.3
--- src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile:1.2 Sun Jul 31 06:49:03 2011
+++ src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile Sun Jul 31 09:58:19 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/07/31 06:49:03 plunky Exp $
+# $NetBSD: Makefile,v 1.3 2011/07/31 09:58:19 plunky Exp $
USE_FORT?= yes# network protocol library
@@ -35,8 +35,6 @@
asn1_NegTokenInitWin.x \
asn1_NegTokenResp.x
-CLEANFILES+= spnego_asn1-template.c
-
krb5src = \
krb5/8003.c \
krb5/accept_sec_context.c \
Index: src/crypto/external/bsd/heimdal/lib/libhx509/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libhx509/Makefile:1.3 src/crypto/external/bsd/heimdal/lib/libhx509/Makefile:1.4
--- src/crypto/external/bsd/heimdal/lib/libhx509/Makefile:1.3 Sun Jul 31 06:49:03 2011
+++ src/crypto/external/bsd/heimdal/lib/libhx509/Makefile Sun Jul 31 09:58:19 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/07/31 06:49:03 plunky Exp $
+# $NetBSD: Makefile,v 1.4 2011/07/31 09:58:19 plunky Exp $
NOLINT= # defined
@@ -83,7 +83,5 @@
asn1_id_pkix_ocsp_basic.x \
asn1_id_pkix_ocsp_nonce.x
-CLEANFILES+= ocsp_asn1-template.c
-
.include <${HEIMBASE}/Makefile.rules.inc>
.include
CVS commit: src/crypto/external/bsd/heimdal/lib
Module Name:src
Committed By: plunky
Date: Sun Jul 31 06:49:03 UTC 2011
Modified Files:
src/crypto/external/bsd/heimdal/lib/libgssapi: Makefile
src/crypto/external/bsd/heimdal/lib/libhx509: Makefile
Log Message:
Clean up intermediate asn1 template files
(this should reeally be fixed in <${HEIMBASE}/Makefile.rules.inc>
but I don't see where since they are not generated for all asn1 sources)
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/lib/libhx509/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile:1.1 src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile:1.2
--- src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile:1.1 Wed Apr 13 19:16:50 2011
+++ src/crypto/external/bsd/heimdal/lib/libgssapi/Makefile Sun Jul 31 06:49:03 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/04/13 19:16:50 elric Exp $
+# $NetBSD: Makefile,v 1.2 2011/07/31 06:49:03 plunky Exp $
USE_FORT?= yes# network protocol library
@@ -35,6 +35,8 @@
asn1_NegTokenInitWin.x \
asn1_NegTokenResp.x
+CLEANFILES+= spnego_asn1-template.c
+
krb5src = \
krb5/8003.c \
krb5/accept_sec_context.c \
Index: src/crypto/external/bsd/heimdal/lib/libhx509/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libhx509/Makefile:1.2 src/crypto/external/bsd/heimdal/lib/libhx509/Makefile:1.3
--- src/crypto/external/bsd/heimdal/lib/libhx509/Makefile:1.2 Wed May 25 19:21:17 2011
+++ src/crypto/external/bsd/heimdal/lib/libhx509/Makefile Sun Jul 31 06:49:03 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/05/25 19:21:17 he Exp $
+# $NetBSD: Makefile,v 1.3 2011/07/31 06:49:03 plunky Exp $
NOLINT= # defined
@@ -83,5 +83,7 @@
asn1_id_pkix_ocsp_basic.x \
asn1_id_pkix_ocsp_nonce.x
+CLEANFILES+= ocsp_asn1-template.c
+
.include <${HEIMBASE}/Makefile.rules.inc>
.include
CVS commit: src/crypto/external/bsd/heimdal/lib/libkrb5
Module Name:src
Committed By: plunky
Date: Sun Jul 31 06:43:57 UTC 2011
Modified Files:
src/crypto/external/bsd/heimdal/lib/libkrb5: Makefile
Log Message:
cleanup vars.texi
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile:1.5 src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile:1.6
--- src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile:1.5 Thu May 26 12:56:24 2011
+++ src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile Sun Jul 31 06:43:56 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2011/05/26 12:56:24 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2011/07/31 06:43:56 plunky Exp $
USE_FORT?= yes # network protocol library
@@ -533,6 +533,8 @@
sed -e 's,[@]dbdir[@],/var/heimdal,g' \
-e 's,[@]PACKAGE_VERSION[@],1.5pre1,g'
+CLEANFILES+= vars.texi
+
.include <${HEIMBASE}/Makefile.rules.inc>
.include
.include
CVS commit: src/crypto/external/bsd/heimdal
Module Name:src
Committed By: matt
Date: Wed Jul 27 03:18:52 UTC 2011
Modified Files:
src/crypto/external/bsd/heimdal: Makefile.rules.inc
Log Message:
Workaround around make bug by using an intermediate file/rule.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/heimdal/Makefile.rules.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/Makefile.rules.inc
diff -u src/crypto/external/bsd/heimdal/Makefile.rules.inc:1.4 src/crypto/external/bsd/heimdal/Makefile.rules.inc:1.5
--- src/crypto/external/bsd/heimdal/Makefile.rules.inc:1.4 Sun May 15 15:10:12 2011
+++ src/crypto/external/bsd/heimdal/Makefile.rules.inc Wed Jul 27 03:18:52 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rules.inc,v 1.4 2011/05/15 15:10:12 tsutsui Exp $
+# $NetBSD: Makefile.rules.inc,v 1.5 2011/07/27 03:18:52 matt Exp $
SRCS+= ${HEIMSRCS:N*.et:N*.in:N*.asn1}
@@ -27,40 +27,43 @@
${src:.asn1=_asn1.h} \
${src:.asn1=_asn1.hx} \
${src:.asn1=_asn1-priv.h} \
- ${src:.asn1=_asn1-priv.hx}
+ ${src:.asn1=_asn1-priv.hx} \
+ ${src:.asn1=.ts}
ASN1_INCS += ${src:.asn1=_asn1.h}
DPSRCS += ${src:.asn1=_asn1.h} ${src:.asn1=_asn1-priv.h}
-DPSRCS += ${src:.asn1=_asn1.hx} ${src:.asn1=_asn1-priv.hx}
OBJS += ${ASN1_FILES.${src}:.x=.o}
+${ASN1_FILES.${src}} ${src:.asn1=_asn1.h} ${src:.asn1=_asn1-priv.h}: \
+ ${src:.asn1=.ts}
+
.if exists(${src:.asn1=.opt})
-${ASN1_FILES.${src}} ${src:.asn1=_asn1.hx} ${src:.asn1=_asn1-priv.hx}: ${src} \
- ${src:.asn1=.opt} ${TOOL_ASN1_COMPILE}
+${src:.asn1=.ts}: ${src} ${src:.asn1=.opt} ${TOOL_ASN1_COMPILE}
+ @touch $@
${TOOL_ASN1_COMPILE} \
${ASN1_OPTS.${src}} \
--option-file=${.ALLSRC:[2]} \
${.ALLSRC:[1]} ${src:.asn1=_asn1}
-
+ @${TOOL_SED} -E \
+ -e 's,#include <(.*)_asn1\.h>,#include ,' \
+ 2> /dev/null < ${src:.asn1=_asn1.hx} > ${src:.asn1=_asn1.h}
+ @cmp -s ${src:.asn1=_asn1-priv.hx} ${src:.asn1=_asn1-priv.h} \
+ 2> /dev/null || \
+ cp ${src:.asn1=_asn1-priv.hx} ${src:.asn1=_asn1-priv.h}
.else
-${ASN1_FILES.${src}} ${src:.asn1=_asn1.hx} ${src:.asn1=_asn1-priv.hx}: ${src} \
- ${TOOL_ASN1_COMPILE}
+${src:.asn1=.ts}: ${src} ${TOOL_ASN1_COMPILE}
+ @touch $@
${TOOL_ASN1_COMPILE} \
${ASN1_OPTS.${src}} \
${.ALLSRC:[1]} ${src:.asn1=_asn1}
-
-.endif
-
-${src:.asn1=_asn1.h}: ${src:.asn1=_asn1.hx}
@${TOOL_SED} -E \
-e 's,#include <(.*)_asn1\.h>,#include ,' \
2> /dev/null < ${src:.asn1=_asn1.hx} > ${src:.asn1=_asn1.h}
-
-${src:.asn1=_asn1-priv.h}: ${src:.asn1=_asn1-priv.hx}
@cmp -s ${src:.asn1=_asn1-priv.hx} ${src:.asn1=_asn1-priv.h} \
2> /dev/null || \
cp ${src:.asn1=_asn1-priv.hx} ${src:.asn1=_asn1-priv.h}
+.endif
.for x2c in ${ASN1_FILES.${src}}
${x2c:.x=.c}: ${x2c}
CVS commit: src/crypto/external/bsd/heimdal/dist/lib
Module Name:src
Committed By: joerg
Date: Fri Jul 1 02:10:20 UTC 2011
Modified Files:
src/crypto/external/bsd/heimdal/dist/lib/hx509: cert.c
src/crypto/external/bsd/heimdal/dist/lib/krb5: crypto-des3.c
Log Message:
Fix memset usage.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/crypto/external/bsd/heimdal/dist/lib/hx509/cert.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/crypto/external/bsd/heimdal/dist/lib/krb5/crypto-des3.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/dist/lib/hx509/cert.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/hx509/cert.c:1.1.1.1 src/crypto/external/bsd/heimdal/dist/lib/hx509/cert.c:1.2
--- src/crypto/external/bsd/heimdal/dist/lib/hx509/cert.c:1.1.1.1 Wed Apr 13 18:15:10 2011
+++ src/crypto/external/bsd/heimdal/dist/lib/hx509/cert.c Fri Jul 1 02:10:19 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cert.c,v 1.1.1.1 2011/04/13 18:15:10 elric Exp $ */
+/* $NetBSD: cert.c,v 1.2 2011/07/01 02:10:19 joerg Exp $ */
/*
* Copyright (c) 2004 - 2007 Kungliga Tekniska Högskolan
@@ -357,7 +357,7 @@
free(cert->friendlyname);
if (cert->basename)
hx509_name_free(&cert->basename);
-memset(cert, 0, sizeof(cert));
+memset(cert, 0, sizeof(*cert));
free(cert);
}
Index: src/crypto/external/bsd/heimdal/dist/lib/krb5/crypto-des3.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/krb5/crypto-des3.c:1.1.1.1 src/crypto/external/bsd/heimdal/dist/lib/krb5/crypto-des3.c:1.2
--- src/crypto/external/bsd/heimdal/dist/lib/krb5/crypto-des3.c:1.1.1.1 Wed Apr 13 18:15:32 2011
+++ src/crypto/external/bsd/heimdal/dist/lib/krb5/crypto-des3.c Fri Jul 1 02:10:19 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: crypto-des3.c,v 1.1.1.1 2011/04/13 18:15:32 elric Exp $ */
+/* $NetBSD: crypto-des3.c,v 1.2 2011/07/01 02:10:19 joerg Exp $ */
/*
* Copyright (c) 1997 - 2008 Kungliga Tekniska Högskolan
@@ -204,7 +204,7 @@
DES_cblock *k;
int i, j;
-memset(x, 0, sizeof(x));
+memset(x, 0, 32);
for (i = 0; i < 3; ++i) {
unsigned char foo;
for (j = 0; j < 7; ++j) {
CVS commit: src/crypto/external/bsd/heimdal
Module Name:src Committed By: he Date: Wed May 25 19:21:20 UTC 2011 Modified Files: src/crypto/external/bsd/heimdal/bin: Makefile.inc src/crypto/external/bsd/heimdal/bin/gsstool: Makefile src/crypto/external/bsd/heimdal/bin/hxtool: Makefile src/crypto/external/bsd/heimdal/bin/kcc: Makefile src/crypto/external/bsd/heimdal/bin/kdestroy: Makefile src/crypto/external/bsd/heimdal/bin/kgetcred: Makefile src/crypto/external/bsd/heimdal/bin/kinit: Makefile src/crypto/external/bsd/heimdal/bin/kpasswd: Makefile src/crypto/external/bsd/heimdal/bin/string2key: Makefile src/crypto/external/bsd/heimdal/bin/verify_krb5_conf: Makefile src/crypto/external/bsd/heimdal/dist/lib/hx509: sel.h src/crypto/external/bsd/heimdal/dist/lib/krb5: version-script.map src/crypto/external/bsd/heimdal/lib: Makefile src/crypto/external/bsd/heimdal/lib/libhdb: Makefile src/crypto/external/bsd/heimdal/lib/libhx509: Makefile src/crypto/external/bsd/heimdal/lib/libkrb5: Makefile src/crypto/external/bsd/heimdal/libexec: Makefile.inc src/crypto/external/bsd/heimdal/libexec/digest-service: Makefile src/crypto/external/bsd/heimdal/libexec/hpropd: Makefile src/crypto/external/bsd/heimdal/libexec/ipropd-master: Makefile src/crypto/external/bsd/heimdal/libexec/ipropd-slave: Makefile src/crypto/external/bsd/heimdal/libexec/kadmind: Makefile src/crypto/external/bsd/heimdal/libexec/kpasswdd: Makefile src/crypto/external/bsd/heimdal/sbin: Makefile.inc src/crypto/external/bsd/heimdal/sbin/hprop: Makefile src/crypto/external/bsd/heimdal/sbin/iprop-log: Makefile src/crypto/external/bsd/heimdal/sbin/kadmin: Makefile src/crypto/external/bsd/heimdal/sbin/kcm: Makefile src/crypto/external/bsd/heimdal/sbin/kdc: Makefile src/crypto/external/bsd/heimdal/sbin/kdigest: Makefile src/crypto/external/bsd/heimdal/sbin/kimpersonate: Makefile src/crypto/external/bsd/heimdal/sbin/kstash: Makefile src/crypto/external/bsd/heimdal/sbin/ktutil: Makefile Log Message: Fix up Heimdal so that it can be built statically, allowing the sun2 port to proceed beyond trying and failing to build Heimdal. This is done by: 1) Stop pretending that libipc is a separate library, and instead build it as part of libkrb5. The version map for libkrb5 needed to be updated to expose the required symbols from libipc. 2) The lexer in libhx509 needs to use its own prefix, so that the resulting library can be statically linked with a lexer which uses the default prefix. This was hidden because libhx509's version map file (which is only used for the shared libs) hid away the lexer symbols. Some defines needed tweaking as well to restore buildability. 3) Excplicitly mention all the required libraries in LDADD+= and make sure DPADD is set to correspond. This allows static linking; earlier this relied on shared library dependencies to have all the libs pulled in. In the process, convert to single-line LDADD+= and DPADD+= settings. Use Makefile.inc for the common libraries to the extent possible. Successfully built from scratch for i386 and sun2 several times, and for lots of other ports as well. Discussed with elric@ and christos@. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/heimdal/bin/Makefile.inc cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/heimdal/bin/gsstool/Makefile cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/heimdal/bin/hxtool/Makefile cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/heimdal/bin/kcc/Makefile cvs rdiff -u -r1.1 -r1.2 \ src/crypto/external/bsd/heimdal/bin/kdestroy/Makefile cvs rdiff -u -r1.1 -r1.2 \ src/crypto/external/bsd/heimdal/bin/kgetcred/Makefile cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/heimdal/bin/kinit/Makefile cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/heimdal/bin/kpasswd/Makefile cvs rdiff -u -r1.1 -r1.2 \ src/crypto/external/bsd/heimdal/bin/string2key/Makefile cvs rdiff -u -r1.1 -r1.2 \ src/crypto/external/bsd/heimdal/bin/verify_krb5_conf/Makefile cvs rdiff -u -r1.1.1.1 -r1.2 \ src/crypto/external/bsd/heimdal/dist/lib/hx509/sel.h cvs rdiff -u -r1.1.1.1 -r1.2 \ src/crypto/external/bsd/heimdal/dist/lib/krb5/version-script.map cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/heimdal/lib/Makefile cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/heimdal/lib/libhdb/Makefile cvs rdiff -u -r1.1 -r1.2 \ src/crypto/external/bsd/heimdal/lib/libhx509/Makefile cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/heimdal/libexec/Makefile.inc cvs rdiff -u -r1.1 -r1.2 \ src/crypto/external/bsd/heimdal/libexec/digest-service/Makefile cvs rdiff -u -r1.1 -r1.2 \ src/crypto/external/bsd/heimdal/libexe
CVS commit: src/crypto/external/bsd/heimdal/lib/libkrb5
Module Name:src
Committed By: joerg
Date: Fri May 20 20:09:37 UTC 2011
Modified Files:
src/crypto/external/bsd/heimdal/lib/libkrb5: Makefile
Log Message:
Revert, breaks the build.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile:1.2 src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile:1.3
--- src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile:1.2 Fri May 20 02:04:59 2011
+++ src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile Fri May 20 20:09:37 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/05/20 02:04:59 christos Exp $
+# $NetBSD: Makefile,v 1.3 2011/05/20 20:09:37 joerg Exp $
USE_FORT?= yes # network protocol library
@@ -17,7 +17,6 @@
crypto ${SSLBASE}/lib/libcrypto \
asn1 ${HEIMBASE}/lib/libasn1 \
com_err ${HEIMBASE}/lib/libcom_err \
- ipc ${HEIMBASE}/lib/libipc \
roken ${HEIMBASE}/lib/libroken \
wind ${HEIMBASE}/lib/libwind \
heimbase ${HEIMBASE}/lib/libheimbase
CVS commit: src/crypto/external/bsd/heimdal/lib/libkrb5
Module Name:src
Committed By: christos
Date: Fri May 20 02:04:59 UTC 2011
Modified Files:
src/crypto/external/bsd/heimdal/lib/libkrb5: Makefile
Log Message:
Let's see if we can get away with this for the sun2 port or we are going
to need to:
1. put the contents of libipc.a in libkrb5.a
or
2. install libipc.a [perhaps call it libkrbipc.a?]
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile:1.1 src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile:1.2
--- src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile:1.1 Wed Apr 13 15:16:53 2011
+++ src/crypto/external/bsd/heimdal/lib/libkrb5/Makefile Thu May 19 22:04:59 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/04/13 19:16:53 elric Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/20 02:04:59 christos Exp $
USE_FORT?= yes # network protocol library
@@ -17,6 +17,7 @@
crypto ${SSLBASE}/lib/libcrypto \
asn1 ${HEIMBASE}/lib/libasn1 \
com_err ${HEIMBASE}/lib/libcom_err \
+ ipc ${HEIMBASE}/lib/libipc \
roken ${HEIMBASE}/lib/libroken \
wind ${HEIMBASE}/lib/libwind \
heimbase ${HEIMBASE}/lib/libheimbase
CVS commit: src/crypto/external/bsd/heimdal/include
Module Name:src Committed By: christos Date: Tue May 17 12:56:44 UTC 2011 Modified Files: src/crypto/external/bsd/heimdal/include: krb5-protos.h Log Message: add missing prototypes. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ src/crypto/external/bsd/heimdal/include/krb5-protos.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/heimdal/include/krb5-protos.h diff -u src/crypto/external/bsd/heimdal/include/krb5-protos.h:1.1 src/crypto/external/bsd/heimdal/include/krb5-protos.h:1.2 --- src/crypto/external/bsd/heimdal/include/krb5-protos.h:1.1 Wed Apr 13 15:03:58 2011 +++ src/crypto/external/bsd/heimdal/include/krb5-protos.h Tue May 17 08:56:44 2011 @@ -2781,6 +2781,11 @@ char */*prefix*/, size_t /*prefixsize*/); +KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL +krb5_kt_have_content ( + krb5_context /*context*/, +krb5_keytab /*id*/); + KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL krb5_kt_next_entry ( krb5_context /*context*/, @@ -3861,6 +3866,9 @@ KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL krb5_sockaddr_uninteresting (const struct sockaddr */*sa*/); +KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL +krb5_sockaddr_is_loopback (const struct sockaddr */*sa*/); + KRB5_LIB_FUNCTION void KRB5_LIB_CALL krb5_std_usage ( int /*code*/,
CVS commit: src/crypto/external/bsd/heimdal
Module Name:src
Committed By: tsutsui
Date: Sun May 15 15:10:12 UTC 2011
Modified Files:
src/crypto/external/bsd/heimdal: Makefile.rules.inc
Log Message:
- fix build failure on CentOS 5
(it looks bash doesn't like redirection operators before commands)
- use ${TOOL_SED}
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/Makefile.rules.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/Makefile.rules.inc
diff -u src/crypto/external/bsd/heimdal/Makefile.rules.inc:1.3 src/crypto/external/bsd/heimdal/Makefile.rules.inc:1.4
--- src/crypto/external/bsd/heimdal/Makefile.rules.inc:1.3 Fri Apr 15 14:39:32 2011
+++ src/crypto/external/bsd/heimdal/Makefile.rules.inc Sun May 15 15:10:12 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rules.inc,v 1.3 2011/04/15 14:39:32 elric Exp $
+# $NetBSD: Makefile.rules.inc,v 1.4 2011/05/15 15:10:12 tsutsui Exp $
SRCS+= ${HEIMSRCS:N*.et:N*.in:N*.asn1}
@@ -53,13 +53,13 @@
.endif
${src:.asn1=_asn1.h}: ${src:.asn1=_asn1.hx}
- @2>/dev/null < ${src:.asn1=_asn1.hx} > ${src:.asn1=_asn1.h} \
- sed -E \
- -e 's,#include <(.*)_asn1\.h>,#include ,'
+ @${TOOL_SED} -E \
+ -e 's,#include <(.*)_asn1\.h>,#include ,' \
+ 2> /dev/null < ${src:.asn1=_asn1.hx} > ${src:.asn1=_asn1.h}
${src:.asn1=_asn1-priv.h}: ${src:.asn1=_asn1-priv.hx}
- @2> /dev/null \
- cmp -s ${src:.asn1=_asn1-priv.hx} ${src:.asn1=_asn1-priv.h} || \
+ @cmp -s ${src:.asn1=_asn1-priv.hx} ${src:.asn1=_asn1-priv.h} \
+ 2> /dev/null || \
cp ${src:.asn1=_asn1-priv.hx} ${src:.asn1=_asn1-priv.h}
.for x2c in ${ASN1_FILES.${src}}
CVS commit: src/crypto/external/bsd/heimdal/dist/po
Module Name:src Committed By: drochner Date: Thu May 5 18:40:25 UTC 2011 Removed Files: src/crypto/external/bsd/heimdal/dist/po/heim_com_err-1765328384: sv_SE.mo src/crypto/external/bsd/heimdal/dist/po/heimdal_krb5: sv_SE.mo src/crypto/external/bsd/heimdal/dist/po/heimdal_kuser: sv_SE.mo Log Message: remove generated binary files To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 \ src/crypto/external/bsd/heimdal/dist/po/heim_com_err-1765328384/sv_SE.mo cvs rdiff -u -r1.1.1.1 -r0 \ src/crypto/external/bsd/heimdal/dist/po/heimdal_krb5/sv_SE.mo cvs rdiff -u -r1.1.1.1 -r0 \ src/crypto/external/bsd/heimdal/dist/po/heimdal_kuser/sv_SE.mo Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/crypto/external/bsd/heimdal/dist/lib/roken
Module Name:src Committed By: wiz Date: Thu Apr 28 14:55:59 UTC 2011 Modified Files: src/crypto/external/bsd/heimdal/dist/lib/roken: rtbl.3 Log Message: Fix a typo. To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 \ src/crypto/external/bsd/heimdal/dist/lib/roken/rtbl.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/heimdal/dist/lib/roken/rtbl.3 diff -u src/crypto/external/bsd/heimdal/dist/lib/roken/rtbl.3:1.1.1.2 src/crypto/external/bsd/heimdal/dist/lib/roken/rtbl.3:1.2 --- src/crypto/external/bsd/heimdal/dist/lib/roken/rtbl.3:1.1.1.2 Thu Apr 14 14:09:30 2011 +++ src/crypto/external/bsd/heimdal/dist/lib/roken/rtbl.3 Thu Apr 28 14:55:59 2011 @@ -1,4 +1,4 @@ -.\" $NetBSD: rtbl.3,v 1.1.1.2 2011/04/14 14:09:30 elric Exp $ +.\" $NetBSD: rtbl.3,v 1.2 2011/04/28 14:55:59 wiz Exp $ .\" .\" Copyright (c) 2004 Kungliga Tekniska Högskolan .\" (Royal Institute of Technology, Stockholm, Sweden). @@ -91,7 +91,7 @@ or .Xr netstat 1 , where you have a fixed number of columns, but don't know the column -widthds before hand. +widths before hand. .Pp A table is created with .Fn rtbl_create
CVS commit: src/crypto/external/bsd/heimdal/dist/lib/krb5
Module Name:src Committed By: wiz Date: Thu Apr 28 14:44:10 UTC 2011 Modified Files: src/crypto/external/bsd/heimdal/dist/lib/krb5: krb5_string_to_key.3 Log Message: Fix a typo. To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 \ src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5_string_to_key.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5_string_to_key.3 diff -u src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5_string_to_key.3:1.1.1.2 src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5_string_to_key.3:1.2 --- src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5_string_to_key.3:1.1.1.2 Thu Apr 14 14:09:23 2011 +++ src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5_string_to_key.3 Thu Apr 28 14:44:10 2011 @@ -1,4 +1,4 @@ -.\" $NetBSD: krb5_string_to_key.3,v 1.1.1.2 2011/04/14 14:09:23 elric Exp $ +.\" $NetBSD: krb5_string_to_key.3,v 1.2 2011/04/28 14:44:10 wiz Exp $ .\" .\" Copyright (c) 2004 - 2006 Kungliga Tekniska Högskolan .\" (Royal Institute of Technology, Stockholm, Sweden). @@ -116,7 +116,7 @@ .Pp .Fn krb5_string_to_key_data_salt_opaque is the function that does all the work, the rest of the functions are -just wrapers around +just wrappers around .Fn krb5_string_to_key_data_salt_opaque that calls it with default values. .Pp
CVS commit: src/crypto/external/bsd/heimdal/dist/lib/krb5
Module Name:src Committed By: wiz Date: Thu Apr 28 14:40:42 UTC 2011 Modified Files: src/crypto/external/bsd/heimdal/dist/lib/krb5: krb5_principal.3 Log Message: Fix a typo. To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 \ src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5_principal.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5_principal.3 diff -u src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5_principal.3:1.1.1.2 src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5_principal.3:1.2 --- src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5_principal.3:1.1.1.2 Thu Apr 14 14:09:23 2011 +++ src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5_principal.3 Thu Apr 28 14:40:42 2011 @@ -1,4 +1,4 @@ -.\" $NetBSD: krb5_principal.3,v 1.1.1.2 2011/04/14 14:09:23 elric Exp $ +.\" $NetBSD: krb5_principal.3,v 1.2 2011/04/28 14:40:42 wiz Exp $ .\" .\" Copyright (c) 2003 - 2007 Kungliga Tekniska Högskolan .\" (Royal Institute of Technology, Stockholm, Sweden). @@ -157,12 +157,12 @@ argument the following flags can be passed in .Bl -tag -width Ds .It Dv KRB5_PRINCIPAL_PARSE_NO_REALM -requries the input string to be without a realm, and no realm is +requires the input string to be without a realm, and no realm is stored in the .Fa principal return argument. .It Dv KRB5_PRINCIPAL_PARSE_REQUIRE_REALM -requries the input string to with a realm. +requires the input string to with a realm. .El .Pp .Fn krb5_unparse_name
CVS commit: src/crypto/external/bsd/heimdal/dist/lib
Module Name:src Committed By: wiz Date: Thu Apr 28 14:38:49 UTC 2011 Modified Files: src/crypto/external/bsd/heimdal/dist/lib/gssapi: gss_acquire_cred.3 src/crypto/external/bsd/heimdal/dist/lib/krb5: krb5.conf.5 krb524_convert_creds_kdc.3 krb5_is_thread_safe.3 Log Message: Typo fix. To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 \ src/crypto/external/bsd/heimdal/dist/lib/gssapi/gss_acquire_cred.3 cvs rdiff -u -r1.1.1.2 -r1.2 \ src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5.conf.5 \ src/crypto/external/bsd/heimdal/dist/lib/krb5/krb524_convert_creds_kdc.3 \ src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5_is_thread_safe.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/heimdal/dist/lib/gssapi/gss_acquire_cred.3 diff -u src/crypto/external/bsd/heimdal/dist/lib/gssapi/gss_acquire_cred.3:1.1.1.2 src/crypto/external/bsd/heimdal/dist/lib/gssapi/gss_acquire_cred.3:1.2 --- src/crypto/external/bsd/heimdal/dist/lib/gssapi/gss_acquire_cred.3:1.1.1.2 Thu Apr 14 14:08:24 2011 +++ src/crypto/external/bsd/heimdal/dist/lib/gssapi/gss_acquire_cred.3 Thu Apr 28 14:38:49 2011 @@ -1,4 +1,4 @@ -.\" $NetBSD: gss_acquire_cred.3,v 1.1.1.2 2011/04/14 14:08:24 elric Exp $ +.\" $NetBSD: gss_acquire_cred.3,v 1.2 2011/04/28 14:38:49 wiz Exp $ .\" .\" Copyright (c) 2003 - 2007 Kungliga Tekniska Högskolan .\" (Royal Institute of Technology, Stockholm, Sweden). @@ -515,7 +515,7 @@ .Dv gss_buffer_t . .Pp Exported names also have the property that they are specified by the -mechanism itself and compatible between diffrent GSS-API +mechanism itself and compatible between different GSS-API implementations. .El .Sh ACCESS CONTROL Index: src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5.conf.5 diff -u src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5.conf.5:1.1.1.2 src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5.conf.5:1.2 --- src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5.conf.5:1.1.1.2 Thu Apr 14 14:09:22 2011 +++ src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5.conf.5 Thu Apr 28 14:38:49 2011 @@ -1,4 +1,4 @@ -.\" $NetBSD: krb5.conf.5,v 1.1.1.2 2011/04/14 14:09:22 elric Exp $ +.\" $NetBSD: krb5.conf.5,v 1.2 2011/04/28 14:38:49 wiz Exp $ .\" .\" Copyright (c) 1999 - 2005 Kungliga Tekniska Högskolan .\" (Royal Institute of Technology, Stockholm, Sweden). @@ -365,7 +365,7 @@ .Bl -tag -width "xxx" -offset indent .It Li dbname Li = Va DATABASENAME Use this database for this realm. -See the info documetation how to configure diffrent database backends. +See the info documetation how to configure different database backends. .It Li realm Li = Va REALM Specifies the realm that will be stored in this database. It realm isn't set, it will used as the default database, there can Index: src/crypto/external/bsd/heimdal/dist/lib/krb5/krb524_convert_creds_kdc.3 diff -u src/crypto/external/bsd/heimdal/dist/lib/krb5/krb524_convert_creds_kdc.3:1.1.1.2 src/crypto/external/bsd/heimdal/dist/lib/krb5/krb524_convert_creds_kdc.3:1.2 --- src/crypto/external/bsd/heimdal/dist/lib/krb5/krb524_convert_creds_kdc.3:1.1.1.2 Thu Apr 14 14:09:21 2011 +++ src/crypto/external/bsd/heimdal/dist/lib/krb5/krb524_convert_creds_kdc.3 Thu Apr 28 14:38:49 2011 @@ -1,4 +1,4 @@ -.\" $NetBSD: krb524_convert_creds_kdc.3,v 1.1.1.2 2011/04/14 14:09:21 elric Exp $ +.\" $NetBSD: krb524_convert_creds_kdc.3,v 1.2 2011/04/28 14:38:49 wiz Exp $ .\" .\" Copyright (c) 2004 Kungliga Tekniska Högskolan .\" (Royal Institute of Technology, Stockholm, Sweden). @@ -68,7 +68,7 @@ .Fa credentials . .Pp .Fn krb524_convert_creds_kdc_ccache -is diffrent from +is different from .Fn krb524_convert_creds_kdc in that way that if .Fa in_cred Index: src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5_is_thread_safe.3 diff -u src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5_is_thread_safe.3:1.1.1.2 src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5_is_thread_safe.3:1.2 --- src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5_is_thread_safe.3:1.1.1.2 Thu Apr 14 14:09:23 2011 +++ src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5_is_thread_safe.3 Thu Apr 28 14:38:49 2011 @@ -1,4 +1,4 @@ -.\" $NetBSD: krb5_is_thread_safe.3,v 1.1.1.2 2011/04/14 14:09:23 elric Exp $ +.\" $NetBSD: krb5_is_thread_safe.3,v 1.2 2011/04/28 14:38:49 wiz Exp $ .\" .\" Copyright (c) 2005 Kungliga Tekniska Högskolan .\" (Royal Institute of Technology, Stockholm, Sweden). @@ -52,7 +52,7 @@ if the library was compiled with with multithread support. If the library isn't compiled, the consumer have to use a global lock to make sure Kerboros functions are not called at the same time by -diffrent threads. +different threads. .\" .Sh EXAMPLE .\" .Sh BUGS .Sh SEE ALSO
CVS commit: src/crypto/external/bsd/heimdal/dist/lib/krb5
Module Name:src Committed By: wiz Date: Thu Apr 28 14:34:33 UTC 2011 Modified Files: src/crypto/external/bsd/heimdal/dist/lib/krb5: krb5_c_make_checksum.3 Log Message: Fix a typo and punctuation. To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 \ src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5_c_make_checksum.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5_c_make_checksum.3 diff -u src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5_c_make_checksum.3:1.1.1.2 src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5_c_make_checksum.3:1.2 --- src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5_c_make_checksum.3:1.1.1.2 Thu Apr 14 14:09:22 2011 +++ src/crypto/external/bsd/heimdal/dist/lib/krb5/krb5_c_make_checksum.3 Thu Apr 28 14:34:33 2011 @@ -1,4 +1,4 @@ -.\" $NetBSD: krb5_c_make_checksum.3,v 1.1.1.2 2011/04/14 14:09:22 elric Exp $ +.\" $NetBSD: krb5_c_make_checksum.3,v 1.2 2011/04/28 14:34:33 wiz Exp $ .\" .\" Copyright (c) 2003 - 2006 Kungliga Tekniska Högskolan .\" (Royal Institute of Technology, Stockholm, Sweden). @@ -281,14 +281,14 @@ .Fn krb5_c_is_coll_proof_cksum returns true if .Fa ctype -is a collition proof checksum type. +is a collision proof checksum type. .Pp .Fn krb5_c_keylengths -return the minimum length ( -.Fa inlength ) +return the minimum length +.Fa ( inlength ) bytes needed to create a key and the -length ( -.Fa keylength ) +length +.Fa ( keylength ) of the resulting key for the .Fa enctype .
CVS commit: src/crypto/external/bsd/heimdal/dist/lib/kadm5
Module Name:src Committed By: wiz Date: Thu Apr 28 14:29:53 UTC 2011 Modified Files: src/crypto/external/bsd/heimdal/dist/lib/kadm5: iprop-log.8 Log Message: Fix typo. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/crypto/external/bsd/heimdal/dist/lib/kadm5/iprop-log.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/heimdal/dist/lib/kadm5/iprop-log.8 diff -u src/crypto/external/bsd/heimdal/dist/lib/kadm5/iprop-log.8:1.3 src/crypto/external/bsd/heimdal/dist/lib/kadm5/iprop-log.8:1.4 --- src/crypto/external/bsd/heimdal/dist/lib/kadm5/iprop-log.8:1.3 Thu Apr 28 14:07:12 2011 +++ src/crypto/external/bsd/heimdal/dist/lib/kadm5/iprop-log.8 Thu Apr 28 14:29:53 2011 @@ -1,4 +1,4 @@ -.\" $NetBSD: iprop-log.8,v 1.3 2011/04/28 14:07:12 wiz Exp $ +.\" $NetBSD: iprop-log.8,v 1.4 2011/04/28 14:29:53 wiz Exp $ .\" .\" Id .\" @@ -110,7 +110,7 @@ realm .El .Pp -Print out all entires in the log to standard output. +Print out all entries in the log to standard output. .It replay .Bl -tag -width Ds .It Fl -start-version= Ns Ar version-number
CVS commit: src/crypto/external/bsd/heimdal/dist/lib/gssapi
Module Name:src Committed By: wiz Date: Thu Apr 28 14:28:47 UTC 2011 Modified Files: src/crypto/external/bsd/heimdal/dist/lib/gssapi: gssapi.3 Log Message: Typo fix. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/heimdal/dist/lib/gssapi/gssapi.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/heimdal/dist/lib/gssapi/gssapi.3 diff -u src/crypto/external/bsd/heimdal/dist/lib/gssapi/gssapi.3:1.2 src/crypto/external/bsd/heimdal/dist/lib/gssapi/gssapi.3:1.3 --- src/crypto/external/bsd/heimdal/dist/lib/gssapi/gssapi.3:1.2 Thu Apr 14 19:19:19 2011 +++ src/crypto/external/bsd/heimdal/dist/lib/gssapi/gssapi.3 Thu Apr 28 14:28:47 2011 @@ -1,4 +1,4 @@ -.\" $NetBSD: gssapi.3,v 1.2 2011/04/14 19:19:19 elric Exp $ +.\" $NetBSD: gssapi.3,v 1.3 2011/04/28 14:28:47 wiz Exp $ .\" .\" Copyright (c) 2003 - 2005 Kungliga Tekniska Högskolan .\" (Royal Institute of Technology, Stockholm, Sweden). @@ -144,7 +144,7 @@ .Pp This config option modifies behaviour for both clients and servers. .Pp -Microsoft implemented SPNEGO to Windows2000, however, they manage to +Microsoft implemented SPNEGO to Windows2000, however, they managed to get it wrong, their implementation didn't fill in the MechListMIC in the reply token with the right content. There is a work around for this problem, but not all implementation
CVS commit: src/crypto/external/bsd/heimdal/dist/kuser
Module Name:src Committed By: wiz Date: Thu Apr 28 14:24:18 UTC 2011 Modified Files: src/crypto/external/bsd/heimdal/dist/kuser: kdestroy.1 Log Message: Improve wording in description. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/heimdal/dist/kuser/kdestroy.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/heimdal/dist/kuser/kdestroy.1 diff -u src/crypto/external/bsd/heimdal/dist/kuser/kdestroy.1:1.2 src/crypto/external/bsd/heimdal/dist/kuser/kdestroy.1:1.3 --- src/crypto/external/bsd/heimdal/dist/kuser/kdestroy.1:1.2 Thu Apr 14 19:19:19 2011 +++ src/crypto/external/bsd/heimdal/dist/kuser/kdestroy.1 Thu Apr 28 14:24:18 2011 @@ -1,4 +1,4 @@ -.\" $NetBSD: kdestroy.1,v 1.2 2011/04/14 19:19:19 elric Exp $ +.\" $NetBSD: kdestroy.1,v 1.3 2011/04/28 14:24:18 wiz Exp $ .\" .\" Copyright (c) 1997, 1999, 2001, 2004, 2006 Kungliga Tekniska Högskolan .\" (Royal Institute of Technology, Stockholm, Sweden). @@ -53,7 +53,7 @@ .Ek .Sh DESCRIPTION .Nm -remove one or the current set of tickets. +removes one credential or the current set of tickets. .Pp Supported options: .Bl -tag -width Ds
CVS commit: src/crypto/external/bsd/heimdal/dist/kuser
Module Name:src Committed By: wiz Date: Thu Apr 28 14:21:52 UTC 2011 Modified Files: src/crypto/external/bsd/heimdal/dist/kuser: copy_cred_cache.1 Log Message: Fix typo. To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 \ src/crypto/external/bsd/heimdal/dist/kuser/copy_cred_cache.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/heimdal/dist/kuser/copy_cred_cache.1 diff -u src/crypto/external/bsd/heimdal/dist/kuser/copy_cred_cache.1:1.1.1.2 src/crypto/external/bsd/heimdal/dist/kuser/copy_cred_cache.1:1.2 --- src/crypto/external/bsd/heimdal/dist/kuser/copy_cred_cache.1:1.1.1.2 Thu Apr 14 14:08:18 2011 +++ src/crypto/external/bsd/heimdal/dist/kuser/copy_cred_cache.1 Thu Apr 28 14:21:52 2011 @@ -1,4 +1,4 @@ -.\" $NetBSD: copy_cred_cache.1,v 1.1.1.2 2011/04/14 14:08:18 elric Exp $ +.\" $NetBSD: copy_cred_cache.1,v 1.2 2011/04/28 14:21:52 wiz Exp $ .\" .\" Copyright (c) 2004 Kungliga Tekniska Högskolan .\" (Royal Institute of Technology, Stockholm, Sweden). @@ -90,7 +90,7 @@ .Sh DIAGNOSTICS The .Nm -utility exits 0 on success, and \*[Gt]0 if an error occurs, or of no +utility exits 0 on success, and \*[Gt]0 if an error occurs, or if no credentials where actually copied. .\".Sh SEE ALSO .\".Sh STANDARDS
CVS commit: src/crypto/external/bsd/heimdal/dist/kdc
Module Name:src Committed By: wiz Date: Thu Apr 28 14:18:08 UTC 2011 Modified Files: src/crypto/external/bsd/heimdal/dist/kdc: hprop.8 Log Message: Punctuation fix. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/dist/kdc/hprop.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/heimdal/dist/kdc/hprop.8 diff -u src/crypto/external/bsd/heimdal/dist/kdc/hprop.8:1.2 src/crypto/external/bsd/heimdal/dist/kdc/hprop.8:1.3 --- src/crypto/external/bsd/heimdal/dist/kdc/hprop.8:1.2 Thu Apr 14 19:19:19 2011 +++ src/crypto/external/bsd/heimdal/dist/kdc/hprop.8 Thu Apr 28 14:18:08 2011 @@ -1,4 +1,4 @@ -.\" $NetBSD: hprop.8,v 1.2 2011/04/14 19:19:19 elric Exp $ +.\" $NetBSD: hprop.8,v 1.3 2011/04/28 14:18:08 wiz Exp $ .\" .\" Copyright (c) 2000 - 2004 Kungliga Tekniska Högskolan .\" (Royal Institute of Technology, Stockholm, Sweden). @@ -124,7 +124,7 @@ .Sh EXAMPLES The following will propagate a database to another machine (which should run -.Xr hpropd 8 ): +.Xr hpropd 8 ) : .Bd -literal -offset indent $ hprop slave-1 slave-2 .Ed
CVS commit: src/crypto/external/bsd/heimdal/dist/kdc
Module Name:src Committed By: wiz Date: Thu Apr 28 14:16:40 UTC 2011 Modified Files: src/crypto/external/bsd/heimdal/dist/kdc: kdc.8 Log Message: Fix typo. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/dist/kdc/kdc.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/heimdal/dist/kdc/kdc.8 diff -u src/crypto/external/bsd/heimdal/dist/kdc/kdc.8:1.2 src/crypto/external/bsd/heimdal/dist/kdc/kdc.8:1.3 --- src/crypto/external/bsd/heimdal/dist/kdc/kdc.8:1.2 Thu Apr 14 19:19:19 2011 +++ src/crypto/external/bsd/heimdal/dist/kdc/kdc.8 Thu Apr 28 14:16:40 2011 @@ -1,4 +1,4 @@ -.\" $NetBSD: kdc.8,v 1.2 2011/04/14 19:19:19 elric Exp $ +.\" $NetBSD: kdc.8,v 1.3 2011/04/28 14:16:40 wiz Exp $ .\" .\" Copyright (c) 2003 - 2004 Kungliga Tekniska Högskolan .\" (Royal Institute of Technology, Stockholm, Sweden). @@ -112,7 +112,7 @@ specified. The default is whatever is returned by .Fn krb_get_lrealm . -This option is only availabe if the KDC has been compiled with version +This option is only available if the KDC has been compiled with version 4 support. .It Fl K , Fl -kaserver Enable kaserver emulation (in case it's compiled in).
CVS commit: src/crypto/external/bsd/heimdal/dist/kadmin
Module Name:src Committed By: wiz Date: Thu Apr 28 14:15:53 UTC 2011 Modified Files: src/crypto/external/bsd/heimdal/dist/kadmin: kadmind.8 Log Message: Punctuation fix. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/heimdal/dist/kadmin/kadmind.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/heimdal/dist/kadmin/kadmind.8 diff -u src/crypto/external/bsd/heimdal/dist/kadmin/kadmind.8:1.2 src/crypto/external/bsd/heimdal/dist/kadmin/kadmind.8:1.3 --- src/crypto/external/bsd/heimdal/dist/kadmin/kadmind.8:1.2 Thu Apr 14 19:19:19 2011 +++ src/crypto/external/bsd/heimdal/dist/kadmin/kadmind.8 Thu Apr 28 14:15:53 2011 @@ -1,4 +1,4 @@ -.\" $NetBSD: kadmind.8,v 1.2 2011/04/14 19:19:19 elric Exp $ +.\" $NetBSD: kadmind.8,v 1.3 2011/04/28 14:15:53 wiz Exp $ .\" .\" Copyright (c) 2002 - 2004 Kungliga Tekniska Högskolan .\" (Royal Institute of Technology, Stockholm, Sweden). @@ -78,8 +78,7 @@ .Xr kpasswdd 8 daemon is responsible for the Kerberos 5 password changing protocol (used by -.Xr kpasswd 1 ) -. +.Xr kpasswd 1 ) . .Pp This daemon should only be run on the master server, and not on any slaves.
