Marcus Meissner
513c13ffef
Trying again, with some more changes added... OBS-URL: https://build.opensuse.org/request/show/213905 OBS-URL: https://build.opensuse.org/package/show/network/rpcbind?expand=0&rev=28
250 lines
6.6 KiB
Diff
250 lines
6.6 KiB
Diff
From a43a3b1ab5545d835af2867c343ee195a6256665 Mon Sep 17 00:00:00 2001
|
|
From: Olaf Kirch <okir@suse.de>
|
|
Date: Tue, 20 Aug 2013 09:49:15 +0200
|
|
Subject: [PATCH 07/13] init_transport: move the registration code into a
|
|
separate function
|
|
|
|
Signed-off-by: Olaf Kirch <okir@suse.de>
|
|
---
|
|
src/rpcbind.c | 216 +++++++++++++++++++++++++++++++---------------------------
|
|
1 file changed, 116 insertions(+), 100 deletions(-)
|
|
|
|
diff --git a/src/rpcbind.c b/src/rpcbind.c
|
|
index a7dcc0e..25d12c9 100644
|
|
--- a/src/rpcbind.c
|
|
+++ b/src/rpcbind.c
|
|
@@ -447,6 +447,120 @@ skip:
|
|
return 0;
|
|
}
|
|
|
|
+static int
|
|
+rpcbind_register_transport(struct netconfig *nconf, SVCXPRT *xprt, struct netbuf *bind_addr)
|
|
+{
|
|
+ struct __rpc_sockinfo si;
|
|
+ int status;
|
|
+
|
|
+ (void) __rpc_nconf2sockinfo(nconf, &si);
|
|
+
|
|
+#ifdef PORTMAP
|
|
+ /*
|
|
+ * Register both the versions for tcp/ip, udp/ip.
|
|
+ */
|
|
+ if (si.si_af == AF_INET &&
|
|
+ (si.si_proto == IPPROTO_TCP || si.si_proto == IPPROTO_UDP)) {
|
|
+ struct pmaplist *pml;
|
|
+
|
|
+ pml = malloc(sizeof (struct pmaplist));
|
|
+ if (pml == NULL) {
|
|
+ syslog(LOG_ERR, "no memory!");
|
|
+ exit(1);
|
|
+ }
|
|
+ pml->pml_map.pm_prog = PMAPPROG;
|
|
+ pml->pml_map.pm_vers = PMAPVERS;
|
|
+ pml->pml_map.pm_port = PMAPPORT;
|
|
+ pml->pml_map.pm_prot = si.si_proto;
|
|
+
|
|
+ switch (si.si_proto) {
|
|
+ case IPPROTO_TCP:
|
|
+ tcptrans = strdup(nconf->nc_netid);
|
|
+ break;
|
|
+ case IPPROTO_UDP:
|
|
+ udptrans = strdup(nconf->nc_netid);
|
|
+ break;
|
|
+ }
|
|
+ pml->pml_next = list_pml;
|
|
+ list_pml = pml;
|
|
+
|
|
+ /* Add version 3 information */
|
|
+ pml = malloc(sizeof (struct pmaplist));
|
|
+ if (pml == NULL) {
|
|
+ syslog(LOG_ERR, "no memory!");
|
|
+ exit(1);
|
|
+ }
|
|
+ pml->pml_map = list_pml->pml_map;
|
|
+ pml->pml_map.pm_vers = RPCBVERS;
|
|
+ pml->pml_next = list_pml;
|
|
+ list_pml = pml;
|
|
+
|
|
+ /* Add version 4 information */
|
|
+ pml = malloc (sizeof (struct pmaplist));
|
|
+ if (pml == NULL) {
|
|
+ syslog(LOG_ERR, "no memory!");
|
|
+ exit(1);
|
|
+ }
|
|
+ pml->pml_map = list_pml->pml_map;
|
|
+ pml->pml_map.pm_vers = RPCBVERS4;
|
|
+ pml->pml_next = list_pml;
|
|
+ list_pml = pml;
|
|
+
|
|
+ /* Also add version 2 stuff to rpcbind list */
|
|
+ rbllist_add(PMAPPROG, PMAPVERS, nconf, bind_addr);
|
|
+ }
|
|
+
|
|
+ /* We need to support portmap over IPv4. It makes sense to
|
|
+ * support it over AF_LOCAL as well, because that allows
|
|
+ * rpcbind to identify the owner of a socket much better
|
|
+ * than by relying on privileged ports to tell root from
|
|
+ * non-root users. */
|
|
+ if (si.si_af == AF_INET || si.si_af == AF_LOCAL) {
|
|
+ if (!svc_register(xprt, PMAPPROG, PMAPVERS, pmap_service, 0)) {
|
|
+ syslog(LOG_ERR, "could not register on %s",
|
|
+ nconf->nc_netid);
|
|
+ return 0;
|
|
+ }
|
|
+ }
|
|
+#endif
|
|
+
|
|
+ /* version 3 registration */
|
|
+ if (!svc_reg(xprt, RPCBPROG, RPCBVERS, rpcb_service_3, NULL)) {
|
|
+ syslog(LOG_ERR, "could not register %s version 3",
|
|
+ nconf->nc_netid);
|
|
+ return 0;
|
|
+ }
|
|
+ rbllist_add(RPCBPROG, RPCBVERS, nconf, bind_addr);
|
|
+
|
|
+ /* version 4 registration */
|
|
+ if (!svc_reg(xprt, RPCBPROG, RPCBVERS4, rpcb_service_4, NULL)) {
|
|
+ syslog(LOG_ERR, "could not register %s version 4",
|
|
+ nconf->nc_netid);
|
|
+ return 0;
|
|
+ }
|
|
+ rbllist_add(RPCBPROG, RPCBVERS4, nconf, bind_addr);
|
|
+
|
|
+ /* decide if bound checking works for this transport */
|
|
+ status = add_bndlist(nconf, bind_addr);
|
|
+
|
|
+#ifdef RPCBIND_DEBUG
|
|
+ if (debugging) {
|
|
+ if (status < 0) {
|
|
+ fprintf(stderr, "Error in finding bind status for %s\n",
|
|
+ nconf->nc_netid);
|
|
+ } else if (status == 0) {
|
|
+ fprintf(stderr, "check binding for %s\n",
|
|
+ nconf->nc_netid);
|
|
+ } else if (status > 0) {
|
|
+ fprintf(stderr, "No check binding for %s\n",
|
|
+ nconf->nc_netid);
|
|
+ }
|
|
+ }
|
|
+#endif
|
|
+
|
|
+ return 1;
|
|
+}
|
|
+
|
|
/*
|
|
* Adds the entry into the rpcbind database.
|
|
* If PORTMAP, then for UDP and TCP, it adds the entries for version 2 also
|
|
@@ -554,107 +668,9 @@ init_transport(struct netconfig *nconf)
|
|
}
|
|
}
|
|
|
|
-#ifdef PORTMAP
|
|
- /*
|
|
- * Register both the versions for tcp/ip, udp/ip.
|
|
- */
|
|
- if (si.si_af == AF_INET &&
|
|
- (si.si_proto == IPPROTO_TCP || si.si_proto == IPPROTO_UDP)) {
|
|
- struct pmaplist *pml;
|
|
-
|
|
- pml = malloc(sizeof (struct pmaplist));
|
|
- if (pml == NULL) {
|
|
- syslog(LOG_ERR, "no memory!");
|
|
- exit(1);
|
|
- }
|
|
- pml->pml_map.pm_prog = PMAPPROG;
|
|
- pml->pml_map.pm_vers = PMAPVERS;
|
|
- pml->pml_map.pm_port = PMAPPORT;
|
|
- pml->pml_map.pm_prot = si.si_proto;
|
|
-
|
|
- switch (si.si_proto) {
|
|
- case IPPROTO_TCP:
|
|
- tcptrans = strdup(nconf->nc_netid);
|
|
- break;
|
|
- case IPPROTO_UDP:
|
|
- udptrans = strdup(nconf->nc_netid);
|
|
- break;
|
|
- }
|
|
- pml->pml_next = list_pml;
|
|
- list_pml = pml;
|
|
-
|
|
- /* Add version 3 information */
|
|
- pml = malloc(sizeof (struct pmaplist));
|
|
- if (pml == NULL) {
|
|
- syslog(LOG_ERR, "no memory!");
|
|
- exit(1);
|
|
- }
|
|
- pml->pml_map = list_pml->pml_map;
|
|
- pml->pml_map.pm_vers = RPCBVERS;
|
|
- pml->pml_next = list_pml;
|
|
- list_pml = pml;
|
|
-
|
|
- /* Add version 4 information */
|
|
- pml = malloc (sizeof (struct pmaplist));
|
|
- if (pml == NULL) {
|
|
- syslog(LOG_ERR, "no memory!");
|
|
- exit(1);
|
|
- }
|
|
- pml->pml_map = list_pml->pml_map;
|
|
- pml->pml_map.pm_vers = RPCBVERS4;
|
|
- pml->pml_next = list_pml;
|
|
- list_pml = pml;
|
|
-
|
|
- /* Also add version 2 stuff to rpcbind list */
|
|
- rbllist_add(PMAPPROG, PMAPVERS, nconf, &taddr.addr);
|
|
- }
|
|
-
|
|
- /* We need to support portmap over IPv4. It makes sense to
|
|
- * support it over AF_LOCAL as well, because that allows
|
|
- * rpcbind to identify the owner of a socket much better
|
|
- * than by relying on privileged ports to tell root from
|
|
- * non-root users. */
|
|
- if (si.si_af == AF_INET || si.si_af == AF_LOCAL) {
|
|
- if (!svc_register(my_xprt, PMAPPROG, PMAPVERS, pmap_service, 0)) {
|
|
- syslog(LOG_ERR, "could not register on %s",
|
|
- nconf->nc_netid);
|
|
- goto error;
|
|
- }
|
|
- }
|
|
-#endif
|
|
-
|
|
- /* version 3 registration */
|
|
- if (!svc_reg(my_xprt, RPCBPROG, RPCBVERS, rpcb_service_3, NULL)) {
|
|
- syslog(LOG_ERR, "could not register %s version 3",
|
|
- nconf->nc_netid);
|
|
- goto error;
|
|
- }
|
|
- rbllist_add(RPCBPROG, RPCBVERS, nconf, &taddr.addr);
|
|
-
|
|
- /* version 4 registration */
|
|
- if (!svc_reg(my_xprt, RPCBPROG, RPCBVERS4, rpcb_service_4, NULL)) {
|
|
- syslog(LOG_ERR, "could not register %s version 4",
|
|
- nconf->nc_netid);
|
|
- goto error;
|
|
- }
|
|
- rbllist_add(RPCBPROG, RPCBVERS4, nconf, &taddr.addr);
|
|
+ if (!rpcbind_register_transport(nconf, my_xprt, &taddr.addr))
|
|
+ return (1);
|
|
|
|
- /* decide if bound checking works for this transport */
|
|
- status = add_bndlist(nconf, &taddr.addr);
|
|
-#ifdef RPCBIND_DEBUG
|
|
- if (debugging) {
|
|
- if (status < 0) {
|
|
- fprintf(stderr, "Error in finding bind status for %s\n",
|
|
- nconf->nc_netid);
|
|
- } else if (status == 0) {
|
|
- fprintf(stderr, "check binding for %s\n",
|
|
- nconf->nc_netid);
|
|
- } else if (status > 0) {
|
|
- fprintf(stderr, "No check binding for %s\n",
|
|
- nconf->nc_netid);
|
|
- }
|
|
- }
|
|
-#endif
|
|
/*
|
|
* rmtcall only supported on CLTS transports for now.
|
|
*/
|
|
--
|
|
1.7.12.4
|
|
|