mit-kerberos and keyutils in main

2015-06-21 17:28:26 +03:00
parent bc7a7deffa
commit 2b1384da4a
22 changed files with 429 additions and 0 deletions
@@ -0,0 +1,15 @@
+--- configure.in.orig	2014-01-16 02:44:15.000000000 +0200
+++ src/configure.in	2014-05-17 17:05:05.317924895 +0300
+@@ -1206,9 +1206,9 @@
+ # default, so it's not a big deal that it isn't very good.  We should
+ # use python-config instead.
+ PYTHON_LIB=
+-AC_CHECK_HEADERS(Python.h python2.3/Python.h python2.5/Python.h)
+-AC_CHECK_LIB(python2.3,main,[PYTHON_LIB=-lpython2.3],
+-  AC_CHECK_LIB(python2.5,main,[PYTHON_LIB=-lpython2.5]))
+AC_CHECK_HEADERS(Python.h python2.5/Python.h python2.7/Python.h)
+AC_CHECK_LIB(python2.5,main,[PYTHON_LIB=-lpython2.5],
+  AC_CHECK_LIB(python2.7,main,[PYTHON_LIB=-lpython2.7]))
+ AC_SUBST(PYTHON_LIB)
+ 
+ 
@@ -0,0 +1,16 @@
+[kdcdefaults]
+	kdc_ports = 88,750
+
+[realms]
+	EXAMPLE.COM = {
+	database_name = /etc/krb5kdc/principal
+	admin_keytab = /etc/krb5kdc/kadm5.keytab
+	acl_file = /etc/krb5kdc/kadm5.acl
+	dict_file = /etc/krb5kdc/kadm5.dict
+	key_stash_file = /etc/krb5kdc/.k5.EXAMPLE.COM
+	kadmind_port = 749
+	max_life = 10h 0m 0s
+	max_renewable_life = 7d 0h 0m 0s
+	master_key_type = des3-hmac-sha1
+	supported_enctypes = des3-hmac-sha1:normal des-cbc-crc:normal
+	}
@@ -0,0 +1,11 @@
+--- src/build-tools/krb5-config.in.orig	2014-01-16 02:44:15.000000000 +0200
+++ src/build-tools/krb5-config.in	2014-05-17 17:00:42.624580187 +0300
+@@ -221,7 +221,7 @@
+ 	    -e 's#\$(PROG_RPATH)#'$libdir'#' \
+ 	    -e 's#\$(PROG_LIBPATH)#'$libdirarg'#' \
+ 	    -e 's#\$(RPATH_FLAG)#'"$RPATH_FLAG"'#' \
+-	    -e 's#\$(LDFLAGS)#'"$LDFLAGS"'#' \
+	    -e 's#\$(LDFLAGS)##' \
+ 	    -e 's#\$(PTHREAD_CFLAGS)#'"$PTHREAD_CFLAGS"'#' \
+ 	    -e 's#\$(CFLAGS)##'`
+ 
@@ -0,0 +1,25 @@
+[libdefaults]
+	ticket_lifetime = 600
+	default_realm = EXAMPLE.COM
+	default_tkt_enctypes = des3-hmac-sha1 des-cbc-crc
+	default_tgs_enctypes = des3-hmac-sha1 des-cbc-crc
+
+[realms]
+	EXAMPLE.COM = {
+	kdc = kerberos.example.com:88
+	kdc = kerberos2.example.com:88
+	admin_server = kerberos.example.com:749
+	}
+
+[domain_realm]
+	.example.com = EXAMPLE.COM
+	example.com = EXAMPLE.COM
+
+[kdc]
+	profile = /etc/krb5kdc/kdc.conf
+
+[logging]
+	kdc = FILE:/var/log/krb5kdc.log
+	admin_server = FILE:/var/log/kadmin.log
+	default = FILE:/var/log/krb5lib.log
+	    
@@ -0,0 +1,55 @@
+--- a/src/slave/kprop.c
+++ b/src/slave/kprop.c
+@@ -91,7 +91,7 @@ main(argc, argv)
+     int     argc;
+     char    **argv;
+ {
+-    int     fd, database_fd, database_size;
+    int     fd = -1, database_fd, database_size;
+     krb5_error_code retval;
+     krb5_context context;
+     krb5_creds *my_creds;
+--- a/src/kadmin/ktutil/ktutil_funcs.c
+++ b/src/kadmin/ktutil/ktutil_funcs.c
+@@ -64,7 +64,7 @@
+     krb5_kt_list *list;
+     int idx;
+ {
+-    krb5_kt_list lp, prev;
+    krb5_kt_list lp, prev = NULL;
+     int i;
+ 
+     for (lp = *list, i = 1; lp; prev = lp, lp = lp->next, i++) {
+--- a/src/lib/kadm5/alt_prof.c
+++ b/src/lib/kadm5/alt_prof.c
+@@ -164,7 +164,7 @@
+     char **values;
+     char *valp;
+     int idx;
+-    krb5_boolean val;
+    krb5_boolean val = 0;
+ 
+     kret = krb5_aprof_getvals (acontext, hierarchy, &values);
+     if (kret)
+
+--- a/src/util/profile/prof_init.c
+++ b/src/util/profile/prof_init.c
+@@ -255,7 +255,7 @@ copy_vtable_profile(profile_t profile, profile_t *ret_new_profile)
+ {
+     errcode_t err;
+     void *cbdata;
+-    profile_t new_profile;
+    profile_t new_profile = NULL;
+ 
+     *ret_new_profile = NULL;
+ 
+--- a/src/tests/asn.1/trval.c   2013-04-12 12:51:36.000000000 -0500
+++ b/src/tests/asn.1/trval.c   2013-05-24 04:31:14.077036380 -0500
+@@ -404,7 +404,7 @@
+ {
+     int n;
+     int r = 0;
+-    int rlen2;
+    int rlen2 = 0;
+     int rlent;
+     int save_appl;
@@ -0,0 +1,12 @@
+--- /dev/null	2009-10-20 19:31:44.183325514 +0300
+++ src/rebuild-configure-scripts.sh	2009-10-22 10:37:14.583117034 +0300
+@@ -0,0 +1,9 @@
+#!/bin/bash
+
+top=`pwd`
+for configurein in `find -name configure.in -type f` ; do
+    pushd `dirname $configurein`
+    grep -q A._CONFIG_HEADER configure.in && autoheader -I "$top"
+    autoconf -I "$top"
+    popd
+done