Merge pull request #2780 from mstorchak/nfs-kernel-server

nfs-kernel-server: add workaround for musl getservbyport
This commit is contained in:
champtar 2016-07-02 19:22:37 +02:00 committed by GitHub
commit 88f797a499
2 changed files with 19 additions and 1 deletions

View file

@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=nfs-kernel-server PKG_NAME:=nfs-kernel-server
PKG_VERSION:=1.3.3 PKG_VERSION:=1.3.3
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_MD5SUM:=9b87d890669eaaec8e97a2b0a35b2665 PKG_MD5SUM:=9b87d890669eaaec8e97a2b0a35b2665
PKG_SOURCE_URL:=@SF/nfs PKG_SOURCE_URL:=@SF/nfs

View file

@ -0,0 +1,18 @@
Musl will always return something with getservbyport so we cannot skip
ports that returns non-null.
diff --git a/utils/statd/rmtcall.c b/utils/statd/rmtcall.c
index fd576d9..d72a0bf 100644
--- a/utils/statd/rmtcall.c
+++ b/utils/statd/rmtcall.c
@@ -90,8 +90,10 @@ statd_get_socket(void)
__func__);
break;
}
+#if defined(__GLIBC__) || defined(__UCLIBC__)
se = getservbyport(sin.sin_port, "udp");
if (se == NULL)
+#endif
break;
/* rather not use that port, try again */