samba: Big clean/fixup of samba including

- Remove repeition of everything, everywhere
- Fix uclibc builds of 3.0.34
- Add active directory client support to 3.2.7

6 files changed, 375 insertions, 149 deletions

diff --git a/packages/samba/files/smb.conf b/packages/samba/files/smb.conf
new file mode 100644
index 0000000000..3854621c3e
--- /dev/null
+++ b/packages/samba/files/smb.conf
@@ -0,0 +1,266 @@
+# This is the main Samba configuration file. You should read the
+# smb.conf(5) manual page in order to understand the options listed
+# here. Samba has a huge number of configurable options (perhaps too
+# many!) most of which are not shown in this example
+#
+# For a step to step guide on installing, configuring and using samba, 
+# read the Samba-HOWTO-Collection. This may be obtained from:
+#  http://www.samba.org/samba/docs/Samba-HOWTO-Collection.pdf
+#
+# Many working examples of smb.conf files can be found in the 
+# Samba-Guide which is generated daily and can be downloaded from: 
+#  http://www.samba.org/samba/docs/Samba-Guide.pdf
+#
+# Any line which starts with a ; (semi-colon) or a # (hash) 
+# is a comment and is ignored. In this example we will use a #
+# for commentry and a ; for parts of the config file that you
+# may wish to enable
+#
+# NOTE: Whenever you modify this file you should run the command "testparm"
+# to check that you have not made any basic syntactic errors. 
+#
+#======================= Global Settings =====================================
+[global]
+
+# workgroup = NT-Domain-Name or Workgroup-Name, eg: MIDEARTH
+   workgroup = MYGROUP
+
+# server string is the equivalent of the NT Description field
+   server string = Samba Server
+
+# Security mode. Defines in which mode Samba will operate. Possible 
+# values are share, user, server, domain and ads. Most people will want 
+# user level security. See the Samba-HOWTO-Collection for details.
+   security = user
+
+# This option is important for security. It allows you to restrict
+# connections to machines which are on your local network. The
+# following example restricts access to two C class networks and
+# the "loopback" interface. For more examples of the syntax see
+# the smb.conf man page
+;   hosts allow = 192.168.1. 192.168.2. 127.
+
+# If you want to automatically load your printer list rather
+# than setting them up individually then you'll need this
+   load printers = yes
+
+# you may wish to override the location of the printcap file
+;   printcap name = /etc/printcap
+
+# on SystemV system setting printcap name to lpstat should allow
+# you to automatically obtain a printer list from the SystemV spool
+# system
+;   printcap name = lpstat
+
+# It should not be necessary to specify the print system type unless
+# it is non-standard. Currently supported print systems include:
+# bsd, cups, sysv, plp, lprng, aix, hpux, qnx
+;   printing = cups
+
+# Uncomment this if you want a guest account, you must add this to /etc/passwd
+# otherwise the user "nobody" is used
+;  guest account = pcguest
+
+# this tells Samba to use a separate log file for each machine
+# that connects
+   log file = /var/log/samba/log.%m
+
+# Put a capping on the size of the log files (in Kb).
+   max log size = 50
+
+# Use password server option only with security = server
+# The argument list may include:
+#   password server = My_PDC_Name [My_BDC_Name] [My_Next_BDC_Name]
+# or to auto-locate the domain controller/s
+#   password server = *
+;   password server = <NT-Server-Name>
+
+# Use the realm option only with security = ads
+# Specifies the Active Directory realm the host is part of
+;   realm = MY_REALM
+
+# Backend to store user information in. New installations should 
+# use either tdbsam or ldapsam. smbpasswd is available for backwards 
+# compatibility. tdbsam requires no further configuration.
+;   passdb backend = tdbsam
+
+# Using the following line enables you to customise your configuration
+# on a per machine basis. The %m gets replaced with the netbios name
+# of the machine that is connecting.
+# Note: Consider carefully the location in the configuration file of
+#       this line.  The included file is read at that point.
+;   include = /usr/local/samba/lib/smb.conf.%m
+
+# Configure Samba to use multiple interfaces
+# If you have multiple network interfaces then you must list them
+# here. See the man page for details.
+;   interfaces = 192.168.12.2/24 192.168.13.2/24 
+
+# Browser Control Options:
+# set local master to no if you don't want Samba to become a master
+# browser on your network. Otherwise the normal election rules apply
+;   local master = no
+
+# OS Level determines the precedence of this server in master browser
+# elections. The default value should be reasonable
+;   os level = 33
+
+# Domain Master specifies Samba to be the Domain Master Browser. This
+# allows Samba to collate browse lists between subnets. Don't use this
+# if you already have a Windows NT domain controller doing this job
+;   domain master = yes 
+
+# Preferred Master causes Samba to force a local browser election on startup
+# and gives it a slightly higher chance of winning the election
+;   preferred master = yes
+
+# Enable this if you want Samba to be a domain logon server for 
+# Windows95 workstations. 
+;   domain logons = yes
+
+# if you enable domain logons then you may want a per-machine or
+# per user logon script
+# run a specific logon batch file per workstation (machine)
+;   logon script = %m.bat
+# run a specific logon batch file per username
+;   logon script = %U.bat
+
+# Where to store roving profiles (only for Win95 and WinNT)
+#        %L substitutes for this servers netbios name, %U is username
+#        You must uncomment the [Profiles] share below
+;   logon path = \\%L\Profiles\%U
+
+# Windows Internet Name Serving Support Section:
+# WINS Support - Tells the NMBD component of Samba to enable it's WINS Server
+;   wins support = yes
+
+# WINS Server - Tells the NMBD components of Samba to be a WINS Client
+#       Note: Samba can be either a WINS Server, or a WINS Client, but NOT both
+;   wins server = w.x.y.z
+
+# WINS Proxy - Tells Samba to answer name resolution queries on
+# behalf of a non WINS capable client, for this to work there must be
+# at least one  WINS Server on the network. The default is NO.
+;   wins proxy = yes
+
+# DNS Proxy - tells Samba whether or not to try to resolve NetBIOS names
+# via DNS nslookups. The default is NO.
+   dns proxy = no 
+
+# These scripts are used on a domain controller or stand-alone 
+# machine to add or delete corresponding unix accounts
+;  add user script = /usr/sbin/useradd %u
+;  add group script = /usr/sbin/groupadd %g
+;  add machine script = /usr/sbin/adduser -n -g machines -c Machine -d /dev/null -s /bin/false %u
+;  delete user script = /usr/sbin/userdel %u
+;  delete user from group script = /usr/sbin/deluser %u %g
+;  delete group script = /usr/sbin/groupdel %g
+
+
+#============================ Share Definitions ==============================
+[homes]
+   comment = Home Directories
+   browseable = no
+   writable = yes
+
+# Un-comment the following and create the netlogon directory for Domain Logons
+; [netlogon]
+;   comment = Network Logon Service
+;   path = /usr/local/samba/lib/netlogon
+;   guest ok = yes
+;   writable = no
+;   share modes = no
+
+
+# Un-comment the following to provide a specific roving profile share
+# the default is to use the user's home directory
+;[Profiles]
+;    path = /usr/local/samba/profiles
+;    browseable = no
+;    guest ok = yes
+
+
+# NOTE: If you have a BSD-style print system there is no need to 
+# specifically define each individual printer
+[printers]
+   comment = All Printers
+   path = /var/spool/samba
+   browseable = no
+# Set public = yes to allow user 'guest account' to print
+   guest ok = no
+   writable = no
+   printable = yes
+
+# This one is useful for people to share files
+;[tmp]
+;   comment = Temporary file space
+;   path = /tmp
+;   read only = no
+;   public = yes
+
+# A publicly accessible directory, but read only, except for people in
+# the "staff" group
+;[public]
+;   comment = Public Stuff
+;   path = /home/samba
+;   public = yes
+;   writable = yes
+;   printable = no
+;   write list = @staff
+
+# Other examples. 
+#
+# A private printer, usable only by fred. Spool data will be placed in fred's
+# home directory. Note that fred must have write access to the spool directory,
+# wherever it is.
+;[fredsprn]
+;   comment = Fred's Printer
+;   valid users = fred
+;   path = /homes/fred
+;   printer = freds_printer
+;   public = no
+# A private directory, usable only by fred. Note that fred requires write
+# access to the directory.
+;[fredsdir]
+;   comment = Fred's Service
+;   path = /usr/somewhere/private
+;   valid users = fred
+;   public = no
+;   writable = yes
+;   printable = no
+
+# a service which has a different directory for each machine that connects
+# this allows you to tailor configurations to incoming machines. You could
+# also use the %U option to tailor it by user name.
+# The %m gets replaced with the machine name that is connecting.
+;[pchome]
+;  comment = PC Directories
+;  path = /usr/pc/%m
+;  public = no
+;  writable = yes
+
+# A publicly accessible directory, read/write to all users. Note that all files
+# created in the directory by users will be owned by the default user, so
+# any user with access can delete any other user's files. Obviously this
+# directory must be writable by the default user. Another user could of course
+# be specified, in which case all files would be owned by that user instead.
+;[public]
+;   path = /usr/somewhere/else/public
+;   public = yes
+;   only guest = yes
+;   writable = yes
+;   printable = no
+
+# The following two entries demonstrate how to share a directory so that two
+# users can place files there that will be owned by the specific users. In this
+# setup, the directory should be writable by both users and should have the
+# sticky bit set on it to prevent abuse. Obviously this could be extended to
+# as many users as required.
+;[myshare]
+;   comment = Mary's and Fred's stuff
+;   path = /usr/somewhere/shared
+;   valid users = mary fred
+;   public = no
+;   writable = yes
+;   printable = no
+;   create mask = 0765
diff --git a/packages/samba/samba-3.0.34/uclibc-strlcpy-strlcat.patch b/packages/samba/samba-3.0.34/uclibc-strlcpy-strlcat.patch
new file mode 100644
index 0000000000..b10a1b1084
--- /dev/null
+++ b/packages/samba/samba-3.0.34/uclibc-strlcpy-strlcat.patch
@@ -0,0 +1,46 @@
+diff --git source.old/client/mount.cifs.c source/client/mount.cifs.c
+index 3b56e5f..b7a76c6 100644
+--- source.old/client/mount.cifs.c
++++ source/client/mount.cifs.c
+@@ -56,6 +56,10 @@
+  #endif /* _SAMBA_BUILD_ */
+ #endif /* MOUNT_CIFS_VENDOR_SUFFIX */
+ 
++#ifdef _SAMBA_BUILD_
++#include "include/config.h"
++#endif
++
+ #ifndef MS_MOVE 
+ #define MS_MOVE 8192 
+ #endif 
+@@ -94,6 +98,8 @@ char * prefixpath = NULL;
+ 
+ /* like strncpy but does not 0 fill the buffer and always null
+  *    terminates. bufsize is the size of the destination buffer */
++
++#ifndef HAVE_STRLCPY
+ static size_t strlcpy(char *d, const char *s, size_t bufsize)
+ {
+ 	size_t len = strlen(s);
+@@ -104,10 +110,13 @@ static size_t strlcpy(char *d, const char *s, size_t bufsize)
+ 	d[len] = 0;
+ 	return ret;
+ }
++#endif
+ 
+ /* like strncat but does not 0 fill the buffer and always null
+  *    terminates. bufsize is the length of the buffer, which should
+  *       be one more than the maximum resulting string length */
++
++#ifndef HAVE_STRLCAT
+ static size_t strlcat(char *d, const char *s, size_t bufsize)
+ {
+ 	size_t len1 = strlen(d);
+@@ -126,6 +135,7 @@ static size_t strlcat(char *d, const char *s, size_t bufsize)
+ 	}
+ 	return ret;
+ }
++#endif
+ 
+ /* BB finish BB
+
diff --git a/packages/samba/samba.inc b/packages/samba/samba.inc
index be8c2e26e8..85ac612de6 100644
--- a/packages/samba/samba.inc
+++ b/packages/samba/samba.inc
@@ -3,23 +3,53 @@ LICENSE = "GPL"
 DEPENDS = "readline virtual/libiconv"
 
 SRC_URI = "http://samba.org/samba/ftp/stable/samba-${PV}.tar.gz \
-           file://configure.patch;patch=1"
+           file://configure.patch;patch=1 \
+           file://config-lfs.patch;patch=1 \
+           file://quota.patch;patch=1;pnum=0 \
+           file://smb.conf \
+           file://init"
 
 S = "${WORKDIR}/samba-${PV}/source"
 
-inherit autotools
+inherit autotools update-rc.d
 
-EXTRA_OECONF='--disable-cups --with-readline=${STAGING_LIBDIR}/.. \
+# The file system settings --foodir=dirfoo and overridden unconditionally
+# in the samba config by --with-foodir=dirfoo - even if the --with is not
+# specified!  Fix that here.  Set the privatedir to /etc/samba/private.
+EXTRA_OECONF='--disable-cups \
+              --with-readline=${STAGING_LIBDIR}/.. \
               --with-libiconv=${STAGING_LIBDIR}/.. \
-	      --without-ads --without-automount --with-smbmount'
+              --without-automount \
+              --with-smbmount \
+              --with-configdir=${sysconfdir}/samba \
+              --with-privatedir=${sysconfdir}/samba/private \
+              --with-lockdir=${localstatedir}/lock \
+              --with-piddir=${localstatedir}/run \
+              --with-logfilebase=${localstatedir}/log \
+              --with-libdir=${libdir} \
+              --with-mandir=${mandir} \
+              --with-swatdir=${datadir}/swat \
+              samba_cv_struct_timespec=yes'
 
-PACKAGES =+ "libsmbclient libsmbclient-dev cifs cifs-doc smbfs smbfs-doc"
-FILES_smbfs = "${bindir}/smbmount ${bindir}/smbumount ${bindir}/smbmnt ${base_sbindir}/mount.smbfs ${base_sbindir}/mount.smb"
-FILES_smbfs-doc = "${mandir}/man8/smbmount.8 ${mandir}/man8/smbumount.8 ${mandir}/man8/smbmnt.8"
+INITSCRIPT_NAME = "samba"
+# No dependencies, goes in at level 20 (NOTE: take care with the
+# level, later levels put the shutdown later too - see the links
+# in rc6.d, the shutdown must precede network shutdown).
+INITSCRIPT_PARAMS = "defaults"
+CONFFILES_${PN} = "${sysconfdir}/samba/smb.conf"
+
+PACKAGES =+ "libsmbclient libsmbclient-dev cifs cifs-doc smbfs smbfs-doc swat"
 FILES_cifs = "${base_sbindir}/mount.cifs ${base_sbindir}/umount.cifs"
 FILES_cifs-doc = "${mandir}/man8/mount.cifs.8 ${mandir}/man8/umount.cifs.8"
 FILES_libsmbclient = "${libdir}/libsmbclient.so.*"
 FILES_libsmbclient-dev = "${libdir}/libsmbclient.so ${includedir}"
+FILES_smbfs = "${bindir}/smbmount ${bindir}/smbumount ${bindir}/smbmnt ${base_sbindir}/mount.smbfs ${base_sbindir}/mount.smb"
+FILES_smbfs-doc = "${mandir}/man8/smbmount.8 ${mandir}/man8/smbumount.8 ${mandir}/man8/smbmnt.8"
+FILES_swat       = "${sbindir}/swat ${datadir}/swat ${libdir}/*.msg"
+FILES_${PN}     += "${libdir}/vfs/*.so ${libdir}/charset/*.so ${libdir}/*.dat \
+                    ${libdir}/auth/*.so ${libdir}/security/*.so"
+FILES_${PN}-dbg += "${libdir}/vfs/.debug/*.so ${libdir}/charset/.debug/*.so \
+                    ${libdir}/auth/.debug/*.so ${libdir}/security/.debug/*.so"
 
 do_configure_prepend () {
 	./script/mkversion.sh
@@ -45,6 +75,13 @@ do_install_append() {
 	rm -f ${D}${sbindir}/*.old
 	[ -f ${D}${sbindir}/mount.cifs ] && mv ${D}${sbindir}/mount.cifs ${D}${base_sbindir}/
 	[ -f ${D}${sbindir}/umount.cifs ] && mv ${D}${sbindir}/umount.cifs ${D}${base_sbindir}/
+
+	install -d "${D}/var/log/samba"
+	install -d "${D}${sysconfdir}/init.d"
+	install -c -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/samba
+	install -d "${D}${sysconfdir}/samba"
+	install -c -m 644 ${WORKDIR}/smb.conf ${D}${sysconfdir}/samba/smb.conf
+	install -d ${D}/var/spool/samba
 }
 
 do_stage() {
diff --git a/packages/samba/samba_3.0.23c.bb b/packages/samba/samba_3.0.23c.bb
index 0051c5e00a..3a2cfd30aa 100644
--- a/packages/samba/samba_3.0.23c.bb
+++ b/packages/samba/samba_3.0.23c.bb
@@ -1,35 +1,13 @@
 require samba.inc
-inherit update-rc.d
 
 PR = "r4"
 
-SRC_URI += "file://config-lfs.patch;patch=1 \
-	   file://init \
-           file://quota.patch;patch=1;pnum=0 \
-	   file://cifs.patch;patch=1 \
-	   "
+SRC_URI += "file://cifs.patch;patch=1 \
+                "
 
-INITSCRIPT_NAME = "samba"
-# No dependencies, goes in at level 20 (NOTE: take care with the
-# level, later levels put the shutdown later too - see the links
-# in rc6.d, the shutdown must precede network shutdown).
-INITSCRIPT_PARAMS = "defaults"
-CONFFILES_${PN} = "${sysconfdir}/samba/smb.conf"
-
-# The file system settings --foodir=dirfoo and overridden unconditionally
-# in the samba config by --with-foodir=dirfoo - even if the --with is not
-# specified!  Fix that here.  Set the privatedir to /etc/samba/private.
 EXTRA_OECONF += "\
-	samba_cv_struct_timespec=yes \
-	--with-configdir=${sysconfdir}/samba \
-	--with-privatedir=${sysconfdir}/samba/private \
-	--with-lockdir=${localstatedir}/lock \
-	--with-piddir=${localstatedir}/run \
-	--with-logfilebase=${localstatedir}/log \
-	--with-libdir=${libdir} \
-	--with-mandir=${mandir} \
-	--with-swatdir=${datadir}/swat \
-	"
+                 --without-ads \
+	         "
 
 do_compile () {
         oe_runmake proto_exists
@@ -37,23 +15,7 @@ do_compile () {
         ${CC} client/mount.cifs.c -o mount.cifs
 }
 
-do_install_append() {
-	install -d "${D}${localstatedir}/log"
-	install -d "${D}${sysconfdir}/init.d"
-	install -c -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/samba
-	install -d "${D}${sysconfdir}/samba"
-	install -c -m 644 ../examples/smb.conf.default ${D}${sysconfdir}/samba/smb.conf
-}
-
 do_stage() {
 	install -m 0644 include/libsmbclient.h ${STAGING_INCDIR}
 	oe_libinstall -C bin -a -so libsmbclient ${STAGING_LIBDIR}
 }
-
-PACKAGES =+ "swat"
-
-FILES_swat = "${sbindir}/swat ${datadir}/swat ${libdir}/*.msg"
-FILES_${PN} += "${libdir}/vfs/*.so ${libdir}/charset/*.so ${libdir}/*.dat ${libdir}/auth/*.so"
-#
-# bug fix for samba.inc:
-FILES_cifs-doc += "${mandir}/man8/mount.cifs.8"
diff --git a/packages/samba/samba_3.0.34.bb b/packages/samba/samba_3.0.34.bb
index 13107fee69..ecd11badcc 100644
--- a/packages/samba/samba_3.0.34.bb
+++ b/packages/samba/samba_3.0.34.bb
@@ -1,61 +1,18 @@
 require samba.inc
-inherit update-rc.d
 
-PR = "r1"
+PR = "r2"
 
-SRC_URI += "file://config-lfs.patch;patch=1 \
-            file://quota.patch;patch=1;pnum=0 \
-	    file://init \
-	    file://smb.conf \
-	        "
+SRC_URI_append_linux-uclibc = " \
+        file://uclibc-strlcpy-strlcat.patch;patch=1"
+SRC_URI_append_linux-uclibcgnueabi = " \
+        file://uclibc-strlcpy-strlcat.patch;patch=1"
 
-#	   file://cifs.patch;patch=1 \
-
-INITSCRIPT_NAME = "samba"
-# No dependencies, goes in at level 20 (NOTE: take care with the
-# level, later levels put the shutdown later too - see the links
-# in rc6.d, the shutdown must precede network shutdown).
-INITSCRIPT_PARAMS = "defaults"
-CONFFILES_${PN} = "${sysconfdir}/samba/smb.conf"
-
-# The file system settings --foodir=dirfoo and overridden unconditionally
-# in the samba config by --with-foodir=dirfoo - even if the --with is not
-# specified!  Fix that here.  Set the privatedir to /etc/samba/private.
 EXTRA_OECONF += "\
+	--without-ads \
 	SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=yes \
-	samba_cv_struct_timespec=yes \
-	--with-configdir=${sysconfdir}/samba \
-	--with-privatedir=${sysconfdir}/samba/private \
-	--with-lockdir=${localstatedir}/lock \
-	--with-piddir=${localstatedir}/run \
-	--with-logfilebase=${localstatedir}/log \
-	--with-libdir=${libdir} \
-	--with-mandir=${mandir} \
-	--with-swatdir=${datadir}/swat \
 	"
 
-do_install_append() {
-	install -d "${D}/var/log/samba"
-	install -d "${D}${sysconfdir}/init.d"
-	install -c -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/samba
-	install -d "${D}${sysconfdir}/samba"
-	install -c -m 644 ${WORKDIR}/smb.conf ${D}${sysconfdir}/samba/smb.conf
-	install -d ${D}/var/spool/samba
-}
-
 do_stage() {
 	install -m 0644 include/libsmbclient.h ${STAGING_INCDIR}
 	oe_libinstall -C bin -a -so libsmbclient ${STAGING_LIBDIR}
 }
-
-PACKAGES =+ "swat"
-
-FILES_swat       = "${sbindir}/swat ${datadir}/swat ${libdir}/*.msg"
-FILES_${PN}     += "${libdir}/vfs/*.so ${libdir}/charset/*.so ${libdir}/*.dat \
-                    ${libdir}/auth/*.so ${libdir}/security/*.so"
-FILES_${PN}-dbg += "${libdir}/vfs/.debug/*.so ${libdir}/charset/.debug/*.so \
-                    ${libdir}/auth/.debug/*.so ${libdir}/security/.debug/*.so"
-
-#
-# bug fix for samba.inc:
-FILES_cifs-doc += "${mandir}/man8/mount.cifs.8"
diff --git a/packages/samba/samba_3.2.7.bb b/packages/samba/samba_3.2.7.bb
index ec51568313..3653a5dfe3 100644
--- a/packages/samba/samba_3.2.7.bb
+++ b/packages/samba/samba_3.2.7.bb
@@ -1,69 +1,27 @@
 require samba.inc
-inherit update-rc.d
 
-PR = "r0"
-
-SRC_URI += "file://config-lfs.patch;patch=1 \
-            file://quota.patch;patch=1;pnum=0 \
-            file://config-h.patch;patch=1 \
+PR = "r1"
+DEPENDS += " openldap krb5"
+SRC_URI += "file://config-h.patch;patch=1 \
             file://mtab.patch;patch=1 \
-	    file://init \
-	    file://smb.conf \
 	        "
 
-#	   file://cifs.patch;patch=1 \
-
-INITSCRIPT_NAME = "samba"
-# No dependencies, goes in at level 20 (NOTE: take care with the
-# level, later levels put the shutdown later too - see the links
-# in rc6.d, the shutdown must precede network shutdown).
-INITSCRIPT_PARAMS = "defaults"
-CONFFILES_${PN} = "${sysconfdir}/samba/smb.conf"
-
-# The file system settings --foodir=dirfoo and overridden unconditionally
-# in the samba config by --with-foodir=dirfoo - even if the --with is not
-# specified!  Fix that here.  Set the privatedir to /etc/samba/private.
 EXTRA_OECONF += "\
 	SMB_BUILD_CC_NEGATIVE_ENUM_VALUES=yes \
 	samba_cv_CC_NEGATIVE_ENUM_VALUES=yes \
-	samba_cv_struct_timespec=yes \
 	linux_getgrouplist_ok=no \
 	samba_cv_HAVE_BROKEN_GETGROUPS=no \
 	samba_cv_HAVE_FTRUNCATE_EXTEND=yes \
-	ac_cv_path_KRB5CONFIG=no \
+	ac_cv_path_KRB5CONFIG=${STAGING_BINDIR_CROSS}/krb5-config \
 	samba_cv_have_setresuid=yes \
 	samba_cv_have_setresgid=yes \
-	--with-configdir=${sysconfdir}/samba \
-	--with-privatedir=${sysconfdir}/samba/private \
-	--with-lockdir=${localstatedir}/lock \
-	--with-piddir=${localstatedir}/run \
-	--with-logfilebase=${localstatedir}/log \
-	--with-libdir=${libdir} \
-	--with-mandir=${mandir} \
-	--with-swatdir=${datadir}/swat \
+	samba_cv_HAVE_WRFILE_KEYTAB=yes \
+	smb_krb5_cv_enctype_to_string_takes_krb5_context_arg=yes \
+	smb_krb5_cv_enctype_to_string_takes_size_t_arg=yes \
+	--with-krb5=${STAGING_LIBDIR} \
+	--with-ads \
 	"
 
 do_configure() {
 	oe_runconf
 }
-
-do_install_append() {
-	install -d "${D}/var/log/samba"
-	install -d "${D}${sysconfdir}/init.d"
-	install -c -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/samba
-	install -d "${D}${sysconfdir}/samba"
-	install -c -m 644 ${WORKDIR}/smb.conf ${D}${sysconfdir}/samba/smb.conf
-	install -d ${D}/var/spool/samba
-}
-
-PACKAGES =+ "swat"
-
-FILES_swat       = "${sbindir}/swat ${datadir}/swat ${libdir}/*.msg"
-FILES_${PN}     += "${libdir}/vfs/*.so ${libdir}/charset/*.so ${libdir}/*.dat \
-                    ${libdir}/auth/*.so ${libdir}/security/*.so"
-FILES_${PN}-dbg += "${libdir}/vfs/.debug/*.so ${libdir}/charset/.debug/*.so \
-                    ${libdir}/auth/.debug/*.so ${libdir}/security/.debug/*.so"
-
-#
-# bug fix for samba.inc:
-FILES_cifs-doc += "${mandir}/man8/mount.cifs.8"