From ece77a8b985638438e3e017d01295a517462d0ca Mon Sep 17 00:00:00 2001
From: Assar Westerlund <assar@sics.se>
Date: Mon, 13 Sep 1999 02:56:16 +0000
Subject: [PATCH] (kadm5_c_get_principal): new _kadm5_client_recv

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@6954 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 lib/kadm5/get_c.c | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/lib/kadm5/get_c.c b/lib/kadm5/get_c.c
index ef069d3ec..24edd72c8 100644
--- a/lib/kadm5/get_c.c
+++ b/lib/kadm5/get_c.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997 - 1999 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
@@ -51,23 +51,31 @@ kadm5_c_get_principal(void *server_handle,
     krb5_storage *sp;
     unsigned char buf[1024];
     int32_t tmp;
+    krb5_data reply;
+
     sp = krb5_storage_from_mem(buf, sizeof(buf));
+    if (sp == NULL)
+	return ENOMEM;
     krb5_store_int32(sp, kadm_get);
     krb5_store_principal(sp, princ);
     krb5_store_int32(sp, mask);
     ret = _kadm5_client_send(context, sp);
-    if(ret) {
-	krb5_storage_free(sp);
+    krb5_storage_free(sp);
+    if(ret)
 	return ret;
+    ret = _kadm5_client_recv(context, &reply);
+    if (ret)
+	return ret;
+    sp = krb5_storage_from_data (&reply);
+    if (sp == NULL) {
+	krb5_data_free (&reply);
+	return ENOMEM;
     }
-    sp->seek(sp, SEEK_SET, 0);
-    ret = _kadm5_client_recv(context, sp);
-    if(ret == 0) {
-	krb5_ret_int32(sp, &tmp);
-	ret = tmp;
-    }
+    krb5_ret_int32(sp, &tmp);
+    ret = tmp;
     if(ret == 0)
 	kadm5_ret_principal_ent(sp, out);
     krb5_storage_free(sp);
+    krb5_data_free (&reply);
     return ret;
 }