From 34439d060cd9865dd52907d9f1524c85cef69a35 Mon Sep 17 00:00:00 2001 From: "Dave A. Borman" Date: Thu, 27 May 1993 19:50:15 -0800 Subject: [PATCH] Change libtelnet so that instead of picking up the gettytab.c module from getty, it now uses its own version of getent() and getstr(), that use the newer library routines cgetent() and cgetstr(). SCCS-vsn: lib/libtelnet/Makefile 5.8 SCCS-vsn: lib/libtelnet/getent.c 5.4 --- usr/src/lib/libtelnet/Makefile | 5 ++--- usr/src/lib/libtelnet/getent.c | 17 ++++++++++++----- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/usr/src/lib/libtelnet/Makefile b/usr/src/lib/libtelnet/Makefile index ba39627814..79409d0f9e 100644 --- a/usr/src/lib/libtelnet/Makefile +++ b/usr/src/lib/libtelnet/Makefile @@ -1,7 +1,7 @@ -# @(#)Makefile 5.7 (Berkeley) %G% +# @(#)Makefile 5.8 (Berkeley) %G% LIB= telnet -SRCS= auth.c encrypt.c genget.c getent.c gettytab.c misc.c +SRCS= auth.c encrypt.c genget.c getent.c misc.c SRCS+= kerberos.c enc_des.c #SRCS+= kerberos5.c CFLAGS+= -DENCRYPTION -DAUTHENTICATION @@ -13,7 +13,6 @@ CRYPT_SRC+= encrypt.h kerberos.c kerberos5.c krb4encpwd.c CRYPT_SRC+= misc.c spx.c Makefile NOCRYPT_DIR=${.CURDIR}/Nocrypt -.PATH: ${.CURDIR}/../../libexec/getty .include nocrypt: diff --git a/usr/src/lib/libtelnet/getent.c b/usr/src/lib/libtelnet/getent.c index cb2c353e5b..dc81d667cb 100644 --- a/usr/src/lib/libtelnet/getent.c +++ b/usr/src/lib/libtelnet/getent.c @@ -6,22 +6,29 @@ */ #ifndef lint -static char sccsid[] = "@(#)getent.c 5.3 (Berkeley) %G%"; +static char sccsid[] = "@(#)getent.c 5.4 (Berkeley) %G%"; #endif /* not lint */ +static char *area; + /*ARGSUSED*/ getent(cp, name) char *cp, *name; { - return(0); + char *dba[2]; + + dba[0] = "/etc/gettytab"; + dba[1] = 0; + return((cgetent(&area, dba, name) == 0) ? 1 : 0); } #ifndef __svr4__ /*ARGSUSED*/ char * -getstr(cp, cpp) -char *cp, **cpp; +getstr(id, cpp) +char *id, **cpp; { - return(0); + char *answer; + return((cgetstr(area, id, &answer) > 0) ? answer : 0); } #endif -- 2.20.1