From 562c2aced2f00436d0bc2ab0750330e1155286f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= Date: Sun, 8 Oct 2006 13:43:52 +0000 Subject: [PATCH] Adapt to signature change of _krb5_principalname2krb5_principal. git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@18349 ec53bebd-3082-4978-b11e-865c3cabbd6b --- kdc/hpropd.c | 4 ++-- kdc/kerberos4.c | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/kdc/hpropd.c b/kdc/hpropd.c index d34858a38..cda7d0398 100644 --- a/kdc/hpropd.c +++ b/kdc/hpropd.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-2004 Kungliga Tekniska Högskolan + * Copyright (c) 1997-2006 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -328,7 +328,7 @@ main(int argc, char **argv) ret = krb5_make_principal(context, &c1, NULL, "kadmin", "hprop", NULL); if(ret) krb5_err(context, 1, ret, "krb5_make_principal"); - _krb5_principalname2krb5_principal(&c2, + _krb5_principalname2krb5_principal(context, &c2, authent->cname, authent->crealm); if(!krb5_principal_compare(context, c1, c2)) { char *s; diff --git a/kdc/kerberos4.c b/kdc/kerberos4.c index 7a7bcfeca..6c4474980 100644 --- a/kdc/kerberos4.c +++ b/kdc/kerberos4.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997 - 2005 Kungliga Tekniska Högskolan + * Copyright (c) 1997 - 2006 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). * All rights reserved. * @@ -666,7 +666,8 @@ _kdc_encode_v4_ticket(krb5_context context, { krb5_principal princ; - _krb5_principalname2krb5_principal(&princ, + _krb5_principalname2krb5_principal(context, + &princ, *service, et->crealm); ret = krb5_524_conv_principal(context, @@ -678,7 +679,8 @@ _kdc_encode_v4_ticket(krb5_context context, if(ret) return ret; - _krb5_principalname2krb5_principal(&princ, + _krb5_principalname2krb5_principal(context, + &princ, et->cname, et->crealm);