backout 6355106: breaks build

--HG--
rename : usr/src/lib/gss_mechs/mech_krb5/krb5/rcache/rc_none.c => deleted_files/usr/src/lib/gss_mechs/mech_krb5/krb5/rcache/rc_none.c

4 files changed, 4 insertions, 8 deletions

diff --git a/usr/src/lib/gss_mechs/mech_krb5/krb5/rcache/rc_none.c b/deleted_files/usr/src/lib/gss_mechs/mech_krb5/krb5/rcache/rc_none.c
index 9d8117dabe..9d8117dabe 100644
--- a/usr/src/lib/gss_mechs/mech_krb5/krb5/rcache/rc_none.c
+++ b/deleted_files/usr/src/lib/gss_mechs/mech_krb5/krb5/rcache/rc_none.c
diff --git a/usr/src/lib/gss_mechs/mech_krb5/Makefile.com b/usr/src/lib/gss_mechs/mech_krb5/Makefile.com
index 2f3bf18abf..4ea78d42c4 100644
--- a/usr/src/lib/gss_mechs/mech_krb5/Makefile.com
+++ b/usr/src/lib/gss_mechs/mech_krb5/Makefile.com
@@ -161,7 +161,7 @@ K5_OS_UTS=init_os_ctx.o timeofday.o toffset.o c_ustime.o
 K5_POSIX= setenv.o daemon.o
 
 K5_RCACHE=rc_base.o rc_file.o rc_mem.o rc_common.o rc_io.o rcdef.o rc_conv.o \
-	ser_rc.o rcfns.o rc_none.o
+	ser_rc.o rcfns.o
 
 MECH= 	accept_sec_context.o store_cred.o \
 	add_cred.o disp_com_err_status.o  disp_major_status.o \
diff --git a/usr/src/lib/gss_mechs/mech_krb5/krb5/rcache/rc-int.h b/usr/src/lib/gss_mechs/mech_krb5/krb5/rcache/rc-int.h
index bff3499c36..00db4e386f 100644
--- a/usr/src/lib/gss_mechs/mech_krb5/krb5/rcache/rc-int.h
+++ b/usr/src/lib/gss_mechs/mech_krb5/krb5/rcache/rc-int.h
@@ -74,5 +74,6 @@ typedef struct _krb5_rc_ops krb5_rc_ops;
 krb5_error_code krb5_rc_register_type (krb5_context, const krb5_rc_ops *);
 
 extern krb5_rc_ops *krb5_rc_dfl_ops;
+extern const krb5_rc_ops krb5_rc_none_ops;
 
 #endif /* __KRB5_RCACHE_INT_H__ */
diff --git a/usr/src/lib/gss_mechs/mech_krb5/krb5/rcache/rc_base.c b/usr/src/lib/gss_mechs/mech_krb5/krb5/rcache/rc_base.c
index 574f837ab7..9ac9cb84c5 100644
--- a/usr/src/lib/gss_mechs/mech_krb5/krb5/rcache/rc_base.c
+++ b/usr/src/lib/gss_mechs/mech_krb5/krb5/rcache/rc_base.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -30,12 +30,7 @@ struct krb5_rc_typelist
   const krb5_rc_ops *ops;
   struct krb5_rc_typelist *next;
  };
-
-extern krb5_rc_ops krb5_rc_none_ops; /* defined in rc_none.c */
-
-static struct krb5_rc_typelist rc_none_type = { &krb5_rc_none_ops, 0 };
-static struct krb5_rc_typelist rc_mem_type =
-	{ &krb5_rc_mem_ops, &rc_none_type };
+static struct krb5_rc_typelist rc_mem_type = { &krb5_rc_mem_ops, 0 };
 static struct krb5_rc_typelist krb5_rc_typelist_dfl =
 	{ &krb5_rc_file_ops, &rc_mem_type };
 static struct krb5_rc_typelist *typehead = &krb5_rc_typelist_dfl;