qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

nss_files: Allocate nscd file registration data on the heap 

This is only needed if nss_files is loaded by nscd.

Before:

   text	   data	    bss	    dec	    hex	filename
    767	      0	  24952	  25719	   6477	nss/files-init.os

After:

   text	   data	    bss	    dec	    hex	filename
    666	      0	      0	    666	    29a	nss/files-init.os

Using PATH_MAX bytes unconditionally for the directory name
is wasteful, but fixing that would constitute another break
of this semi-public ABI.  (The other issue is that with
symbolic links, an arbitrary set of parent directories may need
watching, not just a single one.)

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
This commit is contained in:
Florian Weimer 2021-07-07 18:33:52 +02:00
parent 7fcdb53253
commit f0c28504a9
1 changed files with 20 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
nss/nss_files/files-init.c
View File

@ -24,44 +24,30 @@
NSS_DECLARE_MODULE_FUNCTIONS (files) NSS_DECLARE_MODULE_FUNCTIONS (files)
#define PWD_FILENAME "/etc/passwd" static void
define_traced_file (pwd, PWD_FILENAME); register_file (void (*cb) (size_t, struct traced_file *),
int db, const char *path, int crinit)
#define GRP_FILENAME "/etc/group" {
define_traced_file (grp, GRP_FILENAME); size_t pathlen = strlen (path) + 1;
struct traced_file *file = malloc (sizeof (struct traced_file) + pathlen);
#define HST_FILENAME "/etc/hosts" /* Do not register anything on memory allocation failure. nscd will
define_traced_file (hst, HST_FILENAME); fail soon anyway. */
if (file != NULL)
#define RESOLV_FILENAME "/etc/resolv.conf" {
define_traced_file (resolv, RESOLV_FILENAME); init_traced_file (file, path, crinit);
cb (db, file);
#define SERV_FILENAME "/etc/services" }
define_traced_file (serv, SERV_FILENAME); }
#define NETGR_FILENAME "/etc/netgroup"
define_traced_file (netgr, NETGR_FILENAME);
void void
_nss_files_init (void (*cb) (size_t, struct traced_file *)) _nss_files_init (void (*cb) (size_t, struct traced_file *))
{ {
init_traced_file (&pwd_traced_file.file, PWD_FILENAME, 0); register_file (cb, pwddb, "/etc/passwd", 0);
cb (pwddb, &pwd_traced_file.file); register_file (cb, grpdb, "/etc/group", 0);
register_file (cb, hstdb, "/etc/hosts", 0);
init_traced_file (&grp_traced_file.file, GRP_FILENAME, 0); register_file (cb, hstdb, "/etc/resolv.conf", 1);
cb (grpdb, &grp_traced_file.file); register_file (cb, servdb, "/etc/services", 0);
register_file (cb, netgrdb, "/etc/netgroup", 0);
init_traced_file (&hst_traced_file.file, HST_FILENAME, 0);
cb (hstdb, &hst_traced_file.file);
init_traced_file (&resolv_traced_file.file, RESOLV_FILENAME, 1);
cb (hstdb, &resolv_traced_file.file);
init_traced_file (&serv_traced_file.file, SERV_FILENAME, 0);
cb (servdb, &serv_traced_file.file);
init_traced_file (&netgr_traced_file.file, NETGR_FILENAME, 0);
cb (netgrdb, &netgr_traced_file.file);
} }
#endif #endif