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

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

diff --git a/contrib/slapd-modules/nssov/group.c b/contrib/slapd-modules/nssov/group.c
index 866dcd6a108fb00da0655917a345bfb73f8c501b..f75d7503d33fa431d28a645c8583a3b57fb17678 100644 (file)
--- a/contrib/slapd-modules/nssov/group.c
+++ b/contrib/slapd-modules/nssov/group.c
@@ -1,7 +1,9 @@
 /* group.c - group lookup routines */
 /* $OpenLDAP$ */
-/*
- * Copyright 2008-2009 by Howard Chu, Symas Corp.
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>. 
+ *
+ * Copyright 2008-2013 The OpenLDAP Foundation.
+ * Portions Copyright 2008-2009 by Howard Chu, Symas Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -12,7 +14,7 @@
  * top-level directory of the distribution or, alternatively, at
  * <http://www.OpenLDAP.org/license.html>.
  */
-/*
+/* ACKNOWLEDGEMENTS:
  * This code references portions of the nss-ldapd package
  * written by Arthur de Jong. The nss-ldapd code was forked
  * from the nss-ldap library written by Luke Howard.
@@ -141,7 +143,7 @@ static int write_group(nssov_group_cbp *cbp,Entry *entry)
        struct berval *names,*gids,*members;
        struct berval passwd = {0};
        Attribute *a;
-       int i,j,nummembers,rc;
+       int i,j,nummembers,rc = 0;
 
        /* get group name (cn) */
        if (BER_BVISNULL(&cbp->name))
@@ -246,7 +248,7 @@ static int write_group(nssov_group_cbp *cbp,Entry *entry)
                                                names[i].bv_val);
                                        continue;
                                }
-                               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_TYPE(cbp->fp,gid,gid_t);
@@ -275,7 +277,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;
        if (!isvalidgroupname(&cbp.name)) {
@@ -314,7 +316,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.user.bv_len = tmpint32;
        cbp.user.bv_val = cbp.buf;
        if (!isvalidusername(&cbp.user)) {