Happy New Year

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

diff --git a/contrib/slapd-modules/nssov/passwd.c b/contrib/slapd-modules/nssov/passwd.c
index d99b8dc38165773be50883be168484bd12493016..c834d2c5f5418b6a76cc18a67d4ce1e90e920bc1 100644 (file)
--- a/contrib/slapd-modules/nssov/passwd.c
+++ b/contrib/slapd-modules/nssov/passwd.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>. 
  *
- * Copyright 2008-2014 The OpenLDAP Foundation.
+ * Copyright 2008-2018 The OpenLDAP Foundation.
  * Portions Copyright 2008 by Howard Chu, Symas Corp.
  * All rights reserved.
  *
@@ -207,7 +207,6 @@ static int write_passwd(nssov_passwd_cbp *cbp,Entry *entry)
 {
        int32_t tmpint32;
        struct berval tmparr[2], tmpuid[2];
-       const char **tmpvalues;
        char *tmp;
        struct berval *names;
        struct berval *uids;
@@ -378,8 +377,8 @@ static int write_passwd(nssov_passwd_cbp *cbp,Entry *entry)
                                WRITE_INT32(cbp->fp,NSLCD_RESULT_BEGIN);
                                WRITE_BERVAL(cbp->fp,&names[i]);
                                WRITE_BERVAL(cbp->fp,&passwd);
-                               WRITE_TYPE(cbp->fp,uid,uid_t);
-                               WRITE_TYPE(cbp->fp,gid,gid_t);
+                               WRITE_INT32(cbp->fp,uid);
+                               WRITE_INT32(cbp->fp,gid);
                                WRITE_BERVAL(cbp->fp,&gecos);
                                WRITE_BERVAL(cbp->fp,&homedir);
                                WRITE_BERVAL(cbp->fp,&shell);
@@ -415,7 +414,7 @@ NSSOV_HANDLE(
        char fbuf[1024];
        struct berval filter = {sizeof(fbuf)};
        filter.bv_val = fbuf;
-       READ_TYPE(fp,uid,uid_t);
+       READ_INT32(fp,uid);
        cbp.id.bv_val = cbp.buf;
        cbp.id.bv_len = snprintf(cbp.buf,sizeof(cbp.buf),"%d",uid);
        BER_BVZERO(&cbp.name);,