View | Details | Raw Unified | Return to bug 14498
Collapse All | Expand All

(-)a/nss/nss_db/db-XXX.c (-3 / +6 lines)
Lines 191-196 enum nss_status \ Link Here
191
      char *p = memcpy (buffer, valstr, len);				      \
191
      char *p = memcpy (buffer, valstr, len);				      \
192
									      \
192
									      \
193
      int err = parse_line (p, result, data, buflen, errnop EXTRA_ARGS);      \
193
      int err = parse_line (p, result, data, buflen, errnop EXTRA_ARGS);      \
194
									      \
195
      /* Advance before break_if_match, lest it uses continue to skip
196
	 to the next entry.  */						      \
197
      if ((hidx += hval2) >= header->dbs[i].hashsize)			      \
198
	hidx -= header->dbs[i].hashsize;				      \
199
									      \
194
      if (err > 0)							      \
200
      if (err > 0)							      \
195
	{								      \
201
	{								      \
196
	  status = NSS_STATUS_SUCCESS;					      \
202
	  status = NSS_STATUS_SUCCESS;					      \
Lines 203-211 enum nss_status \ Link Here
203
	  status = NSS_STATUS_TRYAGAIN;					      \
209
	  status = NSS_STATUS_TRYAGAIN;					      \
204
	  break;							      \
210
	  break;							      \
205
	}								      \
211
	}								      \
206
									      \
207
      if ((hidx += hval2) >= header->dbs[i].hashsize)			      \
208
	hidx -= header->dbs[i].hashsize;				      \
209
    }									      \
212
    }									      \
210
									      \
213
									      \
211
  if (status == NSS_STATUS_NOTFOUND)					      \
214
  if (status == NSS_STATUS_NOTFOUND)					      \
(-)a/nss/nss_files/files-service.c (-2 / +5 lines)
Lines 44-51 DB_LOOKUP (servbyname, ':', Link Here
44
	   {
44
	   {
45
	     /* Must match both protocol (if specified) and name.  */
45
	     /* Must match both protocol (if specified) and name.  */
46
	     if (proto != NULL && strcmp (result->s_proto, proto))
46
	     if (proto != NULL && strcmp (result->s_proto, proto))
47
	       continue;
47
	       /* A continue statement here breaks nss_db, because it
48
	     LOOKUP_NAME (s_name, s_aliases)
48
		bypasses advancing to the next db entry, and it
49
		doesn't make nss_files any more efficient.  */;
50
	     else
51
	       LOOKUP_NAME (s_name, s_aliases)
49
	   },
52
	   },
50
	   const char *name, const char *proto)
53
	   const char *name, const char *proto)
51
54

Return to bug 14498