From baf2c95cb7af3bdff76a3e6693e566e0b8b75bc4 Mon Sep 17 00:00:00 2001
From: suha <none@none>
Date: Mon, 4 Aug 2008 17:16:15 -0700
Subject: backout 6449514/6686002/6686004/6700122: needs more work

---
 usr/src/cmd/cmd-crypto/cryptoadm/Makefile    | 4 +---
 usr/src/cmd/cmd-crypto/cryptoadm/cryptoadm.h | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'usr/src/cmd/cmd-crypto/cryptoadm')

diff --git a/usr/src/cmd/cmd-crypto/cryptoadm/Makefile b/usr/src/cmd/cmd-crypto/cryptoadm/Makefile
index 0b2d346dc7..9ff966839b 100644
--- a/usr/src/cmd/cmd-crypto/cryptoadm/Makefile
+++ b/usr/src/cmd/cmd-crypto/cryptoadm/Makefile
@@ -58,9 +58,7 @@ $(PROG): $(OBJS)
 $(POFILE): $(POFILES)
 	$(RM) $@; cat $(POFILES) > $@
 
-install: all $(ROOTSBINPROG)
-	$(RM) $(ROOTUSRSBINPROG)
-	-$(SYMLINK) ../../sbin/$(PROG) $(ROOTUSRSBINPROG)
+install: all $(ROOTUSRSBINPROG)
 
 clean:
 	$(RM) -f $(OBJS) $(PROG)
diff --git a/usr/src/cmd/cmd-crypto/cryptoadm/cryptoadm.h b/usr/src/cmd/cmd-crypto/cryptoadm/cryptoadm.h
index d1891d4b0f..0bbf82101c 100644
--- a/usr/src/cmd/cmd-crypto/cryptoadm/cryptoadm.h
+++ b/usr/src/cmd/cmd-crypto/cryptoadm/cryptoadm.h
@@ -19,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -37,7 +37,7 @@ extern "C" {
 #endif
 
 #define	_PATH_KCF_CONF		"/etc/crypto/kcf.conf"
-#define	_PATH_KCFD		"/lib/crypto/kcfd"
+#define	_PATH_KCFD		"/usr/lib/crypto/kcfd"
 #define	TMPFILE_TEMPLATE	"/etc/crypto/admXXXXXX"
 
 #define	ERROR_USAGE	2
-- 
cgit v1.2.3