diff options
author | Ken Raeburn <raeburn@mit.edu> | 2008-06-06 17:30:28 +0000 |
---|---|---|
committer | Ken Raeburn <raeburn@mit.edu> | 2008-06-06 17:30:28 +0000 |
commit | e36cd18d341225b0e8790b4bf2856ef8ff4f667a (patch) | |
tree | 2c2542c914abc6ff98623581112a192575fb2860 /src/lib/rpc | |
parent | a49a83460bcc9f123d3d980672b9244b47356b44 (diff) | |
download | krb5-e36cd18d341225b0e8790b4bf2856ef8ff4f667a.zip krb5-e36cd18d341225b0e8790b4bf2856ef8ff4f667a.tar.gz krb5-e36cd18d341225b0e8790b4bf2856ef8ff4f667a.tar.bz2 |
On Mac OS X, try poking launchd to get the portmapper launched before
we try to connect to it.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@20364 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/rpc')
-rw-r--r-- | src/lib/rpc/pmap_clnt.c | 58 |
1 files changed, 55 insertions, 3 deletions
diff --git a/src/lib/rpc/pmap_clnt.c b/src/lib/rpc/pmap_clnt.c index 7951d2e..affac9f 100644 --- a/src/lib/rpc/pmap_clnt.c +++ b/src/lib/rpc/pmap_clnt.c @@ -43,6 +43,12 @@ static char sccsid[] = "@(#)pmap_clnt.c 1.37 87/08/11 Copyr 1984 Sun Micro"; #include <gssrpc/pmap_prot.h> #include <gssrpc/pmap_clnt.h> +#if TARGET_OS_MAC +#include <sys/un.h> +#include <string.h> +#include <syslog.h> +#endif + static struct timeval timeout = { 5, 0 }; static struct timeval tottimeout = { 60, 0 }; @@ -60,27 +66,73 @@ pmap_set( u_int port) { struct sockaddr_in myaddress; - int socket = -1; + int sock = -1; register CLIENT *client; struct pmap parms; bool_t rslt; get_myaddress(&myaddress); client = clntudp_bufcreate(&myaddress, PMAPPROG, PMAPVERS, - timeout, &socket, RPCSMALLMSGSIZE, RPCSMALLMSGSIZE); + timeout, &sock, RPCSMALLMSGSIZE, RPCSMALLMSGSIZE); if (client == (CLIENT *)NULL) return (FALSE); parms.pm_prog = program; parms.pm_vers = version; parms.pm_prot = protocol; parms.pm_port = port; +#if TARGET_OS_MAC + { + /* + * Poke launchd, then wait for portmap to start up. + * + * My impression is that the protocol involves getting + * something back from the server. So wait, briefly, to + * see if it's going to send us something. Then continue + * on, regardless. I don't actually check what the data + * is, because I have no idea what sort of validation, if + * any, is needed. + * + * However, for whatever reason, the socket seems to be + * mode 700 owner root on my system, so if you don't + * change its ownership or mode, and if the program isn't + * running as root, you still lose. + */ +#define TICKLER_SOCKET "/var/run/portmap.socket" + int tickle; + struct sockaddr_un a = { + .sun_family = AF_UNIX, + .sun_path = TICKLER_SOCKET, + .sun_len = (sizeof(TICKLER_SOCKET) + + offsetof(struct sockaddr_un, sun_path)), + }; + + if (sizeof(TICKLER_SOCKET) <= sizeof(a.sun_path)) { + tickle = socket(AF_UNIX, SOCK_STREAM, 0); + if (tickle >= 0) { + if (connect(tickle, (struct sockaddr *)&a, a.sun_len) == 0 + && tickle < FD_SETSIZE) { + fd_set readfds; + struct timeval tv; + + FD_ZERO(&readfds); + /* XXX Range check. */ + FD_SET(tickle, &readfds); + tv.tv_sec = 5; + tv.tv_usec = 0; + (void) select(tickle+1, &readfds, 0, 0, &tv); + } + close(tickle); + } + } + } +#endif if (CLNT_CALL(client, PMAPPROC_SET, xdr_pmap, &parms, xdr_bool, &rslt, tottimeout) != RPC_SUCCESS) { clnt_perror(client, "Cannot register service"); return (FALSE); } CLNT_DESTROY(client); - (void)close(socket); + (void)close(sock); return (rslt); } |