diff options
author | markm <markm@FreeBSD.org> | 2000-01-09 08:31:47 +0000 |
---|---|---|
committer | markm <markm@FreeBSD.org> | 2000-01-09 08:31:47 +0000 |
commit | ca616c603d9e06e51c9e23fab7536acbdac58331 (patch) | |
tree | 20a735799ecd3b90df122d0a8042762dd62c6b0e /crypto/kerberosIV/lib/kadm | |
parent | fe83e8abf357ee11114856a5278bb38431a9517c (diff) | |
download | FreeBSD-src-ca616c603d9e06e51c9e23fab7536acbdac58331.zip FreeBSD-src-ca616c603d9e06e51c9e23fab7536acbdac58331.tar.gz |
Clean import of KTH Kerberos (eBones) v1.0.
Diffstat (limited to 'crypto/kerberosIV/lib/kadm')
-rw-r--r-- | crypto/kerberosIV/lib/kadm/check_password.c | 9 | ||||
-rw-r--r-- | crypto/kerberosIV/lib/kadm/kadm_cli_wrap.c | 8 | ||||
-rw-r--r-- | crypto/kerberosIV/lib/kadm/kadm_locl.h | 9 | ||||
-rw-r--r-- | crypto/kerberosIV/lib/kadm/kadm_supp.c | 18 |
4 files changed, 17 insertions, 27 deletions
diff --git a/crypto/kerberosIV/lib/kadm/check_password.c b/crypto/kerberosIV/lib/kadm/check_password.c index be95c91..ba6ba48 100644 --- a/crypto/kerberosIV/lib/kadm/check_password.c +++ b/crypto/kerberosIV/lib/kadm/check_password.c @@ -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 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. * @@ -37,7 +32,7 @@ */ #include "kadm_locl.h" -RCSID("$Id: check_password.c,v 1.2 1999/03/13 21:23:48 assar Exp $"); +RCSID("$Id: check_password.c,v 1.3 1999/12/02 16:58:39 joda Exp $"); /* This is a client side password check. Should perhaps be merged with kadmind version that lives in pw_check.c */ diff --git a/crypto/kerberosIV/lib/kadm/kadm_cli_wrap.c b/crypto/kerberosIV/lib/kadm/kadm_cli_wrap.c index 8f98d44..8403014 100644 --- a/crypto/kerberosIV/lib/kadm/kadm_cli_wrap.c +++ b/crypto/kerberosIV/lib/kadm/kadm_cli_wrap.c @@ -29,7 +29,7 @@ or implied warranty. #include "kadm_locl.h" -RCSID("$Id: kadm_cli_wrap.c,v 1.26 1999/07/05 13:28:58 bg Exp $"); +RCSID("$Id: kadm_cli_wrap.c,v 1.27 1999/09/16 20:41:46 assar Exp $"); static Kadm_Client client_parm; @@ -73,9 +73,9 @@ kadm_init_link(char *n, char *i, char *r) init_kadm_err_tbl(); init_krb_err_tbl(); - strcpy_truncate(client_parm.sname, n, ANAME_SZ); - strcpy_truncate(client_parm.sinst, i, INST_SZ); - strcpy_truncate(client_parm.krbrlm, r, REALM_SZ); + strlcpy(client_parm.sname, n, ANAME_SZ); + strlcpy(client_parm.sinst, i, INST_SZ); + strlcpy(client_parm.krbrlm, r, REALM_SZ); client_parm.admin_fd = -1; /* set up the admin_addr - fetch name of admin host */ diff --git a/crypto/kerberosIV/lib/kadm/kadm_locl.h b/crypto/kerberosIV/lib/kadm/kadm_locl.h index da73df9..709a224 100644 --- a/crypto/kerberosIV/lib/kadm/kadm_locl.h +++ b/crypto/kerberosIV/lib/kadm/kadm_locl.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: kadm_locl.h,v 1.11 1998/10/05 13:56:42 joda Exp $ */ +/* $Id: kadm_locl.h,v 1.12 1999/12/02 16:58:39 joda Exp $ */ #include "config.h" #include "protos.h" diff --git a/crypto/kerberosIV/lib/kadm/kadm_supp.c b/crypto/kerberosIV/lib/kadm/kadm_supp.c index 0c403eb..2a19cae 100644 --- a/crypto/kerberosIV/lib/kadm/kadm_supp.c +++ b/crypto/kerberosIV/lib/kadm/kadm_supp.c @@ -35,7 +35,7 @@ or implied warranty. #include "kadm_locl.h" -RCSID("$Id: kadm_supp.c,v 1.13 1999/03/16 09:41:20 assar Exp $"); +RCSID("$Id: kadm_supp.c,v 1.14 1999/09/16 20:41:46 assar Exp $"); static void time2str(char *buf, size_t len, time_t t) @@ -112,11 +112,11 @@ kadm_prin_to_vals(u_char *fields, Kadm_vals *new, Principal *old) { memset(new, 0, sizeof(*new)); if (IS_FIELD(KADM_NAME,fields)) { - strcpy_truncate(new->name, old->name, ANAME_SZ); + strlcpy(new->name, old->name, ANAME_SZ); SET_FIELD(KADM_NAME, new->fields); } if (IS_FIELD(KADM_INST,fields)) { - strcpy_truncate(new->instance, old->instance, INST_SZ); + strlcpy(new->instance, old->instance, INST_SZ); SET_FIELD(KADM_INST, new->fields); } if (IS_FIELD(KADM_EXPDATE,fields)) { @@ -142,11 +142,11 @@ kadm_prin_to_vals(u_char *fields, Kadm_vals *new, Principal *old) SET_FIELD(KADM_MODDATE, new->fields); } if (IS_FIELD(KADM_MODNAME,fields)) { - strcpy_truncate(new->mod_name, old->mod_name, ANAME_SZ); + strlcpy(new->mod_name, old->mod_name, ANAME_SZ); SET_FIELD(KADM_MODNAME, new->fields); } if (IS_FIELD(KADM_MODINST,fields)) { - strcpy_truncate(new->mod_instance, old->mod_instance, ANAME_SZ); + strlcpy(new->mod_instance, old->mod_instance, ANAME_SZ); SET_FIELD(KADM_MODINST, new->fields); } if (IS_FIELD(KADM_KVNO,fields)) { @@ -162,9 +162,9 @@ kadm_vals_to_prin(u_char *fields, Principal *new, Kadm_vals *old) memset(new, 0, sizeof(*new)); if (IS_FIELD(KADM_NAME,fields)) - strcpy_truncate(new->name, old->name, ANAME_SZ); + strlcpy(new->name, old->name, ANAME_SZ); if (IS_FIELD(KADM_INST,fields)) - strcpy_truncate(new->instance, old->instance, INST_SZ); + strlcpy(new->instance, old->instance, INST_SZ); if (IS_FIELD(KADM_EXPDATE,fields)) new->exp_date = old->exp_date; if (IS_FIELD(KADM_ATTR,fields)) @@ -179,9 +179,9 @@ kadm_vals_to_prin(u_char *fields, Principal *new, Kadm_vals *old) if (IS_FIELD(KADM_MODDATE,fields)) new->mod_date = old->mod_date; if (IS_FIELD(KADM_MODNAME,fields)) - strcpy_truncate(new->mod_name, old->mod_name, ANAME_SZ); + strlcpy(new->mod_name, old->mod_name, ANAME_SZ); if (IS_FIELD(KADM_MODINST,fields)) - strcpy_truncate(new->mod_instance, old->mod_instance, ANAME_SZ); + strlcpy(new->mod_instance, old->mod_instance, ANAME_SZ); if (IS_FIELD(KADM_KVNO,fields)) new->key_version = old->key_version; #endif |