d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The clnt_create(KEYSERVSOCK, CRYPT_PROG, CRYPT_VERS, "unix") hacks

Browse Source 
were removed and replaced them with clnt_tp_create, now the af_local
support is fixed.

I also removed the hack how rpcinfo contacted rpcbind, now we can
relay on clnt_tp_create create the client-handle for us.  Only
rpcbind itself needs a hardcoded socket-path.

Submitted by: mbr

Also add $FreeBSD
This commit is contained in:
Alfred Perlstein 2002-02-05 19:26:04 +00:00
parent 26d0e65f67
commit 8858373f83
4 changed files with 74 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/libc/rpc/crypt_client.c
View File

@ -42,10 +42,6 @@
static const char rcsid[] = "$FreeBSD$";
#endif
#ifndef KEYSERVSOCK
#define KEYSERVSOCK "/var/run/keyservsock"
#endif
int
_des_crypt_call(buf, len, dparms)
char *buf;
@ -55,12 +51,27 @@ _des_crypt_call(buf, len, dparms)
CLIENT *clnt;
desresp *result_1;
desargs des_crypt_1_arg;
int stat;
struct netconfig *nconf;
void *localhandle;
int stat;
clnt = clnt_create(KEYSERVSOCK, CRYPT_PROG, CRYPT_VERS, "unix");
if (clnt == (CLIENT *) NULL) {
nconf = NULL;
localhandle = setnetconfig();
while ((nconf = getnetconfig(localhandle)) != NULL) {
if (nconf->nc_protofmly != NULL &&
strcmp(nconf->nc_protofmly, NC_LOOPBACK) == 0)
break;
}
if (nconf == NULL) {
warnx("getnetconfig: %s", nc_sperror());
return(DESERR_HWERROR);
}
clnt = clnt_tp_create(NULL, CRYPT_PROG, CRYPT_VERS, nconf);
if (clnt == (CLIENT *) NULL) {
endnetconfig(localhandle);
return(DESERR_HWERROR);
}
endnetconfig(localhandle);
des_crypt_1_arg.desbuf.desbuf_len = len;
des_crypt_1_arg.desbuf.desbuf_val = buf;

24
usr.bin/chpass/pw_yp.c
View File

@ -354,7 +354,6 @@ char *get_yp_master(getserver)
char *mastername;
int rval, localport;
struct stat st;
char *sockname = YP_SOCKNAME;
/*
* Sometimes we are called just to probe for rpc.yppasswdd and
@ -407,7 +406,7 @@ char *get_yp_master(getserver)
/* See if _we_ are the master server. */
if (!force_old && !getuid() && (localport = getrpcport("localhost",
YPPASSWDPROG, YPPASSWDPROC_UPDATE, IPPROTO_UDP)) != 0) {
if (localport == rval && stat(sockname, &st) != -1) {
if (localport == rval) {
suser_override = 1;
mastername = "localhost";
}
@ -433,12 +432,14 @@ void yp_submit(pw)
{
struct yppasswd yppasswd;
struct master_yppasswd master_yppasswd;
struct netconfig *nconf;
void *localhandle;
CLIENT *clnt;
char *master, *password;
int *status = NULL;
struct rpc_err err;
char *sockname = YP_SOCKNAME;
nconf = NULL;
_use_yp = 1;
/* Get NIS master server name */
@ -490,13 +491,26 @@ void yp_submit(pw)
if (suser_override) {
/* Talk to server via AF_UNIX socket. */
clnt = clnt_create(sockname, MASTER_YPPASSWDPROG,
MASTER_YPPASSWDVERS, "unix");
localhandle = setnetconfig();
while ((nconf = getnetconfig(localhandle)) != NULL) {
if (nconf->nc_protofmly != NULL &&
strcmp(nconf->nc_protofmly, NC_LOOPBACK) == 0)
break;
}
if (nconf == NULL) {
warnx("getnetconfig: %s", nc_sperror());
pw_error(tempname, 0, 1);
}
clnt = clnt_tp_create(NULL, MASTER_YPPASSWDPROG,
MASTER_YPPASSWDVERS, nconf);
if (clnt == NULL) {
warnx("failed to contact rpc.yppasswdd: %s",
clnt_spcreateerror(master));
endnetconfig(localhandle);
pw_error(tempname, 0, 1);
}
endnetconfig(localhandle);
} else {
/* Create a handle to yppasswdd. */

26
usr.bin/passwd/yp_passwd.c
View File

@ -27,6 +27,8 @@
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $FreeBSD$
*/
#ifdef YP
@ -55,14 +57,16 @@ yp_passwd(char *user)
{
struct yppasswd yppasswd;
struct master_yppasswd master_yppasswd;
struct netconfig *nconf;
void *localhandle;
struct passwd *pw;
CLIENT *clnt;
struct rpc_err err;
char *master;
int *status = NULL;
uid_t uid;
char *sockname = YP_SOCKNAME;
nconf = NULL;
_use_yp = 1;
uid = getuid();
@ -144,12 +148,24 @@ for other users");
}
if (suser_override) {
if ((clnt = clnt_create(sockname, MASTER_YPPASSWDPROG,
MASTER_YPPASSWDVERS, "unix")) == NULL) {
warnx("failed to contact rpc.yppasswdd on host %s: %s",
master, clnt_spcreateerror(""));
localhandle = setnetconfig();
while ((nconf = getnetconfig(localhandle)) != NULL) {
if (nconf->nc_protofmly != NULL &&
strcmp(nconf->nc_protofmly, NC_LOOPBACK) == 0)
break;
}
if (nconf == NULL) {
warnx("getnetconfig: %s", nc_sperror());
return(1);
}
if ((clnt = clnt_tp_create(NULL, MASTER_YPPASSWDPROG,
MASTER_YPPASSWDVERS, nconf)) == NULL) {
warnx("failed to contact rpc.yppasswdd on host %s: %s",
master, clnt_spcreateerror(""));
endnetconfig(localhandle);
return(1);
}
endnetconfig(localhandle);
} else {
if ((clnt = clnt_create(master, YPPASSWDPROG,
YPPASSWDVERS, "udp")) == NULL) {

30
usr.bin/rpcinfo/rpcinfo.c
View File

@ -321,22 +321,24 @@ main(int argc, char **argv)
static CLIENT *
local_rpcb(u_long prog, u_long vers)
{
struct netbuf nbuf;
struct sockaddr_un sun;
int sock;
void *localhandle;
struct netconfig *nconf;
CLIENT *clnt;
memset(&sun, 0, sizeof sun);
sock = socket(AF_LOCAL, SOCK_STREAM, 0);
if (sock < 0)
return NULL;
localhandle = setnetconfig();
while ((nconf = getnetconfig(localhandle)) != NULL) {
if (nconf->nc_protofmly != NULL &&
strcmp(nconf->nc_protofmly, NC_LOOPBACK) == 0)
break;
}
if (nconf == NULL) {
warnx("getnetconfig: %s", nc_sperror());
return (NULL);
}
sun.sun_family = AF_LOCAL;
strcpy(sun.sun_path, _PATH_RPCBINDSOCK);
nbuf.len = sun.sun_len = SUN_LEN(&sun);
nbuf.maxlen = sizeof (struct sockaddr_un);
nbuf.buf = &sun;
return clnt_vc_create(sock, &nbuf, prog, vers, 0, 0);
clnt = clnt_tp_create(NULL, prog, vers, nconf);
endnetconfig(localhandle);
return clnt;
}
#ifdef PORTMAP