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

Makefile.yp:

Browse Source 
- Improve support for multiple domains. (In preparation for new rpc.yppasswdd.)

yp_dblookup.c:
- Improve error reporting: be more selective as to what error code
  we return when a (dbp->get) fails.
This commit is contained in:
Bill Paul 1996-02-04 05:39:35 +00:00
parent bc66df81bb
commit 920491cf83
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=13896
2 changed files with 34 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
usr.sbin/ypserv/Makefile.yp
View File

@ -1,7 +1,7 @@
#
# Makefile for the NIS databases
#
# $Id: Makefile.yp,v 1.1.1.1 1995/12/16 20:54:17 wpaul Exp $
# $Id: Makefile.yp,v 1.2 1996/01/12 07:07:18 wpaul Exp $
#
# This Makefile should only be run on the NIS master server of a domain.
# All updated maps will be pushed to all NIS slave servers listed in the
@ -42,7 +42,11 @@ CAT = @$(RCAT)
DBLOAD = /usr/sbin/yp_mkdb -m `hostname`
MKNETID = /usr/libexec/mknetid
YPPUSH = /usr/sbin/yppush
.if !defined(UPDATE_DOMAIN)
DOMAIN = `/bin/domainname`
.else
DOMAIN = $(UPDATE_DOMAIN)
.endif
REVNETGROUP = /usr/libexec/revnetgroup
YPSRCDIR = /etc
@ -90,7 +94,7 @@ PUBLICKEY = $(YPSRCDIR)/publickey
target:
@if [ ! -d $(DOMAIN) ]; then mkdir $(DOMAIN); fi; \
cd $(DOMAIN) ; echo "NIS Map update started on `date`" ; \
cd $(DOMAIN) ; echo "NIS Map update started on `date` for domain $(DOMAIN)" ; \
make -f ../Makefile all; echo "NIS Map update completed."
# If you don't want some of these maps built, feel free to comment

37
usr.sbin/ypserv/yp_dblookup.c
View File

@ -29,7 +29,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: yp_dblookup.c,v 1.1.1.1 1995/12/16 20:54:17 wpaul Exp $
* $Id: yp_dblookup.c,v 1.2 1995/12/23 21:35:28 wpaul Exp $
*
*/
#include <stdio.h>
@ -117,6 +117,7 @@ int yp_get_record(domain,map,key,data,allow)
int allow;
{
DB *dbp;
int rval;
if (ypdb_debug)
yp_error("Looking up key [%.*s] in map [%s]",
@ -134,9 +135,12 @@ int yp_get_record(domain,map,key,data,allow)
return(yp_errno);
}
if ((dbp->get)(dbp,key,data,0)) {
if ((rval = (dbp->get)(dbp,key,data,0)) != 0) {
(void)(dbp->close)(dbp);
return(YP_NOKEY);
if (rval == 1)
return(YP_NOKEY);
else
return(YP_BADDB);
}
(void)(dbp->close)(dbp);
@ -153,17 +157,26 @@ int yp_first_record(dbp,key,data)
DBT *key;
DBT *data;
{
int rval;
if (ypdb_debug)
yp_error("Retrieving first key in map.");
if ((dbp->seq)(dbp,key,data,R_FIRST))
return(YP_BADDB);
if ((rval = (dbp->seq)(dbp,key,data,R_FIRST)) != 0) {
if (rval == 1)
return(YP_NOKEY);
else
return(YP_BADDB);
}
/* Avoid passing back magic "YP_*" records. */
while (!strncmp(key->data, "YP_", 3)) {
if ((dbp->seq)(dbp,key,data,R_NEXT))
return(YP_BADDB);
if ((rval = (dbp->seq)(dbp,key,data,R_NEXT)) != 0) {
if (rval == 1)
return(YP_NOKEY);
else
return(YP_BADDB);
}
}
if (ypdb_debug)
@ -180,9 +193,15 @@ int yp_next_record(dbp,key,data,all)
int all;
{
DBT lkey, ldata;
int rval;
if (key == NULL || key->data == NULL)
return(yp_first_record(dbp,key,data));
if (key == NULL || key->data == NULL) {
rval = yp_first_record(dbp,key,data);
if (rval == YP_NOKEY)
return(YP_NOMORE);
else
return(rval);
}
if (ypdb_debug)
yp_error("Retreiving next key, previous was: [%.*s]",