diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2006-09-25 21:17:42 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2006-09-25 21:17:42 +0000 |
| commit | 7dc12e82f745dadc00ef0215abf929eed9b6557f (patch) | |
| tree | e73cffc096558beb5292630b47ff02d34660a182 /src/kadmin | |
| parent | 81e9cbf99d0c584ebd4af9a2c23a088a5aaac725 (diff) | |
| download | krb5-7dc12e82f745dadc00ef0215abf929eed9b6557f.zip krb5-7dc12e82f745dadc00ef0215abf929eed9b6557f.tar.gz krb5-7dc12e82f745dadc00ef0215abf929eed9b6557f.tar.bz2 | |
Patch from Will Fiveash for "kdb5_util create" support in LDAP, modified to
drop separate port-number spec so it'll build with current sources. Not
tested because of a bug in the recent Novell patch. :-(
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@18616 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/kadmin')
| -rw-r--r-- | src/kadmin/dbutil/kdb5_create.c | 4 | ||||
| -rw-r--r-- | src/kadmin/dbutil/kdb5_util.c | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/kadmin/dbutil/kdb5_create.c b/src/kadmin/dbutil/kdb5_create.c index 46bccce..da19225 100644 --- a/src/kadmin/dbutil/kdb5_create.c +++ b/src/kadmin/dbutil/kdb5_create.c @@ -425,6 +425,10 @@ add_principal(context, princ, op, pblock) break; } + entry.mask = (KADM5_KEY_DATA | KADM5_PRINCIPAL | KADM5_ATTRIBUTES | + KADM5_MAX_LIFE | KADM5_MAX_RLIFE | KADM5_TL_DATA | + KADM5_PRINC_EXPIRE_TIME); + retval = krb5_db_put_principal(context, &entry, &nentries); error_out:; diff --git a/src/kadmin/dbutil/kdb5_util.c b/src/kadmin/dbutil/kdb5_util.c index 00c87a2..e60e992 100644 --- a/src/kadmin/dbutil/kdb5_util.c +++ b/src/kadmin/dbutil/kdb5_util.c @@ -229,11 +229,9 @@ int main(argc, argv) } } else if (strcmp(*argv, "-x") == 0 && ARG_VAL) { - db5util_db_args_size++; if (!add_db_arg(koptarg)) { - fprintf(stderr,"%s: Cannot initialize. Not enough memory\n", - argv[0]); - exit(1); + com_err(progname, ENOMEM, "while parsing command arguments\n"); + exit(1); } } else if (strcmp(*argv, "-r") == 0 && ARG_VAL) { |