diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2010-05-01 20:47:37 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2010-05-01 20:47:37 +0000 |
| commit | d88f604b23080c18948ba25c99ddcf015e624943 (patch) | |
| tree | 2412422f92345c97b9bc0bbe31ed280eb5e0c1f0 /usr.sbin | |
| parent | 1cf0cd9e3ed84fb82b2490d8d3c049801f3078d9 (diff) | |
As suggested by miod, rename dynroot_enable so we don't conflict with
a definition from a header. This turns out to be the same change made
in the upstream arla code.
ok miod@
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/afs/src/arlad/dynroot.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.sbin/afs/src/arlad/dynroot.c b/usr.sbin/afs/src/arlad/dynroot.c index 2a67a51278e..b0d6e29683a 100644 --- a/usr.sbin/afs/src/arlad/dynroot.c +++ b/usr.sbin/afs/src/arlad/dynroot.c @@ -53,7 +53,7 @@ struct create_entry { #define DYNROOT_ROOTDIR 1 #define DYNROOT_UNIQUE 1 -static Bool dynroot_enable = 0; /* is dynroot enabled ? */ +static Bool dynroot_enabled = 0; /* is dynroot enabled ? */ static unsigned long last_celldb_version = 0; /* last version of celldb */ /* @@ -381,7 +381,7 @@ dynroot_is_dynrootp (FCacheEntry *entry) { assert (entry); - if (dynroot_enable && + if (dynroot_enabled && entry->fid.Cell == DYNROOT_CELLID && entry->fid.fid.Volume == DYNROOT_ROOTVOLUME) return TRUE; @@ -396,7 +396,7 @@ dynroot_is_dynrootp (FCacheEntry *entry) Bool dynroot_enablep (void) { - return dynroot_enable; + return dynroot_enabled; } /* @@ -406,8 +406,8 @@ dynroot_enablep (void) Bool dynroot_setenable (Bool enable) { - Bool was = dynroot_enable; - dynroot_enable = enable; + Bool was = dynroot_enabled; + dynroot_enabled = enable; return was; } |