Fix Ultrix problems for tests

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

diff --git a/src/lib/kadm/ChangeLog b/src/lib/kadm/ChangeLog
index 42a552ca86d47ff12844e31eb9cde47caa78268d..76323c3a84f0872f0d9e34c32662355ee4fe7485 100644 (file)
--- a/src/lib/kadm/ChangeLog
+++ b/src/lib/kadm/ChangeLog
@@ -1,4 +1,12 @@
 
+Tue May 16 13:19:04 EDT 1995   Paul Park       (pjpark@mit.edu)
+       * t_dbentry.c   - Change isset to is_a_set to keep Ultrix happy.  Also
+                         correctly calculate the length of the standard pwd.
+                         so that we don't overwrite the end of the malloc()ed
+                         string.
+       * t_ktentry.c   - Remove isset logic, no differentiation for keytabs.
+
+
 Tue May 16 10:35:54 EDT 1995   Paul Park       (pjpark@mit.edu)
        * t_dbentry.c, t_ktentry.c - new test modules for encode/decode
                functions.  These convert to and from krb5_db_entry and

diff --git a/src/lib/kadm/t_dbentry.c b/src/lib/kadm/t_dbentry.c
index e42577da844a78f0c743f698515dbb6109b16a2e..ecdc1b8706be95aa5afe65655df99840696797cd 100644 (file)
--- a/src/lib/kadm/t_dbentry.c
+++ b/src/lib/kadm/t_dbentry.c
@@ -106,7 +106,7 @@ gen_dbent(kcontext, dbentp, isrand, validp, pwdp, expectp)
     }
     else {
        if (is_set) {
-           *pwdp = (char *) malloc(strlen(defpass));
+           *pwdp = (char *) malloc(strlen(defpass)+1);
            strcpy(*pwdp, defpass);
            *validp |= KRB5_ADM_M_PASSWORD;
        }
@@ -533,11 +533,11 @@ print_dbent(kcontext, ivalid, ientp, ipwd)
  *     using krb5_adm_proto_to_dbent.  Then verify the match.
  */
 static krb5_int32
-do_test(pname, verbose, isrand, isset, title, passno)
+do_test(pname, verbose, isrand, is_a_set, title, passno)
     char               *pname;
     krb5_boolean       verbose;
     krb5_boolean       isrand;
-    krb5_boolean       isset;
+    krb5_boolean       is_a_set;
     char               *title;
     krb5_int32         passno;
 {
@@ -575,7 +575,7 @@ do_test(pname, verbose, isrand, isset, title, passno)
        complist = (krb5_data *) NULL;
        should_fail = 0;
        if (!isrand) {
-           if (isset)
+           if (is_a_set)
                in_validmask = KRB5_ADM_M_SET;
            else
                in_validmask = KRB5_ADM_M_GET;

diff --git a/src/lib/kadm/t_ktentry.c b/src/lib/kadm/t_ktentry.c
index ed2592b27e18df830c36fbc90ba88fb6db66d6d0..1e1a52c9c19b1eb30698dfbb5db7719645e3d4ed 100644 (file)
--- a/src/lib/kadm/t_ktentry.c
+++ b/src/lib/kadm/t_ktentry.c
@@ -194,11 +194,10 @@ print_ktent(kcontext, ientp)
  *     using krb5_adm_proto_to_ktent.  Then verify the match.
  */
 static krb5_int32
-do_test(pname, verbose, isrand, isset, title, passno)
+do_test(pname, verbose, isrand, title, passno)
     char               *pname;
     krb5_boolean       verbose;
     krb5_boolean       isrand;
-    krb5_boolean       isset;
     char               *title;
     krb5_int32         passno;
 {
@@ -362,8 +361,7 @@ main(argc, argv)
     if (error)
        return(error);
 
-    error += do_test(programname, verbose, 0, 1, "Standard set test", 0);
-    error += do_test(programname, verbose, 0, 0, "Standard get test", 0);
+    error += do_test(programname, verbose, 0, "Standard test", 0);
     for (i=0; i<randompasses; i++)
        error += do_test(programname, verbose, 1, 0, "Random test", i+1);
     if (verbose) {