remove athena env conditionals

Remove the conditionals AFS_ATHENA_STDENV, AFS_ATHENA_ENV
and AFS_KERBREALM_ENV.

Change-Id: If58743acd7d71dd3ed05e76316ff3efd475ca123
Reviewed-on: http://gerrit.openafs.org/6963
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@secure-endpoints.com>

diff --git a/src/afs/VNOPS/afs_vnop_fid.c b/src/afs/VNOPS/afs_vnop_fid.c
index d0e26eb115d9db7e89cce867b7e6e0b055ddb9fd..cdd147eb65b0c5c8e13d72df82197c9f5578f863 100644 (file)
--- a/src/afs/VNOPS/afs_vnop_fid.c
+++ b/src/afs/VNOPS/afs_vnop_fid.c
@@ -64,7 +64,6 @@ int afs_iauth_initd = 0;
 
 extern int afs_NFSRootOnly;    /* 1 => only allow NFS mounts of /afs. */
 
-#if !defined(AFS_ATHENA_ENV)
 int
 #ifdef AFS_AIX41_ENV
 afs_fid(OSI_VC_DECL(avc), struct fid *fidpp, struct ucred *credp)
@@ -150,7 +149,6 @@ afs_fid(OSI_VC_DECL(avc), struct fid **fidpp)
 #endif
     return (0);
 }
-#endif
 
 
 #endif /* !AFS_LINUX20_ENV */

diff --git a/src/afs/afs_prototypes.h b/src/afs/afs_prototypes.h
index 448bcf43d0fbff2d89401f375bdac6128d95aef6..d56b020524eddf07b34e1288fd96fecec06e4c9d 100644 (file)
--- a/src/afs/afs_prototypes.h
+++ b/src/afs/afs_prototypes.h
@@ -1189,7 +1189,6 @@ extern int afs_rmdir(OSI_VC_DECL(adp), char *aname, afs_ucred_t *acred);
 
 struct fid;
 /* VNOPS/afs_vnop_fid.c */
-#if !defined(AFS_ATHENA_ENV)
 #ifdef AFS_AIX41_ENV
 int afs_fid(OSI_VC_DECL(avc), struct fid *fidpp, struct ucred *credp);
 #elif defined(AFS_SUN5_ENV)
@@ -1197,7 +1196,6 @@ int afs_fid(OSI_VC_DECL(avc), struct fid *fidpp);
 #else
 int afs_fid(OSI_VC_DECL(avc), struct fid **fidpp);
 #endif                          /* AFS_AIX41_ENV */
-#endif
 
 /* VNOPS/afs_vnop_flock.c */
 extern afs_int32 lastWarnTime;

diff --git a/src/audit/audit.c b/src/audit/audit.c
index 2c45aeb586c5723d8d8792d03cf93fc393b3535c..749d62b38bc161d83f915dd80c90a1c815ad38bd 100644 (file)
--- a/src/audit/audit.c
+++ b/src/audit/audit.c
@@ -445,7 +445,6 @@ osi_auditU(struct rx_call *call, char *audEvent, int errCode, ...)
                         strcat(vname, inst);
                     }
                     if ((clen = strlen(tcell))) {
-#if defined(AFS_ATHENA_STDENV) || defined(AFS_KERBREALM_ENV)
                         static char local_realms[AFS_NUM_LREALMS][AFS_REALM_SZ];
                        static int  num_lrealms = -1;
                        int i, lrealm_match;
@@ -486,7 +485,6 @@ osi_auditU(struct rx_call *call, char *audEvent, int errCode, ...)
                             strcat(vname, "@");
                             strcat(vname, tcell);
                         }
-#endif
                     }
                     strcpy(afsName, vname);
                 }

diff --git a/src/auth/userok.c b/src/auth/userok.c
index 43a32e295758f9fbb9a9b6bc8cd1d3d5178f69e2..fff3e8ab0b969b0711730b8cdd9a92f65fd55be3 100644 (file)
--- a/src/auth/userok.c
+++ b/src/auth/userok.c
@@ -24,10 +24,6 @@
 #include <afs/afsutil.h>
 #include <afs/fileutil.h>
 
-#ifdef AFS_ATHENA_STDENV
-#include <krb.h>
-#endif
-
 #include "base64.h"
 #include "auth.h"
 #include "cellconfig.h"

