ITS#6279

diff --git a/CHANGES b/CHANGES
index 888dc5f39a8686f0bcca25618f1cc7bc212e717e..3c4b0513cca76102fb2f5da8316208363781aca2 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -11,6 +11,7 @@ OpenLDAP 2.4.19 Engineering
        Fixed slapo-pcache cache corruption (ITS#6242)
        Fixed slapo-sssvlv sort control dereferencing (ITS#6288)
        Fixed contrib/nssov getgroupbymembers (ITS#6291)
+       Fixed contrib/autogroup segfaults (ITS#6279)
 
 OpenLDAP 2.4.18 Release (2009/09/06)
        Fixed client tools common options (ITS#6049)

diff --git a/contrib/slapd-modules/autogroup/autogroup.c b/contrib/slapd-modules/autogroup/autogroup.c
index 242a21488030641ce8b9c2db153d32c71f21073e..41551216889430d2d4291346bd1192ea81d172ef 100644 (file)
--- a/contrib/slapd-modules/autogroup/autogroup.c
+++ b/contrib/slapd-modules/autogroup/autogroup.c
@@ -1452,6 +1452,10 @@ autogroup_db_open(
 
        Debug( LDAP_DEBUG_TRACE, "==> autogroup_db_open\n", 0, 0, 0);
 
+       if ( agi == NULL ) {
+               return 0;
+       }
+
        connection_fake_init( &conn, &opbuf, thrctx );
        op = &opbuf.ob_op;