Index: openafs/src/WINNT/afsd/cm_ioctl.c
diff -c openafs/src/WINNT/afsd/cm_ioctl.c:1.33.2.22 openafs/src/WINNT/afsd/cm_ioctl.c:1.33.2.23
*** openafs/src/WINNT/afsd/cm_ioctl.c:1.33.2.22 Wed Dec 7 07:02:41 2005
--- openafs/src/WINNT/afsd/cm_ioctl.c Tue Jan 10 08:28:01 2006
***************
*** 1882,1887 ****
--- 1882,1888 ----
int flags;
char sessionKey[8];
char *smbname;
+ int release_userp = 0;
saveDataPtr = ioctlp->inDatap;
***************
*** 1951,1956 ****
--- 1952,1958 ----
if (flags & PIOCTL_LOGON) {
userp = smb_FindCMUserByName(smbname, ioctlp->fidp->vcp->rname);
+ release_userp = 1;
}
/* store the token */
***************
*** 1988,1993 ****
--- 1990,1998 ----
cm_ResetACLCache(userp);
+ if (release_userp)
+ cm_ReleaseUser(userp);
+
return 0;
}
Index: openafs/src/WINNT/afsd/cm_scache.h
diff -c openafs/src/WINNT/afsd/cm_scache.h:1.4.2.9 openafs/src/WINNT/afsd/cm_scache.h:1.4.2.11
*** openafs/src/WINNT/afsd/cm_scache.h:1.4.2.9 Fri Oct 7 23:51:26 2005
--- openafs/src/WINNT/afsd/cm_scache.h Sun Jan 8 23:49:17 2006
***************
*** 75,82 ****
#define CM_FILELOCK_FLAG_WAITLOCK 0x04
#define CM_FILELOCK_FLAG_WAITUNLOCK 0x0C
! /* the following is only to be used for locks on non-RO volumes */
! #define CM_FILELOCK_FLAG_CLIENTONLY 0x100
typedef struct cm_prefetch { /* last region scanned for prefetching */
osi_hyper_t base; /* start of region */
--- 75,90 ----
#define CM_FILELOCK_FLAG_WAITLOCK 0x04
#define CM_FILELOCK_FLAG_WAITUNLOCK 0x0C
! /* the following is used to indicate that there are no server side
! locks associated with this lock. This is true for locks obtained
! against files in RO volumes as well as files residing on servers
! that disable client side byte range locking. */
! #define CM_FILELOCK_FLAG_CLIENTONLY 0x10
!
! #define CM_FLSHARE_OFFSET_HIGH 0x01000000
! #define CM_FLSHARE_OFFSET_LOW 0x00000000
! #define CM_FLSHARE_LENGTH_HIGH 0x00000000
! #define CM_FLSHARE_LENGTH_LOW 0x00000001
typedef struct cm_prefetch { /* last region scanned for prefetching */
osi_hyper_t base; /* start of region */
Index: openafs/src/WINNT/afsd/cm_vnodeops.c
diff -c openafs/src/WINNT/afsd/cm_vnodeops.c:1.19.2.29 openafs/src/WINNT/afsd/cm_vnodeops.c:1.19.2.32
*** openafs/src/WINNT/afsd/cm_vnodeops.c:1.19.2.29 Wed Nov 23 00:02:11 2005
--- openafs/src/WINNT/afsd/cm_vnodeops.c Sun Jan 8 23:49:17 2006
***************
*** 33,38 ****
--- 33,40 ----
extern void afsi_log(char *pattern, ...);
#endif
+ int cm_enableServerLocks = 0;
+
/*
* Case-folding array. This was constructed by inspecting of SMBtrace output.
* I do not know anything more about it.
***************
*** 283,293 ****
else
sLockType = LOCKING_ANDX_SHARED_LOCK;
! /* single byte lock at offset 0x0000 0001 0000 0000 */
! LOffset.HighPart = 1;
! LOffset.LowPart = 0;
! LLength.HighPart = 0;
! LLength.LowPart = 1;
code = cm_Lock(scp, sLockType, LOffset, LLength, key, 0, userp, reqp, NULL);
--- 285,294 ----
else
sLockType = LOCKING_ANDX_SHARED_LOCK;
! LOffset.HighPart = CM_FLSHARE_OFFSET_HIGH;
! LOffset.LowPart = CM_FLSHARE_OFFSET_LOW;
! LLength.HighPart = CM_FLSHARE_LENGTH_HIGH;
! LLength.LowPart = CM_FLSHARE_LENGTH_LOW;
code = cm_Lock(scp, sLockType, LOffset, LLength, key, 0, userp, reqp, NULL);
***************
*** 371,381 ****
else
sLockType = LOCKING_ANDX_SHARED_LOCK;
! /* single byte lock at offset 0x0000 0001 0000 0000 */
! LOffset.HighPart = 1;
! LOffset.LowPart = 0;
! LLength.HighPart = 0;
! LLength.LowPart = 1;
code = cm_Lock(scp, sLockType, LOffset, LLength, key, 0, userp, reqp, NULL);
--- 372,382 ----
else
sLockType = LOCKING_ANDX_SHARED_LOCK;
! /* single byte lock at offset 0x0100 0000 0000 0000 */
! LOffset.HighPart = CM_FLSHARE_OFFSET_HIGH;
! LOffset.LowPart = CM_FLSHARE_OFFSET_LOW;
! LLength.HighPart = CM_FLSHARE_LENGTH_HIGH;
! LLength.LowPart = CM_FLSHARE_LENGTH_LOW;
code = cm_Lock(scp, sLockType, LOffset, LLength, key, 0, userp, reqp, NULL);
***************
*** 2788,2801 ****
Keyed byte range locks:
Each cm_scache_t structure keeps track of a list of keyed locks.
! The key for a lock is essentially a token which identifies an owner
! of a set of locks (referred to as a client). The set of keys used
! within a specific cm_scache_t structure form a namespace that has a
! scope of just that cm_scache_t structure. The same key value can
! be used with another cm_scache_t structure and correspond to a
! completely different client. However it is advantageous for the
! SMB or IFS layer to make sure that there is a 1-1 mapping between
! client and keys irrespective of the cm_scache_t.
Assume a client C has key Key(C) (although, since the scope of the
key is a cm_scache_t, the key can be Key(C,S), where S is the
--- 2789,2802 ----
Keyed byte range locks:
Each cm_scache_t structure keeps track of a list of keyed locks.
! The key for a lock identifies an owner of a set of locks (referred
! to as a client). Each key is represented by a value. The set of
! key values used within a specific cm_scache_t structure form a
! namespace that has a scope of just that cm_scache_t structure. The
! same key value can be used with another cm_scache_t structure and
! correspond to a completely different client. However it is
! advantageous for the SMB or IFS layer to make sure that there is a
! 1-1 mapping between client and keys over all cm_scache_t objects.
Assume a client C has key Key(C) (although, since the scope of the
key is a cm_scache_t, the key can be Key(C,S), where S is the
***************
*** 2804,2816 ****
inclusive (a.k.a. [O,O+L-1]). The function Key(x) is implemented
through cm_generateKey() function for both SMB and IFS.
! The cache manager will set a lock on the AFS file server in order
! to assert the locks in S->fileLocks. If only shared locks are in
! place for S, then the cache manager will obtain a LockRead lock,
! while if there are any exclusive locks, it will obtain a LockWrite
! lock. If the exclusive locks are all released while the shared
! locks remain, then the cache manager will downgrade the lock from
! LockWrite to LockRead.
Lock states:
--- 2805,2827 ----
inclusive (a.k.a. [O,O+L-1]). The function Key(x) is implemented
through cm_generateKey() function for both SMB and IFS.
! The list of locks for a cm_scache_t object S is maintained in
! S->fileLocks. The cache manager will set a lock on the AFS file
! server in order to assert the locks in S->fileLocks. If only
! shared locks are in place for S, then the cache manager will obtain
! a LockRead lock, while if there are any exclusive locks, it will
! obtain a LockWrite lock. If the exclusive locks are all released
! while the shared locks remain, then the cache manager will
! downgrade the lock from LockWrite to LockRead. Similarly, if an
! exclusive lock is obtained when only shared locks exist, then the
! cache manager will try to upgrade the lock from LockRead to
! LockWrite.
!
! Each lock L owned by client C maintains a key L->key such that
! L->key == Key(C), the effective range defined by L->LOffset and
! L->LLength such that the range of bytes affected by the lock is
! (L->LOffset, +L->LLength), a type maintained in L->LockType which
! is either exclusive or shared.
Lock states:
***************
*** 2827,2833 ****
the lock allows).
1.1 ACTIVE->LOST: When the AFS file server fails to extend a
! server lock that was required to assert the lock.
1.2 ACTIVE->DELETED: Lock is released.
--- 2838,2850 ----
the lock allows).
1.1 ACTIVE->LOST: When the AFS file server fails to extend a
! server lock that was required to assert the lock. Before
! marking the lock as lost, the cache manager checks if the file
! has changed on the server. If the file has not changed, then
! the cache manager will attempt to obtain a new server lock
! that is sufficient to assert the client side locks for the
! file. If any of these fail, the lock is marked as LOST.
! Otherwise, it is left as ACTIVE.
1.2 ACTIVE->DELETED: Lock is released.
***************
*** 2843,2849 ****
2.3 WAITLOCK->LOST: One or more locks from this client were
marked as LOST. No further locks will be granted to this
! client until al lost locks are removed.
3. WAITUNLOCK: A lock is in a WAITUNLOCK state if the cache manager
receives a request for a lock that conflicts with an existing
--- 2860,2866 ----
2.3 WAITLOCK->LOST: One or more locks from this client were
marked as LOST. No further locks will be granted to this
! client until all lost locks are removed.
3. WAITUNLOCK: A lock is in a WAITUNLOCK state if the cache manager
receives a request for a lock that conflicts with an existing
***************
*** 2860,2866 ****
however the required serverLock is yet to be asserted with the
server.
! 3.3 WAITUNLOCK->DELETED: The lock is abandoned or timed out.
3.5 WAITUNLOCK->LOST: One or more locks from this client were
marked as LOST. No further locks will be granted to this
--- 2877,2884 ----
however the required serverLock is yet to be asserted with the
server.
! 3.3 WAITUNLOCK->DELETED: The lock is abandoned, timed out or
! released.
3.5 WAITUNLOCK->LOST: One or more locks from this client were
marked as LOST. No further locks will be granted to this
***************
*** 2869,2897 ****
4. LOST: A lock L is LOST if the server lock that was required to
assert the lock could not be obtained or if it could not be
extended, or if other locks by the same client were LOST.
! Effectively, once a lock is LOST, the contract between the cache
manager and that specific client is no longer valid.
The cache manager rechecks the server lock once every minute and
extends it as appropriate. If this is not done for 5 minutes,
! the AFS file server will release the lock. Once released, the
! lock cannot be re-obtained without verifying that the contents
! of the file hasn't been modified since the time the lock was
! released. Doing so may cause data corruption.
4.1 LOST->DELETED: The lock is released.
- 4.2 LOST->ACTIVE: The lock is reassertd. This requires
- verifying that the file was not modified in between.
-
- 4.3 LOST->WAITLOCK: All LOST ACTIVE locks from this client were
- reasserted. The cache manager can reinstate this waiting
- lock.
-
- 4.4 LOST->WAITUNLOCK: All LOST ACTIVE locks from this client
- were reasserted. The cache manager can reinstate this waiting
- lock.
-
5. DELETED: The lock is no longer relevant. Eventually, it will
get removed from the cm_scache_t. In the meantime, it will be
treated as if it does not exist.
--- 2887,2908 ----
4. LOST: A lock L is LOST if the server lock that was required to
assert the lock could not be obtained or if it could not be
extended, or if other locks by the same client were LOST.
! Essentially, once a lock is LOST, the contract between the cache
manager and that specific client is no longer valid.
The cache manager rechecks the server lock once every minute and
extends it as appropriate. If this is not done for 5 minutes,
! the AFS file server will release the lock (the 5 minute timeout
! is based on current file server code and is fairly arbitrary).
! Once released, the lock cannot be re-obtained without verifying
! that the contents of the file hasn't been modified since the
! time the lock was released. Re-obtaining the lock without
! verifying this may lead to data corruption. If the lock can not
! be obtained safely, then all active locks for the cm_scache_t
! are marked as LOST.
4.1 LOST->DELETED: The lock is released.
5. DELETED: The lock is no longer relevant. Eventually, it will
get removed from the cm_scache_t. In the meantime, it will be
treated as if it does not exist.
***************
*** 2899,2977 ****
5.1 DELETED->not exist: The lock is removed from the
cm_scache_t.
! 6* A lock L is ACCEPTED if it is ACTIVE or WAITLOCK.
! These locks have been accepted by the cache manager, but may or
! may not have been granted back to the client.
! 7* A lock L is QUEUED if it is ACTIVE, WAITLOCK or WAITUNLOCK.
! 8* A lock L is EFFECTIVE if it is ACTIVE or LOST.
! 9* A lock L is WAITING if it is WAITLOCK or WAITUNLOCK.
Lock operation:
! A client C can READ range (Offset,+Length) of cm_scache_t S iff:
!
! 1. for all _a_ in (Offset,+Length), one of the following is true:
!
! 1.1 There does NOT exist an ACTIVE lock L in S->fileLocks such
! that _a_ in (L->LOffset,+L->LLength) (IOW: byte _a_ of S is
! unowned)
!
! AND
! For each LOST lock M in S->fileLocks such that
! _a_ in (M->LOffset,+M->LLength), M->LockType is shared AND
! M->key != Key(C).
! (Note: If this is a different client from one whose shared
! lock was LOST, then the contract between this client and the
! cache manager is indistinguishable from that where no lock
! was lost. If an exclusive lock was lost, then the range is
! considered unsafe for consumption.)
! 1.3 There is an ACTIVE lock L in S->fileLocks such that: L->key
! == Key(C) && _a_ in (L->LOffset,+L->LLength) (IOW: byte _a_
! of S is owned by C under lock L)
! 1.4 There is an ACTIVE lock L in S->fileLocks such that _a_ in
! (L->LOffset,L->+LLength) && L->LockType is shared (IOW: byte
! _a_ of S is shared) AND there is no LOST lock M such that _a_
! in (M->LOffset,+M->LLength) and M->key == Key(C)
! A client C can WRITE range (Offset,+Length) of cm_scache_t S iff:
2. for all _a_ in (Offset,+Length), one of the following is true:
! 2.1 Byte _a_ of S is unowned (as above) AND for each LOST lock
! L in S->fileLocks _a_ NOT in (L->LOffset,+L->LLength).
! 2.2 Byte _a_ of S is owned by C under lock L (as above) AND
! L->LockType is exclusive.
! A client C can OBTAIN a lock L on cm_scache_t S iff:
3. for all _a_ in (L->LOffset,+L->LLength), ALL of the following is
true:
! 3.1 L->LockType is exclusive IMPLIES there does NOT exist a QUEUED lock
! M in S->fileLocks such that _a_ in (M->LOffset,+M->LLength).
! (Note: If we count all QUEUED locks then we hit cases such as
cascading waiting locks where the locks later on in the queue
can be granted without compromising file integrity. On the
other hand if only ACCEPTED locks are considered, then locks
that were received earlier may end up waiting for locks that
! were received later to be unlocked. The choice of QUEUED
! locks were made so that large locks don't consistently get
! trumped by smaller locks which were requested later.)
! 3.2 L->LockType is shared IMPLIES for each QUEUED lock M in
S->fileLocks, if _a_ in (M->LOffset,+M->LLength) then
M->LockType is shared.
! 4. For each LOST lock M in S->fileLocks, M->key != Key(C)
(Note: If a client loses a lock, it loses all locks.
Subsequently, it will not be allowed to obtain any more locks
--- 2910,2983 ----
5.1 DELETED->not exist: The lock is removed from the
cm_scache_t.
! The following are classifications of locks based on their state.
! 6* A lock L is ACCEPTED if it is ACTIVE or WAITLOCK. These locks
! have been accepted by the cache manager, but may or may not have
! been granted back to the client.
! 7* A lock L is QUEUED if it is ACTIVE, WAITLOCK or WAITUNLOCK.
! 8* A lock L is WAITING if it is WAITLOCK or WAITUNLOCK.
Lock operation:
! A client C can READ range (Offset,+Length) of a file represented by
! cm_scache_t S iff (1):
! 1. for all _a_ in (Offset,+Length), all of the following is true:
! 1.1 For each ACTIVE lock L in S->fileLocks such that _a_ in
! (L->LOffset,+L->LLength); L->key == Key(C) OR L->LockType is
! shared.
! 1.2 For each LOST lock L in S->fileLocks such that _a_ in
! (L->LOffset,+L->LLength); L->LockType is shared AND L->key !=
! Key(C)
! (When locks are lost on an cm_scache_t, all locks are lost. By
! 4.2 (below), if there is an exclusive LOST lock, then there
! can't be any overlapping ACTIVE locks.)
! A client C can WRITE range (Offset,+Length) of cm_scache_t S iff (2):
2. for all _a_ in (Offset,+Length), one of the following is true:
! 2.1 Byte _a_ of S is unowned (as specified in 1.1) AND there
! does not exist a LOST lock L such that _a_ in
! (L->LOffset,+L->LLength).
! 2.2 Byte _a_ of S is owned by C under lock L (as specified in
! 1.2) AND L->LockType is exclusive.
! A client C can OBTAIN a lock L on cm_scache_t S iff (both 3 and 4):
3. for all _a_ in (L->LOffset,+L->LLength), ALL of the following is
true:
! 3.1 If L->LockType is exclusive then there does NOT exist a
! ACCEPTED lock M in S->fileLocks such that _a_ in
! (M->LOffset,+M->LLength).
! (If we count all QUEUED locks then we hit cases such as
cascading waiting locks where the locks later on in the queue
can be granted without compromising file integrity. On the
other hand if only ACCEPTED locks are considered, then locks
that were received earlier may end up waiting for locks that
! were received later to be unlocked. The choice of ACCEPTED
! locks was made to mimic the Windows byte range lock
! semantics.)
! 3.2 If L->LockType is shared then for each ACCEPTED lock M in
S->fileLocks, if _a_ in (M->LOffset,+M->LLength) then
M->LockType is shared.
! 4. For all LOST locks M in S->fileLocks, ALL of the following are true:
!
! 4.1 M->key != Key(C)
!
! 4.2 If M->LockType is exclusive, then (L->LOffset,+L->LLength)
! and (M->LOffset,+M->LLength) do not intersect.
(Note: If a client loses a lock, it loses all locks.
Subsequently, it will not be allowed to obtain any more locks
***************
*** 2979,2985 ****
released. Once all locks are released by a single client,
there exists no further contract between the client and AFS
about the contents of the file, hence the client can then
! proceed to obtain new locks and establish a new contract.)
A client C can only unlock locks L in S->fileLocks which have
L->key == Key(C).
--- 2985,2999 ----
released. Once all locks are released by a single client,
there exists no further contract between the client and AFS
about the contents of the file, hence the client can then
! proceed to obtain new locks and establish a new contract.
!
! This doesn't quite work as you think it should, because most
! applications aren't built to deal with losing locks they
! thought they once had. For now, we don't have a good
! solution to lost locks.
!
! Also, for consistency reasons, we have to hold off on
! granting locks that overlap exclusive LOST locks.)
A client C can only unlock locks L in S->fileLocks which have
L->key == Key(C).
***************
*** 3028,3043 ****
I5. S->serverLock == LockWrite iff there is at least one ACTIVE
exclusive lock.
! I6. If a WAITUNLOCK lock L exists in S->fileLocks, then all
! locks that L is waiting on are ahead of L in S->fileLocks.
!
! I7. If L is a LOST lock, then for each lock M in S->fileLocks,
M->key == L->key IMPLIES M is LOST or DELETED.
--asanka
*/
! #define IS_LOCK_ACTIVE(lockp) (((lockp)->flags & (CM_FILELOCK_FLAG_DELETED|CM_FILELOCK_FLAG_WAITLOCK|CM_FILELOCK_FLAG_WAITUNLOCK|CM_FILELOCK_FLAG_LOST))==0)
#define IS_LOCK_WAITLOCK(lockp) (((lockp)->flags & (CM_FILELOCK_FLAG_DELETED|CM_FILELOCK_FLAG_WAITLOCK|CM_FILELOCK_FLAG_WAITUNLOCK|CM_FILELOCK_FLAG_LOST)) == CM_FILELOCK_FLAG_WAITLOCK)
--- 3042,3054 ----
I5. S->serverLock == LockWrite iff there is at least one ACTIVE
exclusive lock.
! I6. If L is a LOST lock, then for each lock M in S->fileLocks,
M->key == L->key IMPLIES M is LOST or DELETED.
--asanka
*/
! #define IS_LOCK_ACTIVE(lockp) (((lockp)->flags & (CM_FILELOCK_FLAG_DELETED|CM_FILELOCK_FLAG_WAITLOCK|CM_FILELOCK_FLAG_WAITUNLOCK|CM_FILELOCK_FLAG_LOST)) == 0)
#define IS_LOCK_WAITLOCK(lockp) (((lockp)->flags & (CM_FILELOCK_FLAG_DELETED|CM_FILELOCK_FLAG_WAITLOCK|CM_FILELOCK_FLAG_WAITUNLOCK|CM_FILELOCK_FLAG_LOST)) == CM_FILELOCK_FLAG_WAITLOCK)
***************
*** 3047,3065 ****
#define IS_LOCK_DELETED(lockp) (((lockp)->flags & CM_FILELOCK_FLAG_DELETED) == CM_FILELOCK_FLAG_DELETED)
! /* the following macros are unsafe */
#define IS_LOCK_ACCEPTED(lockp) (IS_LOCK_ACTIVE(lockp) || IS_LOCK_WAITLOCK(lockp))
! #define IS_LOCK_QUEUED(lockp) (IS_LOCK_ACTIVE(lockp) || IS_LOCK_WAITLOCK(lockp) || IS_LOCK_WAITUNLOCK(lockp))
!
! #define IS_LOCK_EFFECTIVE(lockp) (IS_LOCK_ACTIVE(lockp) || IS_LOCK_LOST(lockp))
!
#define IS_LOCK_CLIENTONLY(lockp) ((((lockp)->scp->flags & CM_SCACHEFLAG_RO) == CM_SCACHEFLAG_RO) || (((lockp)->flags & CM_FILELOCK_FLAG_CLIENTONLY) == CM_FILELOCK_FLAG_CLIENTONLY))
#define INTERSECT_RANGE(r1,r2) (((r2).offset+(r2).length) > (r1).offset && ((r1).offset +(r1).length) > (r2).offset)
#define CONTAINS_RANGE(r1,r2) (((r2).offset+(r2).length) <= ((r1).offset+(r1).length) && (r1).offset <= (r2).offset)
static void cm_LockRangeSubtract(cm_range_t * pos, const cm_range_t * neg)
{
afs_int64 int_begin;
--- 3058,3083 ----
#define IS_LOCK_DELETED(lockp) (((lockp)->flags & CM_FILELOCK_FLAG_DELETED) == CM_FILELOCK_FLAG_DELETED)
! /* unsafe */
#define IS_LOCK_ACCEPTED(lockp) (IS_LOCK_ACTIVE(lockp) || IS_LOCK_WAITLOCK(lockp))
! /* unsafe */
#define IS_LOCK_CLIENTONLY(lockp) ((((lockp)->scp->flags & CM_SCACHEFLAG_RO) == CM_SCACHEFLAG_RO) || (((lockp)->flags & CM_FILELOCK_FLAG_CLIENTONLY) == CM_FILELOCK_FLAG_CLIENTONLY))
+ /* unsafe */
#define INTERSECT_RANGE(r1,r2) (((r2).offset+(r2).length) > (r1).offset && ((r1).offset +(r1).length) > (r2).offset)
+ /* unsafe */
#define CONTAINS_RANGE(r1,r2) (((r2).offset+(r2).length) <= ((r1).offset+(r1).length) && (r1).offset <= (r2).offset)
+ #if defined(VICED_CAPABILITY_USE_BYTE_RANGE_LOCKS) && !defined(LOCK_TESTING)
+ #define SCP_SUPPORTS_BRLOCKS(scp) ((scp)->cbServerp && ((scp)->cbServerp->capabilities & VICED_CAPABILITY_USE_BYTE_RANGE_LOCKS))
+ #else
+ #define SCP_SUPPORTS_BRLOCKS(scp) (1)
+ #endif
+
+ #define SERVERLOCKS_ENABLED(scp) (!((scp)->flags & CM_SCACHEFLAG_RO) && cm_enableServerLocks && SCP_SUPPORTS_BRLOCKS(scp))
+
static void cm_LockRangeSubtract(cm_range_t * pos, const cm_range_t * neg)
{
afs_int64 int_begin;
***************
*** 3073,3081 ****
pos->length = pos->offset + pos->length - int_end;
pos->offset = int_end;
} else if(int_end == pos->offset + pos->length) {
! pos->offset = int_begin;
! pos->length = int_end - int_begin;
}
}
}
--- 3091,3102 ----
pos->length = pos->offset + pos->length - int_end;
pos->offset = int_end;
} else if(int_end == pos->offset + pos->length) {
! pos->length = int_begin - pos->offset;
}
+
+ /* We only subtract ranges if the resulting range is
+ contiguous. If we try to support non-contigous ranges, we
+ aren't actually improving performance. */
}
}
***************
*** 3098,3124 ****
range.offset = LOffset.QuadPart;
range.length = LLength.QuadPart;
! /*
! 1. for all _a_ in (Offset,+Length), one of the following is true:
- 1.1 There does NOT exist an ACTIVE lock L in S->fileLocks such
- that _a_ in (L->LOffset,+L->LLength) (IOW: byte _a_ of S is
- unowned)
-
- AND
-
- For each LOST lock M in S->fileLocks such that
- _a_ in (M->LOffset,+M->LLength), M->LockType is shared AND
- M->key != Key(C).
-
- 1.3 There is an ACTIVE lock L in S->fileLocks such that: L->key
- == Key(C) && _a_ in (L->LOffset,+L->LLength) (IOW: byte _a_
- of S is owned by C under lock L)
-
- 1.4 There is an ACTIVE lock L in S->fileLocks such that _a_ in
- (L->LOffset,L->+LLength) && L->LockType is shared (IOW: byte
- _a_ of S is shared) AND there is no LOST lock M such that _a_
- in (M->LOffset,+M->LLength) and M->key == Key(C)
*/
lock_ObtainRead(&cm_scacheLock);
--- 3119,3136 ----
range.offset = LOffset.QuadPart;
range.length = LLength.QuadPart;
! /*
!
! 1. for all _a_ in (Offset,+Length), all of the following is true:
!
! 1.1 For each ACTIVE lock L in S->fileLocks such that _a_ in
! (L->LOffset,+L->LLength); L->key == Key(C) OR L->LockType is
! shared.
!
! 1.2 For each LOST lock L in S->fileLocks such that _a_ in
! (L->LOffset,+L->LLength); L->LockType is shared AND L->key !=
! Key(C)
*/
lock_ObtainRead(&cm_scacheLock);
***************
*** 3127,3146 ****
fileLock =
(cm_file_lock_t *)((char *) q - offsetof(cm_file_lock_t, fileq));
! #if 0
! if(IS_LOCK_DELETED(fileLock) ||
! (IS_LOCK_LOST(fileLock) &&
! fileLock->lockType == LockRead &&
! fileLock->key != key))
! continue;
! #endif
!
! if(INTERSECT_RANGE(range, fileLock->range)) {
if(IS_LOCK_ACTIVE(fileLock)) {
if(fileLock->key == key) {
! /* if there is an active lock for this client, it
! is safe to substract ranges */
cm_LockRangeSubtract(&range, &fileLock->range);
substract_ranges = TRUE;
} else {
--- 3139,3150 ----
fileLock =
(cm_file_lock_t *)((char *) q - offsetof(cm_file_lock_t, fileq));
! if (INTERSECT_RANGE(range, fileLock->range)) {
if(IS_LOCK_ACTIVE(fileLock)) {
if(fileLock->key == key) {
! /* If there is an active lock for this client, it
! is safe to substract ranges.*/
cm_LockRangeSubtract(&range, &fileLock->range);
substract_ranges = TRUE;
} else {
***************
*** 3154,3177 ****
because the client may have lost locks. That
is, unless we have already seen an active lock
belonging to the client, in which case there
! can't be any lost locks. */
if(substract_ranges)
cm_LockRangeSubtract(&range, &fileLock->range);
}
! } else if(IS_LOCK_LOST(fileLock)
! #if 0
! /* Uncomment for less aggressive handling of
! lost locks. */
! &&
! (fileLock->key == key || fileLock->lockType == LockWrite)
! #endif
! ) {
code = CM_ERROR_BADFD;
break;
}
- } else if (IS_LOCK_LOST(fileLock)) {
- code = CM_ERROR_BADFD;
- break;
}
}
--- 3158,3172 ----
because the client may have lost locks. That
is, unless we have already seen an active lock
belonging to the client, in which case there
! can't be any lost locks for this client. */
if(substract_ranges)
cm_LockRangeSubtract(&range, &fileLock->range);
}
! } else if(IS_LOCK_LOST(fileLock) &&
! (fileLock->key == key || fileLock->lockType == LockWrite)) {
code = CM_ERROR_BADFD;
break;
}
}
}
***************
*** 3208,3223 ****
range.length = LLength.QuadPart;
/*
! A client C can WRITE range (Offset,+Length) of cm_scache_t S iff:
2. for all _a_ in (Offset,+Length), one of the following is true:
! 2.1 Byte _a_ of S is unowned (as above) AND for each LOST lock
! L in S->fileLocks _a_ NOT in (L->LOffset,+L->LLength).
!
! 2.2 Byte _a_ of S is owned by C under lock L (as above) AND
! L->LockType is exclusive.
*/
lock_ObtainRead(&cm_scacheLock);
--- 3203,3217 ----
range.length = LLength.QuadPart;
/*
! A client C can WRITE range (Offset,+Length) of cm_scache_t S iff (2):
2. for all _a_ in (Offset,+Length), one of the following is true:
! 2.1 Byte _a_ of S is unowned AND there does not exist a LOST
! lock L such that _a_ in (L->LOffset,+L->LLength).
+ 2.2 Byte _a_ of S is owned by C under lock L AND L->LockType is
+ exclusive.
*/
lock_ObtainRead(&cm_scacheLock);
***************
*** 3226,3239 ****
fileLock =
(cm_file_lock_t *)((char *) q - offsetof(cm_file_lock_t, fileq));
- #if 0
- if(IS_LOCK_DELETED(fileLock) ||
- (IS_LOCK_LOST(fileLock) &&
- fileLock->lockType == LockRead &&
- fileLock->key != key))
- continue;
- #endif
-
if(INTERSECT_RANGE(range, fileLock->range)) {
if(IS_LOCK_ACTIVE(fileLock)) {
if(fileLock->key == key) {
--- 3220,3225 ----
***************
*** 3254,3262 ****
code = CM_ERROR_BADFD;
break;
}
- } else if (IS_LOCK_LOST(fileLock)) {
- code = CM_ERROR_BADFD;
- break;
}
}
--- 3240,3245 ----
***************
*** 3323,3341 ****
(unsigned long)(key >> 32), (unsigned long)(key & 0xffffffff));
/*
! A client C can OBTAIN a lock L on cm_scache_t S iff:
3. for all _a_ in (L->LOffset,+L->LLength), ALL of the following is
true:
! 3.1 L->LockType is exclusive IMPLIES there does NOT exist a QUEUED lock
! M in S->fileLocks such that _a_ in (M->LOffset,+M->LLength).
! 3.2 L->LockType is shared IMPLIES for each QUEUED lock M in
S->fileLocks, if _a_ in (M->LOffset,+M->LLength) then
M->LockType is shared.
! 4. For each LOST lock M in S->fileLocks, M->key != Key(C)
*/
range.offset = LOffset.QuadPart;
--- 3306,3330 ----
(unsigned long)(key >> 32), (unsigned long)(key & 0xffffffff));
/*
! A client C can OBTAIN a lock L on cm_scache_t S iff (both 3 and 4):
3. for all _a_ in (L->LOffset,+L->LLength), ALL of the following is
true:
! 3.1 If L->LockType is exclusive then there does NOT exist a
! ACCEPTED lock M in S->fileLocks such that _a_ in
! (M->LOffset,+M->LLength).
! 3.2 If L->LockType is shared then for each ACCEPTED lock M in
S->fileLocks, if _a_ in (M->LOffset,+M->LLength) then
M->LockType is shared.
! 4. For all LOST locks M in S->fileLocks, ALL of the following are true:
!
! 4.1 M->key != Key(C)
!
! 4.2 If M->LockType is exclusive, then (L->LOffset,+L->LLength)
! and (M->LOffset,+M->LLength) do not intersect.
*/
range.offset = LOffset.QuadPart;
***************
*** 3344,3360 ****
lock_ObtainRead(&cm_scacheLock);
for(q = scp->fileLocksH; q; q = osi_QNext(q)) {
! fileLock =
(cm_file_lock_t *)((char *) q - offsetof(cm_file_lock_t, fileq));
! if(IS_LOCK_LOST(fileLock) && fileLock->key == key) {
! code = CM_ERROR_BADFD;
! break;
}
/* we don't need to check for deleted locks here since deleted
! locks are dequeued from fileLocks */
! if(INTERSECT_RANGE(range, fileLock->range)) {
if((sLockType & LOCKING_ANDX_SHARED_LOCK) == 0 ||
fileLock->lockType != LockRead) {
--- 3333,3356 ----
lock_ObtainRead(&cm_scacheLock);
for(q = scp->fileLocksH; q; q = osi_QNext(q)) {
! fileLock =
(cm_file_lock_t *)((char *) q - offsetof(cm_file_lock_t, fileq));
! if(IS_LOCK_LOST(fileLock)) {
! if (fileLock->key == key) {
! code = CM_ERROR_BADFD;
! break;
! } else if (fileLock->lockType == LockWrite && INTERSECT_RANGE(range, fileLock->range)) {
! code = CM_ERROR_WOULDBLOCK;
! wait_unlock = TRUE;
! break;
! }
}
/* we don't need to check for deleted locks here since deleted
! locks are dequeued from scp->fileLocks */
! if(IS_LOCK_ACCEPTED(fileLock) &&
! INTERSECT_RANGE(range, fileLock->range)) {
if((sLockType & LOCKING_ANDX_SHARED_LOCK) == 0 ||
fileLock->lockType != LockRead) {
***************
*** 3367,3373 ****
lock_ReleaseRead(&cm_scacheLock);
! if(code == 0 && !(scp->flags & CM_SCACHEFLAG_RO)) {
if(Which == scp->serverLock ||
(Which == LockRead && scp->serverLock == LockWrite)) {
--- 3363,3369 ----
lock_ReleaseRead(&cm_scacheLock);
! if(code == 0 && SERVERLOCKS_ENABLED(scp)) {
if(Which == scp->serverLock ||
(Which == LockRead && scp->serverLock == LockWrite)) {
***************
*** 3517,3524 ****
}
}
}
! } else if (code == 0 && (scp->flags & CM_SCACHEFLAG_RO)) {
! osi_Log0(afsd_logp, " Skipping server lock for RO scp");
}
check_code:
--- 3513,3521 ----
}
}
}
! } else if (code == 0) { /* server locks not enabled */
! osi_Log0(afsd_logp,
! " Skipping server lock for scp");
}
check_code:
***************
*** 3556,3561 ****
--- 3553,3561 ----
CM_FILELOCK_FLAG_WAITUNLOCK :
CM_FILELOCK_FLAG_WAITLOCK));
+ if (!SERVERLOCKS_ENABLED(scp))
+ fileLock->flags |= CM_FILELOCK_FLAG_CLIENTONLY;
+
fileLock->lastUpdate = (code == 0) ? time(NULL) : 0;
osi_QAddT(&scp->fileLocksH, &scp->fileLocksT, &fileLock->fileq);
***************
*** 3603,3610 ****
struct rx_connection * callp;
int n_unlocks = 0;
! osi_Log3(afsd_logp, "cm_UnlockByKey scp 0x%x key 0x%x:%x",
! (long) scp, (unsigned long)(key >> 32), (unsigned long)(key & 0xffffffff));
lock_ObtainWrite(&cm_scacheLock);
--- 3603,3613 ----
struct rx_connection * callp;
int n_unlocks = 0;
! osi_Log4(afsd_logp, "cm_UnlockByKey scp 0x%x key 0x%x:%x flags=0x%x",
! (long) scp,
! (unsigned long)(key >> 32),
! (unsigned long)(key & 0xffffffff),
! flags);
lock_ObtainWrite(&cm_scacheLock);
***************
*** 3616,3622 ****
#ifdef DEBUG
osi_Log4(afsd_logp, " Checking lock[0x%x] range[%d,+%d] type[%d]",
! fileLock, (unsigned long) fileLock->range.offset, (unsigned long) fileLock->range.length,
fileLock->lockType);
osi_Log3(afsd_logp, " key[0x%x:%x] flags[0x%x]",
(unsigned long)(fileLock->key >> 32),
--- 3619,3627 ----
#ifdef DEBUG
osi_Log4(afsd_logp, " Checking lock[0x%x] range[%d,+%d] type[%d]",
! fileLock,
! (unsigned long) fileLock->range.offset,
! (unsigned long) fileLock->range.length,
fileLock->lockType);
osi_Log3(afsd_logp, " key[0x%x:%x] flags[0x%x]",
(unsigned long)(fileLock->key >> 32),
***************
*** 3684,3691 ****
osi_assertx(scp->sharedLocks >= 0, "scp->sharedLocks < 0");
osi_assertx(scp->exclusiveLocks >= 0, "scp->exclusiveLocks < 0");
! if (scp->flags & CM_SCACHEFLAG_RO) {
! osi_Log0(afsd_logp, " Skipping server lock for RO scp");
goto done;
}
--- 3689,3696 ----
osi_assertx(scp->sharedLocks >= 0, "scp->sharedLocks < 0");
osi_assertx(scp->exclusiveLocks >= 0, "scp->exclusiveLocks < 0");
! if (!SERVERLOCKS_ENABLED(scp)) {
! osi_Log0(afsd_logp, " Skipping server lock for scp");
goto done;
}
***************
*** 3927,3934 ****
fileLock->scp = NULL;
lock_ReleaseWrite(&cm_scacheLock);
! if (scp->flags & CM_SCACHEFLAG_RO) {
! osi_Log0(afsd_logp, " Skipping server locks for RO scp");
goto done;
}
--- 3932,3939 ----
fileLock->scp = NULL;
lock_ReleaseWrite(&cm_scacheLock);
! if (!SERVERLOCKS_ENABLED(scp)) {
! osi_Log0(afsd_logp, " Skipping server locks for scp");
goto done;
}
***************
*** 4147,4152 ****
--- 4152,4161 ----
} else if (IS_LOCK_ACTIVE(fileLock) && !IS_LOCK_CLIENTONLY(fileLock)) {
+ /* Server locks must have been enabled for us to have
+ received an active non-client-only lock. */
+ osi_assert(cm_enableServerLocks);
+
scp = fileLock->scp;
osi_assert(scp != NULL);
***************
*** 4288,4294 ****
long cm_RetryLock(cm_file_lock_t *oldFileLock, int client_is_dead)
{
long code = 0;
! cm_scache_t *scp;
AFSFid tfid;
AFSVolSync volSync;
cm_conn_t *connp;
--- 4297,4303 ----
long cm_RetryLock(cm_file_lock_t *oldFileLock, int client_is_dead)
{
long code = 0;
! cm_scache_t *scp = NULL;
AFSFid tfid;
AFSVolSync volSync;
cm_conn_t *connp;
***************
*** 4302,4323 ****
if (client_is_dead) {
code = CM_ERROR_TIMEDOUT;
! goto handleCode;
}
lock_ObtainRead(&cm_scacheLock);
/* if the lock has already been granted, then we have nothing to do */
if(IS_LOCK_ACTIVE(oldFileLock)) {
lock_ReleaseRead(&cm_scacheLock);
return 0;
}
/* we can't do anything with lost or deleted locks at the moment. */
if(IS_LOCK_LOST(oldFileLock) || IS_LOCK_DELETED(oldFileLock)) {
code = CM_ERROR_BADFD;
lock_ReleaseRead(&cm_scacheLock);
! goto handleCode;
}
scp = oldFileLock->scp;
--- 4311,4345 ----
if (client_is_dead) {
code = CM_ERROR_TIMEDOUT;
! goto updateLock;
}
lock_ObtainRead(&cm_scacheLock);
+ osi_Log2(afsd_logp, "cm_RetryLock checking lock %p (scp=%p)", oldFileLock, oldFileLock->scp);
+ osi_Log4(afsd_logp, " offset(%x:%x) length(%x:%x)",
+ (unsigned)(oldFileLock->range.offset >> 32),
+ (unsigned)(oldFileLock->range.offset & 0xffffffff),
+ (unsigned)(oldFileLock->range.length >> 32),
+ (unsigned)(oldFileLock->range.length & 0xffffffff));
+ osi_Log3(afsd_logp, " key(%x:%x) flags=%x",
+ (unsigned)(oldFileLock->key >> 32),
+ (unsigned)(oldFileLock->key & 0xffffffff),
+ (unsigned)(oldFileLock->flags));
+
/* if the lock has already been granted, then we have nothing to do */
if(IS_LOCK_ACTIVE(oldFileLock)) {
lock_ReleaseRead(&cm_scacheLock);
+ osi_Log0(afsd_logp, "cm_RetryLock lock already granted");
return 0;
}
/* we can't do anything with lost or deleted locks at the moment. */
if(IS_LOCK_LOST(oldFileLock) || IS_LOCK_DELETED(oldFileLock)) {
code = CM_ERROR_BADFD;
+ osi_Log0(afsd_logp, "cm_RetryLock lock is lost or deleted");
lock_ReleaseRead(&cm_scacheLock);
! goto updateLock;
}
scp = oldFileLock->scp;
***************
*** 4331,4341 ****
/* Check if we already have a sufficient server lock to allow this
lock to go through */
if(IS_LOCK_WAITLOCK(oldFileLock) &&
! (scp->serverLock == oldFileLock->lockType ||
scp->serverLock == LockWrite)) {
oldFileLock->flags &= ~CM_FILELOCK_FLAG_WAITLOCK;
lock_ReleaseWrite(&cm_scacheLock);
lock_ReleaseMutex(&scp->mx);
--- 4353,4371 ----
/* Check if we already have a sufficient server lock to allow this
lock to go through */
if(IS_LOCK_WAITLOCK(oldFileLock) &&
! (!SERVERLOCKS_ENABLED(scp) ||
! scp->serverLock == oldFileLock->lockType ||
scp->serverLock == LockWrite)) {
oldFileLock->flags &= ~CM_FILELOCK_FLAG_WAITLOCK;
+ if (SERVERLOCKS_ENABLED(scp)) {
+ osi_Log1(afsd_logp, "cm_RetryLock Server lock (%d) is sufficient for lock. Granting",
+ (int) scp->serverLock);
+ } else {
+ osi_Log0(afsd_logp, "cm_RetryLock skipping server lock for scp");
+ }
+
lock_ReleaseWrite(&cm_scacheLock);
lock_ReleaseMutex(&scp->mx);
***************
*** 4345,4379 ****
if(IS_LOCK_WAITUNLOCK(oldFileLock)) {
/* check if the conflicting locks have dissappeared already */
-
for(q = scp->fileLocksH; q; q = osi_QNext(q)) {
fileLock = (cm_file_lock_t *)
((char *) q - offsetof(cm_file_lock_t, fileq));
! /* a oldFileLock can only depend on locks that are ahead
! of it in the queue. If we came this far, then all
! should be ok */
! if(fileLock == oldFileLock) {
! break;
! }
!
! if(IS_LOCK_LOST(fileLock)
! #if 0
! && fileLock->key == oldFileLock->key
! #endif
! ) {
! code = CM_ERROR_BADFD;
! oldFileLock->flags |= CM_FILELOCK_FLAG_LOST;
! break;
}
! /* we don't need to check for deleted locks here since deleted
! locks are dequeued from fileLocks */
! if(INTERSECT_RANGE(oldFileLock->range, fileLock->range)) {
if(oldFileLock->lockType != LockRead ||
fileLock->lockType != LockRead) {
code = CM_ERROR_WOULDBLOCK;
break;
}
--- 4375,4407 ----
if(IS_LOCK_WAITUNLOCK(oldFileLock)) {
/* check if the conflicting locks have dissappeared already */
for(q = scp->fileLocksH; q; q = osi_QNext(q)) {
fileLock = (cm_file_lock_t *)
((char *) q - offsetof(cm_file_lock_t, fileq));
! if(IS_LOCK_LOST(fileLock)) {
! if (fileLock->key == oldFileLock->key) {
! code = CM_ERROR_BADFD;
! oldFileLock->flags |= CM_FILELOCK_FLAG_LOST;
! osi_Log1(afsd_logp, " found lost lock %p for same key. Marking lock as lost",
! fileLock);
! break;
! } else if (fileLock->lockType == LockWrite &&
! INTERSECT_RANGE(oldFileLock->range, fileLock->range)) {
! osi_Log1(afsd_logp, " found conflicting LOST lock %p", fileLock);
! code = CM_ERROR_WOULDBLOCK;
! break;
! }
}
! if(IS_LOCK_ACCEPTED(fileLock) &&
! INTERSECT_RANGE(oldFileLock->range, fileLock->range)) {
if(oldFileLock->lockType != LockRead ||
fileLock->lockType != LockRead) {
+
+ osi_Log1(afsd_logp, " found conflicting lock %p", fileLock);
code = CM_ERROR_WOULDBLOCK;
break;
}
***************
*** 4407,4415 ****
oldFileLock->flags |= CM_FILELOCK_FLAG_WAITLOCK;
}
! if (scp->serverLock == oldFileLock->lockType ||
! (oldFileLock->lockType == LockRead && scp->serverLock == LockWrite) ||
! (scp->flags & CM_SCACHEFLAG_RO)) {
oldFileLock->flags &= ~CM_FILELOCK_FLAG_WAITLOCK;
--- 4435,4444 ----
oldFileLock->flags |= CM_FILELOCK_FLAG_WAITLOCK;
}
! if (!SERVERLOCKS_ENABLED(scp) ||
! scp->serverLock == oldFileLock->lockType ||
! (oldFileLock->lockType == LockRead &&
! scp->serverLock == LockWrite)) {
oldFileLock->flags &= ~CM_FILELOCK_FLAG_WAITLOCK;
***************
*** 4490,4495 ****
--- 4519,4525 ----
}
lock_ReleaseMutex(&scp->mx);
+ updateLock:
lock_ObtainWrite(&cm_scacheLock);
if (code == 0) {
oldFileLock->flags &= ~CM_FILELOCK_FLAG_WAITLOCK;
***************
*** 4497,4504 ****
oldFileLock->flags |= CM_FILELOCK_FLAG_DELETED;
cm_ReleaseUser(oldFileLock->userp);
oldFileLock->userp = NULL;
! cm_ReleaseSCacheNoLock(scp);
! oldFileLock->scp = NULL;
}
lock_ReleaseWrite(&cm_scacheLock);
--- 4527,4536 ----
oldFileLock->flags |= CM_FILELOCK_FLAG_DELETED;
cm_ReleaseUser(oldFileLock->userp);
oldFileLock->userp = NULL;
! if (oldFileLock->scp) {
! cm_ReleaseSCacheNoLock(oldFileLock->scp);
! oldFileLock->scp = NULL;
! }
}
lock_ReleaseWrite(&cm_scacheLock);
***************
*** 4507,4515 ****
cm_key_t cm_GenerateKey(unsigned int session_id, unsigned long process_id, unsigned int file_id)
{
! return (((cm_key_t) process_id) << 32) |
! (((cm_key_t) session_id) << 16) |
! (((cm_key_t) file_id));
}
static int cm_KeyEquals(cm_key_t k1, cm_key_t k2, int flags)
--- 4539,4554 ----
cm_key_t cm_GenerateKey(unsigned int session_id, unsigned long process_id, unsigned int file_id)
{
! #ifdef DEBUG
! osi_assert((process_id & 0xffffffff) == process_id);
! osi_assert((session_id & 0xffff) == session_id);
! osi_assert((file_id & 0xffff) == file_id);
! #endif
!
! return
! (((cm_key_t) (process_id & 0xffffffff)) << 32) |
! (((cm_key_t) (session_id & 0xffff)) << 16) |
! (((cm_key_t) (file_id & 0xffff)));
}
static int cm_KeyEquals(cm_key_t k1, cm_key_t k2, int flags)
Index: openafs/src/WINNT/afsd/cm_vnodeops.h
diff -c openafs/src/WINNT/afsd/cm_vnodeops.h:1.5.2.7 openafs/src/WINNT/afsd/cm_vnodeops.h:1.5.2.8
*** openafs/src/WINNT/afsd/cm_vnodeops.h:1.5.2.7 Tue Nov 8 22:05:34 2005
--- openafs/src/WINNT/afsd/cm_vnodeops.h Sun Jan 8 23:49:17 2006
***************
*** 12,17 ****
--- 12,19 ----
extern unsigned int cm_mountRootGen;
+ extern int cm_enableServerLocks;
+
/* parms for attribute setting call */
typedef struct cm_attr {
int mask;
***************
*** 150,156 ****
int allowWait, cm_user_t *userp, cm_req_t *reqp,
cm_file_lock_t **lockpp);
! #define CM_UNLOCK_BY_FID 1
extern long cm_UnlockByKey(cm_scache_t * scp,
cm_key_t key,
--- 152,158 ----
int allowWait, cm_user_t *userp, cm_req_t *reqp,
cm_file_lock_t **lockpp);
! #define CM_UNLOCK_BY_FID 0x0001
extern long cm_UnlockByKey(cm_scache_t * scp,
cm_key_t key,
Index: openafs/src/WINNT/afsd/smb.c
diff -c openafs/src/WINNT/afsd/smb.c:1.55.2.32 openafs/src/WINNT/afsd/smb.c:1.55.2.35
*** openafs/src/WINNT/afsd/smb.c:1.55.2.32 Mon Oct 24 22:09:05 2005
--- openafs/src/WINNT/afsd/smb.c Tue Jan 10 08:28:01 2006
***************
*** 918,923 ****
--- 918,1007 ----
lock_ReleaseWrite(&smb_rctLock);
}
+ void smb_CleanupDeadVC(smb_vc_t *vcp)
+ {
+ smb_fid_t *fidpIter;
+ smb_fid_t *fidpNext;
+ smb_fid_t *fidp;
+ unsigned short fid;
+ smb_tid_t *tidpIter;
+ smb_tid_t *tidpNext;
+ smb_tid_t *tidp;
+ unsigned short tid;
+ smb_user_t *userpIter;
+ smb_user_t *userpNext;
+ smb_user_t *userp;
+ unsigned short uid;
+
+ osi_Log1(smb_logp, "Cleaning up dead vcp 0x%x", vcp);
+
+ lock_ObtainRead(&smb_rctLock);
+ for (fidpIter = vcp->fidsp; fidpIter; fidpIter = fidpNext) {
+ fidpNext = (smb_fid_t *) osi_QNext(&fidpIter->q);
+
+ if (fidpIter->flags & SMB_FID_DELETE)
+ continue;
+
+ fid = fidpIter->fid;
+ osi_Log2(smb_logp, " Cleanup FID %d (fidp=0x%x)", fid, fidpIter);
+ lock_ReleaseRead(&smb_rctLock);
+
+ fidp = smb_FindFID(vcp, fid, 0);
+ osi_assert(fidp);
+ smb_CloseFID(vcp, fidp, NULL, 0);
+ smb_ReleaseFID(fidp);
+
+ lock_ObtainRead(&smb_rctLock);
+ }
+
+ for (tidpIter = vcp->tidsp; tidpIter; tidpIter = tidpNext) {
+ tidpNext = tidpIter->nextp;
+ if (tidpIter->flags & SMB_TIDFLAG_DELETE)
+ continue;
+
+ tid = tidpIter->tid;
+ osi_Log2(smb_logp, " Cleanup TID %d (tidp=0x%x)", tid, tidpIter);
+ lock_ReleaseRead(&smb_rctLock);
+
+ tidp = smb_FindTID(vcp, tid, 0);
+ osi_assert(tidp);
+
+ lock_ObtainMutex(&tidp->mx);
+ tidp->flags |= SMB_TIDFLAG_DELETE;
+ lock_ReleaseMutex(&tidp->mx);
+
+ smb_ReleaseTID(tidp);
+
+ lock_ObtainRead(&smb_rctLock);
+ }
+
+ for (userpIter = vcp->usersp; userpIter; userpIter = userpNext) {
+ userpNext = userpIter->nextp;
+
+ if (userpIter->flags & SMB_USERFLAG_DELETE)
+ continue;
+
+ uid = userpIter->userID;
+ osi_Log2(smb_logp, " Cleanup UID %d (userp=0x%x)", uid, userpIter);
+ lock_ReleaseRead(&smb_rctLock);
+
+ userp = smb_FindUID(vcp, uid, 0);
+ osi_assert(userp);
+
+ lock_ObtainMutex(&userp->mx);
+ userp->flags |= SMB_USERFLAG_DELETE;
+ lock_ReleaseMutex(&userp->mx);
+
+ smb_ReleaseUID(userp);
+
+ lock_ObtainRead(&smb_rctLock);
+ }
+
+ lock_ReleaseRead(&smb_rctLock);
+
+ osi_Log0(smb_logp, "Done cleaning up dead vcp");
+ }
+
smb_tid_t *smb_FindTID(smb_vc_t *vcp, unsigned short tid, int flags)
{
smb_tid_t *tidp;
***************
*** 1046,1058 ****
lock_ReleaseWrite(&smb_rctLock);
return uidp;
}
void smb_ReleaseUID(smb_user_t *uidp)
{
smb_user_t *up;
smb_user_t **lupp;
! cm_user_t *userp;
- userp = NULL;
lock_ObtainWrite(&smb_rctLock);
osi_assert(uidp->refCount-- > 0);
if (uidp->refCount == 0 && (uidp->flags & SMB_USERFLAG_DELETE)) {
--- 1130,1172 ----
lock_ReleaseWrite(&smb_rctLock);
return uidp;
}
+
+ void smb_ReleaseUsername(smb_username_t *unp)
+ {
+ smb_username_t *up;
+ smb_username_t **lupp;
+ cm_user_t *userp = NULL;
+
+ lock_ObtainWrite(&smb_rctLock);
+ osi_assert(unp->refCount-- > 0);
+ if (unp->refCount == 0) {
+ lupp = &usernamesp;
+ for(up = *lupp; up; lupp = &up->nextp, up = *lupp) {
+ if (up == unp)
+ break;
+ }
+ osi_assert(up != NULL);
+ *lupp = up->nextp;
+ lock_FinalizeMutex(&unp->mx);
+ userp = unp->userp;
+ free(unp->name);
+ free(unp->machine);
+ free(unp);
+ }
+ lock_ReleaseWrite(&smb_rctLock);
+
+ if (userp) {
+ cm_ReleaseUserVCRef(userp);
+ cm_ReleaseUser(userp);
+ }
+ }
+
void smb_ReleaseUID(smb_user_t *uidp)
{
smb_user_t *up;
smb_user_t **lupp;
! smb_username_t *unp = NULL;
lock_ObtainWrite(&smb_rctLock);
osi_assert(uidp->refCount-- > 0);
if (uidp->refCount == 0 && (uidp->flags & SMB_USERFLAG_DELETE)) {
***************
*** 1064,1083 ****
osi_assert(up != NULL);
*lupp = up->nextp;
lock_FinalizeMutex(&uidp->mx);
! if (uidp->unp) {
! userp = uidp->unp->userp; /* avoid deadlock by releasing */
! uidp->unp->userp = NULL; /* after releasing the lock */
! }
smb_ReleaseVCNoLock(uidp->vcp);
! uidp->vcp = NULL;
}
lock_ReleaseWrite(&smb_rctLock);
- if (userp) {
- cm_ReleaseUserVCRef(userp);
- cm_ReleaseUser(userp);
- }
- }
/* retrieve a held reference to a user structure corresponding to an incoming
* request.
--- 1178,1192 ----
osi_assert(up != NULL);
*lupp = up->nextp;
lock_FinalizeMutex(&uidp->mx);
! unp = uidp->unp;
smb_ReleaseVCNoLock(uidp->vcp);
! free(uidp);
}
lock_ReleaseWrite(&smb_rctLock);
+ if (unp)
+ smb_ReleaseUsername(unp);
+ }
/* retrieve a held reference to a user structure corresponding to an incoming
* request.
***************
*** 1170,1177 ****
if (fid == fidp->fid) {
if (newFid) {
fid++;
! if (fid == 0)
fid = 1;
goto retry;
}
fidp->refCount++;
--- 1279,1289 ----
if (fid == fidp->fid) {
if (newFid) {
fid++;
! if (fid == 0) {
! osi_Log1(smb_logp,
! "New FID number wraps on vcp 0x%x", vcp);
fid = 1;
+ }
goto retry;
}
fidp->refCount++;
***************
*** 1188,1195 ****
osi_Log1(smb_logp, "Event Object Already Exists: %s", osi_LogSaveString(smb_logp, eventName));
thrd_CloseHandle(event);
fid++;
! if (fid == 0)
fid = 1;
goto retry;
}
--- 1300,1309 ----
osi_Log1(smb_logp, "Event Object Already Exists: %s", osi_LogSaveString(smb_logp, eventName));
thrd_CloseHandle(event);
fid++;
! if (fid == 0) {
! osi_Log1(smb_logp, "New FID wraps around for vcp 0x%x", vcp);
fid = 1;
+ }
goto retry;
}
***************
*** 1205,1214 ****
fidp->raw_write_event = event;
if (newFid) {
vcp->fidCounter = fid+1;
! if (vcp->fidCounter == 0)
vcp->fidCounter = 1;
}
}
lock_ReleaseWrite(&smb_rctLock);
return fidp;
--- 1319,1331 ----
fidp->raw_write_event = event;
if (newFid) {
vcp->fidCounter = fid+1;
! if (vcp->fidCounter == 0) {
! osi_Log1(smb_logp, "fidCounter wrapped around for vcp 0x%x",
! vcp);
vcp->fidCounter = 1;
}
}
+ }
lock_ReleaseWrite(&smb_rctLock);
return fidp;
***************
*** 1217,1222 ****
--- 1334,1340 ----
void smb_ReleaseFID(smb_fid_t *fidp)
{
cm_scache_t *scp;
+ cm_user_t *userp;
smb_vc_t *vcp = NULL;
smb_ioctl_t *ioctlp;
***************
*** 1224,1236 ****
return;
scp = NULL;
lock_ObtainWrite(&smb_rctLock);
osi_assert(fidp->refCount-- > 0);
if (fidp->refCount == 0 && (fidp->flags & SMB_FID_DELETE)) {
vcp = fidp->vcp;
! fidp->vcp = 0;
scp = fidp->scp; /* release after lock is released */
! fidp->scp = 0;
osi_QRemove((osi_queue_t **) &vcp->fidsp, &fidp->q);
thrd_CloseHandle(fidp->raw_write_event);
--- 1342,1357 ----
return;
scp = NULL;
+ userp = NULL;
lock_ObtainWrite(&smb_rctLock);
osi_assert(fidp->refCount-- > 0);
if (fidp->refCount == 0 && (fidp->flags & SMB_FID_DELETE)) {
vcp = fidp->vcp;
! fidp->vcp = NULL;
scp = fidp->scp; /* release after lock is released */
! fidp->scp = NULL;
! userp = fidp->userp;
! fidp->userp = NULL;
osi_QRemove((osi_queue_t **) &vcp->fidsp, &fidp->q);
thrd_CloseHandle(fidp->raw_write_event);
***************
*** 1256,1261 ****
--- 1377,1385 ----
/* now release the scache structure */
if (scp)
cm_ReleaseSCache(scp);
+
+ if (userp)
+ cm_ReleaseUser(userp);
}
/*
***************
*** 3117,3124 ****
osi_SleepW((long)&smb_allWaitingLocks, &smb_globalLock);
thrd_Sleep(1000);
continue;
! } else
first = 1;
do {
if (first)
--- 3241,3250 ----
osi_SleepW((long)&smb_allWaitingLocks, &smb_globalLock);
thrd_Sleep(1000);
continue;
! } else {
first = 1;
+ osi_Log0(smb_logp, "smb_WaitingLocksDaemon starting wait lock check");
+ }
do {
if (first)
***************
*** 3126,3131 ****
--- 3252,3259 ----
else
lock_ObtainWrite(&smb_globalLock);
+ osi_Log1(smb_logp, " Checking waiting lock request %p", nwlRequest);
+
wlRequest = nwlRequest;
nwlRequest = (smb_waitingLockRequest_t *) osi_QNext(&wlRequest->q);
lock_ReleaseWrite(&smb_globalLock);
***************
*** 3135,3140 ****
--- 3263,3270 ----
for (wl = wlRequest->locks; wl; wl = (smb_waitingLock_t *) osi_QNext(&wl->q)) {
if (wl->state == SMB_WAITINGLOCKSTATE_DONE)
continue;
+
+ osi_assert(wl->state != SMB_WAITINGLOCKSTATE_ERROR);
/* wl->state is either _DONE or _WAITING. _ERROR
would no longer be on the queue. */
***************
*** 3165,3170 ****
--- 3295,3303 ----
cm_scache_t * scp;
cm_req_t req;
+ osi_Log1(smb_logp, "smb_WaitingLocksDaemon discarding lock req %p",
+ wlRequest);
+
scp = wlRequest->scp;
cm_InitReq(&req);
***************
*** 3185,3190 ****
--- 3318,3327 ----
lock_ReleaseMutex(&scp->mx);
} else {
+
+ osi_Log1(smb_logp, "smb_WaitingLocksDaemon granting lock req %p",
+ wlRequest);
+
for (wl = wlRequest->locks; wl; wl = wlNext) {
wlNext = (smb_waitingLock_t *) osi_QNext(&wl->q);
osi_QRemove((osi_queue_t **) &wlRequest->locks, &wl->q);
***************
*** 4574,4579 ****
--- 4711,4719 ----
/* save a pointer to the vnode */
fidp->scp = scp;
+ /* and the user */
+ cm_HoldUser(userp);
+ fidp->userp = userp;
if ((share & 0xf) == 0)
fidp->flags |= SMB_FID_OPENREAD;
***************
*** 5385,5413 ****
*newPathp = strdup(pathp);
}
! long smb_ReceiveCoreClose(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp)
! {
! unsigned short fid;
! smb_fid_t *fidp;
! cm_user_t *userp;
! afs_uint32 dosTime;
long code = 0;
cm_req_t req;
! cm_InitReq(&req);
!
! fid = smb_GetSMBParm(inp, 0);
! dosTime = smb_GetSMBParm(inp, 1) | (smb_GetSMBParm(inp, 2) << 16);
!
! osi_Log1(smb_logp, "SMB close fid %d", fid);
! fid = smb_ChainFID(fid, inp);
! fidp = smb_FindFID(vcp, fid, 0);
! if (!fidp) {
return CM_ERROR_BADFD;
}
! userp = smb_GetUser(vcp, inp);
lock_ObtainMutex(&fidp->mx);
--- 5525,5549 ----
*newPathp = strdup(pathp);
}
! long smb_CloseFID(smb_vc_t *vcp, smb_fid_t *fidp, cm_user_t *userp,
! afs_uint32 dosTime) {
long code = 0;
cm_req_t req;
! osi_Log3(smb_logp, "smb_CloseFID Closing fidp 0x%x (fid=%d vcp=0x%x)",
! fidp, fidp->fid, vcp);
! if (!userp) {
! if (!fidp->userp) {
! osi_Log0(smb_logp, " No user specified. Not closing fid");
return CM_ERROR_BADFD;
}
! userp = fidp->userp; /* no hold required since fidp is held
! throughout the function */
! }
!
! cm_InitReq(&req);
lock_ObtainMutex(&fidp->mx);
***************
*** 5439,5450 ****
if (!(fidp->flags & SMB_FID_IOCTL) && fidp->scp &&
fidp->scp->fileType == CM_SCACHETYPE_FILE) {
cm_key_t key;
- unsigned pid;
cm_scache_t * scp;
long tcode;
! pid = ((smb_t *) inp)->pid;
! key = cm_GenerateKey(vcp->vcID, pid, fid);
scp = fidp->scp;
cm_HoldSCache(scp);
lock_ObtainMutex(&scp->mx);
--- 5575,5586 ----
if (!(fidp->flags & SMB_FID_IOCTL) && fidp->scp &&
fidp->scp->fileType == CM_SCACHETYPE_FILE) {
cm_key_t key;
cm_scache_t * scp;
long tcode;
! /* CM_UNLOCK_BY_FID doesn't look at the process ID. We pass
! in zero. */
! key = cm_GenerateKey(vcp->vcID, 0, fidp->fid);
scp = fidp->scp;
cm_HoldSCache(scp);
lock_ObtainMutex(&scp->mx);
***************
*** 5455,5461 ****
| CM_SCACHESYNC_LOCK);
if (tcode) {
! osi_Log1(smb_logp, "smb CoreClose SyncOp failure code 0x%x", tcode);
goto post_syncopdone;
}
--- 5591,5598 ----
| CM_SCACHESYNC_LOCK);
if (tcode) {
! osi_Log1(smb_logp,
! "smb CoreClose SyncOp failure code 0x%x", tcode);
goto post_syncopdone;
}
***************
*** 5481,5489 ****
smb_NotifyChange(FILE_ACTION_REMOVED,
FILE_NOTIFY_CHANGE_DIR_NAME,
dscp, fullPathp, NULL, TRUE);
! }
! else
! {
code = cm_Unlink(dscp, fullPathp, userp, &req);
if (code == 0 && (dscp->flags & CM_SCACHEFLAG_ANYWATCH))
smb_NotifyChange(FILE_ACTION_REMOVED,
--- 5618,5624 ----
smb_NotifyChange(FILE_ACTION_REMOVED,
FILE_NOTIFY_CHANGE_DIR_NAME,
dscp, fullPathp, NULL, TRUE);
! } else {
code = cm_Unlink(dscp, fullPathp, userp, &req);
if (code == 0 && (dscp->flags & CM_SCACHEFLAG_ANYWATCH))
smb_NotifyChange(FILE_ACTION_REMOVED,
***************
*** 5497,5505 ****
if (fidp->flags & SMB_FID_NTOPEN) {
cm_ReleaseSCache(fidp->NTopen_dscp);
free(fidp->NTopen_pathp);
}
! if (fidp->NTopen_wholepathp)
free(fidp->NTopen_wholepathp);
smb_ReleaseFID(fidp);
cm_ReleaseUser(userp);
--- 5632,5669 ----
if (fidp->flags & SMB_FID_NTOPEN) {
cm_ReleaseSCache(fidp->NTopen_dscp);
free(fidp->NTopen_pathp);
+ fidp->NTopen_pathp = NULL;
}
! if (fidp->NTopen_wholepathp) {
free(fidp->NTopen_wholepathp);
+ fidp->NTopen_wholepathp = NULL;
+ }
+
+ return code;
+ }
+
+ long smb_ReceiveCoreClose(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp)
+ {
+ unsigned short fid;
+ smb_fid_t *fidp;
+ cm_user_t *userp;
+ long code = 0;
+ afs_uint32 dosTime;
+
+ fid = smb_GetSMBParm(inp, 0);
+ dosTime = smb_GetSMBParm(inp, 1) | (smb_GetSMBParm(inp, 2) << 16);
+
+ osi_Log1(smb_logp, "SMB ReceiveCoreClose fid %d", fid);
+
+ fid = smb_ChainFID(fid, inp);
+ fidp = smb_FindFID(vcp, fid, 0);
+ if (!fidp) {
+ return CM_ERROR_BADFD;
+ }
+
+ userp = smb_GetUser(vcp, inp);
+
+ code = smb_CloseFID(vcp, fidp, userp, dosTime);
smb_ReleaseFID(fidp);
cm_ReleaseUser(userp);
***************
*** 5759,5765 ****
/* handle over quota or out of space */
if (scp->flags & (CM_SCACHEFLAG_OVERQUOTA | CM_SCACHEFLAG_OUTOFSPACE)) {
*writtenp = written;
! code = CM_ERROR_QUOTA;
break;
}
--- 5923,5929 ----
/* handle over quota or out of space */
if (scp->flags & (CM_SCACHEFLAG_OVERQUOTA | CM_SCACHEFLAG_OUTOFSPACE)) {
*writtenp = written;
! code = (scp->flags & CM_SCACHEFLAG_OVERQUOTA) ? CM_ERROR_QUOTA : CM_ERROR_SPACE;
break;
}
***************
*** 6617,6622 ****
--- 6781,6789 ----
/* save a pointer to the vnode */
fidp->scp = scp;
+ /* and the user */
+ cm_HoldUser(userp);
+ fidp->userp = userp;
/* always create it open for read/write */
fidp->flags |= (SMB_FID_OPENREAD | SMB_FID_OPENWRITE);
***************
*** 7392,7397 ****
--- 7559,7565 ----
case NRC_SCLOSED:
case NRC_SNUMOUT:
+ case NRC_SABORT:
/* Client closed session */
dead_sessions[idx_session] = TRUE;
if (vcp)
***************
*** 7419,7424 ****
--- 7587,7595 ----
dead_vcp = vcp;
vcp->flags |= SMB_VCFLAG_ALREADYDEAD;
}
+
+ smb_CleanupDeadVC(vcp);
+
if (vcp->justLoggedOut) {
loggedOut = 1;
loggedOutTime = vcp->logoffTime;
Index: openafs/src/WINNT/afsd/smb.h
diff -c openafs/src/WINNT/afsd/smb.h:1.14.2.13 openafs/src/WINNT/afsd/smb.h:1.14.2.16
*** openafs/src/WINNT/afsd/smb.h:1.14.2.13 Wed Oct 5 01:12:28 2005
--- openafs/src/WINNT/afsd/smb.h Tue Jan 10 08:28:02 2006
***************
*** 230,236 ****
unsigned long refCount; /* ref count */
long flags; /* flags; locked by mx */
osi_mutex_t mx;
! long userID; /* the session identifier */
struct smb_vc *vcp; /* back ptr to virtual circuit */
struct smb_username *unp; /* user name struct */
} smb_user_t;
--- 230,236 ----
unsigned long refCount; /* ref count */
long flags; /* flags; locked by mx */
osi_mutex_t mx;
! unsigned short userID; /* the session identifier */
struct smb_vc *vcp; /* back ptr to virtual circuit */
struct smb_username *unp; /* user name struct */
} smb_user_t;
***************
*** 315,320 ****
--- 315,324 ----
unsigned short fid; /* the file ID */
struct smb_vc *vcp; /* back ptr */
struct cm_scache *scp; /* scache of open file */
+ struct cm_user *userp; /* user that opened the file
+ originally (used to close
+ the file if session is
+ terminated) */
long offset; /* our file pointer */
smb_ioctl_t *ioctlp; /* ptr to ioctl structure */
/* Under NT, we may need to know the
***************
*** 338,343 ****
--- 342,348 ----
* magic ioctl file */
#define SMB_FID_OPENDELETE 0x10 /* open for deletion (NT) */
#define SMB_FID_DELONCLOSE 0x20 /* marked for deletion */
+
/*
* Now some special flags to work around a bug in NT Client
*/
***************
*** 500,505 ****
--- 505,512 ----
extern smb_user_t *smb_FindUserByNameThisSession(smb_vc_t *vcp, char *usern);
+ extern void smb_ReleaseUsername(smb_username_t *unp);
+
extern void smb_ReleaseUID(smb_user_t *uidp);
extern cm_user_t *smb_GetUser(smb_vc_t *vcp, smb_packet_t *inp);
***************
*** 510,515 ****
--- 517,525 ----
extern void smb_ReleaseFID(smb_fid_t *fidp);
+ extern long smb_CloseFID(smb_vc_t *vcp, smb_fid_t *fidp, cm_user_t *userp,
+ afs_uint32 dosTime);
+
extern int smb_FindShare(smb_vc_t *vcp, smb_user_t *uidp, char *shareName, char **pathNamep);
extern int smb_FindShareCSCPolicy(char *shareName);
Index: openafs/src/WINNT/afsd/smb3.c
diff -c openafs/src/WINNT/afsd/smb3.c:1.42.2.33 openafs/src/WINNT/afsd/smb3.c:1.42.2.35
*** openafs/src/WINNT/afsd/smb3.c:1.42.2.33 Mon Oct 24 22:09:06 2005
--- openafs/src/WINNT/afsd/smb3.c Tue Jan 10 08:28:02 2006
***************
*** 842,848 ****
if (uidp) { /* already there, so don't create a new one */
unp = uidp->unp;
userp = unp->userp;
! newUid = (unsigned short)uidp->userID; /* For some reason these are different types!*/
osi_LogEvent("AFS smb_ReceiveV3SessionSetupX",NULL,"FindUserByName:Lana[%d],lsn[%d],userid[%d],name[%s]",vcp->lana,vcp->lsn,newUid,osi_LogSaveString(smb_logp, usern));
osi_Log3(smb_logp,"smb_ReceiveV3SessionSetupX FindUserByName:Lana[%d],lsn[%d],userid[%d]",vcp->lana,vcp->lsn,newUid);
smb_ReleaseUID(uidp);
--- 842,848 ----
if (uidp) { /* already there, so don't create a new one */
unp = uidp->unp;
userp = unp->userp;
! newUid = uidp->userID;
osi_LogEvent("AFS smb_ReceiveV3SessionSetupX",NULL,"FindUserByName:Lana[%d],lsn[%d],userid[%d],name[%s]",vcp->lana,vcp->lsn,newUid,osi_LogSaveString(smb_logp, usern));
osi_Log3(smb_logp,"smb_ReceiveV3SessionSetupX FindUserByName:Lana[%d],lsn[%d],userid[%d]",vcp->lana,vcp->lsn,newUid);
smb_ReleaseUID(uidp);
***************
*** 2364,2369 ****
--- 2364,2372 ----
/* save a pointer to the vnode */
fidp->scp = scp;
+ /* and the user */
+ cm_HoldUser(userp);
+ fidp->userp = userp;
/* compute open mode */
if (openMode != 1) fidp->flags |= SMB_FID_OPENREAD;
***************
*** 4742,4747 ****
--- 4745,4753 ----
/* save a pointer to the vnode */
fidp->scp = scp;
+ /* also the user */
+ cm_HoldUser(userp);
+ fidp->userp = userp;
/* compute open mode */
if (openMode != 1)
***************
*** 5931,5936 ****
--- 5937,5946 ----
fidp = smb_FindFID(vcp, 0, SMB_FLAG_CREATE);
osi_assert(fidp);
+ /* save a reference to the user */
+ cm_HoldUser(userp);
+ fidp->userp = userp;
+
/* If we are restricting sharing, we should do so with a suitable
share lock. */
if (scp->fileType == CM_SCACHETYPE_FILE &&
***************
*** 6519,6524 ****
--- 6529,6538 ----
fidp = smb_FindFID(vcp, 0, SMB_FLAG_CREATE);
osi_assert(fidp);
+ /* save a reference to the user */
+ cm_HoldUser(userp);
+ fidp->userp = userp;
+
/* If we are restricting sharing, we should do so with a suitable
share lock. */
if (scp->fileType == CM_SCACHETYPE_FILE &&
***************
*** 7159,7167 ****
lock_InitializeMutex(&smb_Dir_Watch_Lock, "Directory Watch List Lock");
}
! cm_user_t *smb_FindCMUserByName(/*smb_vc_t *vcp,*/ char *usern, char *machine)
{
- /*int newUid;*/
smb_username_t *unp;
unp = smb_FindUserByName(usern, machine, SMB_FLAG_CREATE);
--- 7173,7180 ----
lock_InitializeMutex(&smb_Dir_Watch_Lock, "Directory Watch List Lock");
}
! cm_user_t *smb_FindCMUserByName(char *usern, char *machine)
{
smb_username_t *unp;
unp = smb_FindUserByName(usern, machine, SMB_FLAG_CREATE);
***************
*** 7174,7180 ****
} else {
osi_Log2(smb_logp,"smb_FindCMUserByName Not found name[%s] machine[%s]",osi_LogSaveString(smb_logp,usern),osi_LogSaveString(smb_logp,machine));
osi_LogEvent("AFS smb_FindCMUserByName : Found",NULL,"name[%s] machine[%s]",usern,machine);
! }
return unp->userp;
}
--- 7187,7195 ----
} else {
osi_Log2(smb_logp,"smb_FindCMUserByName Not found name[%s] machine[%s]",osi_LogSaveString(smb_logp,usern),osi_LogSaveString(smb_logp,machine));
osi_LogEvent("AFS smb_FindCMUserByName : Found",NULL,"name[%s] machine[%s]",usern,machine);
! }
! cm_HoldUser(unp->userp);
! smb_ReleaseUsername(unp);
return unp->userp;
}
Index: openafs/src/WINNT/doc/install/Documentation/en_US/html/ReleaseNotes/frames.htm
diff -c openafs/src/WINNT/doc/install/Documentation/en_US/html/ReleaseNotes/frames.htm:1.1.2.3 openafs/src/WINNT/doc/install/Documentation/en_US/html/ReleaseNotes/frames.htm:1.1.2.4
*** openafs/src/WINNT/doc/install/Documentation/en_US/html/ReleaseNotes/frames.htm:1.1.2.3 Wed Nov 30 02:13:12 2005
--- openafs/src/WINNT/doc/install/Documentation/en_US/html/ReleaseNotes/frames.htm Mon Jan 9 00:29:23 2006
***************
*** 8,22 ****
! OpenAFS for Windows 1.4.0 Release Notes
!
There are two things to consider when using a Microsoft
Windows Active Directory as the Kerberos realm that issues the AFS service
--- 3609,3616 ----
style='mso-element:field-begin'>
There are two things to consider when using a Microsoft
Windows Active Directory as the Kerberos realm that issues the AFS service
***************
*** 2843,2850 ****
style='mso-spacerun:yes'> XE "DES enctypes"
Some organizations which have AFS cell names and Kerberos
realm names which differ by more then just lower and upper case rely on a
--- 3631,3638 ----
style='mso-spacerun:yes'> XE "DES enctypes"
Some organizations which have AFS cell names and Kerberos
realm names which differ by more then just lower and upper case rely on a
***************
*** 2871,2880 ****
and the principal names placed into the ACL’s are not the principal names from
the Kerberos 5 ticket.To support this
transition, OpenAFS for Windows 1.4 adds a new registry value, Use524, to force the use of krb524d.However, the availability of this option
! should only be used by individuals until such time as their organizations can
! provide a more permanent solution.
--- 3883,3896 ----
into the default ccache within the user logon session.
Integrated Logon does not have the ability to cache the
! user's username and password for the purpose of obtaining tokens if the
! Kerberos KDC is inaccessible at logon time.
Integrated Login supports the ability to obtain tokens for
multiple cells.For further information
on how to configure this feature read the TheseCells value in Appendix A.
***************
*** 3125,3132 ****
-M = renew
drive maps
!
-N = IP
! address change detection
-Q = quiet
mode.do not display start service
--- 3913,3920 ----
-M = renew
drive maps
!
-N = IP address
! change detection
-Q = quiet
mode.do not display start service
***************
*** 3149,3160 ****
autoinit will result in automated attempts to acquire AFS
tokens when afscreds.exe is started.
! afscreds.exe will attempt to utilize tickets stored in the MSLSA credentials
! cache; any existing CCAPI credentials cache; and finally display an Obtain
! Tokens dialog to the user.When used in
! combination with IP address change detection, afscreds.exe will attempt to
! acquire AFS tokens whenever the IP address list changes and the Kerberos KDC is
! accessible.
The renew drive maps option is used to ensure that the user
drive maps constructed via the OpenAFS tools (not NET USE) are re-constructed
--- 3937,3948 ----
autoinit will result in automated attempts to acquire AFS
tokens when afscreds.exe is started.
! afscreds.exe will attempt to utilize tickets stored in the MSLSA
! credentials cache; any existing CCAPI credentials cache; and finally display an
! Obtain Tokens dialog to the user.When
! used in combination with IP address change detection, afscreds.exe will attempt
! to acquire AFS tokens whenever the IP address list changes and the Kerberos KDC
! is accessible.
The renew drive maps option is used to ensure that the user
drive maps constructed via the OpenAFS tools (not NET USE) are re-constructed
***************
*** 3166,3173 ****
change this selection after install time although these options may be altered
via the registry on either per machine or per user basis.See AfscredsShortcutParams in Appendix A.
--- 3954,3961 ----
change this selection after install time although these options may be altered
via the registry on either per machine or per user basis.See AfscredsShortcutParams
! in Appendix A.
***************
*** 3177,3253 ****
The OpenAFS for Windows 1.4 client supports a local Windows
authorization group named "AFS Client Admins".This group is used in place of the
! "Administrators" group to determine which users are allowed to modify
! the AFS Client Service configuration via the AFS Control Panel (afs_config.exe)
! or fs.exe command line tool.The
! following fs.exe commands are now restricted to members of the "AFS Client
! Admins" group:
·checkservers
with a non-zero timer value
·setcachesize
·newcell
·sysname
with a new sysname list
·exportafs
·setcell
·setserverprefs
·storebehind
·setcrypt
·cscpolicy
·trace
--- 3965,4040 ----
The OpenAFS for Windows 1.4 client supports a local Windows
authorization group named "AFS Client Admins".This group is used in place of the "Administrators"
! group to determine which users are allowed to modify the AFS Client Service
! configuration via the AFS Control Panel (afs_config.exe) or fs.exe command line
! tool.The following fs.exe commands are
! now restricted to members of the "AFS Client Admins" group:
·checkservers
with a non-zero timer value
·setcachesize
·newcell
·sysname
with a new sysname list
·exportafs
·setcell
·setserverprefs
·storebehind
·setcrypt
·cscpolicy
·trace
***************
*** 3262,3276 ****
user is added to the "Administrators" group after the creation of the
"AFS Client Admin" group, that user will not be an AFS Client
Administrator.Only users that are
! members of the "AFS Client Admins" group are AFS Client
! Administrators.The local
! "SYSTEM" account is an implicit member of the "AFS Client
! Admins" group.
Setting the default sysname for a machine should be done via
! the registry and not via "fs
! sysname".
--- 4215,4222 ----
OpenAFS for Windows does not support files larger than
2GB.The version of the SMB/CIFS
protocol implemented imposes this limitation.
! Upgrading the SMB/CIFS implementation or replacing it with an
! Installable File System will allow larger files to be supported.
The OpenAFS for Windows installer by default activates a
! weak form of encrypted data transfer between the AFS client and the AFS servers.This is often referred to as
"fcrypt" mode.
The OpenAFS for Windows installer by default activates a
! weak form of encrypted data transfer between the AFS client and the AFS
! servers.This is often referred to as
"fcrypt" mode.
Previous AFS clients for Windows stored configuration data
! in Windows .INI files.OpenAFS 1.4 does
not use Windows .INI files for the storage of configuration data.All settings are now stored in the registry
! (see Appendix A).The CellServDB file is now stored in the
! %PROGRAMFILES%\OpenAFS\Client directory.
! The CellServDBDir registry value can be
! used to specify an alternative location.
OpenAFS 1.4 will relocate the contents of the “afsdcell.ini”
file to the new CellServDB file.OpenAFS
--- 4257,4271 ----
Files
Previous AFS clients for Windows stored configuration data
! in Windows .INI files. OpenAFS 1.4 does
not use Windows .INI files for the storage of configuration data.All settings are now stored in the registry
! (see Appendix
! A).The CellServDB file is now
! stored in the %PROGRAMFILES%\OpenAFS\Client directory.The CellServDBDir
! registry value can be used to specify an alternative location.
OpenAFS 1.4 will relocate the contents of the “afsdcell.ini”
file to the new CellServDB file.OpenAFS
***************
*** 3500,3507 ****
authentication to be performed across the Microsoft Loopback Adapter.
The OpenAFS 1.4 Client Service implements the CIFS Remote
Admin Protocol which allows Explorer to browse server and share information.
--- 4286,4293 ----
authentication to be performed across the Microsoft Loopback Adapter.
The OpenAFS 1.4 Client Service implements the CIFS Remote
Admin Protocol which allows Explorer to browse server and share information.
***************
*** 3517,3547 ****
style='mso-bookmark:_Toc115417060'>
Locking
!
Many applications on Windows (e.g. Microsoft Office) require
! the use of byte range locks applied to a file either to protect against
simultaneous file access or as a signaling mechanism.As of 1.4.1, OpenAFS for Windows utilizes
! AFS' advisory locks to simulate Microsoft Windows mandatory locks.When an application opens a file, a lock
! will be placed in AFS indicating that the file is in use.If the lock is a write lock, the use of the
! file will be restricted to other applications running on the same machine as
! the first application to apply the lock.
! Applications running on other machines will see the full lock and will
! be unable to access the file.
!
!
Most Windows applications and Windows itself opens files in
! shared read mode. When this is done, a read lock is applied to the file.This does not prevent shared read access
! across multiple machines but is used to ensure that no one writes to the file
! while it is in use.
!
!
As locks are checked and applied during the file open
! operation, it is crucial that users have the locking 'k' privilege in all
! directories in which the user might read a file or execute an application
! unless the directory exists on a read only volume.A failure to assign the 'k' privilege will
! result in "Access Denied" errors during file open.
Many applications on Windows (e.g. Microsoft Office)
! require the use of byte range locks applied to a file either to protect against
simultaneous file access or as a signaling mechanism.OpenAFS implements byte range locking local
! to the machine.OpenAFS does not obtain
! file locks on the server.It is
! strongly recommended that files not be edited within AFS if they might be
! accessed by multiple users or multiple processes on more than one machine at
! the same time.
!
!
Note:
! In a future release, OpenAFS for Windows will utilize
! AFS' advisory locks to simulate Microsoft Windows mandatory locks.
! When an application opens a file, a lock will be placed in AFS indicating that
! the file is in use. If the lock is a write lock, the use of the file will
! be restricted to other applications running on the same machine as the first
! application to apply the lock. Applications running on other
! machines will see the full lock and will be unable to access the file.
!
!
Most Windows
! applications and Windows itself opens files in shared read mode. When this is
! done, a read lock is applied to the file. This does not prevent
! shared read access across multiple machines but is used to ensure that no one
! writes to the file while it is in use.
!
!
As locks are checked and applied during the file open operation, it is
! crucial that users have the locking 'k' privilege in all directories in which
! the user might read a file or execute an application unless the directory
! exists on a read only volume. A failure to assign the 'k' privilege will
! result in "Access Denied" errors during file open.
Appendix A
! documents the "VerifyServiceSignature"
registry value which can be used to disable the signature check.The file version check cannot be disabled.
--- 4427,4436 ----
mixture of files from different releases.
!
Appendix A
! documents the "VerifyServiceSignature"
registry value which can be used to disable the signature check.The file version check cannot be disabled.
***************
*** 3836,3856 ****
OpenAFS 1.4 provides an optional registry value, StoreAnsiFilenames, that can be
! set to instruct OpenAFS to store filenames using the ANSI Code Page instead of
! the OEM Code Page.The ANSI Code Page is
! a compatible superset of Latin-1.This
! setting is not the default setting because making this change would prevent
! OpenAFS for Windows from being able to access filenames containing the above
! characters which were created without this setting.
There is a known issue with storing Windows Roaming Profiles
! when the profile contains either directories or files with names which cannot be
! represented in the local OEM character set.In this case, attempts to write the profile back to AFS will fail.OpenAFS for Windows does not currently
support UNICODE.To avoid this problem
--- 4637,4657 ----
OpenAFS 1.4 provides an optional registry value, StoreAnsiFilenames,
! that can be set to instruct OpenAFS to store filenames using the ANSI Code Page
! instead of the OEM Code Page.The ANSI
! Code Page is a compatible superset of Latin-1.
! This setting is not the default setting because making this change would
! prevent OpenAFS for Windows from being able to access filenames containing the
! above characters which were created without this setting.
There is a known issue with storing Windows Roaming Profiles
! when the profile contains either directories or files with names which cannot
! be represented in the local OEM character set.In this case, attempts to write the profile back to AFS will fail.OpenAFS for Windows does not currently
support UNICODE.To avoid this problem
***************
*** 3862,3869 ****
AFSCache File
The AFS Cache file is stored by default at %TEMP%\AFSCache
! in a persistent file marked with the Hidden and System attributes.The persistent nature of the data stored in
the cache file improves the performance of OpenAFS by reducing the number of
times data must be read from the AFS file servers.
--- 4663,4670 ----
AFSCache File
The AFS Cache file is stored by default at %TEMP%\AFSCache
! in a persistent file marked with the Hidden and System attributes. The persistent nature of the data stored in
the cache file improves the performance of OpenAFS by reducing the number of
times data must be read from the AFS file servers.
***************
*** 3919,3930 ****
In OpenAFS 1.4, symlinks to AFS UNC paths, \\AFS[\all]\...,
are treated the same as symlinks to /afs/...
! However, please use /afs/... as the Windows UNC form will not work on
! UNIX.
OpenAFS for Windows 1.4 implements the Cache Manager
Debugging RPC Interface.The CM debugger
--- 4720,4730 ----
In OpenAFS 1.4, symlinks to AFS UNC paths, \\AFS[\all]\...,
are treated the same as symlinks to /afs/...
! However, please use /afs/... as the Windows UNC form will not work on UNIX.
OpenAFS for Windows 1.4 implements the Cache Manager
Debugging RPC Interface.The CM debugger
***************
*** 3963,3970 ****
values using registry keys.This is
useful for managed machines in a Windows domain which are centrally located
(e.g., in a computing lab.)See Appendix A for details on the "Server Preferences" keys.
OpenAFS for Windows provides a wide range of tools to assist
! you in debugging problems.The techniques
! available to you are varied because of the wide range of issues that have been
! discovered over the years.
--- 4846,4859 ----
Problems with OpenAFS for Windows:
OpenAFS for Windows provides a wide range of tools to assist
! you in debugging problems.The
! techniques available to you are varied because of the wide range of issues that
! have been discovered over the years.
·setting/querying
***************
*** 4159,4168 ****
code will quickly reveal the reason for the termination.
The MaxLogSize registry value determines the
! maximum size of the %WINDIR%\TEMP\afsd_init.log file.If the file is larger than this value when
! OpenAFS Client Service starts, the file will be reset to 0 bytes.If value is set to 0, the file will be
allowed to grow indefinitely.
--- 4961,4970 ----
code will quickly reveal the reason for the termination.
The MaxLogSize
! registry value determines the maximum size of the %WINDIR%\TEMP\afsd_init.log
! file.If the file is larger than this
! value when OpenAFS Client Service starts, the file will be reset to 0 bytes.If value is set to 0, the file will be
allowed to grow indefinitely.
***************
*** 4176,4182 ****
Client Service keeps an in memory log of many of its actions.The default number of actions preserved at
any one time is 5000.This can be
! adjusted with the registry value:
--- 4978,4985 ----
Client Service keeps an in memory log of many of its actions.The default number of actions preserved at
any one time is 5000.This can be
! adjusted with the registry
! value:
***************
*** 4193,4205 ****
name="_Toc115416149">4.4. Using
SysInternal’s DbgView and FileMon Tools
!
An alternatve option to the use of "fs trace
! -dump" to capture internal OpenAFS Client Service events is to use a tool
! such as Sysinternal's DbgView to capture real-time debugging output.When the OpenAFS Client Service starts and
! Bit 2 of the TraceOption value in the
! registry is set, all trace log events are output using the Windows Debug
! Monitor interface (OutputDebugString).
--- 4996,5009 ----
name="_Toc115416149">4.4. Using
SysInternal’s DbgView and FileMon Tools
!
An alternatve option to the use of "fs trace -dump"
! to capture internal OpenAFS Client Service events is to use a tool such as
! Sysinternal's DbgView to capture real-time debugging output.When the OpenAFS Client Service starts and Bit
! 2 of the TraceOption
! value in the registry is set, all trace log events are output using the Windows
! Debug Monitor interface (OutputDebugString).
!
If you are having trouble with the Integrated Logon
operations it is often useful to be able to obtain a log of what it is
attempting to do.Setting Bit 0 of the TraceOption registry value:
If you are having trouble with the Integrated Logon
operations it is often useful to be able to obtain a log of what it is
attempting to do.Setting Bit 0 of the TraceOption registry
! value:
! -refcountsprint only cache
! entries with positive reference counts
-callbacksprint only cache
entries with callbacks
! -addrsprint only host interfaces
-cacheprint only cache
--- 5135,5150 ----
print all info
! -refcountsprint only cache entries
! with positive reference counts
-callbacksprint only cache
entries with callbacks
! -addrsprint only host
! interfaces
-cacheprint only cache
***************
*** 4368,4381 ****
for the problem, %WINDIR%\TEMP\afsd.dmp, include it along with the AFS Client
Trace file%WINDIR%\TEMP\afsd.log.The AFS Client startup log is
! %WINDIR%\TEMP\afsd_init.log.Send the last
! continuous block oflog information from
! this file.
Configuring DrWatson to generate dump files for crashes:
·Run
--- 5175,5188 ----
for the problem, %WINDIR%\TEMP\afsd.dmp, include it along with the AFS Client
Trace file%WINDIR%\TEMP\afsd.log.The AFS Client startup log is
! %WINDIR%\TEMP\afsd_init.log.Send the
! last continuous block oflog information
! from this file.
Configuring DrWatson to generate dump files for crashes:
·Run
***************
*** 4383,4459 ****
are created:
Secure
! Endpoints Inc. provides development and support services for OpenAFS for
! Windows and MIT Kerberos for Windows.
! Donations provided to Secure Endpoints Inc. for the development of
! OpenAFS are used to cover the OpenAFS gatekeeper responsibilities; providing
! support to the OpenAFS community via the OpenAFS mailing lists; and furthering
! development of desired features that are either too small to be financed by
! development contracts.
!
!
Secure Endpoints Inc. accepts software development
! agreements from organizations who wish to fund a well-defined set of bug fixes
! or new features.
!
!
Secure Endpoints Inc. provides contract based support for
! the OpenAFS for Windows and the MIT Kerberos for Windows products.
The MIT Kerberos development team accepts
! unrestricted grants.Grants are tax
! deductible and the full amount of the grant will be used to fund the
! development of Kerberos 5 and/or Kerberos for Windows.OpenAFS for Windows is dependent on MIT
! Kerberos for Windows for authentication and shares many of the same requirements for credential management.Future releases of both products will share a
! common identity management user interface.
Organizations that use OpenAFS in house and have
! development staffs are encouraged to contribute any code modifications they
! make to OpenAFS.org via openafs-bugs@openafs.org.Contributions of documentation are highly
! desired.
Secure Endpoints Inc. provides
! development and support services for OpenAFS for Windows and MIT Kerberos for
! Windows. Donations provided to Secure
! Endpoints Inc. for the development of OpenAFS are used to cover the OpenAFS
! gatekeeper responsibilities; providing support to the OpenAFS community via the
! OpenAFS mailing lists; and furthering development of desired features that are
! either too small to be financed by development contracts.
!
!
Secure Endpoints
! Inc. accepts software development agreements from organizations who wish to
! fund a well-defined set of bug fixes or new features.
!
!
Secure Endpoints
! Inc. provides contract based support for the OpenAFS for Windows and the MIT
! Kerberos for Windows products.
The MIT
! Kerberos development team accepts unrestricted grants. Grants are tax deductible and the full amount
! of the grant will be used to fund the development of Kerberos 5 and/or Kerberos
! for Windows. OpenAFS for Windows is
! dependent on MIT Kerberos for Windows for authentication and shares many of the
! same requirements for credential
! management. Future releases of both
! products will share a common identity management user interface.
Organizations that
! use OpenAFS in house and have development staffs are encouraged to contribute
! any code modifications they make to OpenAFS.org via openafs-bugs@openafs.org.
! Contributions of documentation are
! highly desired.
The information in this document applies to MSI packages
distributed with OpenAFS for Windows releases from 1.3.65 and onwards or MSI
! packages built from corresponding source releases.Not all releases support all the
! configuration options documented here.
Authoring a "Windows Installer" transform requires
additional software for editing the MSI database tables and generating the
transform from the modified MSI package.
! ORCA.EXE and MSITRAN.EXE which are included in the Windows Platform SDK
! ("Windows Installer" SDK) can be used for this purpose.
For reference, the schema for the MSI package is based on
SCHEMA.MSI distributed with the Platform SDK.
--- 5430,5444 ----
The information in this document applies to MSI packages
distributed with OpenAFS for Windows releases from 1.3.65 and onwards or MSI
! packages built from corresponding source releases. Not all releases support all the configuration
! options documented here.
Authoring a "Windows Installer" transform requires
additional software for editing the MSI database tables and generating the
transform from the modified MSI package.
! ORCA.EXE and MSITRAN.EXE which are included in the Windows Platform SDK ("Windows
! Installer" SDK) can be used for this purpose.
For reference, the schema for the MSI package is based on
SCHEMA.MSI distributed with the Platform SDK.
The logic necessary to implement many of the settings
! described in Appendix A are present
! in the MSI.Most of these can be
! controlled by setting the corresponding properties to the desired value.Some settings may require modifying existing registry
! entries (though not recommended) or adding new resources (like files or
! registry keys).Instructions for
! performing these tasks are below.
The logic necessary to implement many of the settings
! described in Appendix
! A are present in the MSI.Most of
! these can be controlled by setting the corresponding properties to the desired
! value.Some settings may require
! modifying existing registry entries (though not recommended) or adding new
! resources (like files or registry keys).
! Instructions for performing these tasks are below.
When one of the configurable properties is set, the
installer will use the property value to set the corresponding setting in the
! HKEY_LOCAL_MACHINE registry hive.The
! HKEY_CURRENT_USER hive is not touched by the installer.
For each property, the associated registry setting is
! referenced by the same text used in Appendix
! A.
Strings are quoted using single quotes (e.g. 'a string'). An
empty string is denoted as ''.Note that
--- 5552,5563 ----
When one of the configurable properties is set, the
installer will use the property value to set the corresponding setting in the
! HKEY_LOCAL_MACHINE registry hive.The HKEY_CURRENT_USER
! hive is not touched by the installer.
For each property, the associated registry setting is
! referenced by the same text used in Appendix A.
Strings are quoted using single quotes (e.g. 'a string'). An
empty string is denoted as ''.Note that
***************
*** 4760,4773 ****
In order to set a property,
1.Open the MSI in ORCA.EXE
2.
--- 5570,5583 ----
In order to set a property,
1.Open the MSI in ORCA.EXE
2.
***************
*** 4775,4781 ****
tables on the left.
3.
--- 5585,5591 ----
tables on the left.
3.
***************
*** 4783,4789 ****
the right, double click the value and type the new value.
4.
--- 5593,5599 ----
the right, double click the value and type the new value.
These properties are combined to add a command line option
! to the shortcut that will be created in the Start:Programs:OpenAFS and Start:Programs:Startup
! folders (see CREDSSTARTUP).The method
! of specifying the option was chosen for easy integration with the Windows
! Installer user interface.Although other
! methods can be used to specify options to AFSCREDS.EXE, it is advised that they
! be avoided as transforms including such options may not apply to future
! releases of OpenAFS.
These properties are combined to add a command line option
! to the shortcut that will be created in the Start:Programs:OpenAFS and
! Start:Programs:Startup folders (see CREDSSTARTUP).The method of specifying the option was
! chosen for easy integration with the Windows Installer user interface.Although other methods can be used to specify
! options to AFSCREDS.EXE, it is advised that they be avoided as transforms
! including such options may not apply to future releases of OpenAFS.
You can change existing registry values subject to the restrictions
! mentioned in the Windows Platform SDK.
! Pay special attention to component key paths and try to only change the
! 'Value' column in the 'Registry' table.
! If you want to add additional registry keys please refer to section 3
! (Additional resources).
You can change existing registry values subject to the
! restrictions mentioned in the Windows Platform SDK.Pay special attention to component key paths
! and try to only change the 'Value' column in the 'Registry' table.If you want to add additional registry keys
! please refer to section 3 (Additional resources).
The walkthrough below is to add a custom 'CellServDB' file.
1.Disable
the component that contains the configuration file that you want to replace.
1.1.Locate
and select the 'Component' table in the 'Tables' list.
1.2.In
the Component table, locate the component you need to change ( Ctrl-F invokes
the 'Find' dialog).The component names
! are listed below in section 7.2.3.1.For this example, the component name is
'elf_CellServDB'.
1.3.Go
to the 'Condition' column of the component.
1.4.Enter
--- 5905,5944 ----
The walkthrough below is to add a custom 'CellServDB' file.
1.Disable
the component that contains the configuration file that you want to replace.
1.1.Locate
and select the 'Component' table in the 'Tables' list.
1.2.In
the Component table, locate the component you need to change ( Ctrl-F invokes
the 'Find' dialog).The component names
! are listed below in section 7.2.3.1.For this example, the component name is
'elf_CellServDB'.
1.3.Go
to the 'Condition' column of the component.
1.4.Enter
***************
*** 5130,5154 ****
Note that you can also use this step to disable other
configuration files without providing replacements.
!
2.Add
a new component containing the new configuration file.
!
2.1.Select
the 'Component' table in the 'Tables' list.
!
2.2.Select
'Tables'->'Add Row' (Ctrl-R).
!
2.3.Enter
--- 5948,5972 ----
Note that you can also use this step to disable other
configuration files without providing replacements.
!
2.Add
a new component containing the new configuration file.
!
2.1.Select
the 'Component' table in the 'Tables' list.
!
2.2.Select
'Tables'->'Add Row' (Ctrl-R).
!
2.3.Enter
***************
*** 5251,5269 ****
'fil_my_CellServDB'
is a key into the 'File' table which we will fill later.
!
3.Add
a new feature to hold the new component.
!
3.1.Select
the 'Feature' table.
!
3.2.Add
--- 6069,6087 ----
'fil_my_CellServDB'
is a key into the 'File' table which we will fill later.
!
3.Add
a new feature to hold the new component.
!
3.1.Select
the 'Feature' table.
!
3.2.Add
***************
*** 5377,5384 ****
!
It is important to create the new
! feature under the 'feaClient' feature, which will ensure that the configuration
file will be installed when the client binaries are installed.
Setting 'Display' to 0 will hide
--- 6195,6202 ----
!
It is important to create the
! new feature under the 'feaClient' feature, which will ensure that the configuration
file will be installed when the client binaries are installed.
Setting 'Display' to 0 will hide
***************
*** 5386,5409 ****
style='mso-spacerun:yes'> A value of 30 for 'Level' allows this feature
to be installed by default (on a 'Typical' installation).
!
The 'Attributes' value is
! msidbFeatureAttributesDisallowAdvertise (8), which is set on all features in
! the OpenAFS MSI.The OpenAFS MSI is not designed
! for an advertised installation.
!
4.Join
the component and the feature.
!
4.1.Select
the 'FeatureComponents' table.
!
4.2.Add
--- 6204,6227 ----
style='mso-spacerun:yes'> A value of 30 for 'Level' allows this feature
to be installed by default (on a 'Typical' installation).
!
The 'Attributes' value is msidbFeatureAttributesDisallowAdvertise
! (8), which is set on all features in the OpenAFS MSI.The OpenAFS MSI is not designed for an
! advertised installation.
Finally, the 'Sequence' value of
! 1000 will be used later to distinguish the file as being in a separate source
! location than the other files in the MSI.
!
6.Set
a media source for the file.
!
6.1.Select
the 'Media' table.
!
6.2.Add
--- 6368,6389 ----
cabinet streams.
Finally, the 'Sequence' value of
! 1000 will be used later to distinguish the file as being in a separate source location
! than the other files in the MSI.
!
6.Set
a media source for the file.
!
6.1.Select
the 'Media' table.
!
6.2.Add
***************
*** 5604,5617 ****
(leave other fields blank)
!
The sequence number of 1000
! designates this as the media source for the newly added file.
!
7.2.3.1 Components for Configuration Files
!
CellServDB: 'cpf_CellServDB'
! (ID {D5BA4C15-DBEC-4292-91FC-B54C30F24F2A})
It is beyond the scope of this document to provide a
comprehensive overview of how to add new resources through a transform.Please refer to the "Windows
! Installer" documentation for details.
! The relevant section is at :
A sample walkthrough of adding a new configuration file is
in section 2.3.
!
Add new features under the 'feaClient' or 'feaServer' as
! appropriate and set the 'Level' column for those features to equal the 'Level'
! for their parent features for consistency.
! Note that none of the features in the OpenAFS for Windows MSI package
! are designed to be installed to run from 'source' or 'advertised'.It is recommended that you set
'msidbFeatureAttributesFavorLocal' (0), 'msidbFeatureAttributesFollowParent'
! (2) and 'msidbFeatureAttributesDisallowAdvertise' (8) attributes for new
! features.
If you are creating new components, retain the same
component GUID when creating new transforms against new releases of the OpenAFS
--- 6840,6862 ----
It is beyond the scope of this document to provide a
comprehensive overview of how to add new resources through a transform.Please refer to the "Windows Installer"
! documentation for details.The relevant
! section is at :
A sample walkthrough of adding a new configuration file is
in section 2.3.
!
Add new features under the 'feaClient' or 'feaServer' as appropriate
! and set the 'Level' column for those features to equal the 'Level' for their
! parent features for consistency.Note
! that none of the features in the OpenAFS for Windows MSI package are designed
! to be installed to run from 'source' or 'advertised'.It is recommended that you set
'msidbFeatureAttributesFavorLocal' (0), 'msidbFeatureAttributesFollowParent'
! (2) and 'msidbFeatureAttributesDisallowAdvertise' (8) attributes for new features.
If you are creating new components, retain the same
component GUID when creating new transforms against new releases of the OpenAFS
***************
*** 6059,6093 ****
The MSI package is designed to replace (or uninstall)
! previous versions of OpenAFS for Windows during installation.Previous versions are installations that used
! the NSIS (.EXE) installer or an MSI that has a known Upgrade Code and a
! different Product Code.The MSI does not
! directly upgrade an existing installation.
! This is intentional and ensures that development releases which do not
! have strictly increasing version numbers are properly upgraded.
!
Versions of OpenAFS that are upgraded by the MSI package
! are:
!
1)OpenAFS
MSI package
Upgrade code {6823EEDD-84FC-4204-ABB3-A80D25779833}
! All versions regardless of Product Code
!
2)MIT's
Transarc AFS MSI package
Upgrade code {5332B94F-DE38-4927-9EAB-51F4A64193A7}
! All versions up to 3.6.2
The MSI package is designed to uninstall previous versions
! of OpenAFS for Windows during installation.
! Note that it doesn't directly upgrade an existing installation.This is intentional and ensures that
! development releases which do not have strictly increasing version numbers are
! properly upgraded.
!
Versions of OpenAFS that are upgraded by the MSI package are:
!
1)OpenAFS
MSI package
Upgrade code {6823EEDD-84FC-4204-ABB3-A80D25779833}
! Up to current release
!
2)MIT's
Transarc AFS MSI package
Upgrade code {5332B94F-DE38-4927-9EAB-51F4A64193A7}
! Up to version 3.6.2
!
3)OpenAFS
***************
*** 6102,6141 ****
deployments will fail on machines that have the OpenAFS NSIS package installed.
If you have used a different MSI package to install OpenAFS
! and wish to upgrade it you can author rows into the 'Upgrade' table as
! described in the Platform SDK.
When performing an upgrade with msiexec.exe execute the MSI
with the repair options "vomus".
-
7.4.1. OpenAFS MSI Product Codes
-
-
Release 1.3
-
-
-
-
-
i386_w2k
-
-
-
{CCAF9E14-976E-46C0-8A1B-A218EAB7ADC5}
-
-
-
-
-
Release 1.4 and later
-
-
Each build of the installation package will have a randomly
- assigned Product Code assigned to it.As
- each release of OpenAFS is shipped using a unique file name the Product IDs
- must be unique as well.
-
If you have used a different MSI package to install OpenAFS
! and wish to upgrade it you can author rows into the 'Upgrade' table as described
! in the Platform SDK.
When performing an upgrade with msiexec.exe execute the MSI
with the repair options "vomus".
Type: DWORD {1..32} or {1..64} depending on the
architecture
Default: <no default>
***************
*** 6588,6595 ****
!
Value: smbAuthType
Type: DWORD {0..2}
Default: 2
If this value is specified, it defines the type of SMB
--- 7395,7403 ----
!
Value:
! smbAuthType
Type: DWORD {0..2}
Default: 2
If this value is specified, it defines the type of SMB
***************
*** 6605,6654 ****
!
Value: MaxLogSize
Type: DWORD {0 .. MAXDWORD}
Default: 100K
This entry determines the maximum size of the
! %WINDIR%\TEMP\afsd_init.log file.If the
! file is larger than this value when afsd_service.exe starts the file will be
! reset to 0 bytes.If this value is 0,
! it means the file should be allowed to grow indefinitely.
If set, flushes all volumes before the machine goes on
hibernate or stand-by.
-
-
-
Value: RxEnablePeerStats
-
Type: REG_DWORD
- Default: 0x0
-
This value will enable the gathering of RX Statistics
- for connections with the Cache Manager’s Peers.This functionality can be adjusted at
- runtime with the “fs rxstatpeer” command.
-
-
-
-
-
Value: RxEnableProcessStats
-
Type: REG_DWORD
- Default: 0x0
-
This value will enable the gathering of RX Statistics
- for the Cache Manager’s Process.This functionality
- can be adjusted at runtime with the “fs rxstatproc” command.
This entry determines the maximum size of the
! %WINDIR%\TEMP\afsd_init.log file.If
! the file is larger than this value when afsd_service.exe starts the file will
! be reset to 0 bytes.If this value is
! 0, it means the file should be allowed to grow indefinitely.
Specifies the submount name to
be mapped by afsd_service.exe at startup to the provided drive letter.
***************
*** 6679,6686 ****
!
Value:
CellServDBDir
Type: REG_SZ
Default: <not defined>
--- 7465,7472 ----
!
Value:
CellServDBDir
Type: REG_SZ
Default: <not defined>
***************
*** 6692,6699 ****
!
Value: VerifyServiceSignature
Type: REG_DWORD
Default: 0x1
This value can be used to disable the runtime
--- 7478,7486 ----
!
Value:
! VerifyServiceSignature
Type: REG_DWORD
Default: 0x1
This value can be used to disable the runtime
***************
*** 6702,6719 ****
performed to verify thatthe DLLs
which are loaded by afsd_service.exe are from the same distribution as
afsd_service.exe.This is to prevent
! random errors caused when DLLs from one distribution of AFS are loaded by
! another one.This is not a security
! test.The reason for disabling this
! test is to free up additional memory which can be used for a large cache
! size.
!
Value: IoctlDebug
Type: REG_DWORD
Default: 0x0
This value can be used to debug the cause of pioctl()
--- 7489,7506 ----
performed to verify thatthe DLLs
which are loaded by afsd_service.exe are from the same distribution as
afsd_service.exe.This is to prevent
! random errors caused when DLLs from one distribution of AFS are loaded by another
! one.This is not a security test.The reason for disabling this test is to
! free up additional memory which can be used for a large cache size.
!
Value:
! IoctlDebug
Type: REG_DWORD
Default: 0x0
This value can be used to debug the cause of pioctl()
***************
*** 6727,6733 ****
This value is used to specify the type of minidump
***************
*** 6757,6764 ****
!
Value: StoreAnsiFilenames
Type: REG_DWORD
Default: 0x0
This value can be used to force the AFS Client Service
--- 7544,7552 ----
!
Value:
! StoreAnsiFilenames
Type: REG_DWORD
Default: 0x0
This value can be used to force the AFS Client Service
***************
*** 6768,6775 ****
Note: The use of ANSI characters will render access to
files with 8-bit OEM file names unaccessible from Windows.This option is of use primarily when you
! wish to allow file names produced on Windows to be accessible from Latin-1
! UNIX systems and vice versa.
--- 7556,7563 ----
Note: The use of ANSI characters will render access to
files with 8-bit OEM file names unaccessible from Windows.This option is of use primarily when you
! wish to allow file names produced on Windows to be accessible from Latin-1 UNIX
! systems and vice versa.
The network provider can be configured to have different
behavior depending on the domain that the user logs into.These settings are only relevant when using
! integrated login.A domain refers to an
! Active Directory (AD) domain, a trusted Kerberos (non-AD) realm or the local
! machine (i.e. local account logins).The
! domain name that is used for selecting the domain would be the domain that is
! passed into the NPLogonNotify function of the network provider.
Domain specific registry keys are:
--- 7839,7849 ----
The network provider can be configured to have different
behavior depending on the domain that the user logs into.These settings are only relevant when using
! integrated login.A domain refers to an Active
! Directory (AD) domain, a trusted Kerberos (non-AD) realm or the local machine
! (i.e. local account logins).The domain
! name that is used for selecting the domain would be the domain that is passed
! into the NPLogonNotify function of the network provider.
Domain specific registry keys are:
***************
*** 7083,7090 ****
+- Domain
!
! +-AD1.EXAMPLE.COM
+-AD2.EXAMPLE.NET
--- 7874,7880 ----
+- Domain
!
+-AD1.EXAMPLE.COM
+-AD2.EXAMPLE.NET
***************
*** 7096,7103 ****
values described in 2.1.1.The effective
values are chosen as described in 2.1.2.
!
Type: REG_SZ or REG_EXPAND_SZ
Default: (null)
NSIS/WiX: (only value under NP key) <install path>\afscreds.exe -:%s -x
-a -m -n -q
!
A logon script that will be scheduled to be run after
! the profile load is complete.If using
! the REG_EXPAND_SZ type, you can use any system environment variable as
"%varname%" which would be expanded at the time the network
provider is run.Optionally using a
"%s" in the value would result in it being expanded into the AFS
--- 7938,7951 ----
Type: REG_SZ or REG_EXPAND_SZ
Default: (null)
NSIS/WiX: (only value under NP key) <install path>\afscreds.exe -:%s -x
-a -m -n -q
!
A logon script that will be scheduled to be run after the
! profile load is complete.If using the
! REG_EXPAND_SZ type, you can use any system environment variable as
"%varname%" which would be expanded at the time the network
provider is run.Optionally using a
"%s" in the value would result in it being expanded into the AFS
***************
*** 7164,7170 ****
When Kerberos 5 is being used, TheseCells provides a
--- 7979,7987 ----
!
Value:
! TheseCells
Type: REG_MULTI_SZ
NSIS: <not set>
When Kerberos 5 is being used, TheseCells provides a
***************
*** 7203,7227 ****
specific configuration
During login to domain X, where X is the domain passed
! into NPLogonNotify as lpAuthentInfo->LogonDomainName or the string
! 'LOCALHOST' if lpAuthentInfo->LogonDomainName equals the name of the
! computer, the following keys will be looked up.
During login to domain X, where X is the domain passed
! into NPLogonNotify as lpAuthentInfo->LogonDomainName or the string 'LOCALHOST'
! if lpAuthentInfo->LogonDomainName equals the name of the computer, the
! following keys will be looked up.
***************
*** 7231,7259 ****
configuration information in this case will come from the NP key.
If the specific domain key exists, then for each of the
! values metioned in (2), they will be looked up in the specific domain key,
! domains key and the NP key successively until the value is found. The first
! instance of the value found this way will be the effective for the login
! session.If no such instance can be
! found, the default will be used.To
! re-iterate, a value in a more specific key supercedes a value in a less
! specific key.The exceptions to this
! rule are stated below.
Historically, the 'FailLoginsSilently' value was in
! HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\Parameters key and not
! in the NP key.Therefore, for backwards
! compatibility, the value in the Parameters key will supercede all instances of
! this value in other keys.In the absence
! of this value in the Parameters key, normal scope rules apply.
--- 8023,8050 ----
configuration information in this case will come from the NP key.
If the specific domain key exists, then for each of the
! values metioned in (2), they will be looked up in the specific domain key, domains
! key and the NP key successively until the value is found. The first instance of
! the value found this way will be the effective for the login session.If no such instance can be found, the default
! will be used.To re-iterate, a value in
! a more specific key supercedes a value in a less specific key.The exceptions to this rule are stated below.
Historically, the 'FailLoginsSilently' value was in HKLM\SYSTEM\CurrentControlSet\Services\TransarcAFSDaemon\Parameters
! key and not in the NP key.Therefore, for
! backwards compatibility, the value in the Parameters key will supercede all
! instances of this value in other keys.
! In the absence of this value in the Parameters key, normal scope rules
! apply.
This value specifies the command line options which should
! be set as part of the shortcut to afscreds.exe.afscreds.exe rewrites the shortcut each
time it exits so as to ensure that the shortcut points to the latest version
of the program.This value is used to
--- 8153,8166 ----
This value specifies the command line options which
! should be set as part of the shortcut to afscreds.exe.afscreds.exe rewrites the shortcut each
time it exits so as to ensure that the shortcut points to the latest version
of the program.This value is used to
***************
*** 7395,7402 ****
height:92.0pt'>
These values are used to store
***************
*** 7485,7491 ****
mso-border-insideh:.75pt outset windowtext;mso-border-insidev:.75pt outset windowtext'>
Values:"OFF" disables the use of RPC
encryption any other value allows RPC encryption to be used
--- 8280,8287 ----
mso-border-insideh:.75pt outset windowtext;mso-border-insidev:.75pt outset windowtext'>
Index: openafs/src/WINNT/doc/install/Documentation/en_US/html/ReleaseNotes/relnotes_files/header.htm
diff -c openafs/src/WINNT/doc/install/Documentation/en_US/html/ReleaseNotes/relnotes_files/header.htm:1.1.2.3 openafs/src/WINNT/doc/install/Documentation/en_US/html/ReleaseNotes/relnotes_files/header.htm:1.1.2.4
*** openafs/src/WINNT/doc/install/Documentation/en_US/html/ReleaseNotes/relnotes_files/header.htm:1.1.2.3 Mon Sep 26 20:44:40 2005
--- openafs/src/WINNT/doc/install/Documentation/en_US/html/ReleaseNotes/relnotes_files/header.htm Mon Jan 9 00:29:30 2006
***************
*** 1,8 ****
--- 1,8 ----
***************
*** 10,18 ****
-
--- 19,34 ----
!
Index: openafs/src/WINNT/doc/install/Documentation/en_US/html/ReleaseNotes/relnotes_files/preview.wmf
Index: openafs/src/afs/afs_volume.c
diff -c openafs/src/afs/afs_volume.c:1.26.2.3 openafs/src/afs/afs_volume.c:1.26.2.4
*** openafs/src/afs/afs_volume.c:1.26.2.3 Thu Jan 5 00:57:56 2006
--- openafs/src/afs/afs_volume.c Tue Jan 10 23:26:44 2006
***************
*** 19,25 ****
#include "afs/param.h"
RCSID
! ("$Header: /cvs/openafs/src/afs/afs_volume.c,v 1.26.2.3 2006/01/05 05:57:56 shadow Exp $");
#include "afs/stds.h"
#include "afs/sysincludes.h" /* Standard vendor system headers */
--- 19,25 ----
#include "afs/param.h"
RCSID
! ("$Header: /cvs/openafs/src/afs/afs_volume.c,v 1.26.2.4 2006/01/11 04:26:44 shadow Exp $");
#include "afs/stds.h"
#include "afs/sysincludes.h" /* Standard vendor system headers */
***************
*** 333,338 ****
--- 333,339 ----
osi_dnlc_purgedp(tvc);
#ifdef AFS_DARWIN80_ENV
+ vnode_put(AFSTOV(tvc));
/* our tvc ptr is still good until now */
AFS_FAST_RELE(tvc);
ObtainReadLock(&afs_xvcache);
Index: openafs/src/afs/DARWIN/osi_vnodeops.c
diff -c openafs/src/afs/DARWIN/osi_vnodeops.c:1.18.2.9 openafs/src/afs/DARWIN/osi_vnodeops.c:1.18.2.11
*** openafs/src/afs/DARWIN/osi_vnodeops.c:1.18.2.9 Thu Jan 5 00:57:56 2006
--- openafs/src/afs/DARWIN/osi_vnodeops.c Tue Jan 10 23:24:39 2006
***************
*** 5,11 ****
#include
RCSID
! ("$Header: /cvs/openafs/src/afs/DARWIN/osi_vnodeops.c,v 1.18.2.9 2006/01/05 05:57:56 shadow Exp $");
#include /* Standard vendor system headers */
#include /* Afs-based standard headers */
--- 5,11 ----
#include
RCSID
! ("$Header: /cvs/openafs/src/afs/DARWIN/osi_vnodeops.c,v 1.18.2.11 2006/01/11 04:24:39 shadow Exp $");
#include /* Standard vendor system headers */
#include /* Afs-based standard headers */
***************
*** 583,592 ****
--- 583,594 ----
bits |= PRSFS_INSERT;
if (ap->a_action & KAUTH_VNODE_DELETE_CHILD)
bits |= PRSFS_DELETE;
+ #if 0 /* I'd argue this should be enforced on the parent. But that's ugly */
if (ap->a_action & KAUTH_VNODE_READ_ATTRIBUTES)
bits |= PRSFS_LOOKUP;
if (ap->a_action & KAUTH_VNODE_READ_SECURITY) /* mode bits/gid, not afs acl */
bits |= PRSFS_LOOKUP;
+ #endif
} else {
if (ap->a_action & KAUTH_VNODE_READ_DATA)
bits |= PRSFS_READ;
***************
*** 595,603 ****
if (ap->a_action & KAUTH_VNODE_EXECUTE)
bits |= PRSFS_READ; /* and mode bits.... */
if (ap->a_action & KAUTH_VNODE_READ_ATTRIBUTES)
! bits |= PRSFS_READ;
if (ap->a_action & KAUTH_VNODE_READ_SECURITY) /* mode bits/gid, not afs acl */
! bits |= PRSFS_READ;
}
if (ap->a_action & KAUTH_VNODE_WRITE_ATTRIBUTES)
bits |= PRSFS_WRITE;
--- 597,605 ----
if (ap->a_action & KAUTH_VNODE_EXECUTE)
bits |= PRSFS_READ; /* and mode bits.... */
if (ap->a_action & KAUTH_VNODE_READ_ATTRIBUTES)
! bits |= PRSFS_LOOKUP;
if (ap->a_action & KAUTH_VNODE_READ_SECURITY) /* mode bits/gid, not afs acl */
! bits |= PRSFS_LOOKUP;
}
if (ap->a_action & KAUTH_VNODE_WRITE_ATTRIBUTES)
bits |= PRSFS_WRITE;
***************
*** 1641,1652 ****
);
afs_osi_Wakeup(&tvc->states);
}
- ReleaseWriteLock(&afs_xvcache);
- AFS_GUNLOCK();
if (!error && vnode_fsnode(vp))
panic("afs_reclaim: vnode not cleaned");
if (!error && (tvc->v != NULL))
panic("afs_reclaim: vcache not cleaned");
}
return error;
}
--- 1643,1654 ----
);
afs_osi_Wakeup(&tvc->states);
}
if (!error && vnode_fsnode(vp))
panic("afs_reclaim: vnode not cleaned");
if (!error && (tvc->v != NULL))
panic("afs_reclaim: vcache not cleaned");
+ ReleaseWriteLock(&afs_xvcache);
+ AFS_GUNLOCK();
}
return error;
}
Index: openafs/src/afs/VNOPS/afs_vnop_remove.c
diff -c openafs/src/afs/VNOPS/afs_vnop_remove.c:1.31.2.11 openafs/src/afs/VNOPS/afs_vnop_remove.c:1.31.2.13
*** openafs/src/afs/VNOPS/afs_vnop_remove.c:1.31.2.11 Fri Dec 23 19:21:45 2005
--- openafs/src/afs/VNOPS/afs_vnop_remove.c Tue Jan 10 10:11:08 2006
***************
*** 21,27 ****
#include "afs/param.h"
RCSID
! ("$Header: /cvs/openafs/src/afs/VNOPS/afs_vnop_remove.c,v 1.31.2.11 2005/12/24 00:21:45 shadow Exp $");
#include "afs/sysincludes.h" /* Standard vendor system headers */
#include "afsincludes.h" /* Afs-based standard headers */
--- 21,27 ----
#include "afs/param.h"
RCSID
! ("$Header: /cvs/openafs/src/afs/VNOPS/afs_vnop_remove.c,v 1.31.2.13 2006/01/10 15:11:08 shadow Exp $");
#include "afs/sysincludes.h" /* Standard vendor system headers */
#include "afsincludes.h" /* Afs-based standard headers */
***************
*** 356,362 ****
--- 356,368 ----
FetchWholeEnchilada(tvc, &treq);
#endif
ReleaseWriteLock(&tvc->lock);
+ if (tdc)
+ ReleaseSharedLock(&tdc->lock);
ObtainWriteLock(&adp->lock, 144);
+ /* Technically I don't think we need this back, but let's hold it
+ anyway; The "got" reference should actually be sufficient. */
+ if (tdc)
+ ObtainSharedLock(&tdc->lock, 640);
}
osi_dnlc_remove(adp, aname, tvc);
***************
*** 387,393 ****
--- 393,404 ----
code = afsrename(adp, aname, adp, unlname, acred, &treq);
Tnam1 = unlname;
if (!code) {
+ char *oldmvid = NULL;
+ if (tvc->mvid)
+ oldmvid = tvc->mvid;
tvc->mvid = (struct VenusFid *)unlname;
+ if (oldmvid)
+ osi_FreeSmallSpace(oldmvid);
crhold(acred);
if (tvc->uncred) {
crfree(tvc->uncred);
Index: openafs/src/config/NTMakefile.amd64_w2k
diff -c openafs/src/config/NTMakefile.amd64_w2k:1.1.2.24 openafs/src/config/NTMakefile.amd64_w2k:1.1.2.25
*** openafs/src/config/NTMakefile.amd64_w2k:1.1.2.24 Wed Jan 4 23:43:40 2006
--- openafs/src/config/NTMakefile.amd64_w2k Mon Jan 9 00:36:52 2006
***************
*** 80,86 ****
#define used in WinNT/2000 installation and program version display
AFSPRODUCT_VER_MAJOR=1
AFSPRODUCT_VER_MINOR=4
! AFSPRODUCT_VER_PATCH=0093
AFSPRODUCT_VER_BUILD=0
AFSPRODUCT_VERSION=$(AFSPRODUCT_VER_MAJOR).$(AFSPRODUCT_VER_MINOR).$(AFSPRODUCT_VER_PATCH)
--- 80,86 ----
#define used in WinNT/2000 installation and program version display
AFSPRODUCT_VER_MAJOR=1
AFSPRODUCT_VER_MINOR=4
! AFSPRODUCT_VER_PATCH=0094
AFSPRODUCT_VER_BUILD=0
AFSPRODUCT_VERSION=$(AFSPRODUCT_VER_MAJOR).$(AFSPRODUCT_VER_MINOR).$(AFSPRODUCT_VER_PATCH)
Index: openafs/src/config/NTMakefile.i386_nt40
diff -c openafs/src/config/NTMakefile.i386_nt40:1.46.2.39 openafs/src/config/NTMakefile.i386_nt40:1.46.2.40
*** openafs/src/config/NTMakefile.i386_nt40:1.46.2.39 Wed Jan 4 23:43:40 2006
--- openafs/src/config/NTMakefile.i386_nt40 Mon Jan 9 00:36:52 2006
***************
*** 80,86 ****
#define used in WinNT/2000 installation and program version display
AFSPRODUCT_VER_MAJOR=1
AFSPRODUCT_VER_MINOR=4
! AFSPRODUCT_VER_PATCH=0093
AFSPRODUCT_VER_BUILD=0
AFSPRODUCT_VERSION=$(AFSPRODUCT_VER_MAJOR).$(AFSPRODUCT_VER_MINOR).$(AFSPRODUCT_VER_PATCH)
--- 80,86 ----
#define used in WinNT/2000 installation and program version display
AFSPRODUCT_VER_MAJOR=1
AFSPRODUCT_VER_MINOR=4
! AFSPRODUCT_VER_PATCH=0094
AFSPRODUCT_VER_BUILD=0
AFSPRODUCT_VERSION=$(AFSPRODUCT_VER_MAJOR).$(AFSPRODUCT_VER_MINOR).$(AFSPRODUCT_VER_PATCH)
Index: openafs/src/config/NTMakefile.i386_w2k
diff -c openafs/src/config/NTMakefile.i386_w2k:1.1.2.26 openafs/src/config/NTMakefile.i386_w2k:1.1.2.27
*** openafs/src/config/NTMakefile.i386_w2k:1.1.2.26 Wed Jan 4 23:43:40 2006
--- openafs/src/config/NTMakefile.i386_w2k Mon Jan 9 00:36:52 2006
***************
*** 80,86 ****
#define used in WinNT/2000 installation and program version display
AFSPRODUCT_VER_MAJOR=1
AFSPRODUCT_VER_MINOR=4
! AFSPRODUCT_VER_PATCH=0093
AFSPRODUCT_VER_BUILD=0
AFSPRODUCT_VERSION=$(AFSPRODUCT_VER_MAJOR).$(AFSPRODUCT_VER_MINOR).$(AFSPRODUCT_VER_PATCH)
--- 80,86 ----
#define used in WinNT/2000 installation and program version display
AFSPRODUCT_VER_MAJOR=1
AFSPRODUCT_VER_MINOR=4
! AFSPRODUCT_VER_PATCH=0094
AFSPRODUCT_VER_BUILD=0
AFSPRODUCT_VERSION=$(AFSPRODUCT_VER_MAJOR).$(AFSPRODUCT_VER_MINOR).$(AFSPRODUCT_VER_PATCH)
Index: openafs/src/config/afs_sysnames.h
diff -c openafs/src/config/afs_sysnames.h:1.50.2.20 openafs/src/config/afs_sysnames.h:1.50.2.21
*** openafs/src/config/afs_sysnames.h:1.50.2.20 Fri Oct 21 00:48:48 2005
--- openafs/src/config/afs_sysnames.h Tue Jan 10 23:47:10 2006
***************
*** 236,244 ****
#define SYS_NAME_ID_amd64_fbsd_53 3008
! #define SYS_NAME_ID_amd64_w2k 3100
! #define SYS_NAME_ID_i64_w2k 3200
/*
* Placeholder to keep system-wide standard flags since this file is included by all
--- 236,244 ----
#define SYS_NAME_ID_amd64_fbsd_53 3008
! #define SYS_NAME_ID_amd64_w2k 3400
! #define SYS_NAME_ID_i64_w2k 3500
/*
* Placeholder to keep system-wide standard flags since this file is included by all
Index: openafs/src/man/afs_ftpd.1
diff -c openafs/src/man/afs_ftpd.1:1.1 openafs/src/man/afs_ftpd.1:removed
*** openafs/src/man/afs_ftpd.1:1.1 Mon Jul 16 14:48:32 2001
--- openafs/src/man/afs_ftpd.1 Wed Jan 11 00:01:40 2006
***************
*** 1,69 ****
- ftpd (AFS version) AFS Commands ftpd (AFS version)
-
-
- NAME
-
- ftpd (AFS version) -- initialize Internet File Transfer
-
- Protocol server.
-
-
- /usr/etc/ftpd [-d] [-l] [-ttimeout]
-
- DESCRIPTION
-
- Functions like the standard UNIX ftpd, except that it also
- authenticates the issuer of the ftp command (who is
- presumably working on a remote machine) with the
- Authentication Server in the local cell (the home cell of
- the machine where ftpd is running). The authentication is
- based on the user name and password provided at the ftp
- prompts on the remote machine. The Cache Manager on the
- machine running ftpd stores the newly created token,
- identifying it by PAG rather than by the user's UNIX UID.
-
- The issuer of ftp may be working in a foreign cell, as long
- as the user name and password provided are valid in the cell
- where ftpd is running.
-
- If the user name under which ftp is issued does not exist in
- the Authentication Database for the cell where ftpd is
- running, or the issuer provides the wrong password, then
- ftpd logs the user into the UNIX file system of the machine
- where ftpd is running. The success of this local login
- depends on the user name appearing in the local password
- file and on the user providing the correct local password.
- In the case of a local login, AFS server processes consider
- the issuer of ftp to be anonymous.
-
- In the configuration recommended by Transarc Corporation,
- the AFS version of ftpd is substituted for the standard
- version (only one of the versions can run at a time). The
- administrator then has two choices:
-
- - name the binary for the AFS version something like
- ftpd.afs, leaving the standard version as ftpd.
- Change inetd.conf to refer to ftpd.afs; the
- standard version is not referenced.
-
- - name the binary for the AFS version ftpd and
- rename the binary for the standard version to
- something like ftpd.old. No change to inetd.conf
- is necessary, but it is not as obvious that the
- standard version of ftpd is no longer in use.
-
- ARGUMENTS
-
- See the UNIX manual page for ftpd.
-
-
-
- PRIVILEGE REQUIRED
-
- See the UNIX manual page for ftpd.
-
- MORE INFORMATION
-
- UNIX manual page for ftp
-
- UNIX manual page for ftpd
--- 0 ----
Index: openafs/src/man/afs_inetd.1
diff -c openafs/src/man/afs_inetd.1:1.1 openafs/src/man/afs_inetd.1:removed
*** openafs/src/man/afs_inetd.1:1.1 Mon Jul 16 14:48:32 2001
--- openafs/src/man/afs_inetd.1 Wed Jan 11 00:01:40 2006
***************
*** 1,163 ****
- inetd (AFS version) AFS Commands inetd (AFS version)
-
-
- NAME
-
- inetd (AFS version) -- initialize Internet service daemon.
-
-
- /etc/inetd [-d] []
-
- DESCRIPTION
-
- Functions like the standard UNIX inetd in invoking an
- Internet service daemon (itself called "inetd") that handles
- remotely-issued commands. The AFS inetd enables users of
- the remote services it supports to access those services as
- authenticated AFS users, provided that the supported
- services are also AFS versions capable of passing AFS tokens
- (authentication information). Examples of supported
- services are rcp and rsh.
-
- AFS inetd can service the standard UNIX versions of the
- remote services, but it is instead recommended that the
- standard UNIX version of inetd be run in parallel with the
- AFS version. Name the AFS version something like inetd.afs
- and use it to service requests from AFS-modified programs;
- use standard inetd to service requests from standard UNIX
- programs. This separation requires using two different
- inetd.conf files, as described in the
- REQUIREMENTS/RESTRICTIONS section.
-
- REQUIREMENTS/RESTRICTIONS
-
- Several configuration changes are necessary for token
- passing to work correctly with the AFS version of inetd.
- There may be other UNIX-based requirements/restrictions not
- mentioned here; consult the UNIX manual page. (One
- important restriction is that there can be no blank lines in
- the configuration file other than at the end.)
-
- The requirements/restrictions include the following. They
- assume that inetd.afs is running in parallel with standard
- inetd.
-
- - For token passing to work, the request must come
- from the AFS version of the remote service (such
- as AFS rcp or AFS rsh). If the remote service is
- the standard UNIX version, it will not pass
- tokens. The issuer of the remote command is
- authenticated only in the local UNIX file system,
- not with AFS, so the AFS server processes in the
- local cell consider the issuer to be anonymous.
-
- - The machine's reboot configuration file (/etc/rc
- or equivalent) should be altered so that it starts
- both standard inetd and inetd.afs.
-
- - An AFS-specific inetd.conf file, perhaps called
- inetd.conf.afs, should exist alongside the
- standard one. When initializing inetd.afs,
- specify this configuration file rather than the
- standard one.
-
- Each line in the inetd.conf.afs file must include
-
-
-
- an additional field, fifth from the left, to
- specify the identity under which the program is to
- run. The normal choice is "root." The following
- sample shows the only lines that should appear in
- this file:
-
- ta-rauth stream tcp nowait root internal
- shell stream tcp nowait root /usr/etc/r
- login stream tcp nowait root /usr/etc/r
-
- Substitute appropriate values for the binary
- locations and names on the shell and login lines.
- Include the login line only if the AFS version of
- login is also in use in the cell; otherwise, refer
- to login in the standard inetd.conf instead. In
- addition, if the inetd.cond.afs file is used on a
- machine with a Sun system type, change rshd to
- in.rshd and change rlogind.afs to in.rlogind.afs
- on the shell and login lines, respectively.
-
- - The standard inetd.conf (referred to by the
- standard inetd) should be altered: comment out the
- shell line and, if the AFS version of login is in
- use in the cell, the login line. References to
- these programs appear in inetd.conf.afs instead.
- Retain the login line if AFS login is not being
- used. Alter the ftp line to refer to the AFS
- version of ftpd, if it was substituted for the
- standard version. Do not insert the extra fifth
- column into standard inetd.conf if it does not
- already appear there. See the EXAMPLE section
- below for an illustration.
-
- - The following two lines must appear in the
- /etc/services file on the machine running inetd
- (as well as on the machine running modified rcp or
- rsh). On NeXT machines, this information must
- appear in the NetInfo database rather than in
- /etc/services.
-
- auth 113/tcp authentication
- ta-rauth 601/tcp rauth
-
- ARGUMENTS
-
- See the UNIX manual page for inetd.
-
- EXAMPLE
-
- The following are sample inetd.conf.afs and inetd.conf
- files, appropriate for use when inetd.afs is running in
- parallel with standard inetd and AFS login is being used in
- the cell. Changes to standard inetd.conf include
- referencing the AFS version of the ftpd binary and
- commenting out shell and login. The example inetd.conf does
- not include the extra fifth column. Do not use these
- examples without modifying them appropriately for the local
- machine type or cell.
-
-
-
- # AFS version of Internet server configuration datab
- #(EXAMPLE ONLY)
- #
- ta-rauth stream tcp nowait root internal
- shell stream tcp nowait root /usr/etc/rshd
- login stream tcp nowait root /usr/etc/rlogind.afs
-
-
-
- # Standard version of Internet server configuration
- #(EXAMPLE ONLY)
- #
- ftp stream tcp nowait /etc/ftpd.afs ftpd
- telnet stream tcp nowait /etc/telnetd teln
- #shell stream tcp nowait /etc/rshd rshd
- #login stream tcp nowait /etc/rlogind rlog
- finger stream tcp nowait /usr/etc/fingd fing
- uucp stream tcp nowait /etc/uucpd uucp
- exec stream tcp nowait /etc/rexecd rexe
- comsat dgram udp wait /etc/comsat coms
- talk dgram udp wait /etc/talkd talk
- ntalk dgram udp wait /usr/etc/ntalkd talk
- time dgram udp wait /etc/miscd time
-
- PRIVILEGE REQUIRED
-
- See the UNIX manual page for inetd.
-
- MORE INFORMATION
-
- rcp (AFS version)
-
- rsh (AFS version)
-
- UNIX manual page for inetd
--- 0 ----
Index: openafs/src/man/afs_login.1
diff -c openafs/src/man/afs_login.1:1.1 openafs/src/man/afs_login.1:removed
*** openafs/src/man/afs_login.1:1.1 Mon Jul 16 14:48:32 2001
--- openafs/src/man/afs_login.1 Wed Jan 11 00:01:40 2006
***************
*** 1,204 ****
- login (AFS version) AFS Commands login (AFS version)
-
-
- NAME
-
- login (AFS version) -- login to AFS and UNIX file systems.
-
-
- login []
-
- Authenticates the issuer with the AFS Authentication Server
- in the local cell and logs him or her into the local
- machine's UNIX file system. More precisely, AFS login:
-
- - creates a new "process authentication group" (PAG)
- associated with the issuer and the command shell
- where the command is issued. A PAG is a number
- guaranteed to identify the issuer uniquely to the
- local Cache Manager. The Cache Manager uses the
- PAG, instead of the issuer's UNIX UID, to identify
- him or her in the credential structure that it
- creates to track each user.
-
- - authenticates the user with the AFS Authentication
- Server and obtains a "token"; the other AFS server
- processes in the cell accept the token as partial
- proof that the user is a legitimate AFS user. The
- Cache Manager stores the token in the credential
- structure along with the PAG, and presents it to
- AFS server processes as necessary.
-
- - logs the user into the local UNIX file system
-
- The lifetime of the token resulting from this command is the
- smallest of the following:
-
- - the "maximum ticket lifetime" recorded in the
- "afs" entry in the Authentication Database. The
- default is 100 hours. Administrators can inspect
- this value using kas examine, and change it using
- kas setfields.
-
- - the "maximum ticket lifetime" recorded in the
- issuer's Authentication Database entry. The
- default is 25 hours for user entries created by
- the AFS 3.1 or later version of the Authentication
- Server, and 100 hours for user entries created by
- the AFS 3.0 version of the Authentication Server.
- Administrators and the user himself/herself can
- inspect this value using kas examine, and
- administrators can change it using kas setfields.
-
- - the "maximum ticket lifetime" recorded in the
- "krbtgt.CELLNAME" entry in the Authentication
- Database; this entry corresponds to the ticket-
- granting ticket used internally in generating the
- token. The default is 720 hours (30 days).
-
- If none of these defaults have been changed, then the
- standard token lifetime is 25 hours for users whose
- Authentication Database entries were created by the AFS 3.1
- or later version of the Authentication Server, and 100 hours
- for users whose Authentication Database entries were created
- by the AFS 3.0 version of the Authentication Server. The
-
-
-
- user can issue klog to request a token with a different
- lifetime.
-
- Using a PAG instead of the UNIX UID to distinguish users has
- two advantages.
-
- - It means that processes spawned by the user
- inherit the PAG and so share the token; thus they
- gain access to AFS as the authenticated user.
- This is important in many environments where, for
- example, printer and other daemons run under
- identities (such as "root") that the AFS server
- processes recognize only as anonymous. Unless
- PAGs are used, such daemons cannot access
- information in directories protected against
- system:anyuser.
-
- - It closes a potential security loophole: UNIX
- allows anyone already logged in as "root" on a
- machine to assume any other identity by issuing
- su. If the credential structure were identified
- by a UNIX UID rather than a PAG, then assuming the
- same UID would mean being able to use the token,
- too. Use of a PAG as an identifier eliminates
- that possibility.
-
- The process of authenticating with the AFS Authentication
- Server is as follows:
-
- 1. The login program checks the user's entry in the
- local /etc/passwd file.
-
- If no entry exists, or if an asterisk ( * )
- appears in the password field, the login attempt
- fails.
-
- If the entry exists, the attempt proceeds to step
- LOGIN.PAG.
-
- 2. The login program invokes the command that
- creates a PAG.
-
- 3. The login program converts the password provided
- by the user into an encryption key and encrypts a
- packet of data with the key. It sends the packet
- to an AFS Authentication Server. The
- Authentication Server decrypts the packet and,
- depending on the success of the decryption,
- judges the password to be correct or incorrect.
- (Consult the AFS System Administrator's Guide for
- more information on the "mutual authentication"
- procedure used to verify the password in this
- step.)
-
- If the Authentication Server judges the password
- incorrect, the user does not receive an AFS
- token. The attempt proceeds to step LOGIN.LOCAL.
- If the Authentication Server judges the password
- correct, it issues a token to the user as proof
- of AFS authentication. The login program also
- logs the user into the local UNIX file system.
-
-
-
- Step LOGIN.LOCAL is skipped.
-
- 4. If no AFS token was granted in step 3, the login
- programattempts to log the user into the local
- UNIX file system, by comparing the password
- provided to the local password file (/etc/passwd,
- for instance).
-
- If the provided password is incorrect, or the
- password field in the local password file
- contains anything other than a 13-character
- UNIX-encrypted password string, then the login
- attempt fails.
-
- If the password is correct, the user is logged
- into the local UNIX file system only. (The
- success of this attempt and the failure of the
- AFS authentication implies that the AFS and local
- passwords are different and that the issuer
- provided the latter.)
-
- WARNINGS
-
- Each PAG uses two of the memory slots that the kernel uses
- to record the UNIX groups associated with a user. If none
- of these slots are available, the PAG creation fails. The
- use of two group slots per PAG does not present a problem
- with most operating systems, which make at least 16 slots
- available.
-
- The AFS version of login is based on the Berkeley 4.3
- Distribution and does not include the modified features
- included in some proprietary versions of login.
-
- The AFS version of login works only on machines that have
- run afsd.
-
- ARGUMENTS
-
- See the UNIX manual page for login. The AFS version does
- not impose any stronger restrictions on acceptable user
- names than does the UNIX file system.
-
- OUTPUT
-
- To distinguish the AFS version of login from other versions,
- one of the following banners appears on standard out
- (stdout) when the command executes successfully.
-
- AFS 3.0 Login
-
- or
-
- AFS 3.2 (R) Login
-
- Various error messages appear if the login attempt is not
- successful. The "login:" prompt normally returns following
- the error messages, giving the user another chance to type
- the password correctly.
-
- PRIVILEGE REQUIRED
-
-
-
- None.
-
-
-
- MORE INFORMATION
-
- rlogind (AFS version)
-
- UNIX manual page for login
--- 0 ----
Index: openafs/src/man/afs_rcp.1
diff -c openafs/src/man/afs_rcp.1:1.1 openafs/src/man/afs_rcp.1:removed
*** openafs/src/man/afs_rcp.1:1.1 Mon Jul 16 14:48:32 2001
--- openafs/src/man/afs_rcp.1 Wed Jan 11 00:01:40 2006
***************
*** 1,134 ****
- rcp (AFS version) AFS Commands rcp (AFS version)
-
-
- NAME
-
- rcp (AFS version) -- copy file on remote machine.
-
-
- +
- rcp [-p] rcp [-r] [-p]
-
- DESCRIPTION
-
- Functions like the standard UNIX rcp, except it allows the
- issuer to use the remote machine's Cache Manager to access
- AFS files as an authenticated AFS user. The command passes
- a copy of the AFS token which the issuer obtained on the
- local machine to the remote machine's Cache Manager. The
- remote Cache Manager can use the token to gain authenticated
- access to AFS.
-
- Token passing is most effective if both the remote machine
- and local machine belong to the same cell, because rcp can
- pass only one token even if the user has several tokensMit
- passes the token that is marked [1] in the output from the
- tokens command. If the remote and local machine are not in
- the same cell, the possibilities are:
-
- - the token passed is for the cell to which the
- remote machine belongs. The issuer accesses the
- remote cell's AFS file tree as an authenticated
- AFS user, but is considered anonymous in the local
- cell. This means that the issuer can only
- exercise the access rights granted to
- system:anyuser in the local AFS file tree. For
- instance, a file being copied into the local cell
- can only be copied into a UNIX directory or an AFS
- directory where system:anyuser has the INSERT
- right.
-
- - the token passed is for the cell to which the
- local machine belongs. The issuer accesses the
- remote cell's AFS file tree as anonymous, and so
- can only exercise the access rights granted to
- system:anyuser.
-
- In addition to running the AFS version of the rcp binary on
- the machine where the rcp command is issued, other
- configuration changes are necessary for token passing to
- work properly. See the REQUIREMENTS/RESTRICTIONS section
- for a list.
-
- The AFS version of rcp is compatible with the standard
- inetd, but token passing works only if the AFS versions of
- both programs are being used. If only one of them is
- modified, the issuer will access AFS files through the
- remote machine as anonymous.
-
- WARNINGS
-
- AFS rcp does not allow "third party copies", in which
- neither source nor target file is on the current machine.
- Standard UNIX rcp claims to provide this functionality.
-
- The protections required on the .rhosts file in order for
-
-
-
- token passing to work with this command (see the
- REQUIREMENTS/RESTRICTIONS section) are the opposite of those
- necessary for token creation to work with the AFS version of
- rlogind.
-
- For security's sake, use the AFS version of rcp only in
- conjunction with PAGs, either by using the AFS version of
- login or always issuing pagsh before obtaining tokens.
-
- REQUIREMENTS/RESTRICTIONS
-
- Several configuration requirements and restrictions are
- necessary for token passing to work correctly with the AFS
- version of rcp. Some of these are also necessary with the
- standard UNIX version, but are included here because the
- issuer accustomed to AFS protections may not consider them.
- There may be other UNIX-based requirements/restrictions not
- mentioned here; consult the UNIX manual page. (One
- important one is that no stty commands may appear in the
- issuer's shell initialization file, such as .cshrc.)
-
- The requirements/restrictions for token passing include the
- following.
-
- - The local machine must be running the AFS version
- of rcp, with the rcp binary file locally installed
- to grant setuid privilege to the owner, "root".
-
- - The remote machine must be running the AFS version
- of inetd.
-
- - The following two lines must appear in the
- /etc/services file on the local machine (as well
- as on the remote machine running modified inetd).
- On NeXT machines, this information must appear in
- the NetInfo database rather than in /etc/services.
-
- auth 113/tcp authentication
- ta-rauth 601/tcp rauth
-
- - If rcp is to consult an .rhosts file on the remote
- machine, the file must have UNIX protections no
- more liberal than -rw-r--r--. If .rhosts resides
- in a user home directory in AFS, the home
- directory must also grant the LOOKUP and READ
- rights to system:anyuser.
-
- ARGUMENTS
-
- Consult the UNIX manual page for rcp.
-
- PRIVILEGE REQUIRED
-
- None.
-
- MORE INFORMATION
-
- inetd (AFS version)
-
- UNIX manual page for rcp
-
- rlogind (AFS version)
-
-
-
- tokens
--- 0 ----
Index: openafs/src/man/afs_rlogind.1
diff -c openafs/src/man/afs_rlogind.1:1.1 openafs/src/man/afs_rlogind.1:removed
*** openafs/src/man/afs_rlogind.1:1.1 Mon Jul 16 14:48:32 2001
--- openafs/src/man/afs_rlogind.1 Wed Jan 11 00:01:40 2006
***************
*** 1,91 ****
- rlogind (AFS version) AFS Commands rlogind (AFS version)
-
-
- NAME
-
- rlogind (AFS version) -- initialize remote login server.
-
-
- /etc/rlogind
-
- DESCRIPTION
-
- Functions like the standard UNIX rlogind, except that it is
- appropriate only for cells using the AFS version of the
- login program supplied by Transarc Corporation.
-
- The AFS modifications to rlogind are strictly internal and
- are necessary so that remote AFS authentication is possible
- with the rlogin command. When a user issues rlogin, the AFS
- version of rlogind running on the remote machine invokes the
- AFS version of login; the user therefore obtains AFS tokens
- on the remote machine.
-
- In the configuration recommended by Transarc Corporation,
- the AFS version of rlogind is substituted for the standard
- versionMbut only if the AFS version of login is also being
- used in the cell. (Only one version of rlogind can run on a
- machine at a time.) The administrator then has two choices:
-
- - name the binary for the AFS version something like
- rlogind.afs, leaving the standard version as
- rlogind. Refer to rlogind.afs in inetd.conf.afs
- (the AFS version of inetd.conf), and comment out
- the reference to standard rlogind in standard
- inetd.conf.
-
- - name the binary for the AFS version rlogind and
- rename the binary for the standard version to
- something like rlogind.old. Refer to rlogind in
- inetd.conf.afs (the AFS version of inetd.conf),
- and comment out the reference to rlogind in
- standard inetd.conf.
-
- WARNINGS
-
- The AFS version of rlogind is not available for the AIX
- 2.2.1 operating system. (AIX 2.2.1 does not include the
- standard rlogind either.)
-
- Do not install the AFS version of rlogind if the AFS version
- of login is not being used in the cell.
-
- Remote AFS authentication is possible with rlogin only if
-
- EITHER no .rhosts file exists on the machine where rlogind
- is running
-
- OR .rhosts exists on the machine where rlogind is running, b
- has mode bits more liberal than -rw-r--r--. If .rhosts has
- mode bits as restrictive as -rw-r--r--, then rlogind logs th
- issuer of the remote rlogin command into the local UNIX file
- system without prompting for a password. The issuer does no
- tokens (authenticate with AFS), because that requires provid
- password. The user can, however, obtain tokens by issuing p
-
-
-
- and klog after establishing the connection.
-
- The protection required on .rhosts for token creation to
- work properly are exactly opposite those necessary for the
- AFS versions of rcp and rsh to handle tokens properly. The
- recommended solution is to configure .rhosts so that rcp and
- rsh work properly and to use telnet instead of rlogin.
-
- No modifications to rlogin itself are necessary for AFS
- authentication to work.
-
- PRIVILEGE REQUIRED
-
- See the UNIX manual page for rlogind.
-
- MORE INFORMATION
-
- login (AFS version)
-
- rcp (AFS version)
-
- UNIX manual page for rlogind
-
- rsh (AFS version)
--- 0 ----
Index: openafs/src/man/afs_rsh.1
diff -c openafs/src/man/afs_rsh.1:1.1 openafs/src/man/afs_rsh.1:removed
*** openafs/src/man/afs_rsh.1:1.1 Mon Jul 16 14:48:32 2001
--- openafs/src/man/afs_rsh.1 Wed Jan 11 00:01:40 2006
***************
*** 1,109 ****
- rsh (AFS version) AFS Commands rsh (AFS version)
-
-
- NAME
-
- rsh (AFS version) -- open shell on remote machine.
-
-
- rsh host [-l ] [-n] host [-l
- ] [-n]
-
- DESCRIPTION
-
- Functions like the standard UNIX rsh, except that it allows
- the issuer to execute commands on the remote machine as an
- authenticated AFS user. The command passes a copy of the
- AFS token that the issuer has obtained on the local machine
- to the remote machine's Cache Manager. The remote Cache
- Manager can use the token to have the issuer recognized as
- an authenticated AFS user.
-
- Token passing is most effective if both the remote machine
- and local machine belong to the same cell, because rsh can
- pass only one token even if the user has severalMit passes
- the token that is marked [1] in the output from the tokens
- command. If the remote and local machine are not in the
- same cell, the token should be for the cell to which the
- remote machine belongs, so that the remote cell's server
- processes will recognize the issuer as authenticated.
-
- In addition to running the AFS version of the rsh binary on
- the machine where the rsh command is issued, other
- configuration changes are necessary for token passing to
- work properly. See the REQUIREMENTS/RESTRICTIONS section
- for a list.
-
- The AFS version of rsh is compatible with the standard
- inetd, but token passing only works if the AFS versions of
- both programs are being used. If only one of them is
- modified, the issuer will access AFS files through the
- remote machine as anonymous.
-
- WARNINGS
-
- The protections required on the .rhosts file for token
- passing to work correctly with this command (see the
- REQUIREMENTS/RESTRICTIONS section) are the opposite of those
- necessary for token creation to work correctly with the AFS
- version of rlogind.
-
- For security's sake, use the AFS version of rsh only in
- conjunction with PAGs, either by using the AFS version of
- login or always issuing pagsh before obtaining tokens.
-
- REQUIREMENTS/RESTRICTIONS
-
- Several configuration requirements and restrictions are
- necessary for token passing to work correctly with the AFS
- version of rsh. Some of these are also necessary with the
- standard UNIX version, but are included here because the
- issuer used to AFS protections may not be inclined to think
- of them. There may be other UNIX-based
- requirements/restrictions not mentioned here; consult the
- UNIX manual page. (One important one is that no stty
-
-
-
- commands may appear in the issuer's shell initialization
- file, such as .cshrc.)
-
- The requirements/restrictions for token passing include the
- following.
-
- - The local machine must be running the AFS version
- of rsh, with the binary file locally installed to
- grant setuid privilege to the owner, "root".
-
- - The remote machine must be running the AFS version
- of inetd.
-
- - The following two lines must appear in the
- /etc/services file on the local machine (as well
- as on the remote machine running modified inetd).
- On NeXT machines, this information must appear in
- the NetInfo database rather than in /etc/services.
-
- auth 113/tcp authentication
- ta-rauth 601/tcp rauth
-
- - If rsh is to consult an .rhosts file on the remote
- machine, the file must have UNIX protections no
- more liberal than -rw-r--r--. If .rhosts resides
- in a user home directory in AFS, the home
- directory must also grant the LOOKUP and READ
- rights to system:anyuser.
-
- ARGUMENTS
-
- Consult the UNIX manual page for rsh.
-
- MORE INFORMATION
-
- inetd (AFS version)
-
- UNIX manual page for rsh
-
- rlogind (AFS version)
-
- tokens
--- 0 ----
Index: openafs/src/man/afsd.1
diff -c openafs/src/man/afsd.1:1.1 openafs/src/man/afsd.1:removed
*** openafs/src/man/afsd.1:1.1 Mon Jul 16 14:48:32 2001
--- openafs/src/man/afsd.1 Wed Jan 11 00:01:40 2006
***************
*** 1,462 ****
- afsd AFS Commands afsd
-
-
- NAME
-
- afsd -- initialize Cache Manager and start related
-
- daemons.
-
-
- afsd [-blocks ] [-files ]
- [-stat ] [-rootvol ]
- [-cachedir ] [-mountdir ]
- [-verbose] [-debug] [-nosettime]
- [-daemons ] [-rmtsys]
- [-memcache] [-dcache <# entries>] [-chunksize ]
-
- ACCEPTABLE ABBREVIATIONS
-
- This command does not use the syntax conventions of the AFS
- command suites. Therefore, "afsd" and all switches and
- flags must be typed in full.
-
- DESCRIPTION
-
- Initializes the Cache Manager on an AFS client machine by
- transferring AFS-related configuration information into
- kernel memory and starting several daemons. More
- specifically, afsd
-
- - sets a field in kernel memory that defines which
- cell the machine belongs to. Some Cache
- Manager-internal operations and system calls
- consult this field to learn which cell to execute
- in. (The AFS command interpreters refer to
- /usr/vice/etc/ThisCell instead.)
-
- This information is transferred into the kernel
- from the file /usr/vice/etc/ThisCell and cannot be
- changed until afsd runs again.
-
- - places in kernel memory the names and Internet
- addresses of the database server machines in the
- local cell and (optionally) foreign cells. The
- appearance of a cell's database server machines in
- this list enables the Cache Manager to contact
- them and so to access files in the cell. Omission
- of a cell from this list, or incorrect information
- about its database server machines, prevents the
- Cache Manager from accessing files in it.
-
- This information is transferred into the kernel
- from the file /usr/vice/etc/CellServDB. After
- initialization, use the fs newcell command to
- change the kernel-resident list without having to
- reboot.
-
- - determines whether the cache is on disk or in
- machine memory. The default is to use a disk
- cache. If the -memcache argument is provided,
-
-
-
- space is allocated in machine memory for caching,
- and disk space is not used even if the machine has
- a disk.
-
- - defines the name of the local disk directory
- devoted to caching, when -memcache is not used.
- If necessary, afsd creates the directory (as long
- as its parent directory exists). It does not
- remove from the disk the directory that formerly
- served this function, if any.
-
- The second field in the file
- /usr/vice/etc/cacheinfo is the source for this
- name, and the standard value is /usr/vice/cache.
- Use the -cachedir argument to override the value
- from cacheinfo.
-
- - sets the size of the cache, for both disk and
- memory caches.
-
- The afsd program consults the third field in the
- file /usr/vice/etc/cacheinfo to learn the default
- cache size in kilobyte blocks. The value should
- not exceed 90% to 95% of the disk space available
- on the cache partition (with a disk cache) or of
- the machine's memory (with a memory cache). This
- is because the cache implementation itself
- requires a small amount of disk or machine memory.
-
- For either a disk or memory cache, use the -blocks
- argument to override the value from cacheinfo.
-
- For a memory cache, the issuer can also override
- the cacheinfo value by providing either
-
- * both -dcache and -chunksize, to set both
- number of dcache entries and chunk size (see
- below for definition of these parameters).
- In this case, afsd derives cache size
- (overriding the cacheinfo value) by
- multiplying the two values. Using this
- combination is not recommended, as it
- requires the issuer to perform the
- calculation beforehand to determine the
- resulting cache size.
-
- * -dcache by itself. In this case, afsd derives
- cache size (overriding the cacheinfo value)
- by multiplying -dcache by the default chunk
- size of 8 kilobytes. Using this argument is
- not recommended, as it requires the issuer to
- perform the calculation beforehand to
- determine the resulting cache size.
-
- For a disk cache, the value defined in cacheinfo
- or with -blocks is an absolute upper limit on
- cache size; values provided for other arguments
- cannot result in a larger cache.
-
- After initialization, use fs setcachesize to
- change the size of a disk cache without having to
-
-
-
- reboot; the value set with that command is
- overridden the next time afsd runs. The
- fs setcachesize command does not work for memory
- caches. Instead, the machine must be rebooted.
-
- - sets the size of each "chunk" of data in the
- cache, and by implication the amount of data that
- the Cache Manager requests at a time from the File
- Server (how much data per "fetch" RPC, since AFS
- uses partial file transfer).
-
- For a disk cache, each chunk is called a "V file",
- so this parameter sets the maximum size of each V
- file; the default is 64 kilobytes. See below for
- more on V files.
-
- For a memory cache, each chunk is a collection of
- memory blocks allocated together, so this sets the
- size of each collection; the default is 8
- kilobytes.
-
- For both types of cache, use the -chunksize
- argument to change the default chunk size. To
- guarantee proper chunk sizes, the integer provided
- is used as an exponent on the number 2; see the
- ARGUMENTS section for details. For a memory
- cache, if total cache size divided by chunk size
- leaves a remainder, afsd rounds down the number of
- dcache entries. resulting in a slightly smaller
- cache (see below for more on dcache entries).
-
- - sets the number of empty "V files" created in the
- cache directory for a disk cache. Each file is a
- cache chunk, and the Cache Manager caches data in
- them as needed. By default, each "V" file can
- accommodate up to 64 kilobytes of data, since 64
- kilobytes is the default size of a disk cache
- chunk.
-
- A memory cache cannot use V files because it does
- not use disk memory; instead the number of chunks
- is equivalent to the number of "dcache entries"
- (see below).
-
- The default number of V files is 1000; use the
- -files argument to override it. Since by default
- each V file can accommodate 64 kilobytes, the only
- reason to increase from the default of 1000 is if
- the cache size is greater than about 64 megabytes
- (or the chunk size has been changed with the
- -chunksize argument discussed above).
-
- - sets the number of "dcache entries" allocated in
- machine memory for storing information about the
- chunks in the cache.
-
- With a disk cache, the file
- /usr/vice/cache/CacheItems on disk contains one
- entry for each V file. Some of the CacheItems
- entries, by default 100, are duplicated as dcache
- entries in machine memory for quicker access.
-
-
-
- With a memory cache, there is no CacheItems file,
- so all information about cache chunks must be in
- memory as dcache entries. There must be one
- dcache entry for each cache chunk, so for a memory
- cache number of dcache entries equals number of
- cache chunks. There is no default number of
- dcache entries for a memory cache; instead, afsd
- derives it by dividing cache size by chunk size.
-
- Use the -dcache argument to set the number of
- dcache entries. This is not recommended for
- either type of cache. Increasing the number of
- dcache entries for a disk cache may improve
- performance marginally because more entries are
- retrieved from memory rather than from disk, but
- is not generally necessary. Using this argument
- is not recommended for a memory cache because it
- requires the issuer to pre-calculate cache size by
- multiplying this value times chunk size (either
- the default 8 kilobytes or the value of
- -chunksize).
-
- - sets the number of "stat" entries available in
- machine memory for caching status information
- about cached AFS files.
-
- The default is 300; use the -stat argument to
- override the default.
-
- - defines the directory in the machine's file name
- space at which the AFS file tree is mounted.
-
- The first field in the file
- /usr/vice/etc/cacheinfo is the source for the
- default directory name. The standard value is
- /afs. Use the -mountdir argument to override the
- value from cacheinfo.
-
- - defines which volume corresponds to the root of
- the AFS file tree.
-
- The default is root.afs; use the -rootvol argument
- to override it. Note that although the volume
- name should be given in the "base" (ReadWrite)
- form, the Cache Manager retains its bias for
- accessing the ReadOnly version of the volumeMin
- the default case, root.afs.readonlyMif it is
- available.
-
- - randomly selects a file server machine in the
- local cell as the source for the "correct" time.
- Every five minutes thereafter, the local clock is
- adjusted (if necessary) to match the file server
- machine's clock.
-
- Use the -nosettime flag to prevent afsd from
- selecting a time standard. This is recommended
- only on file server machines that are also acting
- as clients. File server machines maintain the
- correct time using the Network Time Protocol
- Daemon instead.
-
-
-
- In addition to setting cache configuration parameters, afsd
- starts up the following three types of daemons. On most
- system types, these daemons appear as nameless entries in
- the output of the ps command:
-
- - a "callback" daemon that handles callbacks. It
- also responds to the File Server's periodic
- probes, which check that the client machine is
- still alive.
-
- - a "maintenance" daemon that performs routine
- periodic maintenance tasks, including
-
- * performing garbage collection
-
- * synchronizing files
-
- * probing the fileserver process on file server
- machines every few minutes
-
- * refreshing information from ReadOnly volumes
- once per hour
-
- * doing delayed writes for NFS clients if the
- machine is running the NFS/AFS Translator
-
- * keeping the machine's clock synchronized with
- the chosen file server machine's
-
- - "background" daemons that improve performance by
- pre-fetching files and performing background
- (delayed) writes of saved data into AFS.
-
- The default number of background daemons is 2,
- usually enough to handle up to 5 simultaneous
- users of the machine. Use the -daemons argument
- to increase the number of background daemons, if
- the machine serves more users. No more than 6
- background daemons should ever be necessary.
-
- The default number of daemons is four (one callback daemon,
- one maintenance daemon, and two background daemons). The
- issuer can alter only the number of background daemons; afsd
- always initializes one callback daemon and one maintenance
- daemon.
-
- AFS includes three configuration scripts that can be used to
- modify some Cache Manager parameters on a client machine
- that uses a disk cache. Named rc.afsd.small, rc.afsd.med,
- and rc.afsd.large, the configuration scripts specify
- suitable, predefined values for the afsd command's -stat,
- -dcache, -daemons, and -volumes switches. They define
- increasingly greater values for these switches according to
- the configuration and usage patterns of the client machine
- on which the afsd command is run. Refer to the AFS System
- Administrator's Guide for more information about the scripts
- and how to use them.
-
- ARGUMENTS
-
- -blocks specifies the number of kilobyte blocks to be made
-
-
-
- available for caching in the machine's cache
- directory (for a disk cache) or memory (for a
- memory cache), overriding the default defined in
- the third field of /usr/vice/etc/cacheinfo. It
- should not exceed 90% to 95% of the actual space
- available. If using a memory cache, do not
- combine this argument with -dcache, since doing so
- could result in a chunk size that was not an
- exponent of 2.
-
- -files specifies the number of V files to be created in
- the cache directory for a disk cache, overriding
- the default of 1000. Each V file can accommodate
- a "chunk" of data, which for a disk cache is 64
- kilobytes by default. Thus the default of 1000 is
- adequate for any cache smaller than 64 megabytes
- (unless chunk size is changed with -chunksize).
- Do not combine this argument with -memcache.
-
- -stat specifies the number of entries in the machine's
- memory for recording status information about the
- AFS files in the cache. This value overrides the
- default of 300.
-
- -rootvol names the Read Write volume corresponding to the
- root directory for the AFS file tree (which is
- usually /afs). This value overrides the default
- of root.afs.
-
- -cachedir names the local disk directory to be used as the
- cache. This value overrides the default defined
- in the second field of /usr/vice/etc/cacheinfo
- (typically, /usr/vice/cache).
-
- -mountdir names the local disk directory on which to mount
- the AFS file tree. This value overrides the
- default defined in the first field of
- /usr/vice/etc/cacheinfo (typically, /afs). If
- /afs is not used, the machine cannot access the
- AFS global name space.
-
- -daemons specifies the number of "background" daemons to
- run on the machine. These daemons improve
- efficiency by doing pre-fetching and background
- writing of saved data. This value overrides the
- default of 2, which is adequate for a machine
- serving up to five users. It does not change the
- number of "callback" or "maintenance" daemons,
- which is always one each.
-
- -verbose causes afsd to produce a more detailed trace of
- its activities than the default one. The trace
- displays on standard out (stdout) unless it is
- piped into a file.
-
- -debug causes afsd to produce a highly detailed trace of
- its activities, potentially useful to a developer
- for debugging purposes. The trace goes to
- standard output (stdout) by default.
-
- -nosettime
-
-
-
- prevents the machine from selecting at random a
- local file server machine to act as a source for
- the "correct" time. If this flag is omitted, the
- machine selects a file server machine as a time
- standard, and every five minutes thereafter
- adjusts its clock to avoid drifting from the
- standard.
-
- -rmtsys initializes an additional "remote-system" daemon
- to execute AFS-specific system calls on behalf of
- NFS client machines. This flag is necessary only
- if the machine is an NFS/AFS translator machine,
- and if users on its NFS clients want to execute
- AFS commands.
-
- -memcache causes afsd to initialize a memory cache rather
- than a disk cache. Do not combine this flag with
- -files.
-
- -dcache sets the number of "dcache entries" in memory,
- which are used to store information about cache
- chunks. For a disk cache, this overrides the
- default of 100. For a memory cache, this argument
- effectively sets the number of cache chunks. Use
- of this argument is not recommended for a memory
- cache, because it requires the issuer to
- pre-calculate the resulting total cache size
- (derived by multiplying this value by chunk size).
- Do not combine this argument with -blocks, since
- doing so could result in a chunk size that was not
- an exponent of 2.
-
- -chunksize
- sets the size of each cache chunk. The integer
- provided, which should be between 0 and 20, is
- used as an exponent on the number 2. It overrides
- 16
- the default of 16 for a disk cache (2 is 64
- 13
- kilobytes) and 13 for a memory cache (2 is 8
- kilobytes). A value of 0 or less, or greater than
- 20, sets chunk size to the appropriate default.
- Values less than 10 (which sets chunk size to a
- 10
- kilobyte, 2 ) are not recommended. Combining
- this argument with -dcache is not recommended
- because it requires that the issuer pre-calculate
- the cache size that results.
-
- EXAMPLE
-
- This command is normally included in an initialization file
- such as /etc/rc, rather than typed at the command shell
- prompt. For most disk caches, the appropriate form is
-
- /usr/vice/etc/afsd
-
- The following is appropriate when enabling a machine to act
- as an NFS/AFS Translator machine serving more than five
- users.
-
- /usr/vice/etc/afsd -daemons 4 -rmtsys
-
-
-
- The following initializes a memory cache and sets chunk size
- 14
- to 16 kilobytes (2 ).
-
- /usr/vice/etc/afsd -memcache -chunksize 14
-
- PRIVILEGE REQUIRED
-
- Issuer must be logged into the machine's UNIX file system as
- "root."
--- 0 ----
Index: openafs/src/man/dkload.1
diff -c openafs/src/man/dkload.1:1.1 openafs/src/man/dkload.1:removed
*** openafs/src/man/dkload.1:1.1 Mon Jul 16 14:48:32 2001
--- openafs/src/man/dkload.1 Wed Jan 11 00:01:40 2006
***************
*** 1,198 ****
- dkload AFS Commands dkload
-
-
- NAME
-
- dkload -- incorporate external libraries into kernel
-
- without rebooting.
-
-
- dkload [-readonly] [-quiet] [-verbose] [-syscallResult
- ]
- [-path
