From: Barry Jaspan <bjaspan@mit.edu>
Date: Fri, 2 Aug 1996 17:20:45 +0000 (+0000)
Subject: 	* alt_prof.c (kadm5_get_config_params): alloc enough bytes for
X-Git-Tag: krb5-1.0-beta7~188
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=a98113771e48fde82f0475bdea14add78efecbbe;p=krb5.git

	* alt_prof.c (kadm5_get_config_params): alloc enough bytes for
        adbname

	* kadm_rpc_xdr.c (xdr_krb5_kvno): assign tmp before xdr'ing it to
        avoid a spurious purify error

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@8894 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/lib/kadm5/ChangeLog b/src/lib/kadm5/ChangeLog
index 217687b02..7471ded41 100644
--- a/src/lib/kadm5/ChangeLog
+++ b/src/lib/kadm5/ChangeLog
@@ -1,3 +1,11 @@
+Fri Aug  2 13:19:29 1996  Barry Jaspan  <bjaspan@DUN-DUN-NOODLES>
+
+	* alt_prof.c (kadm5_get_config_params): alloc enough bytes for
+        adbname
+
+	* kadm_rpc_xdr.c (xdr_krb5_kvno): assign tmp before xdr'ing it to
+        avoid a spurious purify error
+
 Thu Jul 25 12:04:32 1996  Theodore Y. Ts'o  <tytso@mit.edu>
 
 	* admin_internal.h (_KADM5_CHECK_HANDLE): Add parenthesis around
diff --git a/src/lib/kadm5/alt_prof.c b/src/lib/kadm5/alt_prof.c
index 2f36f76fa..9dd8015b2 100644
--- a/src/lib/kadm5/alt_prof.c
+++ b/src/lib/kadm5/alt_prof.c
@@ -369,7 +369,7 @@ krb5_error_code kadm5_get_config_params(context, kdcprofile, kdcenv,
 	 params.mask |= KADM5_CONFIG_ADBNAME;
 	 params.admin_dbname = strdup(params_in->admin_dbname);
     } else if (params_in->mask & KADM5_CONFIG_DBNAME) {
-	 params.admin_dbname = (char *) malloc(strlen(params.dbname) + 6);
+	 params.admin_dbname = (char *) malloc(strlen(params.dbname) + 7);
 	 if (params.admin_dbname) {
 	      sprintf(params.admin_dbname, "%s.kadm5", params.dbname);
 	      params.mask |= KADM5_CONFIG_ADBNAME;
@@ -378,7 +378,7 @@ krb5_error_code kadm5_get_config_params(context, kdcprofile, kdcenv,
 	 params.admin_dbname = svalue;
 	 params.mask |= KADM5_CONFIG_ADBNAME;
     } else if (params.mask & KADM5_CONFIG_DBNAME) {
-	 params.admin_dbname = (char *) malloc(strlen(params.dbname) + 6);
+	 params.admin_dbname = (char *) malloc(strlen(params.dbname) + 7);
 	 if (params.admin_dbname) {
 	      sprintf(params.admin_dbname, "%s.kadm5", params.dbname);
 	      params.mask |= KADM5_CONFIG_ADBNAME;
diff --git a/src/lib/kadm5/kadm_rpc_xdr.c b/src/lib/kadm5/kadm_rpc_xdr.c
index 6cce9391e..fd6b8e7ee 100644
--- a/src/lib/kadm5/kadm_rpc_xdr.c
+++ b/src/lib/kadm5/kadm_rpc_xdr.c
@@ -140,6 +140,8 @@ xdr_krb5_kvno(XDR *xdrs, krb5_kvno *objp)
 {
 	unsigned char tmp;
 
+	tmp = '\0'; /* for purify, else xdr_u_char performs a umr */
+
 	if (xdrs->x_op == XDR_ENCODE)
 		tmp = (unsigned char) *objp;