Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
29 changed files
with
2,041 additions
and
0 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
DIST heimdal-1.5.3.tar.gz 6798305 SHA256 aac27bedb33c341b6aed202af07ccc816146a893148721f8123abbbf93bbfea5 SHA512 5c7890f60d6fe6b5034fca204eb7cdb33fdc397fe09b169212b6267310b83bb0b3b06a4c2888841be34c92cbd701bd95734b4019c33c147459c4a449861c4431 WHIRLPOOL 8202b1bdf76e84b4a0fea1aa89935dfb3fbcceca38c84ffb3e3e8454691398c9a7cecfad40c6661426be5e82f4e3f43b6d6494cf287900ff958e06603b602e19 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
# /etc/conf.d/heimdal-kadmind | ||
|
||
# Options to pass to the kadmind daemon. Please see man 8 kadmind for details. | ||
# | ||
# OPTIONS="--keytab=/etc/krb5.keytab" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
#!/sbin/runscript | ||
# Copyright 1999-2013 Gentoo Foundation | ||
# Distributed under the terms of the GNU General Public License v2 | ||
# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/files/heimdal-kadmind.initd-r2,v 1.1 2013/01/16 19:58:57 eras Exp $ | ||
|
||
depend() { | ||
use net heimdal-kdc | ||
after logger | ||
} | ||
|
||
start() { | ||
ebegin "Starting Heimdal kadmind" | ||
/usr/sbin/kadmind "${OPTIONS}" & | ||
echo $! > /var/run/heimdal-kadmind.pid | ||
eend $? | ||
} | ||
|
||
stop() { | ||
ebegin "Stopping Heimdal kadmind" | ||
start-stop-daemon --stop --quiet --exec \ | ||
/usr/sbin/kadmind | ||
eend $? | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
# /etc/conf.d/heimdal-kcm | ||
|
||
# Options to pass to the kcm daemon. Please see man 8 kcm for details | ||
# | ||
# OPTIONS="-c /etc/krb5.conf" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
#!/sbin/runscript | ||
# Copyright 1999-2011 Gentoo Foundation | ||
# Distributed under the terms of the GNU General Public License v2 | ||
# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/files/heimdal-kcm.initd-r1,v 1.1 2011/02/16 22:14:12 eras Exp $ | ||
|
||
depend() { | ||
after heimdal-kdc | ||
} | ||
|
||
OPTIONS="${OPTIONS} --detach" | ||
|
||
start() { | ||
ebegin "Starting Heimdal KCM..." | ||
start-stop-daemon --start --pidfile /var/run/kcm.pid --exec /usr/sbin/kcm -- ${OPTIONS# } | ||
eend $? | ||
} | ||
|
||
stop() { | ||
ebegin "Stopping Heimdal KCM..." | ||
start-stop-daemon --stop --pidfile /var/run/kcm.pid --retry SIGKILL/5 | ||
eend $? | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
# /etc/conf.d/heimdal-kdc | ||
|
||
# Options to pass to the kdc daemon. Please see man 8 kdc for details | ||
# | ||
# OPTIONS="-c /etc/krb5.conf" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
#!/sbin/runscript | ||
# Copyright 1999-2013 Gentoo Foundation | ||
# Distributed under the terms of the GNU General Public License v2 | ||
# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/files/heimdal-kdc.initd-r2,v 1.1 2013/01/16 19:58:57 eras Exp $ | ||
|
||
depend() { | ||
use net | ||
after logger | ||
} | ||
|
||
OPTIONS="${OPTIONS} --detach" | ||
|
||
start() { | ||
ebegin "Starting Heimdal kdc" | ||
start-stop-daemon --start --quiet --exec \ | ||
/usr/sbin/kdc -- ${OPTIONS# } | ||
eend $? | ||
} | ||
|
||
stop() { | ||
ebegin "Stopping Heimdal kdc" | ||
start-stop-daemon --stop --quiet --exec \ | ||
/usr/sbin/kdc | ||
eend $? | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
# /etc/conf.d/heimdal-kpasswdd | ||
|
||
# Options to pass to the kpasswdd daemon. Please see man 8 kpasswdd for details. | ||
# | ||
# OPTIONS="-k /etc/krb5.keytab" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
#!/sbin/runscript | ||
# Copyright 1999-2013 Gentoo Foundation | ||
# Distributed under the terms of the GNU General Public License v2 | ||
# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/files/heimdal-kpasswdd.initd-r2,v 1.1 2013/01/16 19:58:57 eras Exp $ | ||
|
||
depend() { | ||
use net heimdal-kdc | ||
after logger | ||
} | ||
|
||
start() { | ||
ebegin "Starting Heimdal kpasswdd" | ||
start-stop-daemon --background --start --quiet --exec \ | ||
/usr/sbin/kpasswdd -- "${OPTIONS}" | ||
eend $? | ||
} | ||
|
||
stop() { | ||
ebegin "Stopping Heimdal kpasswdd" | ||
start-stop-daemon --stop --quiet --exec \ | ||
/usr/sbin/kpasswdd | ||
eend $? | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
--- a/cf/db.m4 | ||
+++ b/cf/db.m4 | ||
@@ -51,6 +51,8 @@ dnl db_create is used by db3 and db4 and db5 | ||
#include <stdio.h> | ||
#ifdef HAVE_DBHEADER | ||
#include <$dbheader/db.h> | ||
+ #elif HAVE_DB6_DB_H | ||
+ #include <db6/db.h> | ||
#elif HAVE_DB5_DB_H | ||
#include <db5/db.h> | ||
#elif HAVE_DB4_DB_H | ||
--- a/lib/hdb/db3.c | ||
+++ b/lib/hdb/db3.c | ||
@@ -276,7 +276,7 @@ | ||
} | ||
db->hdb_db = d; | ||
|
||
-#if (DB_VERSION_MAJOR >= 4) && (DB_VERSION_MINOR >= 1) | ||
+#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1)) | ||
ret = (*d->open)(db->hdb_db, NULL, fn, NULL, DB_BTREE, myflags, mode); | ||
#else | ||
ret = (*d->open)(db->hdb_db, fn, NULL, DB_BTREE, myflags, mode); | ||
@@ -284,7 +284,7 @@ | ||
|
||
if (ret == ENOENT) { | ||
/* try to open without .db extension */ | ||
-#if (DB_VERSION_MAJOR >= 4) && (DB_VERSION_MINOR >= 1) | ||
+#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1)) | ||
ret = (*d->open)(db->hdb_db, NULL, db->hdb_name, NULL, DB_BTREE, | ||
myflags, mode); | ||
#else | ||
--- a/cf/db.m4 | ||
+++ b/cf/db.m4 | ||
@@ -38,6 +38,7 @@ AS_IF([test "x$with_berkeley_db" != xno], | ||
fi | ||
])], | ||
[AC_CHECK_HEADERS([ \ | ||
+ db6/db.h \ | ||
db5/db.h \ | ||
db4/db.h \ | ||
db3/db.h \ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
diff --git a/tests/kdc/check-iprop.in b/tests/kdc/check-iprop.in | ||
index ba9aff1..0bea2ed 100644 | ||
--- a/tests/kdc/check-iprop.in | ||
+++ b/tests/kdc/check-iprop.in | ||
@@ -31,6 +31,11 @@ | ||
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
# SUCH DAMAGE. | ||
|
||
+# check-iprop is known to fail and there is no easy way out | ||
+# http://article.gmane.org/gmane.comp.encryption.kerberos.heimdal.general/5408 | ||
+# http://article.gmane.org/gmane.comp.encryption.kerberos.heimdal.general/5409 | ||
+exit 77 | ||
+ | ||
top_builddir="@top_builddir@" | ||
env_setup="@env_setup@" | ||
objdir="@objdir@" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
--- kadmin/Makefile.am.orig 2010-11-25 12:39:31.000000000 +0000 | ||
+++ kadmin/Makefile.am 2011-02-14 21:37:29.000000000 +0000 | ||
@@ -64,10 +64,10 @@ | ||
$(top_builddir)/lib/krb5/libkrb5.la \ | ||
$(LIB_hcrypto) \ | ||
$(top_builddir)/lib/asn1/libasn1.la \ | ||
- $(LIB_roken) \ | ||
$(DBLIB) | ||
|
||
kadmind_LDADD = $(top_builddir)/lib/kadm5/libkadm5srv.la \ | ||
+ $(LIB_roken) \ | ||
../lib/gssapi/libgssapi.la \ | ||
$(LDADD_common) \ | ||
$(LIB_pidfile) \ | ||
@@ -78,12 +78,14 @@ | ||
$(top_builddir)/lib/kadm5/libkadm5srv.la \ | ||
$(top_builddir)/lib/sl/libsl.la \ | ||
$(LIB_readline) \ | ||
+ $(LIB_roken) \ | ||
$(LDADD_common) \ | ||
$(LIB_dlopen) | ||
|
||
add_random_users_LDADD = \ | ||
$(top_builddir)/lib/kadm5/libkadm5clnt.la \ | ||
$(top_builddir)/lib/kadm5/libkadm5srv.la \ | ||
+ $(LIB_roken) \ | ||
$(LDADD_common) \ | ||
$(LIB_dlopen) | ||
|
||
--- tests/plugin/check-pac.in.orig 2010-11-25 12:39:31.000000000 +0000 | ||
+++ tests/plugin/check-pac.in 2011-02-16 13:24:50.000000000 +0000 | ||
@@ -62,7 +62,8 @@ | ||
test_apreq="${TESTS_ENVIRONMENT} ../../lib/krb5/test_ap-req" | ||
|
||
KRB5_CONFIG="${objdir}/krb5.conf" | ||
-export KRB5_CONFIG | ||
+LD_PRELOAD="../../lib/roken/.libs/libroken.so" | ||
+export KRB5_CONFIG LD_PRELOAD | ||
|
||
rm -f ${keytabfile} | ||
rm -f current-db* |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
--- base/test_base.c 2011-09-30 15:58:45.000000000 +0300 | ||
+++ base/test_base.c 2011-12-27 23:04:50.482955923 +0200 | ||
@@ -39,6 +39,8 @@ | ||
#include "heimbase.h" | ||
#include "heimbasepriv.h" | ||
|
||
+#include <stdlib.h> | ||
+ | ||
static void | ||
memory_free(heim_object_t obj) | ||
{ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
Add missing symbols. Cherry picked from upstream master. | ||
Bug #420821. | ||
|
||
--- a/lib/krb5/version-script.map 2012-01-10 21:53:51.000000000 +0000 | ||
+++ b/lib/krb5/version-script.map 2012-06-13 16:23:26.000000000 +0000 | ||
@@ -42,6 +42,7 @@ | ||
krb5_auth_con_getrcache; | ||
krb5_auth_con_getremoteseqnumber; | ||
krb5_auth_con_getremotesubkey; | ||
+ krb5_auth_con_getsendsubkey; | ||
krb5_auth_con_init; | ||
krb5_auth_con_removeflags; | ||
krb5_auth_con_setaddrs; | ||
@@ -383,6 +384,14 @@ | ||
krb5_h_errno_to_heim_errno; | ||
krb5_have_error_string; | ||
krb5_hmac; | ||
+ krb5_init_creds_init; | ||
+ krb5_init_creds_set_service; | ||
+ krb5_init_creds_set_keytab; | ||
+ krb5_init_creds_get; | ||
+ krb5_init_creds_set_password; | ||
+ krb5_init_creds_free; | ||
+ krb5_init_creds_get_creds; | ||
+ krb5_init_creds_get_error; | ||
krb5_init_context; | ||
krb5_init_ets; | ||
krb5_initlog; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
--- a/doc/whatis.texi | ||
+++ b/doc/whatis.texi | ||
@@ -35,10 +35,11 @@ services can authenticate each other. | ||
@end macro | ||
@end ifinfo | ||
|
||
-@tex | ||
-@def@xsub#1{$_{#1}$} | ||
-@global@let@sub=@xsub | ||
-@end tex | ||
+@iftex | ||
+@macro sub{arg} | ||
+@textsubscript{\arg\} | ||
+@end macro | ||
+@end iftex | ||
|
||
@ifhtml | ||
@macro sub{arg} | ||
--- a/doc/win2k.texi | ||
+++ b/doc/win2k.texi | ||
@@ -311,4 +311,5 @@ Other useful programs include these: | ||
|
||
@itemize @bullet | ||
@item pwdump2 | ||
-@uref{http://www.bindview.com/Support/RAZOR/Utilities/Windows/pwdump2_readme.cfm}@end itemize | ||
+@uref{http://www.bindview.com/Support/RAZOR/Utilities/Windows/pwdump2_readme.cfm} | ||
+@end itemize | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
--- heimdal-1.5/configure.ac.orig 2011-08-01 12:49:33.554689000 +0200 | ||
+++ heimdal-1.5/configure.ac 2011-08-01 13:54:12.707009421 +0200 | ||
@@ -444,7 +444,7 @@ | ||
#endif | ||
],[0,0,0,0,0]) | ||
|
||
-AC_FIND_FUNC_NO_LIBS(tgetent, termcap ncurses curses,[ | ||
+AC_FIND_FUNC_NO_LIBS(tgetent, tinfo ncurses curses termcap,[ | ||
#ifdef HAVE_TERMCAP_H | ||
#include <termcap.h> | ||
#endif | ||
--- heimdal-1.5/lib/libedit/configure.ac~ 2011-07-30 22:43:29.000000000 +0200 | ||
+++ heimdal-1.5/lib/libedit/configure.ac 2011-08-01 13:54:30.657009419 +0200 | ||
@@ -33,7 +33,7 @@ | ||
EL_MANTYPE | ||
|
||
|
||
-AC_CHECK_LIB(curses, tgetent,, | ||
+AC_CHECK_LIB(tinfo, tgetent,, | ||
[AC_CHECK_LIB(ncurses, tgetent,, | ||
[AC_MSG_ERROR([libcurses or libncurses are required!])] )] ) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
[libdefaults] | ||
default_realm = MY.REALM | ||
# clockskew = 300 | ||
# v4_instance_resolve = false | ||
# v4_name_convert = { | ||
# host = { | ||
# rcmd = host | ||
# ftp = ftp | ||
# } | ||
# plain = { | ||
# something = something-else | ||
# } | ||
# } | ||
|
||
[realms] | ||
MY.REALM = { | ||
kdc = MY.COMPUTER | ||
} | ||
# OTHER.REALM = { | ||
# v4_instance_convert = { | ||
# kerberos = kerberos | ||
# computer = computer.some.other.domain | ||
# } | ||
# } | ||
|
||
[domain_realm] | ||
.my.domain = MY.REALM |
Oops, something went wrong.