kernel: Fix compiling SMBFS and NETSMB into the x86_64 kernel.

diff --git a/sys/conf/files b/sys/conf/files
index e6acc32..50a10fc 100644 (file)
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1541,6 +1541,16 @@ netproto/ncp/ncp_nls.c           optional ncp
 netproto/ncp/ncp_rq.c          optional ncp
 netproto/ncp/ncp_sock.c                optional ncp
 netproto/ncp/ncp_subr.c                optional ncp
+kern/md4c.c                    optional netsmb
+netproto/smb/smb_conn.c                optional netsmb
+netproto/smb/smb_crypt.c       optional netsmb
+netproto/smb/smb_dev.c         optional netsmb
+netproto/smb/smb_iod.c         optional netsmb
+netproto/smb/smb_rq.c          optional netsmb
+netproto/smb/smb_smb.c         optional netsmb
+netproto/smb/smb_subr.c                optional netsmb
+netproto/smb/smb_trantcp.c     optional netsmb
+netproto/smb/smb_usr.c         optional netsmb
 vfs/nfs/nfs_bio.c              optional nfs
 vfs/nfs/nfs_node.c             optional nfs
 vfs/nfs/nfs_serv.c             optional nfs

diff --git a/sys/conf/options b/sys/conf/options
index 87ee521..c64e46f 100644 (file)
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -139,6 +139,7 @@ MSDOSFS             opt_dontuse.h
 NULLFS         opt_dontuse.h
 PORTAL         opt_dontuse.h
 PROCFS         opt_dontuse.h
+SMBFS          opt_dontuse.h
 UDF            opt_dontuse.h
 NTFS           opt_dontuse.h
 #TMPFS         opt_dontuse.h
@@ -161,6 +162,10 @@ CD9660_ICONV       opt_dontuse.h
 MSDOSFS_ICONV  opt_dontuse.h
 NTFS_ICONV     opt_dontuse.h
 
+# SMB/CIFS requester
+NETSMB         opt_netsmb.h
+NETSMBCRYPTO   opt_netsmb.h
+
 # If you are following the conditions in the copyright,
 # you can enable soft-updates which will speed up a lot of things
 # and make the system safer from crashes at the same time.

diff --git a/sys/config/LINT64 b/sys/config/LINT64
index 82e3181..24dc228 100644 (file)
--- a/sys/config/LINT64
+++ b/sys/config/LINT64
@@ -312,6 +312,14 @@ options    MPLS                    #Multi-Protocol Label Switching
 
 options        NETATALK                #Appletalk communications protocols
 
+#
+# SMB/CIFS requester
+# NETSMB enables support for SMB protocol, it requires LIBMCHAIN and LIBICONV
+# options.
+# NETSMBCRYPTO enables support for encrypted passwords.
+options        NETSMB                  #SMB/CIFS requester
+options        NETSMBCRYPTO            #encrypted password support for SMB
+
 # mchain library. It can be either loaded as KLD or compiled into kernel
 options        LIBMCHAIN               #mbuf management library
 
@@ -584,6 +592,7 @@ options     NULLFS                  #NULL filesystem
 options        NWFS                    #NetWare filesystem
 options        PORTAL                  #Portal filesystem
 options        PROCFS                  #Process filesystem
+options        SMBFS                   #SMB/CIFS filesystem
 options                UDF                     #UDF filesystem
 options                HAMMER                  #HAMMER filesystem
 options        TMPFS                   #Temporary filesystem

diff --git a/sys/platform/pc32/conf/files b/sys/platform/pc32/conf/files
index 1a497cf..44e1c92 100644 (file)
--- a/sys/platform/pc32/conf/files
+++ b/sys/platform/pc32/conf/files
@@ -373,7 +373,6 @@ dev/serial/sio/sio.c                        optional        sio
 dev/serial/sio/sio_pccard.c            optional        sio pccard
 bus/isa/syscons_isa.c                  optional        sc
 bus/isa/vga_isa.c                      optional        vga
-kern/md4c.c                            optional        netsmb
 kern/subr_diskmbr.c                    standard
 kern/subr_diskgpt.c                    standard
 libkern/flsl.c                         standard
@@ -382,12 +381,3 @@ libkern/moddi3.c                   standard
 libkern/qdivrem.c                      standard
 libkern/udivdi3.c                      standard
 libkern/umoddi3.c                      standard
-netproto/smb/smb_conn.c                        optional        netsmb
-netproto/smb/smb_crypt.c               optional        netsmb
-netproto/smb/smb_dev.c                 optional        netsmb
-netproto/smb/smb_iod.c                 optional        netsmb
-netproto/smb/smb_rq.c                  optional        netsmb
-netproto/smb/smb_smb.c                 optional        netsmb
-netproto/smb/smb_subr.c                        optional        netsmb
-netproto/smb/smb_trantcp.c             optional        netsmb
-netproto/smb/smb_usr.c                 optional        netsmb

diff --git a/sys/platform/pc32/conf/options b/sys/platform/pc32/conf/options
index 08997ef..c0cdf2a 100644 (file)
--- a/sys/platform/pc32/conf/options
+++ b/sys/platform/pc32/conf/options
@@ -165,13 +165,6 @@ IPR_LOG                    opt_i4b.h
 # Defaults to NDGB*16.
 NDGBPORTS              opt_dgb.h
 
-# SMB/CIFS requester
-NETSMB                 opt_netsmb.h
-NETSMBCRYPTO           opt_netsmb.h
-
-# SMB/CIFS filesystem
-SMBFS
-
 # -------------------------------
 # EOF
 # -------------------------------

diff --git a/sys/vfs/smbfs/Makefile b/sys/vfs/smbfs/Makefile
index e904f6a..238db0e 100644 (file)
--- a/sys/vfs/smbfs/Makefile
+++ b/sys/vfs/smbfs/Makefile
@@ -1,5 +1,4 @@
 # $FreeBSD: src/sys/modules/smbfs/Makefile,v 1.1.2.4 2002/03/26 10:12:29 ume Exp $
-# $DragonFly: src/sys/vfs/smbfs/Makefile,v 1.7 2008/01/06 16:15:29 nth Exp $
 
 .PATH: ${.CURDIR}/../../crypto/des \
        ${.CURDIR}/../../crypto/des/arch/${MACHINE_ARCH} \
@@ -10,7 +9,7 @@
 KMOD=  smbfs
 
 SRCS=  opt_inet.h opt_ipx.h \
-       opt_netsmb.h opt_smbfs.h opt_vmpage.h \
+       opt_netsmb.h opt_vmpage.h \
        iconv_converter_if.h \
        md4c.c \
        smb_conn.c smb_dev.c smb_trantcp.c smb_smb.c smb_subr.c smb_rq.c \