diff options
| -rwxr-xr-x | packaging/RHEL-CTDB/configure.rpm | 1 | ||||
| -rw-r--r-- | packaging/RHEL-CTDB/samba.spec.tmpl | 3 | ||||
| -rw-r--r-- | packaging/RHEL/samba.spec.tmpl | 2 | ||||
| -rw-r--r-- | source3/libsmb/smb_share_modes.c | 8 | ||||
| -rw-r--r-- | source3/libsmb/smbsharemodes.pc.in | 11 | ||||
| -rwxr-xr-x | source3/wscript_build | 8 |
6 files changed, 8 insertions, 25 deletions
diff --git a/packaging/RHEL-CTDB/configure.rpm b/packaging/RHEL-CTDB/configure.rpm index 398a3f918a1..62a326c1dea 100755 --- a/packaging/RHEL-CTDB/configure.rpm +++ b/packaging/RHEL-CTDB/configure.rpm @@ -53,7 +53,6 @@ CC="$CC" CFLAGS="-Wall -g -D_GNU_SOURCE -O3" ./configure -C \ --enable-fhs \ --with-pam_smbpass \ --with-libsmbclient \ - --with-libsmbsharemodes \ --without-smbwrapper \ --with-pam \ --with-quotas \ diff --git a/packaging/RHEL-CTDB/samba.spec.tmpl b/packaging/RHEL-CTDB/samba.spec.tmpl index c1789f23764..056c00f1224 100644 --- a/packaging/RHEL-CTDB/samba.spec.tmpl +++ b/packaging/RHEL-CTDB/samba.spec.tmpl @@ -171,7 +171,6 @@ CFLAGS="$RPM_OPT_FLAGS $EXTRA -D_GNU_SOURCE" ./configure \ --enable-fhs \ --with-pam_smbpass \ --with-libsmbclient \ - --with-libsmbsharemodes \ --without-smbwrapper \ --with-pam \ --with-quotas \ @@ -544,8 +543,6 @@ exit 0 %{_includedir}/libsmbclient.h %{_libarchdir}/libsmbclient.* %{_includedir}/smb_share_modes.h -%{_libarchdir}/libsmbsharemodes.so -%{_libarchdir}/libsmbsharemodes.so.0 %{_includedir}/netapi.h %{_includedir}/wbclient.h diff --git a/packaging/RHEL/samba.spec.tmpl b/packaging/RHEL/samba.spec.tmpl index 05e46e16355..ed379944356 100644 --- a/packaging/RHEL/samba.spec.tmpl +++ b/packaging/RHEL/samba.spec.tmpl @@ -167,7 +167,6 @@ CC="$CC" CFLAGS="$RPM_OPT_FLAGS $EXTRA -D_GNU_SOURCE" ./configure \ --with-fhs \ --with-pam_smbpass \ --with-libsmbclient \ - --with-libsmbsharemodes \ --without-smbwrapper \ --with-pam \ --with-quotas \ @@ -470,7 +469,6 @@ fi %{_includedir}/libsmbclient.h %{_libarchdir}/libsmbclient.* %{_includedir}/smb_share_modes.h -%{_libarchdir}/libsmbsharemodes.* %{_libarchdir}/samba/*.dat %{_libarchdir}/samba/*.msg diff --git a/source3/libsmb/smb_share_modes.c b/source3/libsmb/smb_share_modes.c index f2decc1779a..bf21bf5a593 100644 --- a/source3/libsmb/smb_share_modes.c +++ b/source3/libsmb/smb_share_modes.c @@ -2,6 +2,14 @@ Samba share mode database library external interface library. Used by non-Samba products needing access to the Samba share mode db. + NOTICE FOR SAMBA 4.2.0 + + THIS CODE IS NON-FUNCTIONAL IN SAMBA 4.2.0 AND ABOVE DUE TO THE CHANGES IN + SHARE MODE DATABASE SCHEMA FOR SMB2 LEASES. + + CONTACT THE AUTHOR jra@samba.org IF YOU WISH TO RE-ENABLE + THIS CODE. + Copyright (C) Jeremy Allison 2005 - 2006 sharemodes_procid functions (C) Copyright (C) Volker Lendecke 2005 diff --git a/source3/libsmb/smbsharemodes.pc.in b/source3/libsmb/smbsharemodes.pc.in deleted file mode 100644 index fadc4812351..00000000000 --- a/source3/libsmb/smbsharemodes.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: Samba libsmbsharemodes -Description: A library -Version: @PACKAGE_VERSION@ -Libs: @LIB_RPATH@ -L${libdir} -lsmbsharemodes -Cflags: -I${includedir} -URL: http://www.samba.org/ diff --git a/source3/wscript_build b/source3/wscript_build index 7b5130d1108..df503babc3d 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -55,14 +55,6 @@ bld.SAMBA3_LIBRARY('netapi', pc_files='libnet/netapi.pc', vnum='0') -bld.SAMBA3_LIBRARY('smbsharemodes', - source='libsmb/smb_share_modes.c', - public_deps='''talloc tdb_compat''', - deps='''ccan-hash''', - public_headers='include/smb_share_modes.h', - pc_files='libsmb/smbsharemodes.pc', - vnum='0') - bld.SAMBA3_LIBRARY('nss_wins', source='../nsswitch/wins.c', deps='''param libsmb LIBTSOCKET''', |