*** empty log message ***

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/OV_9510_INTEGRATION@8734 dc483132-0cff-0310-8789-dd5450dbe970

src/kadmin/keytab/ChangeLog

@@ -1,3 +1,9 @@
+Mon Jul 15 16:59:35 1996  Marc Horowitz  <marc@mit.edu>
+
+	* keytab.c (main): the default keytab name logic was inappropriate
+ 	for beta6, since it ignores the env vars, etc.  This version still
+ 	has the problem that the default keytab probably isn't writeable.
+
 Wed Jul 10 01:27:44 1996  Marc Horowitz  <marc@mit.edu>
 
 	* Makefile.in, configure.in: added autoconf support

src/kadmin/keytab/keytab.c

@@ -23,9 +23,6 @@ int remove_principal(char *keytab_str, krb5_keytab keytab, char
 		     *princ_str, char *kvno_str);
 static char *etype_string(krb5_enctype enctype);
 
-#define DEFAULT_KEYTAB "WRFILE:/etc/v5srvtab"
-
-extern char *krb5_defkeyname;
 krb5_context context;
 char *whoami;
 int quiet;
@@ -44,6 +41,7 @@ main(int argc0, char **argv0)
      extern krb5_kt_ops krb5_ktf_writable_ops;
      krb5_keytab keytab = 0;
      char *me_str, *princ_str, *keytab_str, *kvno_str;
+     char keytab_buf[1024];
      int argc, code, did_something, create;
      char **argv;
 
@@ -62,7 +60,6 @@ main(int argc0, char **argv0)
 		  "while registering writable key table functions");
 	  exit(1);
      }
-     krb5_defkeyname = DEFAULT_KEYTAB;
 
      /* process non-action arguments first */
      argc = argc0-1;
@@ -108,15 +105,14 @@ main(int argc0, char **argv0)
      }
 
      if (keytab == NULL) {
-	  if (! (keytab_str = strdup(DEFAULT_KEYTAB))) {
-	      com_err(whoami, ENOMEM, "while creating keytab name");
-	      exit(1);
-	  }
 	  code = krb5_kt_default(context, &keytab);
 	  if (code != 0) {
 	       com_err(whoami, code, "while opening default keytab");
 	       exit(1);
 	  }
+	  code = krb5_kt_get_name(context, keytab,
+				  keytab_buf, sizeof(keytab_buf));
+	  keytab_str = keytab_buf;
      }
 
      argc = argc0-1;

src/kadmin/v4server/unit-test/ChangeLog

@@ -0,0 +1,13 @@
+Mon Jul 15 17:15:51 1996  Marc Horowitz  <marc@mit.edu>
+
+	* helpers.exp (exp_prog): the check for non-newline-terminated
+ 	stdout was causing failures where there weren't any.  Barry
+ 	doesn't remember why this was here to begin with.
+	* Makefile.ov (unit-test-body), helpers.exp: some versions of
+ 	runtest do not like digits in command-line variable names. 
+ 	* Makefile.ov (unit-test-body), helpers.exp: ovsec_v4adm_server
+ 	renamed to kadmind4
+	* getpid.sh: grep out any programs with expect or kadmind4 in
+ 	their names.
+
+

src/kadmin/v4server/unit-test/config/ChangeLog

@@ -0,0 +1,7 @@
+Mon Jul 15 17:18:56 1996  Marc Horowitz  <marc@mit.edu>
+
+	* unix.exp: some versions of runtest do not like digits in
+ 	command-line variable names.  ovsec_edit_keytab renamed to
+ 	kadm5_keytab
+
+

src/lib/kadm5/unit-test/ChangeLog

@@ -1,8 +1,8 @@
 Fri Jul 12 15:24:38 1996  Marc Horowitz  <marc@mit.edu>
 
-	* lock-test.c, iter-test.c, init-test.c, handle-test.c,
- 	destroy-test.c: change <ovsec_admin/foo.h> and "../foo.h" to
- 	<kadm5/foo>
+	* randkey-test.c, lock-test.c, iter-test.c, init-test.c,
+ 	handle-test.c, destroy-test.c: change <ovsec_admin/foo.h> and
+ 	"../foo.h" to <kadm5/foo>
 
 	* Makefile.ov (runtest): some versions of runtest don't like
  	digits in command-line variable settings, so don't use them.