pullup from 1.2 branch

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

5 files changed, 51 insertions, 25 deletions

diff --git a/src/lib/kdb/ChangeLog b/src/lib/kdb/ChangeLog
index 7d7368cc6..b72e64248 100644
--- a/src/lib/kdb/ChangeLog
+++ b/src/lib/kdb/ChangeLog
@@ -1,3 +1,26 @@
+2000-05-11  Nalin Dahyabhai  <nalin@redhat.com>
+
+	* t_kdb.c (gen_principal): Don't overflow "pnamebuf" if bad data was
+	passed in.
+
+2000-05-03  Nalin Dahyabhai  <nalin@redhat.com>
+
+	* setup_mkey.c (krb5_db_setup_mkey_name): Use REALM_SEP_STRING
+	when computing size of buffer that is to include it.
+
+	* fetch_mkey.c (krb5_db_fetch_mkey): Make sure "defkeyfile" is
+	null terminated after construction.
+	* store_mkey.c (krb5_db_store_mkey): Likewise.
+
+2000-04-27  Ken Raeburn  <raeburn@mit.edu>
+	    Ezra Peisach  <epeisach@mit.edu>
+
+	* t_kdb.c (gen_principal): Force argument to isalnum to be in
+	range 0..255.
+	(do_testing): Cast pid_t to long before passing to fprintf, and
+	use %ld format.  Fix argument lists to find_principal and
+	delete_principal.
+
 2000-03-16  Ezra Peisach  <epeisach@mit.edu>
 
 	* kdb_xdr.c (krb5_dbe_lookup_mod_princ_data): Get rid of
diff --git a/src/lib/kdb/fetch_mkey.c b/src/lib/kdb/fetch_mkey.c
index 2ff5c2942..7ae26bbb9 100644
--- a/src/lib/kdb/fetch_mkey.c
+++ b/src/lib/kdb/fetch_mkey.c
@@ -133,7 +133,7 @@ krb5_db_fetch_mkey(context, mname, etype, fromkeyboard, twice, keyfile,
 	(void) strncat(defkeyfile, realm->data,
 		       min(sizeof(defkeyfile)-sizeof(DEFAULT_KEYFILE_STUB)-1,
 			   realm->length));
-	(void) strcat(defkeyfile, "");
+	defkeyfile[sizeof(defkeyfile) - 1] = '\0';
 	
 #ifdef ANSI_STDIO
 	if (!(kf = fopen((keyfile) ? keyfile : defkeyfile, "rb")))
diff --git a/src/lib/kdb/setup_mkey.c b/src/lib/kdb/setup_mkey.c
index 0898a6311..1788ecdd8 100644
--- a/src/lib/kdb/setup_mkey.c
+++ b/src/lib/kdb/setup_mkey.c
@@ -56,7 +56,7 @@ krb5_db_setup_mkey_name(context, keyname, realm, fullname, principal)
 
     keylen = strlen(keyname);
 	 
-    fname = malloc(keylen+rlen+2);
+    fname = malloc(keylen+rlen+strlen(REALM_SEP_STRING)+1);
     if (!fname)
 	return ENOMEM;
 
diff --git a/src/lib/kdb/store_mkey.c b/src/lib/kdb/store_mkey.c
index d18630ac0..47e0bc9c0 100644
--- a/src/lib/kdb/store_mkey.c
+++ b/src/lib/kdb/store_mkey.c
@@ -68,7 +68,7 @@ krb5_db_store_mkey(context, keyfile, mname, key)
 	(void) strncat(defkeyfile, realm->data,
 		       min(sizeof(defkeyfile)-sizeof(DEFAULT_KEYFILE_STUB)-1,
 			   realm->length));
-	(void) strcat(defkeyfile, "");
+	defkeyfile[sizeof(defkeyfile) - 1] = '\0';
 	keyfile = defkeyfile;
     }
 
