diff options
| author | markm <markm@FreeBSD.org> | 2000-02-24 11:28:20 +0000 |
|---|---|---|
| committer | markm <markm@FreeBSD.org> | 2000-02-24 11:28:20 +0000 |
| commit | 5ed96cd5daa48af752db4781418f32f9258cce94 (patch) | |
| tree | cbf6e4300b6d10326e92349d0f71b9054f47c4f2 /crypto/heimdal/kadmin | |
| parent | 69414e22b995b6d161fc19bcab66823585f1d394 (diff) | |
| download | FreeBSD-src-5ed96cd5daa48af752db4781418f32f9258cce94.zip FreeBSD-src-5ed96cd5daa48af752db4781418f32f9258cce94.tar.gz | |
Vendor import of Heimdal 0.2p
Diffstat (limited to 'crypto/heimdal/kadmin')
| -rw-r--r-- | crypto/heimdal/kadmin/ChangeLog | 5 | ||||
| -rw-r--r-- | crypto/heimdal/kadmin/load.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/crypto/heimdal/kadmin/ChangeLog b/crypto/heimdal/kadmin/ChangeLog index 5a73511..05ee0d4 100644 --- a/crypto/heimdal/kadmin/ChangeLog +++ b/crypto/heimdal/kadmin/ChangeLog @@ -1,3 +1,8 @@ +2000-02-16 Assar Westerlund <assar@sics.se> + + * load.c (doit): check return value from parse_hdbflags2int + correctly + 2000-01-25 Assar Westerlund <assar@sics.se> * load.c: checking all parsing for errors and all memory diff --git a/crypto/heimdal/kadmin/load.c b/crypto/heimdal/kadmin/load.c index cc809b5..6a95887 100644 --- a/crypto/heimdal/kadmin/load.c +++ b/crypto/heimdal/kadmin/load.c @@ -34,7 +34,7 @@ #include "kadmin_locl.h" #include <kadm5/private.h> -RCSID("$Id: load.c,v 1.35 2000/01/25 22:59:27 assar Exp $"); +RCSID("$Id: load.c,v 1.36 2000/02/16 16:05:28 assar Exp $"); struct entry { char *principal; @@ -439,7 +439,7 @@ doit(const char *filename, int merge) continue; } - if (parse_hdbflags2int (&ent.flags, e.flags) != 0) { + if (parse_hdbflags2int (&ent.flags, e.flags) != 1) { fprintf (stderr, "%s:%d:error parsing flags (%s)\n", filename, line, e.flags); hdb_free_entry (context, &ent); |
