Module Name: src Committed By: christos Date: Thu Apr 21 17:56:24 UTC 2011
Modified Files: src/crypto/external/bsd/heimdal/dist/kadmin: util.c Log Message: Don't compare a pointer < 0; this is obviously a missed * here. While here, remove shadow variable warnings. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ src/crypto/external/bsd/heimdal/dist/kadmin/util.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/crypto/external/bsd/heimdal/dist/kadmin/util.c diff -u src/crypto/external/bsd/heimdal/dist/kadmin/util.c:1.1.1.1 src/crypto/external/bsd/heimdal/dist/kadmin/util.c:1.2 --- src/crypto/external/bsd/heimdal/dist/kadmin/util.c:1.1.1.1 Wed Apr 13 14:14:35 2011 +++ src/crypto/external/bsd/heimdal/dist/kadmin/util.c Thu Apr 21 13:56:24 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: util.c,v 1.1.1.1 2011/04/13 18:14:35 elric Exp $ */ +/* $NetBSD: util.c,v 1.2 2011/04/21 17:56:24 christos Exp $ */ /* * Copyright (c) 1997 - 2006 Kungliga Tekniska Högskolan @@ -67,7 +67,7 @@ { "disallow-tgt-based", KRB5_KDB_DISALLOW_TGT_BASED }, { "disallow-forwardable", KRB5_KDB_DISALLOW_FORWARDABLE }, { "disallow-postdated", KRB5_KDB_DISALLOW_POSTDATED }, - { NULL } + { NULL, 0 } }; /* @@ -190,7 +190,7 @@ if (str[0] == '+') { str++; *t = parse_time(str, "month"); - if (t < 0) + if (*t < 0) return -1; *t += time(NULL); return 0; @@ -432,7 +432,7 @@ */ int -set_entry(krb5_context context, +set_entry(krb5_context contextp, kadm5_principal_ent_t ent, int *mask, const char *max_ticket_life, @@ -444,14 +444,14 @@ if (max_ticket_life != NULL) { if (parse_deltat (max_ticket_life, &ent->max_life, mask, KADM5_MAX_LIFE)) { - krb5_warnx (context, "unable to parse `%s'", max_ticket_life); + krb5_warnx (contextp, "unable to parse `%s'", max_ticket_life); return 1; } } if (max_renewable_life != NULL) { if (parse_deltat (max_renewable_life, &ent->max_renewable_life, mask, KADM5_MAX_RLIFE)) { - krb5_warnx (context, "unable to parse `%s'", max_renewable_life); + krb5_warnx (contextp, "unable to parse `%s'", max_renewable_life); return 1; } } @@ -459,21 +459,21 @@ if (expiration) { if (parse_timet (expiration, &ent->princ_expire_time, mask, KADM5_PRINC_EXPIRE_TIME)) { - krb5_warnx (context, "unable to parse `%s'", expiration); + krb5_warnx (contextp, "unable to parse `%s'", expiration); return 1; } } if (pw_expiration) { if (parse_timet (pw_expiration, &ent->pw_expiration, mask, KADM5_PW_EXPIRATION)) { - krb5_warnx (context, "unable to parse `%s'", pw_expiration); + krb5_warnx (contextp, "unable to parse `%s'", pw_expiration); return 1; } } if (attributes != NULL) { if (parse_attributes (attributes, &ent->attributes, mask, KADM5_ATTRIBUTES)) { - krb5_warnx (context, "unable to parse `%s'", attributes); + krb5_warnx (contextp, "unable to parse `%s'", attributes); return 1; } }