From 350620e947d17dfb6a042c48cc6ab38b09668431 Mon Sep 17 00:00:00 2001 From: "Chas Williams (CONTRACTOR)" Date: Thu, 21 Oct 2010 10:07:11 -0400 Subject: [PATCH] afs: fix SOLARIS builds conflicting 'u' define Including does the following (which is rather unfriendly): This causes problems for the tokenJar u member. I renamed u to content, but there might be better choices for the name. Change-Id: I3c8cd97e5868ee1ba78c2b2c4951d1af08664b77 Reviewed-on: http://gerrit.openafs.org/3023 Tested-by: BuildBot Reviewed-by: Derrick Brashear --- src/afs/afs.h | 2 +- src/afs/afs_tokens.c | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/afs/afs.h b/src/afs/afs.h index 08a2e76..1ee9ab5 100644 --- a/src/afs/afs.h +++ b/src/afs/afs.h @@ -350,7 +350,7 @@ union tokenUnion { struct tokenJar { struct tokenJar *next; int type; - union tokenUnion u; + union tokenUnion content; }; struct unixuser { diff --git a/src/afs/afs_tokens.c b/src/afs/afs_tokens.c index 64b4085..8bc5020 100644 --- a/src/afs/afs_tokens.c +++ b/src/afs/afs_tokens.c @@ -46,7 +46,7 @@ union tokenUnion * afs_FindToken(struct tokenJar *tokens, rx_securityIndex type) { while (tokens != NULL) { if (tokens->type == type) { - return &tokens->u; + return &tokens->content; } tokens = tokens->next; } @@ -76,10 +76,10 @@ afs_FreeOneToken(struct tokenJar *token) { switch (token->type) { case RX_SECIDX_KAD: - if (token->u.rxkad.ticket != NULL) { - memset(token->u.rxkad.ticket, 0, token->u.rxkad.ticketLen); - afs_osi_Free(token->u.rxkad.ticket, - token->u.rxkad.ticketLen); + if (token->content.rxkad.ticket != NULL) { + memset(token->content.rxkad.ticket, 0, token->content.rxkad.ticketLen); + afs_osi_Free(token->content.rxkad.ticket, + token->content.rxkad.ticketLen); } break; default: @@ -140,7 +140,7 @@ afs_AddToken(struct tokenJar **tokens, rx_securityIndex type) { newToken->next = *tokens; *tokens = newToken; - return &newToken->u; + return &newToken->content; } /*! @@ -159,7 +159,7 @@ int afs_IsTokenExpired(struct tokenJar *token, afs_int32 now) { switch (token->type) { case RX_SECIDX_KAD: - if (token->u.rxkad.clearToken.EndTimestamp < now - NOTOKTIMEOUT) + if (token->content.rxkad.clearToken.EndTimestamp < now - NOTOKTIMEOUT) return 1; break; default: @@ -350,7 +350,7 @@ rxkad_extractTokenForPioctl(struct tokenJar *token, struct rxkadToken *rxkadInternal; rxkadPioctl = &pioctlToken->ktc_tokenUnion_u.at_kad; - rxkadInternal = &token->u.rxkad; + rxkadInternal = &token->content.rxkad; rxkadPioctl->rk_kvno = rxkadInternal->clearToken.AuthHandle; rxkadPioctl->rk_viceid = rxkadInternal->clearToken.ViceId; -- 1.9.4