2 files changed, 34 insertions, 27 deletions
diff --git a/nss/libnss_files.map b/nss/Versions
index 8daa75f5bb..217f4da7a2 100644
--- a/nss/libnss_files.map
+++ b/nss/Versions
@@ -1,5 +1,33 @@
-GLIBC_2.0 {
-  global:
+libc {
+  GLIBC_2.0 {
+     # functions used in other libraries
+    __nss_passwd_lookup; __nss_group_lookup; __nss_next;
+    _nss_files_parse_grent; _nss_files_parse_pwent; _nss_files_parse_spent;
+    __nss_database_lookup; __nss_configure_lookup;
+  }
+}
+
+libnss_db {
+  GLIBC_2.0 {
+    _nss_db_endaliasent; _nss_db_endetherent; _nss_db_endgrent;
+    _nss_db_endnetgrent; _nss_db_endprotoent; _nss_db_endpwent;
+    _nss_db_endrpcent; _nss_db_endservent; _nss_db_endspent;
+    _nss_db_getaliasbyname_r; _nss_db_getaliasent_r; _nss_db_getetherent_r;
+    _nss_db_getgrent_r; _nss_db_getgrgid_r; _nss_db_getgrnam_r;
+    _nss_db_gethostton_r; _nss_db_getnetgrent_r; _nss_db_getntohost_r;
+    _nss_db_getprotobyname_r; _nss_db_getprotobynumber_r;
+    _nss_db_getprotoent_r; _nss_db_getpwent_r; _nss_db_getpwnam_r;
+    _nss_db_getpwuid_r; _nss_db_getrpcbyname_r; _nss_db_getrpcbynumber_r;
+    _nss_db_getrpcent_r; _nss_db_getservbyname_r; _nss_db_getservbyport_r;
+    _nss_db_getservent_r; _nss_db_getspent_r; _nss_db_getspnam_r;
+    _nss_db_setaliasent; _nss_db_setetherent; _nss_db_setgrent;
+    _nss_db_setnetgrent; _nss_db_setprotoent; _nss_db_setpwent;
+    _nss_db_setrpcent; _nss_db_setservent; _nss_db_setspent;
+  }
+}
+
+libnss_files {
+  GLIBC_2.0 {
     _nss_files_setaliasent;
     _nss_files_endaliasent;
     _nss_files_getaliasbyname_r;
@@ -69,10 +97,9 @@ GLIBC_2.0 {
     _nss_files_getspnam_r;
 
     _nss_netgroup_parseline;
-
+  }
+  GLIBC_2.1 {
     _nss_files_getpublickey;
     _nss_files_getsecretkey;
-
-  local:
-    *;
-};
+  }
+}
diff --git a/nss/libnss_db.map b/nss/libnss_db.map
deleted file mode 100644
index f0765c7522..0000000000
--- a/nss/libnss_db.map
+++ /dev/null
@@ -1,20 +0,0 @@
-GLIBC_2.0 {
-  global:
-    _nss_db_endaliasent; _nss_db_endetherent; _nss_db_endgrent;
-    _nss_db_endnetgrent; _nss_db_endprotoent; _nss_db_endpwent;
-    _nss_db_endrpcent; _nss_db_endservent; _nss_db_endspent;
-    _nss_db_getaliasbyname_r; _nss_db_getaliasent_r; _nss_db_getetherent_r;
-    _nss_db_getgrent_r; _nss_db_getgrgid_r; _nss_db_getgrnam_r;
-    _nss_db_gethostton_r; _nss_db_getnetgrent_r; _nss_db_getntohost_r;
-    _nss_db_getprotobyname_r; _nss_db_getprotobynumber_r;
-    _nss_db_getprotoent_r; _nss_db_getpwent_r; _nss_db_getpwnam_r;
-    _nss_db_getpwuid_r; _nss_db_getrpcbyname_r; _nss_db_getrpcbynumber_r;
-    _nss_db_getrpcent_r; _nss_db_getservbyname_r; _nss_db_getservbyport_r;
-    _nss_db_getservent_r; _nss_db_getspent_r; _nss_db_getspnam_r;
-    _nss_db_setaliasent; _nss_db_setetherent; _nss_db_setgrent;
-    _nss_db_setnetgrent; _nss_db_setprotoent; _nss_db_setpwent;
-    _nss_db_setrpcent; _nss_db_setservent; _nss_db_setspent;
-
-  local:
-    *;
-};