Message ID | 1415118304-5696-1-git-send-email-steved@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On 11/04/2014 11:25 AM, Steve Dickson wrote: > Commit 045d2e46 cause a number of systems to be > undefined during run time in rpc.idmapd. > > Having this type of versioning is not necessary in > this type of a library so the patch was reverted. > > Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1159943 > > Signed-off-by: Steve Dickson <steved@redhat.com> Committed... steved. > --- > Makefile.am | 3 +-- > nfsidmap.map | 31 ------------------------------- > 2 files changed, 1 insertion(+), 33 deletions(-) > delete mode 100644 nfsidmap.map > > diff --git a/Makefile.am b/Makefile.am > index 69bbcbc..85f19c8 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -26,9 +26,8 @@ pkglib_LTLIBRARIES = nsswitch.la static.la $(UMICH_LDAP_LIB) $(GUMS_MAPPING_LIB) > # by this library. > > libnfsidmap_la_SOURCES = libnfsidmap.c cfg.c strlcpy.c cfg.h nfsidmap_internal.h queue.h > -libnfsidmap_la_LDFLAGS = -version-info 3:0:3 -Wl,--version-script=$(srcdir)/nfsidmap.map > +libnfsidmap_la_LDFLAGS = -version-info 3:0:3 > libnfsidmap_la_LIBADD = -ldl > -libnfsidmap_la_DEPENDENCIES = nfsidmap.map > > nsswitch_la_SOURCES = nss.c > nsswitch_la_LDFLAGS = -module -avoid-version > diff --git a/nfsidmap.map b/nfsidmap.map > deleted file mode 100644 > index 1e7cf7e..0000000 > --- a/nfsidmap.map > +++ /dev/null > @@ -1,31 +0,0 @@ > -V_0.26 { > -global: > - nfs4_init_name_mapping; > - nfs4_get_default_domain; > - nfs4_uid_to_name; > - nfs4_gid_to_name; > - nfs4_uid_to_owner; > - nfs4_gid_to_group_owner; > - nfs4_name_to_uid; > - nfs4_name_to_gid; > - nfs4_owner_to_uid; > - nfs4_owner_to_gid; > - nfs4_group_owner_to_gid; > - nfs4_gss_princ_to_ids; > - nfs4_gss_princ_to_grouplist; > - nfs4_gss_princ_to_ids_ex; > - nfs4_gss_princ_to_grouplist_ex; > - nfs4_set_debug; > - idmap_verbosity; > - idmap_log_func; > - get_default_domain; > - get_local_realms; > -local: > - *; > -}; > -/* > -V_0.27 { > -global: > - ... > -} V_0.26; > -*/ > -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/Makefile.am b/Makefile.am index 69bbcbc..85f19c8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,9 +26,8 @@ pkglib_LTLIBRARIES = nsswitch.la static.la $(UMICH_LDAP_LIB) $(GUMS_MAPPING_LIB) # by this library. libnfsidmap_la_SOURCES = libnfsidmap.c cfg.c strlcpy.c cfg.h nfsidmap_internal.h queue.h -libnfsidmap_la_LDFLAGS = -version-info 3:0:3 -Wl,--version-script=$(srcdir)/nfsidmap.map +libnfsidmap_la_LDFLAGS = -version-info 3:0:3 libnfsidmap_la_LIBADD = -ldl -libnfsidmap_la_DEPENDENCIES = nfsidmap.map nsswitch_la_SOURCES = nss.c nsswitch_la_LDFLAGS = -module -avoid-version diff --git a/nfsidmap.map b/nfsidmap.map deleted file mode 100644 index 1e7cf7e..0000000 --- a/nfsidmap.map +++ /dev/null @@ -1,31 +0,0 @@ -V_0.26 { -global: - nfs4_init_name_mapping; - nfs4_get_default_domain; - nfs4_uid_to_name; - nfs4_gid_to_name; - nfs4_uid_to_owner; - nfs4_gid_to_group_owner; - nfs4_name_to_uid; - nfs4_name_to_gid; - nfs4_owner_to_uid; - nfs4_owner_to_gid; - nfs4_group_owner_to_gid; - nfs4_gss_princ_to_ids; - nfs4_gss_princ_to_grouplist; - nfs4_gss_princ_to_ids_ex; - nfs4_gss_princ_to_grouplist_ex; - nfs4_set_debug; - idmap_verbosity; - idmap_log_func; - get_default_domain; - get_local_realms; -local: - *; -}; -/* -V_0.27 { -global: - ... -} V_0.26; -*/
Commit 045d2e46 cause a number of systems to be undefined during run time in rpc.idmapd. Having this type of versioning is not necessary in this type of a library so the patch was reverted. Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1159943 Signed-off-by: Steve Dickson <steved@redhat.com> --- Makefile.am | 3 +-- nfsidmap.map | 31 ------------------------------- 2 files changed, 1 insertion(+), 33 deletions(-) delete mode 100644 nfsidmap.map