c213227f60
Update to rpcbind 0.2.2 and port most patches to it. 6 are still missing. - Split off 0003-systemd-no-dualmode.patch from 0001-systemd-enhancements.patch for easier upstream submission. - Split off 0004-systemd-sd_notify.patch from 0001-systemd-enhancements.patch for easier upstream submission. - Rename 0001-systemd-enhancements.patch to 0001-systemd-unit-files.patch - Update to latest rpcbind 0.2.2 upstream release. - Following patches are upstream: - 0001-Fix-building-one-systems-w-out-nss.h.patch - 0002-Rename-configure.in-to-configure.ac.patch - 0003-rpcbind-rpcuser-not-being-set-in-Makefile.am.patch - 0004-Silence-a-warning-about-setgroups-being-implicitly-d.patch - Adjust following patches: - 0005-Remove-obsolete-function-in6_fillscopeid.patch - 0006-In-init_transport-move-creation-of-COTS-sockets-clos.patch - 0018-configure-check-for-nss.h.patch - Obsolete patches: - 0015-When-using-systemd-activation-make-rpcbind-notify-sy.patch - 0016-Notify-systemd-unconditionally.patch - 0012-Support-systemd-activation.patch - 0013-socket-activation-Fix-rpcbind.service-to-use-separat.patch - 0017-Pull-the-sysconfig-file-into-rpcbind.service-and-use.patch - 0025-rpcinfo-warmstat_no-warning-about-missing-file.patch - 0026-systemd-no-default-dep - 0027-socket-before-service.patch - 0028-rpcbind-after-var-run.patch - 0029-rpcbind-sd-notify-stupid-errmsg.patch - New patches: - 0001-systemd-enhancements.patch - 0002-rpcinfo_warmstart-no_warning_about_missing_file.patch OBS-URL: https://build.opensuse.org/request/show/264790 OBS-URL: https://build.opensuse.org/package/show/network/rpcbind?expand=0&rev=51
48 lines
1.4 KiB
Diff
48 lines
1.4 KiB
Diff
From 2dbc060dd45240216ae37217690f974f57a653f6 Mon Sep 17 00:00:00 2001
|
|
From: Olaf Kirch <okir@suse.de>
|
|
Date: Tue, 20 Aug 2013 09:11:45 +0200
|
|
Subject: [PATCH 06/24] In init_transport, move creation of COTS sockets
|
|
closer to where they are used
|
|
|
|
Signed-off-by: Olaf Kirch <okir@suse.de>
|
|
---
|
|
src/rpcbind.c | 18 ++++++------------
|
|
1 file changed, 6 insertions(+), 12 deletions(-)
|
|
|
|
diff --git a/src/rpcbind.c b/src/rpcbind.c
|
|
index 7ed72bc..f562f7a 100644
|
|
--- a/src/rpcbind.c
|
|
+++ b/src/rpcbind.c
|
|
@@ -389,18 +389,6 @@
|
|
if (my_xprt != NULL)
|
|
goto got_socket;
|
|
|
|
- /*
|
|
- * XXX - using RPC library internal functions. For NC_TPI_CLTS
|
|
- * we call this later, for each socket we like to bind.
|
|
- */
|
|
- if (nconf->nc_semantics != NC_TPI_CLTS) {
|
|
- if ((fd = __rpc_nconf2fd(nconf)) < 0) {
|
|
- syslog(LOG_ERR, "cannot create socket for %s",
|
|
- nconf->nc_netid);
|
|
- return (1);
|
|
- }
|
|
- }
|
|
-
|
|
if ((strcmp(nconf->nc_netid, "local") == 0) ||
|
|
(strcmp(nconf->nc_netid, "unix") == 0)) {
|
|
memset(&sun, 0, sizeof sun);
|
|
@@ -561,6 +549,12 @@
|
|
if (!checkbind)
|
|
return 1;
|
|
} else { /* NC_TPI_COTS */
|
|
+ if ((fd = __rpc_nconf2fd(nconf)) < 0) {
|
|
+ syslog(LOG_ERR, "cannot create socket for %s",
|
|
+ nconf->nc_netid);
|
|
+ return (1);
|
|
+ }
|
|
+
|
|
if ((strcmp(nconf->nc_netid, "local") != 0) &&
|
|
(strcmp(nconf->nc_netid, "unix") != 0)) {
|
|
if ((aicode = getaddrinfo(NULL, servname, &hints, &res))!= 0) {
|