[src/netbsd-1-5]: src/crypto/dist/heimdal/lib/kadm5 Pull up revision 1.2 (via...

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/cc45cf1e06d7
branches:  netbsd-1-5
changeset: 492752:cc45cf1e06d7
user:      he <he%NetBSD.org@localhost>
date:      Sat Feb 09 21:01:32 2002 +0000

description:
Pull up revision 1.2 (via patch, requested by joda):
  Create own param struct before marshalling.  Fixes PR#15520.
  (Diff is actually 1.1.1.4 -> 1.2)

diffstat:

 crypto/dist/heimdal/lib/kadm5/init_c.c |  14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diffs (43 lines):

diff -r 285094836765 -r cc45cf1e06d7 crypto/dist/heimdal/lib/kadm5/init_c.c
--- a/crypto/dist/heimdal/lib/kadm5/init_c.c    Sat Feb 09 20:54:17 2002 +0000
+++ b/crypto/dist/heimdal/lib/kadm5/init_c.c    Sat Feb 09 21:01:32 2002 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997 - 2000 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997 - 2002 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
@@ -37,7 +37,7 @@
 #include <netinet/in.h>
 #include <netdb.h>
 
-RCSID("$Id: init_c.c,v 1.1.1.1.2.1 2001/04/05 23:23:10 he Exp $");
+RCSID("$Id: init_c.c,v 1.1.1.1.2.2 2002/02/09 21:01:32 he Exp $");
 
 static void
 set_funcs(kadm5_client_context *c)
@@ -358,7 +358,13 @@
                        NULL, NULL, cc, NULL, NULL, NULL);
     if(ret == 0) {
        krb5_data params;
-       ret = _kadm5_marshal_params(context, ctx->realm_params, &params);
+       kadm5_config_params p;
+       memset(&p, 0, sizeof(p));
+       if(ctx->realm) {
+           p.mask |= KADM5_CONFIG_REALM;
+           p.realm = ctx->realm;
+       }
+       ret = _kadm5_marshal_params(context, &p, &params);
        
        ret = krb5_write_priv_message(context, ctx->ac, &s, &params);
        krb5_data_free(&params);
@@ -455,7 +461,7 @@
     ctx->prompter = prompter;
     ctx->keytab = keytab;
     ctx->ccache = ccache;
-    ctx->realm_params = realm_params;
+    /* maybe we should copy the params here */
     ctx->sock = -1;
     
     *server_handle = ctx;