diff options
| author | Rich Megginson <rmeggins@redhat.com> | 2009-08-25 11:44:58 -0600 |
|---|---|---|
| committer | Rich Megginson <rmeggins@redhat.com> | 2009-08-25 13:04:15 -0600 |
| commit | 1a4437b32afd9f9c089cb35943a0e3eaea129e2d (patch) | |
| tree | 0e6e8d6d518613f109ecb8d399024d65ff81abfa | |
| parent | e8bc100b891e9e9d5a446394058af5f6de2e9b3e (diff) | |
| download | ds-1a4437b32afd9f9c089cb35943a0e3eaea129e2d.tar.gz ds-1a4437b32afd9f9c089cb35943a0e3eaea129e2d.tar.xz ds-1a4437b32afd9f9c089cb35943a0e3eaea129e2d.zip | |
Fails to start if attrcrypt can't unwrap keys
https://bugzilla.redhat.com/show_bug.cgi?id=519065
Resolves: 519065
Bug Description: Fails to start if attrcrypt can't unwrap keys
Reviewed by: nhosoi (Thanks!)
Fix Description: If not using the attrcrypt feature, just return success
if the keys could not be unwrapped.
Platforms tested: RHEL5 x86_64
Flag Day: no
Doc impact: no
| -rw-r--r-- | ldap/servers/slapd/back-ldbm/ldbm_attrcrypt.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_attrcrypt.c b/ldap/servers/slapd/back-ldbm/ldbm_attrcrypt.c index 763bd2c9..6a935496 100644 --- a/ldap/servers/slapd/back-ldbm/ldbm_attrcrypt.c +++ b/ldap/servers/slapd/back-ldbm/ldbm_attrcrypt.c @@ -473,6 +473,10 @@ attrcrypt_init(ldbm_instance *li) ret = attrcrypt_cipher_init(li, ace, private_key, public_key, acs); if (ret) { LDAPDebug(LDAP_DEBUG_ANY,"Failed to initialize cipher %s in attrcrypt_init\n", ace->cipher_display_name, 0, 0); + if (!li->attrcrypt_configured) { + /* if not using attrcrypt, just return success */ + ret = 0; + } slapi_ch_free((void **)&acs); } else { /* Since we succeeded, add the acs to the backend instance list */ |