diff --git a/src/lib/kdb/t_kdb.c b/src/lib/kdb/t_kdb.c
index 8358088d2..10e6163fb 100644
--- a/src/lib/kdb/t_kdb.c
+++ b/src/lib/kdb/t_kdb.c
@@ -363,15 +363,23 @@ gen_principal(kcontext, realm, do_rand, n, princp, namep)
 	    complen = RANDOM(1,MAX_COMP_SIZE);
 	    for (j=0; j<complen; j++) {
 		*cp = (char) RANDOM(0,256);
-		while (!isalnum(*cp))
+		while (!isalnum(*cp & 0xff))
 		    *cp = (char) RANDOM(0,256);
 		cp++;
+	        if(cp + strlen(realm) >= pnamebuf + sizeof(pnamebuf))
+		    break;
 	    }
+	    if(cp + strlen(realm) >= pnamebuf + sizeof(pnamebuf))
+		break;
 	    *cp = '/';
 	    cp++;
 	}
-	cp[-1] = '@';
-	strcpy(cp, realm);
+	if(cp + strlen(realm) < pnamebuf + sizeof(pnamebuf)) {
+	    cp[-1] = '@';
+	    strcpy(cp, realm);
+	} else {
+            strcpy(cp , "");
+	}
     }
     else {
 	instname = instnames[n % (sizeof(instnames)/sizeof(instnames[0]))];
@@ -894,45 +902,40 @@ do_testing(db, passes, verbose, timing, rcases, check, save_db, dontclean,
 					      &stat_kb,
 					      rseed))) {
 			fprintf(stderr,
-				"%d: (%d,%d) Failed add of %s with %s\n",
-				getpid(), i, j, playback_name(base+j),
+				"%ld: (%d,%d) Failed add of %s with %s\n",
+				(long) getpid(), i, j, playback_name(base+j),
 				error_message(kret));
 			break;
 		    }
 		    if (verbose > 4)
-			fprintf(stderr, "*A[%d](%s)\n", getpid(),
+			fprintf(stderr, "*A[%ld](%s)\n", (long) getpid(),
 				playback_name(base+j));
 		}   
 		for (j=0; (j<nper) && (!kret); j++) {
 		    if ((kret = find_principal(ccontext,
 					       playback_principal(base+j),
-					       &master_encblock,
-					       &stat_kb,
-					       rseed))) {
+					       check))) {
 			fprintf(stderr,
-				"%d: (%d,%d) Failed lookup of %s with %s\n",
-				getpid(), i, j, playback_name(base+j),
+				"%ld: (%d,%d) Failed lookup of %s with %s\n",
+				(long) getpid(), i, j, playback_name(base+j),
 				error_message(kret));
 			break;
 		    }
 		    if (verbose > 4)
-			fprintf(stderr, "-S[%d](%s)\n", getpid(),
+			fprintf(stderr, "-S[%ld](%s)\n", (long) getpid(),
 				playback_name(base+j));
 		}   
 		for (j=0; (j<nper) && (!kret); j++) {
 		    if ((kret = delete_principal(ccontext,
-						 playback_principal(base+j),
-						 &master_encblock,
-						 &stat_kb,
-						 rseed))) {
+					       playback_principal(base+j)))) {
 			fprintf(stderr,
-				"%d: (%d,%d) Failed delete of %s with %s\n",
-				getpid(), i, j, playback_name(base+j),
+				"%ld: (%d,%d) Failed delete of %s with %s\n",
+				(long) getpid(), i, j, playback_name(base+j),
 				error_message(kret));
 			break;
 		    }
 		    if (verbose > 4)
-			fprintf(stderr, "XD[%d](%s)\n", getpid(),
+			fprintf(stderr, "XD[%ld](%s)\n", (long) getpid(),
 				playback_name(base+j));
 		}
 		krb5_db_fini(ccontext);
@@ -949,13 +952,13 @@ do_testing(db, passes, verbose, timing, rcases, check, save_db, dontclean,
 	for (i=0; i<nprocs; i++) {
 	    if (waitpid(children[i], &existat, 0) == children[i]) {
 		if (verbose) 
-		    fprintf(stderr, "%d finished with %d\n", children[i],
-			    existat);
+		    fprintf(stderr, "%ld finished with %d\n",
+			    (long) children[i], existat);
 		if (existat)
 		    kret = KRB5KRB_ERR_GENERIC;
 	    }
 	    else
-		fprintf(stderr, "Wait for %d failed\n", children[i]);
+		fprintf(stderr, "Wait for %ld failed\n", (long) children[i]);
 	}
     }