Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

[openldap] / contrib / slapd-modules / nssov / shadow.c

diff --git a/contrib/slapd-modules/nssov/shadow.c b/contrib/slapd-modules/nssov/shadow.c
index 92be32c2e79a4304e65bb90d382ca180d8d62499..a59eabc1c2c6a7f2a4d704c2aaa5b01ac5a8ede9 100644 (file)
--- a/contrib/slapd-modules/nssov/shadow.c
+++ b/contrib/slapd-modules/nssov/shadow.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>. 
  *
- * Copyright 2008-2010 The OpenLDAP Foundation.
+ * Copyright 2008-2014 The OpenLDAP Foundation.
  * Portions Copyright 2008 by Howard Chu, Symas Corp.
  * All rights reserved.
  *
@@ -217,7 +217,7 @@ static int write_shadow(nssov_shadow_cbp *cbp,Entry *entry)
        /* write the entries */
        for (i=0;!BER_BVISNULL(&names[i]);i++)
        {
-               WRITE_INT32(cbp->fp,NSLCD_RESULT_SUCCESS);
+               WRITE_INT32(cbp->fp,NSLCD_RESULT_BEGIN);
                WRITE_BERVAL(cbp->fp,&names[i]);
                WRITE_BERVAL(cbp->fp,&passwd);
                WRITE_INT32(cbp->fp,lastchangedate);
@@ -238,7 +238,7 @@ NSSOV_HANDLE(
        char fbuf[1024];
        struct berval filter = {sizeof(fbuf)};
        filter.bv_val = fbuf;
-       READ_STRING_BUF2(fp,cbp.buf,sizeof(cbp.buf));,
+       READ_STRING(fp,cbp.buf);,
        cbp.name.bv_len = tmpint32;
        cbp.name.bv_val = cbp.buf;
        Debug(LDAP_DEBUG_ANY,"nssov_shadow_byname(%s)\n",cbp.name.bv_val,0,0);,