From 8eed0d0aef3d03f247def819ca1eb23bddf767e1 Mon Sep 17 00:00:00 2001 From: Ken Raeburn Date: Fri, 27 Aug 2004 23:01:56 +0000 Subject: Finally applied patch from Nalin Dahyabhai at Red Hat to fix 0/NULL bugs in variadic argument lists to krb5_build_principal{,_ext}. Skipped the stylistic patches that removed casts of NULL. tag: 1850 git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16693 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/krb5/ccache/ChangeLog | 6 ++++++ src/lib/krb5/ccache/t_cc.c | 4 ++-- src/lib/krb5/krb/ChangeLog | 6 ++++++ src/lib/krb5/krb/conv_princ.c | 2 +- 4 files changed, 15 insertions(+), 3 deletions(-) (limited to 'src/lib') diff --git a/src/lib/krb5/ccache/ChangeLog b/src/lib/krb5/ccache/ChangeLog index 59a195259..dbf0a8b5b 100644 --- a/src/lib/krb5/ccache/ChangeLog +++ b/src/lib/krb5/ccache/ChangeLog @@ -1,3 +1,9 @@ +2004-08-27 Ken Raeburn + + * t_cc.c (init_test_cred): Terminate argument list to + krb5_build_principal with NULL, not 0. Patch from Nalin + Dahyabhai. + 2004-08-15 Ken Raeburn * cc_file.c (struct _krb5_fcc_data): Add new mutex diff --git a/src/lib/krb5/ccache/t_cc.c b/src/lib/krb5/ccache/t_cc.c index 0e7ae84d6..6559fb2bd 100644 --- a/src/lib/krb5/ccache/t_cc.c +++ b/src/lib/krb5/ccache/t_cc.c @@ -84,10 +84,10 @@ static void init_test_cred(krb5_context context) { #define REALM "REALM" krb5_build_principal(context, &test_creds.client, sizeof(REALM), REALM, - "client-comp1", "client-comp2", 0); + "client-comp1", "client-comp2", NULL); krb5_build_principal(context, &test_creds.server, sizeof(REALM), REALM, - "server-comp1", "server-comp2", 0); + "server-comp1", "server-comp2", NULL); } static void free_test_cred(krb5_context context) diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog index 1e284cce0..84092f11e 100644 --- a/src/lib/krb5/krb/ChangeLog +++ b/src/lib/krb5/krb/ChangeLog @@ -1,3 +1,9 @@ +2004-08-27 Ken Raeburn + + * conv_princ.c (krb5_425_conv_principal): Terminate argument list + to krb5_build_principal with NULL, not 0. Patch from Nalin + Dahyabhai. + 2004-08-12 Alexandra Ellwood * get_in_tkt.c (get_init_creds): diff --git a/src/lib/krb5/krb/conv_princ.c b/src/lib/krb5/krb/conv_princ.c index 6134baa0a..885dc995a 100644 --- a/src/lib/krb5/krb/conv_princ.c +++ b/src/lib/krb5/krb/conv_princ.c @@ -342,7 +342,7 @@ krb5_425_conv_principal(krb5_context context, const char *name, const char *inst not_service: retval = krb5_build_principal(context, princ, strlen(realm), realm, name, - instance, 0); + instance, NULL); if (iterator) profile_iterator_free (&iterator); if (full_name) profile_free_list(full_name); if (v4realms) profile_free_list(v4realms); -- cgit