system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-15 12:54:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Disconnect non-MPSAFE SMBFS from the build in preparation for dropping

Browse source 
GIANT from VFS. In addition, disconnect also netsmb, which is a base
requirement for SMBFS.

In the while SMBFS regular users can use FUSE interface and smbnetfs
port to work with their SMBFS partitions.

Also, there are ongoing efforts by vendor to support in-kernel smbfs,
so there are good chances that it will get relinked once properly locked.

This is not targeted for MFC.
This commit is contained in:
Attilio Rao 2012-10-18 12:04:56 +00:00
parent f9e26776a6
commit 2e564269d0
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=241680
40 changed files with 14 additions and 146 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
etc/defaults/rc.conf
View file

@ -92,7 +92,7 @@ fsck_y_enable="NO" # Set to YES to do fsck -y if the initial preen fails.
fsck_y_flags="" # Additional flags for fsck -y fsck_y_flags="" # Additional flags for fsck -y
background_fsck="YES" # Attempt to run fsck in the background where possible. background_fsck="YES" # Attempt to run fsck in the background where possible.
background_fsck_delay="60" # Time to wait (seconds) before starting the fsck. background_fsck_delay="60" # Time to wait (seconds) before starting the fsck.
netfs_types="nfs:NFS oldnfs:OLDNFS smbfs:SMB" # Net filesystems. netfs_types="nfs:NFS oldnfs:OLDNFS" # Net filesystems.
extra_netfs_types="NO" # List of network extra filesystem types for delayed extra_netfs_types="NO" # List of network extra filesystem types for delayed
# mount at startup (or NO). # mount at startup (or NO).

2
etc/mtree/BSD.include.dist
View file

@ -170,8 +170,6 @@
.. ..
procfs procfs
.. ..
smbfs
..
udf udf
.. ..
unionfs unionfs

4
etc/mtree/BSD.usr.dist
View file

@ -307,10 +307,6 @@
srcs srcs
.. ..
.. ..
smbfs
print
..
..
sunrpc sunrpc
dir dir
.. ..

5
include/Makefile
View file

@ -34,7 +34,7 @@ LHDRS= aio.h errno.h fcntl.h linker_set.h poll.h stdint.h syslog.h \
ucontext.h ucontext.h
LDIRS= bsm cam geom net net80211 netatalk netgraph netinet netinet6 \ LDIRS= bsm cam geom net net80211 netatalk netgraph netinet netinet6 \
netipsec ${_netipx} netnatm netsmb \ netipsec ${_netipx} netnatm \
nfs nfsclient nfsserver \ nfs nfsclient nfsserver \
sys vm sys vm
@ -44,7 +44,7 @@ LSUBDIRS= cam/ata cam/scsi \
dev/ofw dev/pbio ${_dev_powermac_nvram} dev/ppbus dev/smbus \ dev/ofw dev/pbio ${_dev_powermac_nvram} dev/ppbus dev/smbus \
dev/speaker dev/usb dev/utopia dev/vkbd dev/wi \ dev/speaker dev/usb dev/utopia dev/vkbd dev/wi \
fs/devfs fs/fdescfs fs/msdosfs fs/nandfs fs/nfs fs/nullfs \ fs/devfs fs/fdescfs fs/msdosfs fs/nandfs fs/nfs fs/nullfs \
fs/procfs fs/smbfs fs/udf fs/unionfs \ fs/procfs fs/udf fs/unionfs \
geom/cache geom/concat geom/eli geom/gate geom/journal geom/label \ geom/cache geom/concat geom/eli geom/gate geom/journal geom/label \
geom/mirror geom/mountver geom/multipath geom/nop \ geom/mirror geom/mountver geom/multipath geom/nop \
geom/raid geom/raid3 geom/shsec geom/stripe geom/virstor \ geom/raid geom/raid3 geom/shsec geom/stripe geom/virstor \
@ -76,7 +76,6 @@ INCS+= iconv.h
LSUBSUBDIRS+= netgraph/bluetooth/include LSUBSUBDIRS+= netgraph/bluetooth/include
.endif .endif
# XXX unconditionally needed by <netsmb/netbios.h>
#.if ${MK_IPX} != "no" #.if ${MK_IPX} != "no"
_netipx= netipx _netipx= netipx
#.endif #.endif

11
lib/Makefile
View file

