From: Luke Howard <lukeh@padl.com>
Date: Mon, 31 Aug 2009 06:46:58 +0000 (+0000)
Subject: cleanup
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9caac3e9e3c26685476b9126b78b68b2bcd1fd0d;p=thirdparty%2Fkrb5.git

cleanup

git-svn-id: svn://anonsvn.mit.edu/krb5/users/lhoward/authdata@22674 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/plugins/authdata/greet_client/greet.c b/src/plugins/authdata/greet_client/greet.c
index d81d4bf5fd..46c1b90a5b 100644
--- a/src/plugins/authdata/greet_client/greet.c
+++ b/src/plugins/authdata/greet_client/greet.c
@@ -168,6 +168,7 @@ greet_get_attribute(krb5_context kcontext,
                     int *more)
 {
     struct greet_context *greet = (struct greet_context *)request_context;
+    krb5_error_code code;
 
     if (!data_eq(*attribute, greet_attr) || greet->greeting.length == 0)
         return ENOENT;
@@ -176,7 +177,16 @@ greet_get_attribute(krb5_context kcontext,
     *complete = TRUE;
     *more = 0;
 
-    return krb5int_copy_data_contents_add0(kcontext, &greet->greeting, value);
+    code = krb5int_copy_data_contents_add0(kcontext, &greet->greeting, value);
+    if (code == 0) {
+        code = krb5int_copy_data_contents_add0(kcontext,
+                                               &greet->greeting,
+                                               display_value);
+        if (code != 0)
+            krb5_free_data_contents(kcontext, value);
+    }
+
+    return code;
 }
 
 static krb5_error_code
diff --git a/src/plugins/authdata/greet_server/greet_auth.c b/src/plugins/authdata/greet_server/greet_auth.c
index fe722e15f7..cacbc659fe 100644
--- a/src/plugins/authdata/greet_server/greet_auth.c
+++ b/src/plugins/authdata/greet_server/greet_auth.c
@@ -48,7 +48,7 @@ static krb5_error_code greet_hello(krb5_context context, krb5_data **ret)
 {
     krb5_data tmp;
 
-    tmp.data = "Hello, KDC issued acceptor world!\n";
+    tmp.data = "Hello, KDC issued acceptor world!";
     tmp.length = strlen(tmp.data);
 
     return krb5_copy_data(context, &tmp, ret);