ptserver: Remove PR_REMEMBER_TIMES

The #define PR_REMEMBER_TIMES is always true, so remove the #define,
and all of the #ifdefs that it triggers

Reviewed-on: http://gerrit.openafs.org/7264
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
(cherry picked from commit 25a5c423a0d12086ab3cc390306bcd0f0324a731)

Change-Id: Ifb31d3783ca5caaf11260d37dffab3fd45b435ab
Reviewed-on: http://gerrit.openafs.org/12101
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Mark Vitale <mvitale@sinenomine.net>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
Reviewed-by: Michael Meffie <mmeffie@sinenomine.net>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>

diff --git a/src/ptserver/display.c b/src/ptserver/display.c
index 07f15d651662f22dc7ff8b557453d77c139dabe6..1213ee0c9fb6ae0949f894708a3fbb8659f3104e 100644 (file)
--- a/src/ptserver/display.c
+++ b/src/ptserver/display.c
@@ -24,8 +24,6 @@
 
 #include "display.h"
 
-#ifdef PR_REMEMBER_TIMES
-
 # include <time.h>
 
 
@@ -50,7 +48,6 @@ pr_TimeToString(time_t clock)
        strftime(buffer, 32, "%m/%d %H:%M:%S", tm);
     return buffer;
 }
-#endif
 
 #define host(a) (hostOrder ? (a) : ntohl(a))
 
