summaryrefslogtreecommitdiff
path: root/usr.bin/su
diff options
context:
space:
mode:
authorThorsten Lockert <tholo@cvs.openbsd.org>1995-12-16 22:20:39 +0000
committerThorsten Lockert <tholo@cvs.openbsd.org>1995-12-16 22:20:39 +0000
commit14a9e0b27dc4374bb21711ddfd2c319471498493 (patch)
tree3f9b41aa80386aa9df94540971211fe446c61555 /usr.bin/su
parentec46b838472184755608a409e432009edbfb979a (diff)
Make it possible to build without SKEY support
Add support for building with kerberosIV
Diffstat (limited to 'usr.bin/su')
-rw-r--r--usr.bin/su/Makefile19
-rw-r--r--usr.bin/su/su.c3
2 files changed, 17 insertions, 5 deletions
diff --git a/usr.bin/su/Makefile b/usr.bin/su/Makefile
index afb7f5f2cef..adcb6a2227d 100644
--- a/usr.bin/su/Makefile
+++ b/usr.bin/su/Makefile
@@ -1,11 +1,24 @@
# from: @(#)Makefile 5.5 (Berkeley) 5/11/90
-# $Id: Makefile,v 1.1 1995/10/18 08:46:09 deraadt Exp $
+# $Id: Makefile,v 1.2 1995/12/16 22:20:37 tholo Exp $
PROG= su
BINOWN= root
BINMODE=4555
+LDADD+= -lcrypt
+DPADD+= ${LIBCRYPT}
+
+.include <bsd.own.mk>
+
+.if defined(SKEY)
CFLAGS+=-DSKEY
-LDADD+= -lcrypt -lskey
-DPADD+= ${LIBCRYPT} ${LIBSKEY}
+LDADD+= -lskey
+DPADD+= ${LIBSKEY}
+.endif
+
+.if defined(KERBEROS)
+CFLAGS+=-DKERBEROS
+LDADD+= -lkrb -ldes
+DPADD+= ${LIBKRB} ${LIBDES}
+.endif
.include <bsd.prog.mk>
diff --git a/usr.bin/su/su.c b/usr.bin/su/su.c
index 715bcb5911a..f5707090ca6 100644
--- a/usr.bin/su/su.c
+++ b/usr.bin/su/su.c
@@ -39,7 +39,7 @@ char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)su.c 5.26 (Berkeley) 7/6/91";*/
-static char rcsid[] = "$Id: su.c,v 1.1 1995/10/18 08:46:10 deraadt Exp $";
+static char rcsid[] = "$Id: su.c,v 1.2 1995/12/16 22:20:38 tholo Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -311,7 +311,6 @@ kerberos(username, user, uid)
char *username, *user;
int uid;
{
- extern char *krb_err_txt[];
KTEXT_ST ticket;
AUTH_DAT authdata;
struct hostent *hp;