Windows: avoid preprocessor symbols redefinitions

[openafs.git] / src / WINNT / afsd / afskfw.h

diff --git a/src/WINNT/afsd/afskfw.h b/src/WINNT/afsd/afskfw.h
index d774924..565f37a 100644 (file)
--- a/src/WINNT/afsd/afskfw.h
+++ b/src/WINNT/afsd/afskfw.h
@@ -2,20 +2,20 @@
 * Copyright (c) 2004, 2005, 2006 Secure Endpoints Inc.
 * Copyright (c) 2003 SkyRope, LLC
  * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without 
+ *
+ * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
- * 
- * - Redistributions of source code must retain the above copyright notice, 
+ *
+ * - Redistributions of source code must retain the above copyright notice,
  *   this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright notice, 
- *   this list of conditions and the following disclaimer in the documentation 
+ * - Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
  *   and/or other materials provided with the distribution.
- * - Neither the name of Skyrope, LLC nor the names of its contributors may be 
- *   used to endorse or promote products derived from this software without 
+ * - Neither the name of Skyrope, LLC nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
  *   specific prior written permission from Skyrope, LLC.
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
  * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
@@ -37,9 +37,10 @@ extern "C" {
 #include <afs/stds.h>
 #include <afs/auth.h>
 #include <afs/cellconfig.h>
-#include <rxkad.h>
+#include <cm_config.h>
+#include <rx/rxkad.h>
 
-#define MAXCELLCHARS   64
+#define CELL_MAXNAMELEN 256
 #define MAXHOSTCHARS   64
 #define MAXHOSTSPERCELL 8
 #define TRANSARCAFSDAEMON "TransarcAFSDaemon"
@@ -50,7 +51,7 @@ int  KFW_is_available(void);
 int  KFW_AFS_destroy_tickets_for_cell(char *);
 int  KFW_AFS_destroy_tickets_for_principal(char *);
 int  KFW_AFS_renew_expiring_tokens(void);
-int  KFW_AFS_get_cred( char * username, 
+int  KFW_AFS_get_cred( char * username,
                         char * cell,
                         char * password,
                         int lifetime,
@@ -87,8 +88,12 @@ int  KFW_AFS_copy_system_file_to_default_cache(char *);
 #define         KERB_ERR_NULL_KEY                       10
 
 /* From afs/krb.h */
+#ifndef RD_AP_TIME
 #define           RD_AP_TIME     37       /* delta_t too big */
+#endif
+#ifndef INTK_BADPW
 #define           INTK_BADPW     62       /* Incorrect password */
+#endif
 
 #define PROBE_USERNAME               "OPENAFS-KDC-PROBE"
 #define PROBE_PASSWORD_LEN           16