comerr: Fix a couple of libtool problems

[openafs.git] / src / aklog / krb_util.c

diff --git a/src/aklog/krb_util.c b/src/aklog/krb_util.c
index b1a5963..be47e68 100644 (file)
--- a/src/aklog/krb_util.c
+++ b/src/aklog/krb_util.c
@@ -2,22 +2,18 @@
  * This file replaces some of the routines in the Kerberos utilities.
  * It is based on the Kerberos library modules:
  *     send_to_kdc.c
- * 
+ *
  * Copyright 1987, 1988, 1992 by the Massachusetts Institute of Technology.
  *
  * For copying and distribution information, please see the file
  * <mit-copyright.h>.
  */
 
-#ifndef lint
-static char rcsid_send_to_kdc_c[] =
-"$Id$";
-#endif /* lint */
-
-#if 0
-#include <kerberosIV/mit-copyright.h>
-#endif
+#include <afsconfig.h>
 #include <afs/stds.h>
+
+#include <roken.h>
+
 #include "aklog.h"
 #include <krb5.h>
 
@@ -25,18 +21,9 @@ static char rcsid_send_to_kdc_c[] =
 #define MAX_HSTNM 100
 #endif
 
-#ifdef WINDOWS
-
-#include "aklog.h"             /* for struct afsconf_cell */
-
-#else /* !WINDOWS */
-
-#include <afs/param.h>
 #include <afs/cellconfig.h>
 
-#endif /* WINDOWS */
-
-#include <string.h>
+#include <ctype.h>
 
 #define S_AD_SZ sizeof(struct sockaddr_in)
 
@@ -57,13 +44,13 @@ char *afs_realm_of_cell(krb5_context context, struct afsconf_cell *cellconfig, i
        else
            strcpy(krbrlm, cellconfig->name);
        for (p=krbrlm; *p; p++) {
-           if (islower(*p)) 
+           if (islower(*p))
                *p = toupper(*p);
        }
     } else {
-       if (retval = krb5_get_host_realm(context,
-                                        cellconfig->hostName[0], &hrealms))
-           return 0; 
+       if ((retval = krb5_get_host_realm(context,
+                                        cellconfig->hostName[0], &hrealms)))
+           return 0;
        if(!hrealms[0]) return 0;
        strcpy(krbrlm, hrealms[0]);