PSARC 2006/424 Kerberos 1.4 KDC Resync

6406993 kdc and client resync with MIT 1.4

1 files changed, 2 insertions, 32 deletions

diff --git a/usr/src/lib/krb5/ss/error.c b/usr/src/lib/krb5/ss/error.c
index a15a04378e..31c62ffa00 100644
--- a/usr/src/lib/krb5/ss/error.c
+++ b/usr/src/lib/krb5/ss/error.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2000 by Sun Microsystems, Inc.
- * All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  */
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
@@ -14,25 +14,10 @@
 
 #include <stdio.h>
 
-/*
- * I'm assuming that com_err.h includes varargs.h, which it does
- * (right now).  There really ought to be a way for me to include the
- * file without worrying about whether com_err.h includes it or not,
- * but varargs.h doesn't define anything that I can use as a flag, and
- * gcc will lose if I try to include it twice and redefine stuff.
- */
-#if !defined(__STDC__) || !defined(ibm032) || !defined(NeXT)
-#define ss_error ss_error_external
-#endif
-
 #include "copyright.h"
 #include "com_err.h"
 #include "ss_internal.h"
 
-extern void com_err_va ();
-
-#undef ss_error
-
 char * ss_name(sci_idx)
     int sci_idx;
 {
@@ -71,26 +56,11 @@ char * ss_name(sci_idx)
     }
 }
 
-#ifdef HAVE_STDARG_H
 void ss_error (int sci_idx, long code, const char * fmt, ...)
-#else
-void ss_error (va_alist)
-    va_dcl
-#endif
 {
     register char *whoami;
     va_list pvar;
-#ifndef HAVE_STDARG_H
-    int sci_idx;
-    long code;
-    char * fmt;
-    va_start (pvar);
-    sci_idx = va_arg (pvar, int);
-    code = va_arg (pvar, long);
-    fmt = va_arg (pvar, char *);
-#else
     va_start (pvar, fmt);
-#endif
     whoami = ss_name (sci_idx);
     com_err_va (whoami, code, fmt, pvar);
     free (whoami);