@ -100,7 +100,6 @@ SUBDIR= ${SUBDIR_ORDERED} \
${_librtld_db} \ ${_librtld_db} \
${_libsdp} \ ${_libsdp} \
${_libsm} \ ${_libsm} \
${_libsmb} \
${_libsmdb} \ ${_libsmdb} \
${_libsmutil} \ ${_libsmutil} \
libstand \ libstand \
@ -188,7 +187,6 @@ _libypclnt= libypclnt
.endif .endif
.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
_libsmb= libsmb
_libvgl= libvgl _libvgl= libvgl
_libproc= libproc _libproc= libproc
_librtld_db= librtld_db _librtld_db= librtld_db
@ -196,7 +194,6 @@ _librtld_db= librtld_db
.if ${MACHINE_CPUARCH} == "ia64" .if ${MACHINE_CPUARCH} == "ia64"
_libefi= libefi _libefi= libefi
_libsmb= libsmb
.endif .endif
.if ${MACHINE_CPUARCH} == "mips" .if ${MACHINE_CPUARCH} == "mips"
@ -204,14 +201,6 @@ _libproc= libproc
_librtld_db= librtld_db _librtld_db= librtld_db
.endif .endif
.if ${MACHINE_CPUARCH} == "powerpc"
_libsmb= libsmb
.endif
.if ${MACHINE_CPUARCH} == "sparc64"
_libsmb= libsmb
.endif
.if ${MK_OPENSSL} != "no" .if ${MK_OPENSSL} != "no"
_libmp= libmp _libmp= libmp
.endif .endif

1
lib/libprocstat/Makefile
View file

@ -8,7 +8,6 @@ SRCS= cd9660.c \
common_kvm.c \ common_kvm.c \
libprocstat.c \ libprocstat.c \
msdosfs.c \ msdosfs.c \
smbfs.c \
udf.c udf.c
VERSION_DEF= ${.CURDIR}/Versions.def VERSION_DEF= ${.CURDIR}/Versions.def

1
lib/libprocstat/common_kvm.h
View file

@ -41,7 +41,6 @@ int devfs_filestat(kvm_t *kd, struct vnode *vp, struct vnstat *vn);
int isofs_filestat(kvm_t *kd, struct vnode *vp, struct vnstat *vn); int isofs_filestat(kvm_t *kd, struct vnode *vp, struct vnstat *vn);
int msdosfs_filestat(kvm_t *kd, struct vnode *vp, struct vnstat *vn); int msdosfs_filestat(kvm_t *kd, struct vnode *vp, struct vnstat *vn);
int nfs_filestat(kvm_t *kd, struct vnode *vp, struct vnstat *vn); int nfs_filestat(kvm_t *kd, struct vnode *vp, struct vnstat *vn);
int smbfs_filestat(kvm_t *kd, struct vnode *vp, struct vnstat *vn);
int udf_filestat(kvm_t *kd, struct vnode *vp, struct vnstat *vn); int udf_filestat(kvm_t *kd, struct vnode *vp, struct vnstat *vn);
int ufs_filestat(kvm_t *kd, struct vnode *vp, struct vnstat *vn); int ufs_filestat(kvm_t *kd, struct vnode *vp, struct vnstat *vn);
int zfs_filestat(kvm_t *kd, struct vnode *vp, struct vnstat *vn); int zfs_filestat(kvm_t *kd, struct vnode *vp, struct vnstat *vn);

1
lib/libprocstat/libprocstat.c
View file

