Proposed paths for Samba 4.0

Wed Jun 15 06:20:21 MDT 2011

On Wed, 2011-06-15 at 07:45 -0400, simo wrote:
> On Wed, 2011-06-15 at 14:52 +1000, Andrew Bartlett wrote:
> > -    'with-lockdir'                        :
> > [ '${LOCALSTATEDIR}/locks', 'where to put short term disposable state
> > files' ],
> > -    'with-cachedir'                       :
> > [ '${LOCALSTATEDIR}/locks', 'where to put cache files' ],
> > +    'with-lockdir'                        :
> > [ '${LOCALSTATEDIR}/lock', 'where to put short term disposable state
> > files' ],
> 
> Are you sure you want to drop the 's' in locks here ?

Yes, the idea was to get closer to what metze describes, where the
defaults match the FHS.  /var/lock is the directory on my system.

My hope is to remove --enable-fhs, because the interactions between it
and the paths being specified is just too subtle.   

Now, I fully expect that distributions will continue to put Samba files
in a subdirectory, and that's their choice, but I figured I should at
least use the right starting structure, and perhaps even have something
that is 'good enough' not to change many of the paths.  

BTW, I did a survey of the current behaviour and distro configure lines
before I started, and my rough notes are attached.  It contains the smbd
-b output for various toplevel builds, and autoconf builds.

Andrew Bartlett

-- 
Andrew Bartlett                                http://samba.org/~abartlet/
Authentication Developer, Samba Team           http://samba.org
-------------- next part --------------

Top level WAF (default)
   SRCDIR:      /data/samba-2/source3
   BUILDDIR:    /data/samba-2/source3
   SBINDIR: /usr/local/samba/sbin
   BINDIR: /usr/local/samba/bin
   SWATDIR: /usr/local/samba/share/swat
   CONFIGFILE: /usr/local/samba/etc/smb.conf
   LOGFILEBASE: /usr/local/samba/var
   LMHOSTSFILE: /usr/local/samba/etc/lmhosts
   LIBDIR: /usr/local/samba/lib
   MODULESDIR: /data/samba-2/bin/modules
   LOCKDIR: /usr/local/samba/var/locks
   STATEDIR: /usr/local/samba/var
   CACHEDIR: /usr/local/samba/var/locks
   PIDDIR: /usr/local/samba/var/run
   SMB_PASSWD_FILE: /usr/local/samba/private/smbpasswd
   PRIVATE_DIR: /usr/local/samba/private

Top level WAF --prefix=/usr --enable-fhs
   SRCDIR:      /data/samba-2/source3
   BUILDDIR:    /data/samba-2/source3
   SBINDIR: /usr/sbin
   BINDIR: /usr/bin
   SWATDIR: /usr/share/swat
   CONFIGFILE: /usr/etc/samba/smb.conf
   LOGFILEBASE: /usr/var/log/samba
   LMHOSTSFILE: /usr/etc/samba/lmhosts
   LIBDIR: /usr/lib
   MODULESDIR: /data/samba-2/bin/modules
   LOCKDIR: /usr/var/lib/samba
   STATEDIR: /usr/var
   CACHEDIR: /usr/var/locks
   PIDDIR: /usr/var/run/samba
   SMB_PASSWD_FILE: /usr/private/smbpasswd
   PRIVATE_DIR: /usr/var/lib/samba/private

Samba3 autoconf --prefix=/usr --with-fhs
Paths:
   SBINDIR: /usr/sbin
   BINDIR: /usr/bin
+  SWATDIR: /usr/share/samba/swat
   CONFIGFILE: /usr/etc/samba/smb.conf
   LOGFILEBASE: /usr/var/log/samba
   LMHOSTSFILE: /usr/etc/samba/lmhosts
   LIBDIR: /usr/lib
   MODULESDIR: /usr/lib/samba
   SHLIBEXT: so
   LOCKDIR: /usr/var/lib/samba
*  STATEDIR: /usr/var/lib/samba
*  CACHEDIR: /usr/var/lib/samba
*  PIDDIR: /usr/var/run
*  SMB_PASSWD_FILE: /usr/etc/samba/private/smbpasswd
*  PRIVATE_DIR: /usr/etc/samba/private

Samba3 autoconf default paths
Paths:
   SBINDIR: /usr/local/samba/sbin
   BINDIR: /usr/local/samba/bin
   SWATDIR: /usr/local/samba/swat
   CONFIGFILE: /usr/local/samba/lib/smb.conf
   LOGFILEBASE: /usr/local/samba/var
   LMHOSTSFILE: /usr/local/samba/lib/lmhosts
   LIBDIR: /usr/local/samba/lib
   MODULESDIR: /usr/local/samba/lib
   SHLIBEXT: so
   LOCKDIR: /usr/local/samba/var/locks
   STATEDIR: /usr/local/samba/var/locks
   CACHEDIR: /usr/local/samba/var/locks
   PIDDIR: /usr/local/samba/var/locks
   SMB_PASSWD_FILE: /usr/local/samba/private/smbpasswd
   PRIVATE_DIR: /usr/local/samba/private

OpenSUSE Factory 3.5.8 
./autogen.sh
CONFIGURE_OPTIONS="\
	--prefix=%{_prefix} \
	--localstatedir=%{LOCKDIR} \
	--sysconfdir=%{CONFIGDIR} \
	--with-configdir=%{CONFIGDIR} \
	--libdir=%{_libdir} \
	--with-lockdir=%{LOCKDIR} \
	--with-logfilebase=%{LOGDIR} \
	--with-mandir=%{_mandir} \
	--with-modulesdir=%{_libdir}/samba \
	--with-rootsbindir=/sbin \
	--enable-cups \
	--enable-debug \
%if %{link_static_libs}
	--enable-static \
%else
	--disable-static \
%endif
	--with-acl-support \
	--with-automount \
	--with-dnsupdate \
	--with-pam \
	--with-pammodulesdir=%{_lib}/security \
	--with-pam_smbpass \
	--with-piddir=%{PIDDIR} \
	--with-privatedir=%{CONFIGDIR} \
%if %{make_devel}
	--with-profiling-data \
%endif
	--with-quotas \
	--with-swatdir=%{SWATDIR} \
	--with-syslog \
	--with-utmp \
	--with-winbind \
	--with-shared-modules=%{vfs_modules},%{idmap_modules} \
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1120
	--without-cifsmount \
%else
	--with-cifsumount \
%endif
%if %{make_cifsupcall} == 0
	--without-cifsupcall \
%else
	--with-cifsupcall \
%endif
%if %{make_devel}
	--enable-developer \
	--enable-krb5developer \
%endif

Fedora 3.6.0:

CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -DLDAP_DEPRECATED" %configure \
    --with-dnsupdate \
    --with-ads \
    --with-acl-support \
    --with-automount \
    --with-dnsupdate \
    --with-libsmbclient \
    --with-libsmbsharemodes \
    --with-mmap \
    --with-pam \
    --with-pam_smbpass \
    --with-quotas \
    --with-sendfile-support \
    --with-syslog \
    --with-utmp \
    --with-vfs \
    --with-winbind \
    --without-smbwrapper \
    --with-lockdir=/var/lib/samba \
    --with-piddir=/var/run \
    --with-mandir=%{_mandir} \
    --with-privatedir=/var/lib/samba/private \
    --with-logfilebase=/var/log/samba \
    --with-libdir=%{_libdir} \
    --with-modulesdir=%{_libdir}/samba \
    --with-configdir=%{_sysconfdir}/samba \
    --with-pammodulesdir=%{_lib}/security \
    --with-swatdir=%{_datadir}/swat \
    --with-shared-modules=idmap_ad,idmap_rid,idmap_adex,idmap_hash,idmap_tdb2 \
    --with-cluster-support=auto \
    --with-libtalloc=no \
    --enable-external-libtalloc=yes \
    --with-libtdb=no
#    --enable-external-libtdb=yes \
#    --with-aio-support \

Debian:

conf_args = \
		--cache-file=./config.cache \
		--with-fhs \
		--enable-shared \
		--enable-static \
		--prefix=/usr \
		--sysconfdir=/etc \
		--libdir=/usr/lib/samba \
		--with-privatedir=/etc/samba \
		--with-piddir=/var/run/samba \
		--localstatedir=/var \
		--with-rootsbindir=/sbin \
		--with-pammodulesdir=/lib/security \
		--with-pam \
		--with-syslog \
		--with-utmp \
		--with-readline \
		--with-pam_smbpass \
		--with-libsmbclient \
		--with-winbind \
		--with-shared-modules=idmap_rid,idmap_ad,idmap_adex,idmap_hash,idmap_ldap,idmap_tdb2 \
		--with-automount \
		--with-ldap \
		--with-ads \
		--with-dnsupdate \
		--without-libtdb \
		--without-libnetapi \
		--with-modulesdir=/usr/lib/samba \
		--datarootdir=/usr/share \
		--datadir=/usr/share/samba \
		--with-swatdir=/usr/share/samba/swat \
		--with-lockdir=/var/run/samba \
		--with-statedir=/var/lib/samba \
		--with-cachedir=/var/cache/samba \
		--with-codepagedir=/usr/share/samba \
		--with-nmbdsocketdir=/var/run/samba \
		--enable-external-libtalloc \
		--without-libtalloc \
		--disable-avahi