Author: lha Date: 2007-07-16 10:30:22 +0000 (Mon, 16 Jul 2007) New Revision: 769
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=lorikeet&rev=769 Log: Merged with Heimdal svn revision 21583 Modified: trunk/heimdal/ChangeLog trunk/heimdal/heimdal-lorikeet.diff trunk/heimdal/kdc/set_dbinfo.c trunk/heimdal/lib/com_err/ChangeLog trunk/heimdal/lib/com_err/Makefile.am trunk/heimdal/tests/kdc/check-kadmin.in Changeset: Modified: trunk/heimdal/ChangeLog =================================================================== --- trunk/heimdal/ChangeLog 2007-07-16 08:32:41 UTC (rev 768) +++ trunk/heimdal/ChangeLog 2007-07-16 10:30:22 UTC (rev 769) @@ -1,5 +1,7 @@ 2007-07-16 Love H�rnquist �strand <[EMAIL PROTECTED]> + * kdc/set_dbinfo.c: Print acl file too. + * kdc/kerberos4.c: Error codes are just fine, remove XXX now. * lib/krb5/krb5-v4compat.h: Drop duplicate error codes. Modified: trunk/heimdal/heimdal-lorikeet.diff =================================================================== --- trunk/heimdal/heimdal-lorikeet.diff 2007-07-16 08:32:41 UTC (rev 768) +++ trunk/heimdal/heimdal-lorikeet.diff 2007-07-16 10:30:22 UTC (rev 769) @@ -96,193 +96,3 @@ esym="__i686.get_pc_thunk fc_softc" symbols= -Index: kdc/default_config.c -=================================================================== ---- kdc/default_config.c (revision 766) -+++ kdc/default_config.c (working copy) -@@ -39,68 +39,6 @@ - RCSID("$Id: default_config.c 21296 2007-06-25 14:49:11Z lha $"); - - krb5_error_code --krb5_kdc_set_dbinfo(krb5_context context, struct krb5_kdc_configuration *c) --{ -- struct hdb_dbinfo *info, *d; -- krb5_error_code ret; -- int i; -- -- /* fetch the databases */ -- ret = hdb_get_dbinfo(context, &info); -- if (ret) -- return ret; -- -- d = NULL; -- while ((d = hdb_dbinfo_get_next(info, d)) != NULL) { -- void *ptr; -- -- ptr = realloc(c->db, (c->num_db + 1) * sizeof(*c->db)); -- if (ptr == NULL) { -- ret = ENOMEM; -- krb5_set_error_string(context, "out of memory"); -- goto out; -- } -- c->db = ptr; -- -- ret = hdb_create(context, &c->db[c->num_db], -- hdb_dbinfo_get_dbname(context, d)); -- if(ret) -- goto out; -- -- ret = hdb_set_master_keyfile(context, c->db[c->num_db], -- hdb_dbinfo_get_mkey_file(context, d)); -- if (ret) -- goto out; -- -- c->num_db++; -- -- kdc_log(context, c, 0, "label: %s", -- hdb_dbinfo_get_label(context, d)); -- kdc_log(context, c, 0, "\trealm: %s", -- hdb_dbinfo_get_realm(context, d)); -- kdc_log(context, c, 0, "\tdbname: %s", -- hdb_dbinfo_get_dbname(context, d)); -- kdc_log(context, c, 0, "\tmkey_file: %s", -- hdb_dbinfo_get_mkey_file(context, d)); -- } -- hdb_free_dbinfo(context, &info); -- -- return 0; --out: -- for (i = 0; i < c->num_db; i++) -- if (c->db[i] && c->db[i]->hdb_destroy) -- (*c->db[i]->hdb_destroy)(context, c->db[i]); -- c->num_db = 0; -- free(c->db); -- c->db = NULL; -- -- hdb_free_dbinfo(context, &info); -- -- return ret; --} -- -- --krb5_error_code - krb5_kdc_get_config(krb5_context context, krb5_kdc_configuration **config) - { - krb5_kdc_configuration *c; -Index: kdc/set_dbinfo.c -=================================================================== ---- kdc/set_dbinfo.c (revision 0) -+++ kdc/set_dbinfo.c (revision 0) -@@ -0,0 +1,100 @@ -+/* -+ * Copyright (c) 1997-2007 Kungliga Tekniska H�gskolan -+ * (Royal Institute of Technology, Stockholm, Sweden). -+ * -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * -+ * 3. Neither the name of the Institute nor the names of its contributors -+ * may be used to endorse or promote products derived from this software -+ * without specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND -+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+ * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE -+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -+ * SUCH DAMAGE. -+ */ -+ -+#include "kdc_locl.h" -+ -+RCSID("$Id: default_config.c 21296 2007-06-25 14:49:11Z lha $"); -+ -+krb5_error_code -+krb5_kdc_set_dbinfo(krb5_context context, struct krb5_kdc_configuration *c) -+{ -+ struct hdb_dbinfo *info, *d; -+ krb5_error_code ret; -+ int i; -+ -+ /* fetch the databases */ -+ ret = hdb_get_dbinfo(context, &info); -+ if (ret) -+ return ret; -+ -+ d = NULL; -+ while ((d = hdb_dbinfo_get_next(info, d)) != NULL) { -+ void *ptr; -+ -+ ptr = realloc(c->db, (c->num_db + 1) * sizeof(*c->db)); -+ if (ptr == NULL) { -+ ret = ENOMEM; -+ krb5_set_error_string(context, "out of memory"); -+ goto out; -+ } -+ c->db = ptr; -+ -+ ret = hdb_create(context, &c->db[c->num_db], -+ hdb_dbinfo_get_dbname(context, d)); -+ if(ret) -+ goto out; -+ -+ ret = hdb_set_master_keyfile(context, c->db[c->num_db], -+ hdb_dbinfo_get_mkey_file(context, d)); -+ if (ret) -+ goto out; -+ -+ c->num_db++; -+ -+ kdc_log(context, c, 0, "label: %s", -+ hdb_dbinfo_get_label(context, d)); -+ kdc_log(context, c, 0, "\trealm: %s", -+ hdb_dbinfo_get_realm(context, d)); -+ kdc_log(context, c, 0, "\tdbname: %s", -+ hdb_dbinfo_get_dbname(context, d)); -+ kdc_log(context, c, 0, "\tmkey_file: %s", -+ hdb_dbinfo_get_mkey_file(context, d)); -+ } -+ hdb_free_dbinfo(context, &info); -+ -+ return 0; -+out: -+ for (i = 0; i < c->num_db; i++) -+ if (c->db[i] && c->db[i]->hdb_destroy) -+ (*c->db[i]->hdb_destroy)(context, c->db[i]); -+ c->num_db = 0; -+ free(c->db); -+ c->db = NULL; -+ -+ hdb_free_dbinfo(context, &info); -+ -+ return ret; -+} -+ -+ -Index: kdc/Makefile.am -=================================================================== ---- kdc/Makefile.am (revision 766) -+++ kdc/Makefile.am (working copy) -@@ -31,6 +31,7 @@ - kdc-private.h \ - kdc-protos.h \ - default_config.c \ -+ set_dbinfo.c \ - digest.c \ - kdc_locl.h \ - kerberos5.c \ Modified: trunk/heimdal/kdc/set_dbinfo.c =================================================================== --- trunk/heimdal/kdc/set_dbinfo.c 2007-07-16 08:32:41 UTC (rev 768) +++ trunk/heimdal/kdc/set_dbinfo.c 2007-07-16 10:30:22 UTC (rev 769) @@ -80,6 +80,8 @@ hdb_dbinfo_get_dbname(context, d)); kdc_log(context, c, 0, "\tmkey_file: %s", hdb_dbinfo_get_mkey_file(context, d)); + kdc_log(context, c, 0, "\tacl_file: %s", + hdb_dbinfo_get_acl_file(context, d)); } hdb_free_dbinfo(context, &info); Modified: trunk/heimdal/lib/com_err/ChangeLog =================================================================== --- trunk/heimdal/lib/com_err/ChangeLog 2007-07-16 08:32:41 UTC (rev 768) +++ trunk/heimdal/lib/com_err/ChangeLog 2007-07-16 10:30:22 UTC (rev 769) @@ -1,3 +1,7 @@ +2007-07-16 Love H�rnquist �strand <[EMAIL PROTECTED]> + + * Makefile.am: Only do roken rename for the library. + 2007-07-15 Love H�rnquist �strand <[EMAIL PROTECTED]> * Makefile.am: use version script. Modified: trunk/heimdal/lib/com_err/Makefile.am =================================================================== --- trunk/heimdal/lib/com_err/Makefile.am 2007-07-16 08:32:41 UTC (rev 768) +++ trunk/heimdal/lib/com_err/Makefile.am 2007-07-16 10:30:22 UTC (rev 769) @@ -1,13 +1,7 @@ -# $Id: Makefile.am 21558 2007-07-15 10:26:18Z lha $ +# $Id: Makefile.am 21581 2007-07-16 10:15:06Z lha $ include $(top_srcdir)/Makefile.am.common -if do_roken_rename -ES = snprintf.c strlcpy.c -endif - -AM_CPPFLAGS += $(ROKEN_RENAME) - YFLAGS = -d lib_LTLIBRARIES = libcom_err.la @@ -23,6 +17,11 @@ compile_et_SOURCES = compile_et.c compile_et.h parse.y lex.l lex.h +if do_roken_rename +ES = snprintf.c strlcpy.c +endif + +libcom_err_la_CPPFLAGS = $(ROKEN_RENAME) libcom_err_la_SOURCES = error.c com_err.c roken_rename.h $(ES) $(compile_et_OBJECTS): parse.h parse.c ## XXX broken automake 1.4s Modified: trunk/heimdal/tests/kdc/check-kadmin.in =================================================================== --- trunk/heimdal/tests/kdc/check-kadmin.in 2007-07-16 08:32:41 UTC (rev 768) +++ trunk/heimdal/tests/kdc/check-kadmin.in 2007-07-16 10:30:22 UTC (rev 769) @@ -66,6 +66,7 @@ rm -f current-db* rm -f out-* rm -f mkey.file* +rm -f messages.log echo Creating database ${kadmin} -l \ @@ -99,7 +100,8 @@ -S kadmin/[EMAIL PROTECTED] foo/[EMAIL PROTECTED] || exit 1 env KRB5CCNAME=${cache} \ -${kadmin} -p foo/[EMAIL PROTECTED] add -p foo --use-defaults [EMAIL PROTECTED] || exit 1 +${kadmin} -p foo/[EMAIL PROTECTED] add -p foo --use-defaults [EMAIL PROTECTED] || + { cat messages.log ; exit 1; } echo "killing kdc (${kdcpid} ${kadmpid})" kill ${kdcpid} ${kadmpid} > /dev/null 2>/dev/null