@ -973,7 +973,6 @@ procstat_get_vnode_info_kvm(kvm_t *kd, struct filestat *fst,
FSTYPE(isofs), FSTYPE(isofs),
FSTYPE(msdosfs), FSTYPE(msdosfs),
FSTYPE(nfs), FSTYPE(nfs),
FSTYPE(smbfs),
FSTYPE(udf), FSTYPE(udf),
FSTYPE(ufs), FSTYPE(ufs),
#ifdef LIBPROCSTAT_ZFS #ifdef LIBPROCSTAT_ZFS

2
rescue/rescue/Makefile
View file

@ -130,8 +130,6 @@ CRUNCH_LIBS+= -lgeom -lbsdxml -lkiconv -lmd -lsbuf -lufs -lz
.if ${MACHINE_CPUARCH} == "i386" .if ${MACHINE_CPUARCH} == "i386"
CRUNCH_PROGS_sbin+= bsdlabel sconfig fdisk CRUNCH_PROGS_sbin+= bsdlabel sconfig fdisk
CRUNCH_ALIAS_bsdlabel= disklabel CRUNCH_ALIAS_bsdlabel= disklabel
#CRUNCH_PROGS+= mount_smbfs
#CRUNCH_LIBS+= -lsmb
.endif .endif
.if ${MACHINE} == "pc98" .if ${MACHINE} == "pc98"

2
sbin/mount/mount.8
View file

@ -448,7 +448,6 @@ However, for the following file system types:
.Cm nfs , .Cm nfs ,
.Cm nullfs , .Cm nullfs ,
.Cm oldnfs , .Cm oldnfs ,
.Cm smbfs ,
.Cm udf , .Cm udf ,
and and
.Cm unionfs . .Cm unionfs .
@ -543,7 +542,6 @@ support for a particular file system might be provided either on a static
.Xr mount_msdosfs 8 , .Xr mount_msdosfs 8 ,
.Xr mount_nfs 8 , .Xr mount_nfs 8 ,
.Xr mount_nullfs 8 , .Xr mount_nullfs 8 ,
.Xr mount_smbfs 8 ,
.Xr mount_udf 8 , .Xr mount_udf 8 ,
.Xr mount_unionfs 8 , .Xr mount_unionfs 8 ,
.Xr umount 8 , .Xr umount 8 ,

2
sbin/mount/mount.c
View file

@ -143,7 +143,7 @@ use_mountprog(const char *vfstype)
unsigned int i; unsigned int i;
const char *fs[] = { const char *fs[] = {
"cd9660", "mfs", "msdosfs", "nfs", "cd9660", "mfs", "msdosfs", "nfs",
"nullfs", "oldnfs", "smbfs", "udf", "unionfs", "nullfs", "oldnfs", "udf", "unionfs",
NULL NULL
}; };

1
share/examples/Makefile
View file

@ -242,7 +242,6 @@ etc-examples:
.endif .endif
.if ${SHARED} != "symlinks" .if ${SHARED} != "symlinks"
SUBDIR= smbfs
.if ${MK_IPFILTER} != "no" .if ${MK_IPFILTER} != "no"
SUBDIR+=ipfilter SUBDIR+=ipfilter
.endif .endif

1
share/examples/etc/README.examples
View file

@ -40,7 +40,6 @@ netstart - network startup script run from /etc/rc
network.subr - routines for network configuration scripts network.subr - routines for network configuration scripts
networks - see networks(5) networks - see networks(5)
newsyslog.conf - configuration for system log file rotator newsyslog(8) newsyslog.conf - configuration for system log file rotator newsyslog(8)
nsmb.conf - smbfs lookups configuration file
opieaccess - OPIE database of trusted networks opieaccess - OPIE database of trusted networks
pf.conf - pf(4) example configuration file pf.conf - pf(4) example configuration file
pf.os - SYN fingerprint database pf.os - SYN fingerprint database

1
share/mk/bsd.libnames.mk
View file

@ -143,7 +143,6 @@ LIBRT?= ${DESTDIR}${LIBDIR}/librt.a
LIBRTLD_DB?= ${DESTDIR}${LIBDIR}/librtld_db.a LIBRTLD_DB?= ${DESTDIR}${LIBDIR}/librtld_db.a
LIBSBUF?= ${DESTDIR}${LIBDIR}/libsbuf.a LIBSBUF?= ${DESTDIR}${LIBDIR}/libsbuf.a
LIBSDP?= ${DESTDIR}${LIBDIR}/libsdp.a LIBSDP?= ${DESTDIR}${LIBDIR}/libsdp.a
LIBSMB?= ${DESTDIR}${LIBDIR}/libsmb.a
LIBSSH?= ${DESTDIR}${LIBDIR}/libssh.a LIBSSH?= ${DESTDIR}${LIBDIR}/libssh.a
LIBSSL?= ${DESTDIR}${LIBDIR}/libssl.a LIBSSL?= ${DESTDIR}${LIBDIR}/libssl.a
LIBSTAND?= ${DESTDIR}${LIBDIR}/libstand.a LIBSTAND?= ${DESTDIR}${LIBDIR}/libstand.a

7
sys/conf/NOTES
View file

@ -573,12 +573,6 @@ options IPX #IPX/SPX communications protocols
options NETATALK #Appletalk communications protocols options NETATALK #Appletalk communications protocols
options NETATALKDEBUG #Appletalk debugging options NETATALKDEBUG #Appletalk debugging
#
# SMB/CIFS requester
# NETSMB enables support for SMB protocol, it requires LIBMCHAIN and LIBICONV
# options.
options NETSMB #SMB/CIFS requester
# mchain library. It can be either loaded as KLD or compiled into kernel # mchain library. It can be either loaded as KLD or compiled into kernel
options LIBMCHAIN options LIBMCHAIN
@ -1010,7 +1004,6 @@ options NULLFS #NULL filesystem
options PROCFS #Process filesystem (requires PSEUDOFS) options PROCFS #Process filesystem (requires PSEUDOFS)
options PSEUDOFS #Pseudo-filesystem framework options PSEUDOFS #Pseudo-filesystem framework
options PSEUDOFS_TRACE #Debugging support for PSEUDOFS options PSEUDOFS_TRACE #Debugging support for PSEUDOFS
options SMBFS #SMB/CIFS filesystem
options TMPFS #Efficient memory filesystem options TMPFS #Efficient memory filesystem
options UDF #Universal Disk Format options UDF #Universal Disk Format
options UNIONFS #Union filesystem options UNIONFS #Union filesystem

20
sys/conf/files
View file

@ -517,8 +517,8 @@ crypto/blowfish/bf_ecb.c optional ipsec
crypto/blowfish/bf_skey.c optional crypto | ipsec crypto/blowfish/bf_skey.c optional crypto | ipsec
crypto/camellia/camellia.c optional crypto | ipsec crypto/camellia/camellia.c optional crypto | ipsec
crypto/camellia/camellia-api.c optional crypto | ipsec crypto/camellia/camellia-api.c optional crypto | ipsec
crypto/des/des_ecb.c optional crypto | ipsec | netsmb crypto/des/des_ecb.c optional crypto | ipsec
crypto/des/des_setkey.c optional crypto | ipsec | netsmb crypto/des/des_setkey.c optional crypto | ipsec
crypto/rc4/rc4.c optional netgraph_mppc_encryption | kgssapi crypto/rc4/rc4.c optional netgraph_mppc_encryption | kgssapi
crypto/rijndael/rijndael-alg-fst.c optional crypto | geom_bde | \ crypto/rijndael/rijndael-alg-fst.c optional crypto | geom_bde | \
ipsec | random | wlan_ccmp ipsec | random | wlan_ccmp
@ -2386,12 +2386,6 @@ fs/pseudofs/pseudofs.c optional pseudofs
fs/pseudofs/pseudofs_fileno.c optional pseudofs fs/pseudofs/pseudofs_fileno.c optional pseudofs
fs/pseudofs/pseudofs_vncache.c optional pseudofs fs/pseudofs/pseudofs_vncache.c optional pseudofs
fs/pseudofs/pseudofs_vnops.c optional pseudofs fs/pseudofs/pseudofs_vnops.c optional pseudofs
fs/smbfs/smbfs_io.c optional smbfs
fs/smbfs/smbfs_node.c optional smbfs
fs/smbfs/smbfs_smb.c optional smbfs
fs/smbfs/smbfs_subr.c optional smbfs
fs/smbfs/smbfs_vfsops.c optional smbfs
fs/smbfs/smbfs_vnops.c optional smbfs
fs/udf/osta.c optional udf fs/udf/osta.c optional udf
fs/udf/udf_iconv.c optional udf_iconv fs/udf/udf_iconv.c optional udf_iconv
fs/udf/udf_vfsops.c optional udf fs/udf/udf_vfsops.c optional udf
@ -2626,7 +2620,6 @@ kern/kern_uuid.c standard
kern/kern_xxx.c standard kern/kern_xxx.c standard
kern/link_elf.c standard kern/link_elf.c standard
kern/linker_if.m standard kern/linker_if.m standard
kern/md4c.c optional netsmb
kern/md5c.c standard kern/md5c.c standard
kern/p1003_1b.c standard kern/p1003_1b.c standard
kern/posix4_mib.c standard kern/posix4_mib.c standard
@ -3155,15 +3148,6 @@ netpfil/pf/pf_osfp.c optional pf inet
netpfil/pf/pf_ruleset.c optional pf inet netpfil/pf/pf_ruleset.c optional pf inet
netpfil/pf/pf_table.c optional pf inet netpfil/pf/pf_table.c optional pf inet
netpfil/pf/in4_cksum.c optional pf inet netpfil/pf/in4_cksum.c optional pf inet
netsmb/smb_conn.c optional netsmb
netsmb/smb_crypt.c optional netsmb
netsmb/smb_dev.c optional netsmb
netsmb/smb_iod.c optional netsmb
netsmb/smb_rq.c optional netsmb
netsmb/smb_smb.c optional netsmb
netsmb/smb_subr.c optional netsmb
netsmb/smb_trantcp.c optional netsmb
netsmb/smb_usr.c optional netsmb
nfs/bootp_subr.c optional bootp nfsclient | bootp nfscl nfs/bootp_subr.c optional bootp nfsclient | bootp nfscl
nfs/krpc_subr.c optional bootp nfsclient | bootp nfscl nfs/krpc_subr.c optional bootp nfsclient | bootp nfscl
nfs/nfs_common.c optional nfsclient | nfsserver nfs/nfs_common.c optional nfsclient | nfsserver

2
sys/conf/files.amd64
View file

@ -136,7 +136,7 @@ crypto/aesni/aeskeys_amd64.S optional aesni
crypto/aesni/aesni.c optional aesni crypto/aesni/aesni.c optional aesni
crypto/aesni/aesni_wrap.c optional aesni crypto/aesni/aesni_wrap.c optional aesni
crypto/blowfish/bf_enc.c optional crypto | ipsec crypto/blowfish/bf_enc.c optional crypto | ipsec
crypto/des/des_enc.c optional crypto | ipsec | netsmb crypto/des/des_enc.c optional crypto | ipsec
crypto/via/padlock.c optional padlock crypto/via/padlock.c optional padlock
crypto/via/padlock_cipher.c optional padlock crypto/via/padlock_cipher.c optional padlock
crypto/via/padlock_hash.c optional padlock crypto/via/padlock_hash.c optional padlock

2
sys/conf/files.arm
View file

@ -5,7 +5,7 @@ font.h optional sc \
clean "font.h ${SC_DFLT_FONT}-8x14 ${SC_DFLT_FONT}-8x16 ${SC_DFLT_FONT}-8x8" clean "font.h ${SC_DFLT_FONT}-8x14 ${SC_DFLT_FONT}-8x16 ${SC_DFLT_FONT}-8x8"
crypto/blowfish/bf_enc.c optional crypto | ipsec crypto/blowfish/bf_enc.c optional crypto | ipsec
crypto/des/des_enc.c optional crypto | ipsec | netsmb crypto/des/des_enc.c optional crypto | ipsec
arm/arm/autoconf.c standard arm/arm/autoconf.c standard
arm/arm/bcopy_page.S standard arm/arm/bcopy_page.S standard
arm/arm/bcopyinout.S standard arm/arm/bcopyinout.S standard

2
sys/conf/files.i386
View file

@ -122,7 +122,7 @@ crypto/aesni/aesencdec_i386.S optional aesni
crypto/aesni/aeskeys_i386.S optional aesni crypto/aesni/aeskeys_i386.S optional aesni
crypto/aesni/aesni.c optional aesni crypto/aesni/aesni.c optional aesni
crypto/aesni/aesni_wrap.c optional aesni crypto/aesni/aesni_wrap.c optional aesni
crypto/des/arch/i386/des_enc.S optional crypto | ipsec | netsmb crypto/des/arch/i386/des_enc.S optional crypto | ipsec
crypto/via/padlock.c optional padlock crypto/via/padlock.c optional padlock
crypto/via/padlock_cipher.c optional padlock crypto/via/padlock_cipher.c optional padlock
crypto/via/padlock_hash.c optional padlock crypto/via/padlock_hash.c optional padlock

2
sys/conf/files.ia64
View file

@ -45,7 +45,7 @@ contrib/ia64/libuwx/src/uwx_trace.c standard
contrib/ia64/libuwx/src/uwx_uinfo.c standard contrib/ia64/libuwx/src/uwx_uinfo.c standard
contrib/ia64/libuwx/src/uwx_utable.c standard contrib/ia64/libuwx/src/uwx_utable.c standard
crypto/blowfish/bf_enc.c optional crypto | ipsec crypto/blowfish/bf_enc.c optional crypto | ipsec
crypto/des/des_enc.c optional crypto | ipsec | netsmb crypto/des/des_enc.c optional crypto | ipsec
dev/atkbdc/atkbd.c optional atkbd atkbdc dev/atkbdc/atkbd.c optional atkbd atkbdc
dev/atkbdc/atkbd_atkbdc.c optional atkbd atkbdc dev/atkbdc/atkbd_atkbdc.c optional atkbd atkbdc
dev/atkbdc/atkbdc.c optional atkbdc dev/atkbdc/atkbdc.c optional atkbdc

2
sys/conf/files.mips
View file

@ -65,7 +65,7 @@ mips/mips/swtch.S standard
mips/mips/uio_machdep.c standard mips/mips/uio_machdep.c standard
mips/mips/uma_machdep.c standard mips/mips/uma_machdep.c standard
crypto/blowfish/bf_enc.c optional crypto | ipsec crypto/blowfish/bf_enc.c optional crypto | ipsec
crypto/des/des_enc.c optional crypto | ipsec | netsmb crypto/des/des_enc.c optional crypto | ipsec
geom/geom_bsd.c optional geom_bsd geom/geom_bsd.c optional geom_bsd
geom/geom_bsd_enc.c optional geom_bsd geom/geom_bsd_enc.c optional geom_bsd
geom/geom_mbr.c optional geom_mbr geom/geom_mbr.c optional geom_mbr

2
sys/conf/files.pc98
View file

@ -77,7 +77,7 @@ bf_enc.o optional crypto | ipsec \
dependency "$S/crypto/blowfish/arch/i386/bf_enc.S $S/crypto/blowfish/arch/i386/bf_enc_586.S $S/crypto/blowfish/arch/i386/bf_enc_686.S" \ dependency "$S/crypto/blowfish/arch/i386/bf_enc.S $S/crypto/blowfish/arch/i386/bf_enc_586.S $S/crypto/blowfish/arch/i386/bf_enc_686.S" \
compile-with "${CC} -c -I$S/crypto/blowfish/arch/i386 ${ASM_CFLAGS} ${WERROR} ${.IMPSRC}" \ compile-with "${CC} -c -I$S/crypto/blowfish/arch/i386 ${ASM_CFLAGS} ${WERROR} ${.IMPSRC}" \
no-implicit-rule no-implicit-rule
crypto/des/arch/i386/des_enc.S optional crypto | ipsec | netsmb crypto/des/arch/i386/des_enc.S optional crypto | ipsec
dev/agp/agp_ali.c optional agp dev/agp/agp_ali.c optional agp
dev/agp/agp_amd.c optional agp dev/agp/agp_amd.c optional agp
dev/agp/agp_i810.c optional agp dev/agp/agp_i810.c optional agp

2
sys/conf/files.powerpc
View file

@ -18,7 +18,7 @@ font.h optional sc \
cddl/compat/opensolaris/kern/opensolaris_atomic.c optional zfs powerpc compile-with "${ZFS_C}" cddl/compat/opensolaris/kern/opensolaris_atomic.c optional zfs powerpc compile-with "${ZFS_C}"
cddl/contrib/opensolaris/common/atomic/powerpc64/opensolaris_atomic.S optional zfs powerpc64 compile-with "${ZFS_S}" cddl/contrib/opensolaris/common/atomic/powerpc64/opensolaris_atomic.S optional zfs powerpc64 compile-with "${ZFS_S}"
crypto/blowfish/bf_enc.c optional crypto | ipsec crypto/blowfish/bf_enc.c optional crypto | ipsec
crypto/des/des_enc.c optional crypto | ipsec | netsmb crypto/des/des_enc.c optional crypto | ipsec
dev/bm/if_bm.c optional bm powermac dev/bm/if_bm.c optional bm powermac
dev/adb/adb_bus.c optional adb dev/adb/adb_bus.c optional adb
dev/adb/adb_kbd.c optional adb dev/adb/adb_kbd.c optional adb

2
sys/conf/files.sparc64
View file

@ -24,7 +24,7 @@ ukbdmap.h optional ukbd_dflt_keymap \
# #
cddl/contrib/opensolaris/common/atomic/sparc64/opensolaris_atomic.S optional zfs compile-with "${ZFS_S}" cddl/contrib/opensolaris/common/atomic/sparc64/opensolaris_atomic.S optional zfs compile-with "${ZFS_S}"
crypto/blowfish/bf_enc.c optional crypto | ipsec crypto/blowfish/bf_enc.c optional crypto | ipsec
crypto/des/des_enc.c optional crypto | ipsec | netsmb crypto/des/des_enc.c optional crypto | ipsec
dev/atkbdc/atkbd.c optional atkbd atkbdc dev/atkbdc/atkbd.c optional atkbd atkbdc
dev/atkbdc/atkbd_atkbdc.c optional atkbd atkbdc dev/atkbdc/atkbd_atkbdc.c optional atkbd atkbdc
dev/atkbdc/atkbdc.c optional atkbdc dev/atkbdc/atkbdc.c optional atkbdc

4
sys/conf/options
View file

@ -216,7 +216,6 @@ NULLFS opt_dontuse.h
PROCFS opt_dontuse.h PROCFS opt_dontuse.h
PSEUDOFS opt_dontuse.h PSEUDOFS opt_dontuse.h
REISERFS opt_dontuse.h REISERFS opt_dontuse.h
SMBFS opt_dontuse.h
TMPFS opt_dontuse.h TMPFS opt_dontuse.h
UDF opt_dontuse.h UDF opt_dontuse.h
UNIONFS opt_dontuse.h UNIONFS opt_dontuse.h
@ -282,9 +281,6 @@ UFS_GJOURNAL opt_ufs.h
# they won't make any difference yet). # they won't make any difference yet).
NFS_ROOT opt_nfsroot.h NFS_ROOT opt_nfsroot.h
# SMB/CIFS requester
NETSMB opt_netsmb.h
# Options used only in subr_param.c. # Options used only in subr_param.c.
HZ opt_param.h HZ opt_param.h
MAXFILES opt_param.h MAXFILES opt_param.h

1
sys/kern/Make.tags.inc
View file

@ -30,7 +30,6 @@ COMM= ${SYS}/dev/advansys/*.[ch] \
${SYS}/fs/msdosfs/*.[ch] \ ${SYS}/fs/msdosfs/*.[ch] \
${SYS}/fs/nullfs/*.[ch] \ ${SYS}/fs/nullfs/*.[ch] \
${SYS}/fs/procfs/*.[ch] \ ${SYS}/fs/procfs/*.[ch] \
${SYS}/fs/smbfs/*.[ch] \
${SYS}/fs/udf/*.[ch] \ ${SYS}/fs/udf/*.[ch] \
${SYS}/fs/unionfs/*.[ch] \ ${SYS}/fs/unionfs/*.[ch] \
${SYS}/geom/*.[ch] \ ${SYS}/geom/*.[ch] \

56
sys/kern/sys_generic.c
View file

@ -1473,62 +1473,6 @@ sys_openbsd_poll(td, uap)
return (sys_poll(td, (struct poll_args *)uap)); return (sys_poll(td, (struct poll_args *)uap));
} }
/*
* XXX This was created specifically to support netncp and netsmb. This
* allows the caller to specify a socket to wait for events on. It returns
* 0 if any events matched and an error otherwise. There is no way to
* determine which events fired.
*/
int
selsocket(struct socket *so, int events, struct timeval *tvp, struct thread *td)
{
struct timeval atv, rtv, ttv;
int error, timo;
if (tvp != NULL) {
atv = *tvp;
if (itimerfix(&atv))
return (EINVAL);
getmicrouptime(&rtv);
timevaladd(&atv, &rtv);
} else {
atv.tv_sec = 0;
atv.tv_usec = 0;
}
timo = 0;
seltdinit(td);
/*
* Iterate until the timeout expires or the socket becomes ready.
*/
for (;;) {
selfdalloc(td, NULL);
error = sopoll(so, events, NULL, td);
/* error here is actually the ready events. */
if (error)
return (0);
if (atv.tv_sec || atv.tv_usec) {
getmicrouptime(&rtv);
if (timevalcmp(&rtv, &atv, >=)) {
seltdclear(td);
return (EWOULDBLOCK);
}
ttv = atv;
timevalsub(&ttv, &rtv);
timo = ttv.tv_sec > 24 * 60 * 60 ?
24 * 60 * 60 * hz : tvtohz(&ttv);
}
error = seltdwait(td, timo);
seltdclear(td);
if (error)
break;
}
/* XXX Duplicates ncp/smb behavior. */
if (error == ERESTART)
error = 0;
return (error);
}
/* /*
* Preallocate two selfds associated with 'cookie'. Some fo_poll routines * Preallocate two selfds associated with 'cookie'. Some fo_poll routines
* have two select sets, one for read and another for write. * have two select sets, one for read and another for write.

6
sys/modules/Makefile
View file

@ -295,7 +295,6 @@ SUBDIR= \
siis \ siis \
sis \ sis \
sk \ sk \
${_smbfs} \
${_sn} \ ${_sn} \
${_snc} \ ${_snc} \
snp \ snp \
@ -514,7 +513,6 @@ _rdma= rdma
_safe= safe _safe= safe
_sbni= sbni _sbni= sbni
_scsi_low= scsi_low _scsi_low= scsi_low
_smbfs= smbfs
_sound= sound _sound= sound
_speaker= speaker _speaker= speaker
_splash= splash _splash= splash
@ -712,7 +710,6 @@ _s3= s3
_safe= safe _safe= safe
_scsi_low= scsi_low _scsi_low= scsi_low
_sfxge= sfxge _sfxge= sfxge
_smbfs= smbfs
_sound= sound _sound= sound
_speaker= speaker _speaker= speaker
_splash= splash _splash= splash
@ -768,7 +765,6 @@ _ips= ips
_mly= mly _mly= mly
_pccard= pccard _pccard= pccard
_scsi_low= scsi_low _scsi_low= scsi_low
_smbfs= smbfs
_sound= sound _sound= sound
_splash= splash _splash= splash
_sppp= sppp _sppp= sppp
@ -790,7 +786,6 @@ _cpufreq= cpufreq
_exca= exca _exca= exca
_nvram= powermac_nvram _nvram= powermac_nvram
_pccard= pccard _pccard= pccard
_smbfs= smbfs
_sound= sound _sound= sound
.endif .endif
@ -812,7 +807,6 @@ _igb= igb
.if ${MK_CDDL} != "no" || defined(ALL_MODULES) .if ${MK_CDDL} != "no" || defined(ALL_MODULES)
_opensolaris= opensolaris _opensolaris= opensolaris
.endif .endif
_smbfs= smbfs
_sound= sound _sound= sound
.if ${MK_ZFS} != "no" || defined(ALL_MODULES) .if ${MK_ZFS} != "no" || defined(ALL_MODULES)
_zfs= zfs _zfs= zfs

2
sys/sys/socketvar.h
View file

@ -368,8 +368,6 @@ void soupcall_clear(struct socket *so, int which);
void soupcall_set(struct socket *so, int which, void soupcall_set(struct socket *so, int which,
int (*func)(struct socket *, void *, int), void *arg); int (*func)(struct socket *, void *, int), void *arg);
void sowakeup(struct socket *so, struct sockbuf *sb); void sowakeup(struct socket *so, struct sockbuf *sb);
int selsocket(struct socket *so, int events, struct timeval *tv,
struct thread *td);
/* /*
* Accept filter functions (duh). * Accept filter functions (duh).

1
usr.bin/Makefile.amd64
View file

@ -1,3 +1,2 @@
# $FreeBSD$ # $FreeBSD$
SUBDIR+= smbutil

1
usr.bin/Makefile.i386
View file

@ -1,3 +1,2 @@
# $FreeBSD$ # $FreeBSD$
SUBDIR+= smbutil

1
usr.bin/Makefile.ia64
View file

@ -1,3 +1,2 @@
# $FreeBSD$ # $FreeBSD$
SUBDIR+= smbutil

1
usr.bin/Makefile.powerpc
View file

@ -1,3 +1,2 @@
# $FreeBSD$ # $FreeBSD$
SUBDIR+= smbutil

1
usr.bin/Makefile.sparc64
View file

@ -1,3 +1,2 @@
# $FreeBSD$ # $FreeBSD$
SUBDIR+= smbutil

2
usr.bin/kdump/kdump.c
View file

@ -1420,8 +1420,6 @@ ktrsockaddr(struct sockaddr *sa)
TODO: Support additional address families TODO: Support additional address families
#include <netnatm/natm.h> #include <netnatm/natm.h>
struct sockaddr_natm *natm; struct sockaddr_natm *natm;
#include <netsmb/netbios.h>
struct sockaddr_nb *nb;
*/ */
char addr[64]; char addr[64];

1
usr.sbin/Makefile.amd64
View file

@ -17,7 +17,6 @@ SUBDIR+= btxld
SUBDIR+= cpucontrol SUBDIR+= cpucontrol
SUBDIR+= kgmon SUBDIR+= kgmon
SUBDIR+= lptcontrol SUBDIR+= lptcontrol
SUBDIR+= mount_smbfs
SUBDIR+= mptable SUBDIR+= mptable
.if ${MK_NDIS} != "no" .if ${MK_NDIS} != "no"
SUBDIR+= ndiscvt SUBDIR+= ndiscvt

1
usr.sbin/Makefile.i386
View file

@ -12,7 +12,6 @@ SUBDIR+= cpucontrol
SUBDIR+= kgmon SUBDIR+= kgmon
SUBDIR+= kgzip SUBDIR+= kgzip
SUBDIR+= lptcontrol SUBDIR+= lptcontrol
SUBDIR+= mount_smbfs
SUBDIR+= mptable SUBDIR+= mptable
.if ${MK_NDIS} != "no" .if ${MK_NDIS} != "no"
SUBDIR+= ndiscvt SUBDIR+= ndiscvt

1
usr.sbin/Makefile.ia64
View file

@ -4,6 +4,5 @@
SUBDIR+= acpi SUBDIR+= acpi
.endif .endif
SUBDIR+= kgmon SUBDIR+= kgmon
SUBDIR+= mount_smbfs
SUBDIR:= ${SUBDIR:Nuathload} SUBDIR:= ${SUBDIR:Nuathload}
SUBDIR+= zzz SUBDIR+= zzz

1
usr.sbin/Makefile.powerpc
View file

@ -1,5 +1,4 @@
# $FreeBSD$ # $FreeBSD$
SUBDIR+= mount_smbfs
SUBDIR+= nvram SUBDIR+= nvram
SUBDIR+= ofwdump SUBDIR+= ofwdump

1
usr.sbin/Makefile.sparc64
View file

@ -1,7 +1,6 @@
# $FreeBSD$ # $FreeBSD$
SUBDIR+= eeprom SUBDIR+= eeprom
SUBDIR+= mount_smbfs
SUBDIR+= ofwdump SUBDIR+= ofwdump
.if ${MK_SYSINSTALL} != "no" .if ${MK_SYSINSTALL} != "no"
SUBDIR+= sade SUBDIR+= sade