@@ -100,13 +97,11 @@ pr_PrintEntry(FILE *f, int hostOrder, afs_int32 ea, struct prentry *e, int inden
     fprintf(f, "%*s", indent, "");
     fprintf(f, "Entry at %d: flags 0x%x, id %di, next %d.\n", ea,
            host(e->flags), host(e->id), host(e->next));
-#ifdef PR_REMEMBER_TIMES
     fprintf(f, "%*s", indent, "");
     fprintf(f, "c:%s ", pr_TimeToString(host(e->createTime)));
     fprintf(f, "a:%s ", pr_TimeToString(host(e->addTime)));
     fprintf(f, "r:%s ", pr_TimeToString(host(e->removeTime)));
     fprintf(f, "n:%s\n", pr_TimeToString(host(e->changeTime)));
-#endif
     if (host(e->flags) & PRCONT)
        PrintEntries(f, hostOrder, indent, e, COSIZE);
     else {                     /* regular entry */

diff --git a/src/ptserver/ptserver.h b/src/ptserver/ptserver.h
index 653ae0f9d9695d66f268ff7e2bd20ade8e81cc4d..09251b84422014714936d86e8b3bcf016c303275 100644 (file)
--- a/src/ptserver/ptserver.h
+++ b/src/ptserver/ptserver.h
@@ -89,19 +89,13 @@ extern struct prheader cheader;
 #define PRP_GROUP_DEFAULT (PRP_STATUS_ANY | PRP_MEMBER_ANY)
 #define PRP_USER_DEFAULT (PRP_STATUS_ANY)
 
-#define PR_REMEMBER_TIMES 1
-
 struct prentry {
     afs_int32 flags;           /* random flags */
     afs_int32 id;              /* user or group id */
     afs_int32 cellid;          /* A foreign users's repsenting group */
     afs_int32 next;            /* next block same entry (or freelist) */
-#ifdef PR_REMEMBER_TIMES
     afs_uint32 createTime, addTime, removeTime, changeTime;
     afs_int32 reserved[1];
-#else
-    afs_int32 reserved[5];
-#endif
     afs_int32 entries[PRSIZE]; /* groups a user is a member of (or list of members */
     afs_int32 nextID;          /* id hash table next pointer */
     afs_int32 nextName;                /* name has table next ptr */
@@ -128,12 +122,8 @@ struct prentryg {
     afs_int32 id;              /* user or group id */
     afs_int32 cellid;          /* reserved for cellID */
     afs_int32 next;            /* next block same entry (or freelist) */
-#ifdef PR_REMEMBER_TIMES
     afs_uint32 createTime, addTime, removeTime, changeTime;
     afs_int32 reserved[1];
-#else
-    afs_int32 reserved[5];
-#endif
     afs_int32 entries[PRSIZE]; /* groups a user is a member of (or list of members */
     afs_int32 nextID;          /* id hash table next pointer */
     afs_int32 nextName;                /* name has table next ptr */

diff --git a/src/ptserver/ptutils.c b/src/ptserver/ptutils.c
index 296971c0c37cffbcd38cde9609a3fa8254b831f4..4939397d561d313a23aff900f5ff6dd9cd4a12dc 100644 (file)
--- a/src/ptserver/ptutils.c
+++ b/src/ptserver/ptutils.c
@@ -360,9 +360,7 @@ CreateEntry(struct ubik_trans *at, char aname[PR_MAXNAMELEN], afs_int32 *aid, af
     newEntry = AllocBlock(at);
     if (!newEntry)
        return PRDBFAIL;
-#ifdef PR_REMEMBER_TIMES
     tentry.createTime = time(0);
-#endif
 
     if (flag & PRGRP) {
        tentry.flags = PRGRP;
@@ -617,9 +615,7 @@ RemoveFromEntry(struct ubik_trans *at, afs_int32 aid, afs_int32 bid)
     code = pr_ReadEntry(at, 0, temp, &tentry);
     if (code != 0)
        return code;
-#ifdef PR_REMEMBER_TIMES
     tentry.removeTime = time(0);
-#endif
     for (i = 0; i < PRSIZE; i++) {
        if (tentry.entries[i] == aid) {
            tentry.entries[i] = PRBADID;
@@ -775,9 +771,7 @@ RemoveFromSGEntry(struct ubik_trans *at, afs_int32 aid, afs_int32 bid)
     code = pr_ReadEntry(at, 0, temp, &tentry);
     if (code != 0)
        return code;
-#ifdef PR_REMEMBER_TIMES
     tentry.removeTime = time(NULL);
-#endif
     tentryg = (struct prentryg *)&tentry;
     for (i = 0; i < SGSIZE; i++) {
        if (tentryg->supergroup[i] == aid) {
@@ -1016,9 +1010,7 @@ AddToEntry(struct ubik_trans *tt, struct prentry *entry, afs_int32 loc, afs_int3
 
     if (entry->id == aid)
        return PRINCONSISTENT;
-#ifdef PR_REMEMBER_TIMES
     entry->addTime = time(0);
-#endif
     for (i = 0; i < PRSIZE; i++) {
        if (entry->entries[i] == aid)
            return PRIDEXIST;
@@ -1130,9 +1122,7 @@ AddToSGEntry(struct ubik_trans *tt, struct prentry *entry, afs_int32 loc, afs_in
 
     if (entry->id == aid)
        return PRINCONSISTENT;
-#ifdef PR_REMEMBER_TIMES
     entry->addTime = time(NULL);
-#endif
     entryg = (struct prentryg *)entry;
     for (i = 0; i < SGSIZE; i++) {
        if (entryg->supergroup[i] == aid)
@@ -1907,9 +1897,7 @@ ChangeEntry(struct ubik_trans *at, afs_int32 aid, afs_int32 cid, char *name, afs
     if (tentry.owner != cid && !IsAMemberOf(at, cid, SYSADMINID)
        && !IsAMemberOf(at, cid, tentry.owner) && !pr_noAuth)
        return PRPERM;
-#ifdef PR_REMEMBER_TIMES
     tentry.changeTime = time(0);
-#endif
 
     /* we're actually trying to change the id */
     if (newid && (newid != aid)) {

diff --git a/src/ptserver/utils.c b/src/ptserver/utils.c
index 18b0ccb5939c471c55cf53bed8176b61647ebfcd..21dfb08c9e2a80e903f99ca4d851b0799a05c59e 100644 (file)
--- a/src/ptserver/utils.c
+++ b/src/ptserver/utils.c
@@ -106,12 +106,10 @@ pr_WriteEntry(struct ubik_trans *tt, afs_int32 afd, afs_int32 pos, struct prentr
        nentry.sibling = htonl(tentry->sibling);
        nentry.child = htonl(tentry->child);
        strncpy(nentry.name, tentry->name, PR_MAXNAMELEN);
-#ifdef PR_REMEMBER_TIMES
        nentry.createTime = htonl(tentry->createTime);
        nentry.addTime = htonl(tentry->addTime);
        nentry.removeTime = htonl(tentry->removeTime);
        nentry.changeTime = htonl(tentry->changeTime);
-#endif
        for (i = 0; i < PRSIZE; i++)
            nentry.entries[i] = htonl(tentry->entries[i]);
        tentry = &nentry;
@@ -155,12 +153,10 @@ pr_ReadEntry(struct ubik_trans *tt, afs_int32 afd, afs_int32 pos, struct prentry
     tentry->sibling = ntohl(nentry.sibling);
     tentry->child = ntohl(nentry.child);
     strncpy(tentry->name, nentry.name, PR_MAXNAMELEN);
-#ifdef PR_REMEMBER_TIMES
     tentry->createTime = ntohl(nentry.createTime);
     tentry->addTime = ntohl(nentry.addTime);
     tentry->removeTime = ntohl(nentry.removeTime);
     tentry->changeTime = ntohl(nentry.changeTime);
-#endif
     for (i = 0; i < PRSIZE; i++)
        tentry->entries[i] = ntohl(nentry.entries[i]);
     return (code);