This commit was generated by cvs2svn to compensate for changes in r55643,

which included commits to RCS files with non-trunk default branches.

2 files changed, 4 insertions, 9 deletions

diff --git a/crypto/kerberosIV/lib/acl/acl.h b/crypto/kerberosIV/lib/acl/acl.h
index 0a6fa56..a92bbdd 100644
--- a/crypto/kerberosIV/lib/acl/acl.h
+++ b/crypto/kerberosIV/lib/acl/acl.h
@@ -14,12 +14,7 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the Kungliga Tekniska
- *      Högskolan and its contributors.
- * 
- * 4. Neither the name of the Institute nor the names of its contributors
+ * 3. Neither the name of the Institute nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  * 
@@ -36,7 +31,7 @@
  * SUCH DAMAGE.
  */
 
-/* $Id: acl.h,v 1.6 1997/12/05 03:31:47 joda Exp $ */
+/* $Id: acl.h,v 1.7 1999/12/02 16:58:37 joda Exp $ */
 
 #ifndef __ACL_H
 #define __ACL_H
diff --git a/crypto/kerberosIV/lib/acl/acl_files.c b/crypto/kerberosIV/lib/acl/acl_files.c
index 12098b7..5501075 100644
--- a/crypto/kerberosIV/lib/acl/acl_files.c
+++ b/crypto/kerberosIV/lib/acl/acl_files.c
@@ -22,7 +22,7 @@ or implied warranty.
 #include "config.h"
 #include "protos.h"
 
-RCSID("$Id: acl_files.c,v 1.13 1999/03/13 21:21:32 assar Exp $");
+RCSID("$Id: acl_files.c,v 1.14 1999/09/16 20:41:43 assar Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -373,7 +373,7 @@ acl_load(char *name)
     }
 
     /* Set up the acl */
-    strcpy_truncate(acl_cache[i].filename, name, LINESIZE);
+    strlcpy(acl_cache[i].filename, name, LINESIZE);
     if((acl_cache[i].fd = open(name, O_RDONLY, 0)) < 0) return(-1);
     /* Force reload */
     acl_cache[i].acl = (struct hashtbl *) 0;