diff --git a/src/config/afs_sysnames.h b/src/config/afs_sysnames.h
index f3d8bdde2582a2675be7a165a06dfab01a8081ac..74a42e221030be1c6aef0fa47a12a2c2b71dba0e 100644 (file)
--- a/src/config/afs_sysnames.h
+++ b/src/config/afs_sysnames.h
@@ -326,29 +326,10 @@
 #define SYS_NAME_ID_amd64_obsd47        4016
 #define SYS_NAME_ID_amd64_obsd48        4017
 
-/*
- * Placeholder to keep system-wide standard flags since this file is included by all
- * files (i.e in afs/param.h)
- */
-#ifdef notdef
-/* Should be enabled by src sites that are compiling afs in a kerberos environment
- * (i.e. use their headers and libs) and want to use the realm-related kerberos code
- */
-#define        AFS_ATHENA_STDENV               1
-#endif
-#ifdef AFS_ATHENA_STDENV
-/* So that they don't get our own version of the kerb-related function  in libutil.a */
-#define        afs_krb_get_lrealm(r,n) krb_get_lrealm(r,n)
-#define        AFS_REALM_SZ            REALM_SZ
-#endif
 
-/* Should be enabled by src sites that are compiling afs without the kerb headers/libs
- * but want to use the kerberos realm-related code
- */
-#define        AFS_KERBREALM_ENV       1
-#ifdef AFS_KERBREALM_ENV
-#define        AFS_REALM_SZ            64
-#endif
+#define        AFS_REALM_SZ    64
+
 /* Specifies the number of equivalent local realm names */
 #define AFS_NUM_LREALMS 4
+
 #endif /* __AFS_SYSNAMES_INCL_ENV_ */

diff --git a/src/ptserver/ptprocs.c b/src/ptserver/ptprocs.c
index ee0971847bc178d152292d8fcef41f450ca1aa6d..a7cff67217d3f3787be89463b47a4b0528a43f52 100644 (file)
--- a/src/ptserver/ptprocs.c
+++ b/src/ptserver/ptprocs.c
@@ -69,10 +69,6 @@
 #include "ptprototypes.h"
 #include "afs/audit.h"
 
-#ifdef AFS_ATHENA_STDENV
-#include <krb.h>
-#endif
-
 extern int restricted;
 extern struct ubik_dbase *dbase;
 extern int pr_noAuth;

diff --git a/src/util/get_krbrlm.c b/src/util/get_krbrlm.c
index f817b0df1a1202eabc9fe8ad883be71508870445..770d7645935c92d257be5af9743ff8b7a4899f3e 100644 (file)
--- a/src/util/get_krbrlm.c
+++ b/src/util/get_krbrlm.c
@@ -121,7 +121,6 @@ afs_is_foreign_ticket_name(char *tname, char *tinst, char * tcell, char *localre
     if (localrealm && strcasecmp(localrealm, tcell))
        foreign = 1;
 
-#if    defined(AFS_ATHENA_STDENV) || defined(AFS_KERBREALM_ENV)
     if (foreign) {
        static char local_realms[AFS_NUM_LREALMS][AFS_REALM_SZ];
        static int  num_lrealms = -1;
@@ -165,7 +164,6 @@ afs_is_foreign_ticket_name(char *tname, char *tinst, char * tcell, char *localre
 
        foreign = !lrealm_match;
     }
-#endif
     return foreign;
 }
 

diff --git a/src/viced/host.c b/src/viced/host.c
index 8ec0b386ef4442a4815031993dc480f3f9b7ac79..34c23ff8ef651e3b02ac1ba4878c1ad8f7eee4da 100644 (file)
--- a/src/viced/host.c
+++ b/src/viced/host.c
@@ -32,9 +32,6 @@
 #include <afs/ihandle.h>
 #include <afs/vnode.h>
 #include <afs/volume.h>
-#ifdef AFS_ATHENA_STDENV
-#include <krb.h>
-#endif
 #include <afs/acl.h>
 #include <afs/ptclient.h>
 #include <afs/ptuser.h>

diff --git a/src/viced/state_analyzer.c b/src/viced/state_analyzer.c
index 5302d1d1172b6eb33766d6adc92dfa170fe3b172..ab85bdd214ce5e8c745ac3e66cf0d3c86c1fad84 100644 (file)
--- a/src/viced/state_analyzer.c
+++ b/src/viced/state_analyzer.c
@@ -33,9 +33,6 @@
 #include <afs/ihandle.h>
 #include <afs/vnode.h>
 #include <afs/volume.h>
-#ifdef AFS_ATHENA_STDENV
-#include <krb.h>
-#endif
 #include <afs/acl.h>
 #include <afs/ptclient.h>
 #include <afs/prs_fs.h>