I would rather you decreased the number of ifdefs in afs_osi.c. As a general rule I would like to see the systype-dependent code confined to the various afs/FOO/ subdirs. What I did with OpenBSD was move afs_osi_suser out of afs_osi.c (it's ifdefed out) and into OBSD/. But please keep up the good work. We need people working on Solaris.