1995-12-16 20:54:17 +00:00
|
|
|
/*
|
|
|
|
* Copyright (c) 1995
|
|
|
|
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
|
|
|
|
*
|
|
|
|
* Redistribution and use in source and binary forms, with or without
|
|
|
|
* modification, are permitted provided that the following conditions
|
|
|
|
* are met:
|
|
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer.
|
|
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
|
|
* documentation and/or other materials provided with the distribution.
|
|
|
|
* 3. All advertising materials mentioning features or use of this software
|
|
|
|
* must display the following acknowledgement:
|
|
|
|
* This product includes software developed by Bill Paul.
|
|
|
|
* 4. Neither the name of the author nor the names of any co-contributors
|
|
|
|
* may be used to endorse or promote products derived from this software
|
|
|
|
* without specific prior written permission.
|
|
|
|
*
|
|
|
|
* THIS SOFTWARE IS PROVIDED BY Bill Paul AND CONTRIBUTORS ``AS IS'' AND
|
|
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL Bill Paul OR CONTRIBUTORS BE LIABLE
|
|
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
|
|
* 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.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
2003-05-03 21:06:42 +00:00
|
|
|
#include <sys/cdefs.h>
|
|
|
|
__FBSDID("$FreeBSD$");
|
1997-10-29 07:25:05 +00:00
|
|
|
|
1996-02-25 19:25:23 +00:00
|
|
|
#include <stdlib.h>
|
1995-12-16 20:54:17 +00:00
|
|
|
#include <rpc/rpc.h>
|
1996-02-24 22:01:48 +00:00
|
|
|
#include <rpcsvc/yp.h>
|
|
|
|
#include <rpcsvc/yppasswd.h>
|
1996-09-30 22:27:00 +00:00
|
|
|
#include <rpcsvc/ypxfrd.h>
|
1995-12-16 20:54:17 +00:00
|
|
|
#include <sys/types.h>
|
Performance enhancements (I hope) and new stuff:
yp_dblookup.c:
- Implement database handle caching. What this means is that instead
of opening and closing map databases for each request, we open a
database and save the handle (and, if requested, the key index)
in an array. This saves a bit of overhead on things like repeated
YPPROC_NEXT calls, such as you'd get from getpwent(). Normally,
each YPPROC_NEXT would require open()ing the database, seeking
to the location supplied by the caller (which is time consuming with
hash databases as the R_CURSOR flag doesn't work), reading the
data, close()ing the database and then shipping the data off to
the caller. The system call overhead is prohibitive, especially
with very large maps. By caching the handle to an open database,
we elimitate at least the open()/close() system calls, as well
as the associated DB setup and tear-down operations, for a large
percentage of the time. This improves performance substantially at
the cost of consuming a little more memory than before.
Note that all the caching support is surrounded by #ifdef DB_CACHE
so that this same source module can still be used by other programs
that don't need it.
- Make yp_open_db() call yp_validdomain(). Doing it here saves cycles
when caching is enabled since a hit on the map cache list by
definition means that the domain being referenced is valid.
- Also make yp_open_db() check for exhaustion of file descriptors,
just in case.
yp_server.c:
- Reorganize things a little to take advantage of the database
handle caching. Add a call to yp_flush_all() in ypproc_clear_2_svc().
- Remove calls to yp_validdomain() from some of the service procedures.
yp_validdomain() is called inside yp_open_db() now, so procedures that
call into the database package don't need to use yp_validdomain()
themselves.
- Fix a bogosity in ypproc_maplist_2_svc(): don't summarily initiallize
the result.maps pointer to NULL. This causes yp_maplist_free()
to fail and leaks memory.
- Make ypproc_master_2_svc() copy the string it gets from the database
package into a private static buffer before trying to NUL terminate it.
This is necessary with the DB handle caching: stuffing a NUL into the
data returned by DB package will goof it up internally.
yp_main.c:
- Stuff for DB handle caching: call yp_init_dbs() to clear the
handle array and add call to yp_flush_all() to the SIGHUP
signal handler.
Makefile.yp:
- Reorganize to deal with database caching. yp_mkdb(8) can now be used
to send a YPPROC_CLEAR signal to ypserv(8). Call it after each map
is created to refresh ypserv's cache.
- Add support for mail.alias map.
Contributed by Mike Murphy (mrm@sceard.com).
- Make default location for the netgroups source file be /var/yp/netgroup
instead of /etc/netgroup.
mkaliases:
- New file: script to generate mail.alias map.
Contributed by Mike Murphy (mrm@sceard.com).
Makefile:
- Install Makefile.yp as /var/yp/Makefile.dist and link it to
/var/yp/Makefile only if /var/yp/Makefile doesn't already exist.
Suggested by Peter Wemm.
- Install new mkaliases script in /usr/libexec along with mknetid.
- Use somewhat saner approach to generating rpcgen-dependent files
as suggested by Garrett Wollman.
1996-04-28 04:38:52 +00:00
|
|
|
#include <limits.h>
|
|
|
|
#include <db.h>
|
1995-12-16 20:54:17 +00:00
|
|
|
#include <sys/socket.h>
|
|
|
|
#include <netinet/in.h>
|
|
|
|
#include <arpa/inet.h>
|
|
|
|
#include <sys/stat.h>
|
Performance enhancements (I hope) and new stuff:
yp_dblookup.c:
- Implement database handle caching. What this means is that instead
of opening and closing map databases for each request, we open a
database and save the handle (and, if requested, the key index)
in an array. This saves a bit of overhead on things like repeated
YPPROC_NEXT calls, such as you'd get from getpwent(). Normally,
each YPPROC_NEXT would require open()ing the database, seeking
to the location supplied by the caller (which is time consuming with
hash databases as the R_CURSOR flag doesn't work), reading the
data, close()ing the database and then shipping the data off to
the caller. The system call overhead is prohibitive, especially
with very large maps. By caching the handle to an open database,
we elimitate at least the open()/close() system calls, as well
as the associated DB setup and tear-down operations, for a large
percentage of the time. This improves performance substantially at
the cost of consuming a little more memory than before.
Note that all the caching support is surrounded by #ifdef DB_CACHE
so that this same source module can still be used by other programs
that don't need it.
- Make yp_open_db() call yp_validdomain(). Doing it here saves cycles
when caching is enabled since a hit on the map cache list by
definition means that the domain being referenced is valid.
- Also make yp_open_db() check for exhaustion of file descriptors,
just in case.
yp_server.c:
- Reorganize things a little to take advantage of the database
handle caching. Add a call to yp_flush_all() in ypproc_clear_2_svc().
- Remove calls to yp_validdomain() from some of the service procedures.
yp_validdomain() is called inside yp_open_db() now, so procedures that
call into the database package don't need to use yp_validdomain()
themselves.
- Fix a bogosity in ypproc_maplist_2_svc(): don't summarily initiallize
the result.maps pointer to NULL. This causes yp_maplist_free()
to fail and leaks memory.
- Make ypproc_master_2_svc() copy the string it gets from the database
package into a private static buffer before trying to NUL terminate it.
This is necessary with the DB handle caching: stuffing a NUL into the
data returned by DB package will goof it up internally.
yp_main.c:
- Stuff for DB handle caching: call yp_init_dbs() to clear the
handle array and add call to yp_flush_all() to the SIGHUP
signal handler.
Makefile.yp:
- Reorganize to deal with database caching. yp_mkdb(8) can now be used
to send a YPPROC_CLEAR signal to ypserv(8). Call it after each map
is created to refresh ypserv's cache.
- Add support for mail.alias map.
Contributed by Mike Murphy (mrm@sceard.com).
- Make default location for the netgroups source file be /var/yp/netgroup
instead of /etc/netgroup.
mkaliases:
- New file: script to generate mail.alias map.
Contributed by Mike Murphy (mrm@sceard.com).
Makefile:
- Install Makefile.yp as /var/yp/Makefile.dist and link it to
/var/yp/Makefile only if /var/yp/Makefile doesn't already exist.
Suggested by Peter Wemm.
- Install new mkaliases script in /usr/libexec along with mknetid.
- Use somewhat saner approach to generating rpcgen-dependent files
as suggested by Garrett Wollman.
1996-04-28 04:38:52 +00:00
|
|
|
#include <sys/fcntl.h>
|
1995-12-16 20:54:17 +00:00
|
|
|
#include <paths.h>
|
1996-02-24 22:01:48 +00:00
|
|
|
#include <errno.h>
|
1995-12-16 20:54:17 +00:00
|
|
|
#include <sys/param.h>
|
|
|
|
#include "yp_extern.h"
|
|
|
|
#ifdef TCP_WRAPPER
|
|
|
|
#include "tcpd.h"
|
|
|
|
#endif
|
|
|
|
|
|
|
|
extern int debug;
|
|
|
|
|
1996-02-26 02:34:27 +00:00
|
|
|
/* NIS v1 */
|
2002-05-08 15:41:15 +00:00
|
|
|
const char *yp_procs[] = {
|
|
|
|
"ypoldproc_null",
|
|
|
|
"ypoldproc_domain",
|
|
|
|
"ypoldproc_domain_nonack",
|
|
|
|
"ypoldproc_match",
|
|
|
|
"ypoldproc_first",
|
|
|
|
"ypoldproc_next",
|
|
|
|
"ypoldproc_poll",
|
|
|
|
"ypoldproc_push",
|
|
|
|
"ypoldproc_get",
|
|
|
|
"badproc1", /* placeholder */
|
|
|
|
"badproc2", /* placeholder */
|
|
|
|
"badproc3", /* placeholder */
|
|
|
|
|
|
|
|
/* NIS v2 */
|
|
|
|
"ypproc_null",
|
|
|
|
"ypproc_domain",
|
|
|
|
"ypproc_domain_nonack",
|
|
|
|
"ypproc_match",
|
|
|
|
"ypproc_first",
|
|
|
|
"ypproc_next",
|
|
|
|
"ypproc_xfr",
|
|
|
|
"ypproc_clear",
|
|
|
|
"ypproc_all",
|
|
|
|
"ypproc_master",
|
|
|
|
"ypproc_order",
|
|
|
|
"ypproc_maplist"
|
|
|
|
};
|
1996-02-26 02:34:27 +00:00
|
|
|
|
1996-02-24 22:01:48 +00:00
|
|
|
struct securenet {
|
|
|
|
struct in_addr net;
|
|
|
|
struct in_addr mask;
|
|
|
|
struct securenet *next;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct securenet *securenets;
|
|
|
|
|
|
|
|
#define LINEBUFSZ 1024
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Read /var/yp/securenets file and initialize the securenets
|
|
|
|
* list. If the file doesn't exist, we set up a dummy entry that
|
|
|
|
* allows all hosts to connect.
|
|
|
|
*/
|
2002-02-06 15:26:07 +00:00
|
|
|
void
|
|
|
|
load_securenets(void)
|
1996-02-24 22:01:48 +00:00
|
|
|
{
|
|
|
|
FILE *fp;
|
|
|
|
char path[MAXPATHLEN + 2];
|
|
|
|
char linebuf[1024 + 2];
|
|
|
|
struct securenet *tmp;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If securenets is not NULL, we are being called to reload
|
|
|
|
* the list; free the existing list before re-reading the
|
|
|
|
* securenets file.
|
|
|
|
*/
|
2002-02-06 13:30:31 +00:00
|
|
|
while (securenets) {
|
Performance enhancements (I hope) and new stuff:
yp_dblookup.c:
- Implement database handle caching. What this means is that instead
of opening and closing map databases for each request, we open a
database and save the handle (and, if requested, the key index)
in an array. This saves a bit of overhead on things like repeated
YPPROC_NEXT calls, such as you'd get from getpwent(). Normally,
each YPPROC_NEXT would require open()ing the database, seeking
to the location supplied by the caller (which is time consuming with
hash databases as the R_CURSOR flag doesn't work), reading the
data, close()ing the database and then shipping the data off to
the caller. The system call overhead is prohibitive, especially
with very large maps. By caching the handle to an open database,
we elimitate at least the open()/close() system calls, as well
as the associated DB setup and tear-down operations, for a large
percentage of the time. This improves performance substantially at
the cost of consuming a little more memory than before.
Note that all the caching support is surrounded by #ifdef DB_CACHE
so that this same source module can still be used by other programs
that don't need it.
- Make yp_open_db() call yp_validdomain(). Doing it here saves cycles
when caching is enabled since a hit on the map cache list by
definition means that the domain being referenced is valid.
- Also make yp_open_db() check for exhaustion of file descriptors,
just in case.
yp_server.c:
- Reorganize things a little to take advantage of the database
handle caching. Add a call to yp_flush_all() in ypproc_clear_2_svc().
- Remove calls to yp_validdomain() from some of the service procedures.
yp_validdomain() is called inside yp_open_db() now, so procedures that
call into the database package don't need to use yp_validdomain()
themselves.
- Fix a bogosity in ypproc_maplist_2_svc(): don't summarily initiallize
the result.maps pointer to NULL. This causes yp_maplist_free()
to fail and leaks memory.
- Make ypproc_master_2_svc() copy the string it gets from the database
package into a private static buffer before trying to NUL terminate it.
This is necessary with the DB handle caching: stuffing a NUL into the
data returned by DB package will goof it up internally.
yp_main.c:
- Stuff for DB handle caching: call yp_init_dbs() to clear the
handle array and add call to yp_flush_all() to the SIGHUP
signal handler.
Makefile.yp:
- Reorganize to deal with database caching. yp_mkdb(8) can now be used
to send a YPPROC_CLEAR signal to ypserv(8). Call it after each map
is created to refresh ypserv's cache.
- Add support for mail.alias map.
Contributed by Mike Murphy (mrm@sceard.com).
- Make default location for the netgroups source file be /var/yp/netgroup
instead of /etc/netgroup.
mkaliases:
- New file: script to generate mail.alias map.
Contributed by Mike Murphy (mrm@sceard.com).
Makefile:
- Install Makefile.yp as /var/yp/Makefile.dist and link it to
/var/yp/Makefile only if /var/yp/Makefile doesn't already exist.
Suggested by Peter Wemm.
- Install new mkaliases script in /usr/libexec along with mknetid.
- Use somewhat saner approach to generating rpcgen-dependent files
as suggested by Garrett Wollman.
1996-04-28 04:38:52 +00:00
|
|
|
tmp = securenets->next;
|
|
|
|
free(securenets);
|
|
|
|
securenets = tmp;
|
1996-02-24 22:01:48 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
snprintf(path, MAXPATHLEN, "%s/securenets", yp_dir);
|
|
|
|
|
|
|
|
if ((fp = fopen(path, "r")) == NULL) {
|
|
|
|
if (errno == ENOENT) {
|
|
|
|
securenets = (struct securenet *)malloc(sizeof(struct securenet));
|
|
|
|
securenets->net.s_addr = INADDR_ANY;
|
1996-02-29 18:29:24 +00:00
|
|
|
securenets->mask.s_addr = INADDR_ANY;
|
1996-02-24 22:01:48 +00:00
|
|
|
securenets->next = NULL;
|
|
|
|
return;
|
|
|
|
} else {
|
|
|
|
yp_error("fopen(%s) failed: %s", path, strerror(errno));
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
securenets = NULL;
|
|
|
|
|
2002-02-06 13:30:31 +00:00
|
|
|
while (fgets(linebuf, LINEBUFSZ, fp)) {
|
1996-02-24 22:01:48 +00:00
|
|
|
char addr1[20], addr2[20];
|
|
|
|
|
1998-07-15 11:56:28 +00:00
|
|
|
if ((linebuf[0] == '#')
|
|
|
|
|| (strspn(linebuf, " \t\r\n") == strlen(linebuf)))
|
1996-02-24 22:01:48 +00:00
|
|
|
continue;
|
|
|
|
if (sscanf(linebuf, "%s %s", addr1, addr2) < 2) {
|
|
|
|
yp_error("badly formatted securenets entry: %s",
|
|
|
|
linebuf);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
tmp = (struct securenet *)malloc(sizeof(struct securenet));
|
|
|
|
|
|
|
|
if (!inet_aton((char *)&addr1, (struct in_addr *)&tmp->net)) {
|
|
|
|
yp_error("badly formatted securenets entry: %s", addr1);
|
|
|
|
free(tmp);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!inet_aton((char *)&addr2, (struct in_addr *)&tmp->mask)) {
|
|
|
|
yp_error("badly formatted securenets entry: %s", addr2);
|
|
|
|
free(tmp);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
tmp->next = securenets;
|
|
|
|
securenets = tmp;
|
|
|
|
}
|
|
|
|
|
|
|
|
fclose(fp);
|
2002-02-06 13:30:31 +00:00
|
|
|
|
1996-02-24 22:01:48 +00:00
|
|
|
}
|
|
|
|
|
1995-12-16 20:54:17 +00:00
|
|
|
/*
|
|
|
|
* Access control functions.
|
|
|
|
*
|
|
|
|
* yp_access() checks the mapname and client host address and watches for
|
|
|
|
* the following things:
|
|
|
|
*
|
2009-06-25 16:15:39 +00:00
|
|
|
* - If the client is referencing one of the master.passwd.* or shadow.* maps,
|
|
|
|
* it must be using a privileged port to make its RPC to us. If it is, then
|
|
|
|
* we can assume that the caller is root and allow the RPC to succeed. If it
|
1995-12-16 20:54:17 +00:00
|
|
|
* isn't access is denied.
|
|
|
|
*
|
1996-02-24 22:01:48 +00:00
|
|
|
* - The client's IP address is checked against the securenets rules.
|
|
|
|
* There are two kinds of securenets support: the built-in support,
|
Performance enhancements (I hope) and new stuff:
yp_dblookup.c:
- Implement database handle caching. What this means is that instead
of opening and closing map databases for each request, we open a
database and save the handle (and, if requested, the key index)
in an array. This saves a bit of overhead on things like repeated
YPPROC_NEXT calls, such as you'd get from getpwent(). Normally,
each YPPROC_NEXT would require open()ing the database, seeking
to the location supplied by the caller (which is time consuming with
hash databases as the R_CURSOR flag doesn't work), reading the
data, close()ing the database and then shipping the data off to
the caller. The system call overhead is prohibitive, especially
with very large maps. By caching the handle to an open database,
we elimitate at least the open()/close() system calls, as well
as the associated DB setup and tear-down operations, for a large
percentage of the time. This improves performance substantially at
the cost of consuming a little more memory than before.
Note that all the caching support is surrounded by #ifdef DB_CACHE
so that this same source module can still be used by other programs
that don't need it.
- Make yp_open_db() call yp_validdomain(). Doing it here saves cycles
when caching is enabled since a hit on the map cache list by
definition means that the domain being referenced is valid.
- Also make yp_open_db() check for exhaustion of file descriptors,
just in case.
yp_server.c:
- Reorganize things a little to take advantage of the database
handle caching. Add a call to yp_flush_all() in ypproc_clear_2_svc().
- Remove calls to yp_validdomain() from some of the service procedures.
yp_validdomain() is called inside yp_open_db() now, so procedures that
call into the database package don't need to use yp_validdomain()
themselves.
- Fix a bogosity in ypproc_maplist_2_svc(): don't summarily initiallize
the result.maps pointer to NULL. This causes yp_maplist_free()
to fail and leaks memory.
- Make ypproc_master_2_svc() copy the string it gets from the database
package into a private static buffer before trying to NUL terminate it.
This is necessary with the DB handle caching: stuffing a NUL into the
data returned by DB package will goof it up internally.
yp_main.c:
- Stuff for DB handle caching: call yp_init_dbs() to clear the
handle array and add call to yp_flush_all() to the SIGHUP
signal handler.
Makefile.yp:
- Reorganize to deal with database caching. yp_mkdb(8) can now be used
to send a YPPROC_CLEAR signal to ypserv(8). Call it after each map
is created to refresh ypserv's cache.
- Add support for mail.alias map.
Contributed by Mike Murphy (mrm@sceard.com).
- Make default location for the netgroups source file be /var/yp/netgroup
instead of /etc/netgroup.
mkaliases:
- New file: script to generate mail.alias map.
Contributed by Mike Murphy (mrm@sceard.com).
Makefile:
- Install Makefile.yp as /var/yp/Makefile.dist and link it to
/var/yp/Makefile only if /var/yp/Makefile doesn't already exist.
Suggested by Peter Wemm.
- Install new mkaliases script in /usr/libexec along with mknetid.
- Use somewhat saner approach to generating rpcgen-dependent files
as suggested by Garrett Wollman.
1996-04-28 04:38:52 +00:00
|
|
|
* which is very simple and depends on the presence of a
|
1996-02-24 22:01:48 +00:00
|
|
|
* /var/yp/securenets file, and tcp-wrapper support, which requires
|
|
|
|
* Wietse Venema's libwrap.a and tcpd.h. (Since the tcp-wrapper
|
|
|
|
* package does not ship with FreeBSD, we use the built-in support
|
Performance enhancements (I hope) and new stuff:
yp_dblookup.c:
- Implement database handle caching. What this means is that instead
of opening and closing map databases for each request, we open a
database and save the handle (and, if requested, the key index)
in an array. This saves a bit of overhead on things like repeated
YPPROC_NEXT calls, such as you'd get from getpwent(). Normally,
each YPPROC_NEXT would require open()ing the database, seeking
to the location supplied by the caller (which is time consuming with
hash databases as the R_CURSOR flag doesn't work), reading the
data, close()ing the database and then shipping the data off to
the caller. The system call overhead is prohibitive, especially
with very large maps. By caching the handle to an open database,
we elimitate at least the open()/close() system calls, as well
as the associated DB setup and tear-down operations, for a large
percentage of the time. This improves performance substantially at
the cost of consuming a little more memory than before.
Note that all the caching support is surrounded by #ifdef DB_CACHE
so that this same source module can still be used by other programs
that don't need it.
- Make yp_open_db() call yp_validdomain(). Doing it here saves cycles
when caching is enabled since a hit on the map cache list by
definition means that the domain being referenced is valid.
- Also make yp_open_db() check for exhaustion of file descriptors,
just in case.
yp_server.c:
- Reorganize things a little to take advantage of the database
handle caching. Add a call to yp_flush_all() in ypproc_clear_2_svc().
- Remove calls to yp_validdomain() from some of the service procedures.
yp_validdomain() is called inside yp_open_db() now, so procedures that
call into the database package don't need to use yp_validdomain()
themselves.
- Fix a bogosity in ypproc_maplist_2_svc(): don't summarily initiallize
the result.maps pointer to NULL. This causes yp_maplist_free()
to fail and leaks memory.
- Make ypproc_master_2_svc() copy the string it gets from the database
package into a private static buffer before trying to NUL terminate it.
This is necessary with the DB handle caching: stuffing a NUL into the
data returned by DB package will goof it up internally.
yp_main.c:
- Stuff for DB handle caching: call yp_init_dbs() to clear the
handle array and add call to yp_flush_all() to the SIGHUP
signal handler.
Makefile.yp:
- Reorganize to deal with database caching. yp_mkdb(8) can now be used
to send a YPPROC_CLEAR signal to ypserv(8). Call it after each map
is created to refresh ypserv's cache.
- Add support for mail.alias map.
Contributed by Mike Murphy (mrm@sceard.com).
- Make default location for the netgroups source file be /var/yp/netgroup
instead of /etc/netgroup.
mkaliases:
- New file: script to generate mail.alias map.
Contributed by Mike Murphy (mrm@sceard.com).
Makefile:
- Install Makefile.yp as /var/yp/Makefile.dist and link it to
/var/yp/Makefile only if /var/yp/Makefile doesn't already exist.
Suggested by Peter Wemm.
- Install new mkaliases script in /usr/libexec along with mknetid.
- Use somewhat saner approach to generating rpcgen-dependent files
as suggested by Garrett Wollman.
1996-04-28 04:38:52 +00:00
|
|
|
* by default. Users can recompile the server with the tcp-wrapper library
|
1996-02-24 22:01:48 +00:00
|
|
|
* if they already have it installed and want to use hosts.allow and
|
2001-02-06 11:21:58 +00:00
|
|
|
* hosts.deny to control access instead of having a separate securenets
|
1996-02-24 22:01:48 +00:00
|
|
|
* file.)
|
|
|
|
*
|
|
|
|
* If no /var/yp/securenets file is present, the host access checks
|
|
|
|
* are bypassed and all hosts are allowed to connect.
|
1995-12-16 20:54:17 +00:00
|
|
|
*
|
Performance enhancements (I hope) and new stuff:
yp_dblookup.c:
- Implement database handle caching. What this means is that instead
of opening and closing map databases for each request, we open a
database and save the handle (and, if requested, the key index)
in an array. This saves a bit of overhead on things like repeated
YPPROC_NEXT calls, such as you'd get from getpwent(). Normally,
each YPPROC_NEXT would require open()ing the database, seeking
to the location supplied by the caller (which is time consuming with
hash databases as the R_CURSOR flag doesn't work), reading the
data, close()ing the database and then shipping the data off to
the caller. The system call overhead is prohibitive, especially
with very large maps. By caching the handle to an open database,
we elimitate at least the open()/close() system calls, as well
as the associated DB setup and tear-down operations, for a large
percentage of the time. This improves performance substantially at
the cost of consuming a little more memory than before.
Note that all the caching support is surrounded by #ifdef DB_CACHE
so that this same source module can still be used by other programs
that don't need it.
- Make yp_open_db() call yp_validdomain(). Doing it here saves cycles
when caching is enabled since a hit on the map cache list by
definition means that the domain being referenced is valid.
- Also make yp_open_db() check for exhaustion of file descriptors,
just in case.
yp_server.c:
- Reorganize things a little to take advantage of the database
handle caching. Add a call to yp_flush_all() in ypproc_clear_2_svc().
- Remove calls to yp_validdomain() from some of the service procedures.
yp_validdomain() is called inside yp_open_db() now, so procedures that
call into the database package don't need to use yp_validdomain()
themselves.
- Fix a bogosity in ypproc_maplist_2_svc(): don't summarily initiallize
the result.maps pointer to NULL. This causes yp_maplist_free()
to fail and leaks memory.
- Make ypproc_master_2_svc() copy the string it gets from the database
package into a private static buffer before trying to NUL terminate it.
This is necessary with the DB handle caching: stuffing a NUL into the
data returned by DB package will goof it up internally.
yp_main.c:
- Stuff for DB handle caching: call yp_init_dbs() to clear the
handle array and add call to yp_flush_all() to the SIGHUP
signal handler.
Makefile.yp:
- Reorganize to deal with database caching. yp_mkdb(8) can now be used
to send a YPPROC_CLEAR signal to ypserv(8). Call it after each map
is created to refresh ypserv's cache.
- Add support for mail.alias map.
Contributed by Mike Murphy (mrm@sceard.com).
- Make default location for the netgroups source file be /var/yp/netgroup
instead of /etc/netgroup.
mkaliases:
- New file: script to generate mail.alias map.
Contributed by Mike Murphy (mrm@sceard.com).
Makefile:
- Install Makefile.yp as /var/yp/Makefile.dist and link it to
/var/yp/Makefile only if /var/yp/Makefile doesn't already exist.
Suggested by Peter Wemm.
- Install new mkaliases script in /usr/libexec along with mknetid.
- Use somewhat saner approach to generating rpcgen-dependent files
as suggested by Garrett Wollman.
1996-04-28 04:38:52 +00:00
|
|
|
* The yp_validdomain() function checks the domain specified by the caller
|
1995-12-16 20:54:17 +00:00
|
|
|
* to make sure it's actually served by this server. This is more a sanity
|
|
|
|
* check than an a security check, but this seems to be the best place for
|
|
|
|
* it.
|
|
|
|
*/
|
|
|
|
|
1996-10-24 18:58:26 +00:00
|
|
|
#ifdef DB_CACHE
|
2002-02-06 15:26:07 +00:00
|
|
|
int
|
|
|
|
yp_access(const char *map, const char *domain, const struct svc_req *rqstp)
|
1996-10-24 18:58:26 +00:00
|
|
|
#else
|
2002-02-06 15:26:07 +00:00
|
|
|
int
|
|
|
|
yp_access(const char *map, const struct svc_req *rqstp)
|
1996-10-24 18:58:26 +00:00
|
|
|
#endif
|
1995-12-16 20:54:17 +00:00
|
|
|
{
|
|
|
|
struct sockaddr_in *rqhost;
|
2006-05-31 22:32:22 +00:00
|
|
|
int status_securenets = 0;
|
|
|
|
#ifdef TCP_WRAPPER
|
|
|
|
int status_tcpwrap;
|
|
|
|
#endif
|
1996-05-31 16:01:51 +00:00
|
|
|
static unsigned long oldaddr = 0;
|
1996-02-24 22:01:48 +00:00
|
|
|
struct securenet *tmp;
|
2002-05-08 15:41:15 +00:00
|
|
|
const char *yp_procedure = NULL;
|
1996-06-05 02:01:31 +00:00
|
|
|
char procbuf[50];
|
|
|
|
|
|
|
|
if (rqstp->rq_prog != YPPASSWDPROG && rqstp->rq_prog != YPPROG) {
|
2002-05-08 15:41:15 +00:00
|
|
|
snprintf(procbuf, sizeof(procbuf), "#%lu/#%lu",
|
|
|
|
(unsigned long)rqstp->rq_prog,
|
|
|
|
(unsigned long)rqstp->rq_proc);
|
1996-06-05 02:01:31 +00:00
|
|
|
yp_procedure = (char *)&procbuf;
|
|
|
|
} else {
|
|
|
|
yp_procedure = rqstp->rq_prog == YPPASSWDPROG ?
|
|
|
|
"yppasswdprog_update" :
|
|
|
|
yp_procs[rqstp->rq_proc + (12 * (rqstp->rq_vers - 1))];
|
|
|
|
}
|
1995-12-16 20:54:17 +00:00
|
|
|
|
|
|
|
rqhost = svc_getcaller(rqstp->rq_xprt);
|
|
|
|
|
|
|
|
if (debug) {
|
1997-10-29 07:25:05 +00:00
|
|
|
yp_error("procedure %s called from %s:%d", yp_procedure,
|
1996-02-26 02:34:27 +00:00
|
|
|
inet_ntoa(rqhost->sin_addr),
|
1995-12-16 20:54:17 +00:00
|
|
|
ntohs(rqhost->sin_port));
|
|
|
|
if (map != NULL)
|
1997-10-29 07:25:05 +00:00
|
|
|
yp_error("client is referencing map \"%s\".", map);
|
1995-12-16 20:54:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Check the map name if one was supplied. */
|
|
|
|
if (map != NULL) {
|
1996-09-30 22:27:00 +00:00
|
|
|
if (strchr(map, '/')) {
|
|
|
|
yp_error("embedded slash in map name \"%s\" -- \
|
|
|
|
possible spoof attempt from %s:%d",
|
|
|
|
map, inet_ntoa(rqhost->sin_addr),
|
|
|
|
ntohs(rqhost->sin_port));
|
1997-01-06 06:27:55 +00:00
|
|
|
return(1);
|
1996-09-30 22:27:00 +00:00
|
|
|
}
|
1996-10-24 18:58:26 +00:00
|
|
|
#ifdef DB_CACHE
|
|
|
|
if ((yp_testflag((char *)map, (char *)domain, YP_SECURE) ||
|
|
|
|
#else
|
2009-06-25 16:15:39 +00:00
|
|
|
if ((strstr(map, "master.passwd.") || strstr(map, "shadow.") ||
|
1996-10-24 18:58:26 +00:00
|
|
|
#endif
|
1996-09-30 22:27:00 +00:00
|
|
|
(rqstp->rq_prog == YPPROG &&
|
|
|
|
rqstp->rq_proc == YPPROC_XFR) ||
|
|
|
|
(rqstp->rq_prog == YPXFRD_FREEBSD_PROG &&
|
|
|
|
rqstp->rq_proc == YPXFRD_GETMAP)) &&
|
|
|
|
ntohs(rqhost->sin_port) >= IPPORT_RESERVED) {
|
1997-10-29 07:25:05 +00:00
|
|
|
yp_error("access to %s denied -- client %s:%d \
|
1996-09-30 22:27:00 +00:00
|
|
|
not privileged", map, inet_ntoa(rqhost->sin_addr), ntohs(rqhost->sin_port));
|
1995-12-16 20:54:17 +00:00
|
|
|
return(1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef TCP_WRAPPER
|
2006-05-31 22:32:22 +00:00
|
|
|
status_tcpwrap = hosts_ctl("ypserv", STRING_UNKNOWN,
|
1996-02-24 22:01:48 +00:00
|
|
|
inet_ntoa(rqhost->sin_addr), "");
|
2006-05-31 22:32:22 +00:00
|
|
|
#endif
|
1996-02-24 22:01:48 +00:00
|
|
|
tmp = securenets;
|
2002-02-06 13:30:31 +00:00
|
|
|
while (tmp) {
|
1996-02-24 22:01:48 +00:00
|
|
|
if (((rqhost->sin_addr.s_addr & ~tmp->mask.s_addr)
|
|
|
|
| tmp->net.s_addr) == rqhost->sin_addr.s_addr) {
|
2006-05-31 22:32:22 +00:00
|
|
|
status_securenets = 1;
|
1996-02-24 22:01:48 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
tmp = tmp->next;
|
|
|
|
}
|
1995-12-16 20:54:17 +00:00
|
|
|
|
2006-05-31 22:32:22 +00:00
|
|
|
#ifdef TCP_WRAPPER
|
|
|
|
if (status_securenets == 0 || status_tcpwrap == 0) {
|
|
|
|
#else
|
|
|
|
if (status_securenets == 0) {
|
|
|
|
#endif
|
|
|
|
/*
|
|
|
|
* One of the following two events occured:
|
|
|
|
*
|
|
|
|
* (1) The /var/yp/securenets exists and the remote host does not
|
|
|
|
* match any of the networks specified in it.
|
|
|
|
* (2) The hosts.allow file has denied access and TCP_WRAPPER is
|
|
|
|
* defined.
|
|
|
|
*
|
|
|
|
* In either case deny access.
|
|
|
|
*/
|
1996-02-24 22:01:48 +00:00
|
|
|
if (rqhost->sin_addr.s_addr != oldaddr) {
|
|
|
|
yp_error("connect from %s:%d to procedure %s refused",
|
|
|
|
inet_ntoa(rqhost->sin_addr),
|
|
|
|
ntohs(rqhost->sin_port),
|
1996-02-26 02:34:27 +00:00
|
|
|
yp_procedure);
|
1996-02-24 22:01:48 +00:00
|
|
|
oldaddr = rqhost->sin_addr.s_addr;
|
|
|
|
}
|
1995-12-16 20:54:17 +00:00
|
|
|
return(1);
|
|
|
|
}
|
|
|
|
return(0);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2002-02-06 15:26:07 +00:00
|
|
|
int
|
|
|
|
yp_validdomain(const char *domain)
|
1995-12-16 20:54:17 +00:00
|
|
|
{
|
|
|
|
struct stat statbuf;
|
|
|
|
char dompath[MAXPATHLEN + 2];
|
|
|
|
|
|
|
|
if (domain == NULL || strstr(domain, "binding") ||
|
|
|
|
!strcmp(domain, ".") || !strcmp(domain, "..") ||
|
1996-02-24 22:01:48 +00:00
|
|
|
strchr(domain, '/') || strlen(domain) > YPMAXDOMAIN)
|
1995-12-16 20:54:17 +00:00
|
|
|
return(1);
|
|
|
|
|
|
|
|
snprintf(dompath, sizeof(dompath), "%s/%s", yp_dir, domain);
|
|
|
|
|
|
|
|
if (stat(dompath, &statbuf) < 0 || !S_ISDIR(statbuf.st_mode))
|
|
|
|
return(1);
|
|
|
|
|
Performance enhancements (I hope) and new stuff:
yp_dblookup.c:
- Implement database handle caching. What this means is that instead
of opening and closing map databases for each request, we open a
database and save the handle (and, if requested, the key index)
in an array. This saves a bit of overhead on things like repeated
YPPROC_NEXT calls, such as you'd get from getpwent(). Normally,
each YPPROC_NEXT would require open()ing the database, seeking
to the location supplied by the caller (which is time consuming with
hash databases as the R_CURSOR flag doesn't work), reading the
data, close()ing the database and then shipping the data off to
the caller. The system call overhead is prohibitive, especially
with very large maps. By caching the handle to an open database,
we elimitate at least the open()/close() system calls, as well
as the associated DB setup and tear-down operations, for a large
percentage of the time. This improves performance substantially at
the cost of consuming a little more memory than before.
Note that all the caching support is surrounded by #ifdef DB_CACHE
so that this same source module can still be used by other programs
that don't need it.
- Make yp_open_db() call yp_validdomain(). Doing it here saves cycles
when caching is enabled since a hit on the map cache list by
definition means that the domain being referenced is valid.
- Also make yp_open_db() check for exhaustion of file descriptors,
just in case.
yp_server.c:
- Reorganize things a little to take advantage of the database
handle caching. Add a call to yp_flush_all() in ypproc_clear_2_svc().
- Remove calls to yp_validdomain() from some of the service procedures.
yp_validdomain() is called inside yp_open_db() now, so procedures that
call into the database package don't need to use yp_validdomain()
themselves.
- Fix a bogosity in ypproc_maplist_2_svc(): don't summarily initiallize
the result.maps pointer to NULL. This causes yp_maplist_free()
to fail and leaks memory.
- Make ypproc_master_2_svc() copy the string it gets from the database
package into a private static buffer before trying to NUL terminate it.
This is necessary with the DB handle caching: stuffing a NUL into the
data returned by DB package will goof it up internally.
yp_main.c:
- Stuff for DB handle caching: call yp_init_dbs() to clear the
handle array and add call to yp_flush_all() to the SIGHUP
signal handler.
Makefile.yp:
- Reorganize to deal with database caching. yp_mkdb(8) can now be used
to send a YPPROC_CLEAR signal to ypserv(8). Call it after each map
is created to refresh ypserv's cache.
- Add support for mail.alias map.
Contributed by Mike Murphy (mrm@sceard.com).
- Make default location for the netgroups source file be /var/yp/netgroup
instead of /etc/netgroup.
mkaliases:
- New file: script to generate mail.alias map.
Contributed by Mike Murphy (mrm@sceard.com).
Makefile:
- Install Makefile.yp as /var/yp/Makefile.dist and link it to
/var/yp/Makefile only if /var/yp/Makefile doesn't already exist.
Suggested by Peter Wemm.
- Install new mkaliases script in /usr/libexec along with mknetid.
- Use somewhat saner approach to generating rpcgen-dependent files
as suggested by Garrett Wollman.
1996-04-28 04:38:52 +00:00
|
|
|
|
1995-12-16 20:54:17 +00:00
|
|
|
return(0);
|
|
|
|
}
|