5910 libnisdb won't build with modern GCC

*** 17,26 ****
--- 17,27 ----
   * information: Portions Copyright [yyyy] [name of copyright owner]
   *
   * CDDL HEADER END
   */
  /*
+  * Copyright 2015 Gary Mills
   * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
   * Use is subject to license terms.
   */
  
  
*** 39,48 ****
--- 40,50 ----
  #include "ldap_ruleval.h"
  #include "ldap_op.h"
  #include "ldap_nisdbquery.h"
  #include "ldap_attr.h"
  #include "ldap_xdr.h"
+ #include "ldap_ldap.h"
  
  
  item *
  buildItem(int len, void *value) {
          char    *myself = "buildItem";
*** 222,232 ****
  db_query **
  createQuery(int num, char **index, __nis_table_mapping_t *t,
                  __nis_rule_value_t **rvP, int *numVals) {
          db_query                **q;
          db_qcomp                *qc;
!         int                     i, j, n, a, nv, niv, stat, sinum;
          __nis_rule_value_t      *rvq;
          __nis_buffer_t          b = {0, 0};
          char                    *table = 0;
          char                    *myself = "createQuery";
  
--- 224,234 ----
  db_query **
  createQuery(int num, char **index, __nis_table_mapping_t *t,
                  __nis_rule_value_t **rvP, int *numVals) {
          db_query                **q;
          db_qcomp                *qc;
!         int                     i, j, n, a, nv, niv;
          __nis_rule_value_t      *rvq;
          __nis_buffer_t          b = {0, 0};
          char                    *table = 0;
          char                    *myself = "createQuery";
  
*** 255,265 ****
                  }
          }
  
          /* Create a rule-value from the col=val pairs */
          for (n = 0; n < num; n++) {
-                 char    *name;
                  char    *value;
  
                  if ((value = strchr(index[n], '=')) == 0) {
                          logmsg(MSG_NOTIMECHECK, LOG_WARNING,
                                  "%s: no '=' in \"%s\"",
--- 257,266 ----
*** 270,280 ****
                  *value = '\0';
                  value++;
  
                  for (a = 0; a < t->numColumns; a++) {
                          if (strcmp(index[n], t->column[a]) == 0) {
-                                 int             i, len = slen(value)+1;
  
                                  /* Add col=val pair to 'rvq' */
                                  if (addSCol2RuleValue(index[n], value, rvq)) {
                                          freeRuleValue(rvq, 1);
                                          sfree(table);
--- 271,280 ----
*** 690,700 ****
          db_query                **query = 0;
          int                     r, i, j, ir;
          __nis_value_t           *rval, *lval;
          __nis_mapping_item_t    *litem;
          int                     numItems;
!         int                     nq, iqc;
          __nis_obj_attr_t        **attr = 0;
          char                    **dn = 0;
          int                     numDN = 0;
          char                    *myself = "createNisPlusEntry";
  
--- 690,700 ----
          db_query                **query = 0;
          int                     r, i, j, ir;
          __nis_value_t           *rval, *lval;
          __nis_mapping_item_t    *litem;
          int                     numItems;
!         int                     nq;
          __nis_obj_attr_t        **attr = 0;
          char                    **dn = 0;
          int                     numDN = 0;
          char                    *myself = "createNisPlusEntry";