Changeset 1179 for branches/fc11-dev/server/common/oursrc/nss_nonlocal/nonlocal-passwd.c

Timestamp:

Jun 8, 2009, 1:07:47 PM (15 years ago)

Author:

mitchb

Message:

Merge r1121:1178 from trunk to branches/fc11-dev

File:

• branches/fc11-dev/server/common/oursrc/nss_nonlocal/nonlocal-passwd.c (modified) (2 diffs)

branches/fc11-dev/server/common/oursrc/nss_nonlocal/nonlocal-passwd.c

@@ -96 +96 @@
     fct.ptr = fct_start;
     do {
+    morebuf:
         if (fct.l == _nss_nonlocal_getpwuid_r)
             status = NSS_STATUS_NOTFOUND;
         else
             status = DL_CALL_FCT(fct.l, (uid, &pwbuf, buf, buflen, errnop));
-        if (status == NSS_STATUS_TRYAGAIN && *errnop == ERANGE)
-            break;
+        if (status == NSS_STATUS_TRYAGAIN && *errnop == ERANGE) {
+            free(buf);
+            buflen *= 2;
+            buf = malloc(buflen);
+            if (buf == NULL) {
+                *errnop = ENOMEM;
+                errno = old_errno;
+                return NSS_STATUS_TRYAGAIN;
+            }
+            goto morebuf;
+        }
     } while (__nss_next(&nip, fct_name, &fct.ptr, status, 0) == 0);
 
@@ -147 +157 @@
     fct.ptr = fct_start;
     do {
+    morebuf:
         if (fct.l == _nss_nonlocal_getpwnam_r)
             status = NSS_STATUS_NOTFOUND;
         else
             status = DL_CALL_FCT(fct.l, (user, &pwbuf, buf, buflen, errnop));
-        if (status == NSS_STATUS_TRYAGAIN && *errnop == ERANGE)
-            break;
+        if (status == NSS_STATUS_TRYAGAIN && *errnop == ERANGE) {
+            free(buf);
+            buflen *= 2;
+            buf = malloc(buflen);
+            if (buf == NULL) {
+                *errnop = ENOMEM;
+                errno = old_errno;
+                return NSS_STATUS_TRYAGAIN;
+            }
+            goto morebuf;
+        }
     } while (__nss_next(&nip, fct_name, &fct.ptr, status, 0) == 0);