From 492485e1a7b20450cf1d68ca3632851d5c74b073 Mon Sep 17 00:00:00 2001
From: Greg Hudson <ghudson@mit.edu>
Date: Fri, 5 Dec 2008 21:03:25 +0000
Subject: [PATCH] Remove some lingering Saber C cruft

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@21293 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/BADSYMS                   |  1 -
 src/config/winexclude.sed     |  1 -
 src/kdc/.saberinit            | 35 -----------------------------------
 src/lib/krb5/asn.1/.saberinit |  4 ----
 src/util/ss/execute_cmd.c     | 16 ----------------
 5 files changed, 57 deletions(-)
 delete mode 100644 src/kdc/.saberinit
 delete mode 100644 src/lib/krb5/asn.1/.saberinit

diff --git a/src/BADSYMS b/src/BADSYMS
index 882bd7b04..35b2c7c8f 100644
--- a/src/BADSYMS
+++ b/src/BADSYMS
@@ -273,7 +273,6 @@
 ./util/pty/void_assoc.c: TIOCNOTTY
 ./util/ss/configure.in: const HAVE_STDARG_H HAVE_VARARGS_H KRB5_DNS_LOOKUP KRB5_DNS_LOOKUP_KDC KRB5_DNS_LOOKUP_REALM NO_YYLINENO POSIX_SIGNALS RETSIGTYPE USE_DIRENT_H USE_SIGPROCMASK WAIT_USES_INT HAVE_STRDUP HAVE_STDLIB_H HAVE_LIBNSL HAVE_LIBSOCKET
 ./util/ss/error.c: ibm032 NeXT __STDC__
-./util/ss/execute_cmd.c: __SABER__
 ./util/ss/invocation.c: silly
 ./util/ss/list_rqs.c: lint NO_FORK __STDC__
 ./util/ss/pager.c: NO_FORK
diff --git a/src/config/winexclude.sed b/src/config/winexclude.sed
index fd76486ac..199cf4443 100644
--- a/src/config/winexclude.sed
+++ b/src/config/winexclude.sed
@@ -1,4 +1,3 @@
-/krb5\.saber/d
 /autoconf.h$/d
 /t_mddriver$/d
 /test_parse$/d
diff --git a/src/kdc/.saberinit b/src/kdc/.saberinit
deleted file mode 100644
index d79f57ed0..000000000
--- a/src/kdc/.saberinit
+++ /dev/null
@@ -1,35 +0,0 @@
-suppress 223
-suppress 285
-suppress 33 on v4_klog
-suppress 34 on v4_klog
-suppress 36 on sendto
-suppress 35
-suppress 287 on usage
-suppress 287 on sin
-suppress 349 on krb_err_txt
-suppress 349 on krbONE
-suppress 349 on _ctype_
-suppress 340
-suppress 341
-suppress 346
-suppress 226 on error
-load -G main.o kdc5_err.o kdc_util.o network.o policy.o	-I../include
-load -G do_as_req.o do_tgs_req.o extern.o	-I../include
-make SRCS=dispatch.c saber
-load -G kerberos_v4.c -DBACKWARD_COMPAT -DVARARGS -I../include/kerberosIV -I../include -I../include/stdc-incl
-cd  /site/Don/krb5/kdc
-load -G ../lib/kdb/libkdb.a ../lib/libkrb5.a
-load -G ../lib/des/libdes.a ../lib/os-4.3/libos.a ../lib/crc-32/libcrc32.a
-load -G /mit/isode/isode-6.0/@sys/lib/libisode.a
-load -G -lkrb -ldes -lcom_err
-setopt load_flags -I/mit/krb5/vax-cc/include
-link
-unload /site/Don/krb5/lib/kdb/libkdb.a(decrypt_key.o)
-cd     /site/Don/krb5/lib/kdb
-make SRCS=decrypt_key.c saber
-unload /site/Don/krb5/lib/des/libdes.a(enc_dec.o)
-unload /site/Don/krb5/lib/des/libdes.a(new_rn_key.o)
-cd     /site/Don/krb5/lib/des
-make SRCS=enc_dec.c saber
-make SRCS=new_rn_key.c saber
-run
diff --git a/src/lib/krb5/asn.1/.saberinit b/src/lib/krb5/asn.1/.saberinit
deleted file mode 100644
index d14fddb66..000000000
--- a/src/lib/krb5/asn.1/.saberinit
+++ /dev/null
@@ -1,4 +0,0 @@
-alias hex print (unsigned)
-setopt load_flags -I../include
-load -lisode
-alias reload load
diff --git a/src/util/ss/execute_cmd.c b/src/util/ss/execute_cmd.c
index 3f684052c..3b33fdbd0 100644
--- a/src/util/ss/execute_cmd.c
+++ b/src/util/ss/execute_cmd.c
@@ -27,19 +27,7 @@
  *      Has been replaced by a macro.
  */
 
-#ifdef __SABER__
-/* sigh.  saber won't deal with pointer-to-const-struct */
-static struct _ss_request_entry * get_request (tbl, idx)
-    ss_request_table * tbl;
-    int idx;
-{
-    struct _ss_request_table *tbl1 = (struct _ss_request_table *) tbl;
-    struct _ss_request_entry *e = (struct _ss_request_entry *) tbl1->requests;
-    return e + idx;
-}
-#else
 #define get_request(tbl,idx)    ((tbl) -> requests + (idx))
-#endif
 
 /*
  * check_request_table(rqtbl, argc, argv, sci_idx)
@@ -69,11 +57,7 @@ static int check_request_table (rqtbl, argc, argv, sci_idx)
     char *argv[];
     int sci_idx;
 {
-#ifdef __SABER__
-    struct _ss_request_entry *request;
-#else
     register ss_request_entry *request;
-#endif
     register ss_data *info;
     register char const * const * name;
     char *string = argv[0];
-- 
2.26.2