X-Git-Url: http://git.megacz.com/?p=libnss-afs.git;a=blobdiff_plain;f=nss_afs.c;h=e05f53aa2e46336e7d692fa24dd9cc9910e23ea6;hp=11d9fb3a67fd8eecf520d866601e86be62f5e524;hb=e8c23dae9125f8d827c582ce62e2b7258cca2b6f;hpb=9c2744acb84d8dccfed68299a2f3977deed94807 diff --git a/nss_afs.c b/nss_afs.c index 11d9fb3..e05f53a 100644 --- a/nss_afs.c +++ b/nss_afs.c @@ -405,6 +405,14 @@ enum nss_status fill_result_buf(uid_t uid, result_buf->pw_shell = buffer; if ( get_shell(result_buf->pw_name,&buffer,&buflen) ) break; +#ifdef LIMIT_USERNAME_CHARS + if ( strlen(result_buf->pw_name) > LIMIT_USERNAME_CHARS ) { + result_buf->pw_name[LIMIT_USERNAME_CHARS] = '\0'; + buflen = buflen + ( buffer - &result_buf->pw_name[LIMIT_USERNAME_CHARS+1] ); + buffer = &result_buf->pw_name[LIMIT_USERNAME_CHARS+1]; + } +#endif + *errnop = errno; return NSS_STATUS_SUCCESS; } while(0); @@ -436,14 +444,6 @@ enum nss_status _nss_afs_getpwuid_r (uid_t uid, return temp; } -#ifdef LIMIT_USERNAME_CHARS - if ( strlen(result_buf->pw_name) > LIMIT_USERNAME_CHARS ) { - result_buf->pw_name[LIMIT_USERNAME_CHARS] = '\0'; - buflen = buflen + ( buffer - &result_buf->pw_name[LIMIT_USERNAME_CHARS+1] ); - buffer = &result_buf->pw_name[LIMIT_USERNAME_CHARS+1]; - } -#endif - return fill_result_buf(uid, name, result_buf, buffer, buflen, errnop); }