Re: [Samba] Transfer speed

2012-04-09 Thread Stan Hoeppner
On 4/8/2012 8:08 PM, Azerty Ytreza wrote:
 Hello,
 
 I have a little problem which I can't solve with Samba used under Debian
 Squeeze. (version of Samba : 3.5.6)
 I made a transfer speed between Samba server and a samba mount on the same
 PC copy to RAM and the same file directly to RAM.
 
 1. HDD to RAM = 105-115Mo/s

Pure HD read speed.

 2. Shared the same HDD directory with samba and mount to /media locally
 with (mount -t smbfs) :
 Samba to RAM = 60-67Mo/s

This isn't a copy to RAM.  You've created a loop from/to the drive
through the samba server and client.  Thus, if you copy from the samba
share to /media, you're reading from the HD and writing to the HD.  So
you're getting about 120MB/s aggregate to/from the drive.  Linux
buffering is likely pumping this number up a bit.  Issue a sync after
the copy command for flush the write to disk and you'll see a more
accurate number.

 3. From a remote PC under Windows : ~60Mo/s

Obviously GbE.  This low throughput can have a number of causes, most
dealing with network performance, not samba.

 How Samba can divide by almost two the bandwidth ? (105Mo/s HDD and 60Mo/s
 Samba)
 
 I have already changed that to Samba which have up my bandwidth from
 ~55Mo/s to ~60Mo/s :
 **
 socket options = TCP_NODELAY IPTOS_LOWDELAY SO_SNDBUF=262144
 SO_RCVBUF=262144 SO_KEEPALIVE
 min receivefile size=16348
 use sendfile=true
 aio read size = 643638
 aio write size = 643638
 aio write behind = true
 dns proxy=no
 **

Are you using jumbo frames?  Which NICs?  Which GbE switch?  Using FTP
client on Windows PC, what is your GET transfer rate from the Samba
machine?  If it's less than 80MB/s you may have a network problem.  If
it's over 90MB/s you may still have some Samba tuning to do.  BTW,
60MB/s from Samba to Windows over GbE is pretty damn good.  Many people
can't get over 35-40MB/s with Windows/GbE and Samba

 Someone have an idea how I can increased speed of Samba to almost 100Mo/s ?
 (I can understand than the 10% is lost by different protocol but 40-50% no
 :( )
 10Gbits should come and can't sustain 1Gbits ? :(

Assuming your future 10GbE network is configured and tuned perfectly,
you'll need a disk that can push over 1,000 MB/s sustained data rate to
fill the 10GbE pipe.  This requires either a large striped array of
spinning rust (more than 14 SATA disks in RAID0), or a smaller array of
fast SSDs (4 in a RAID0).

-- 
Stan
-- 
To unsubscribe from this list go to the following URL and read the
instructions:  https://lists.samba.org/mailman/options/samba


Re: [Samba] Transfer speed

2012-04-09 Thread Azerty Ytreza

 Pure HD read speed.


Yes and it's what I want.


 This isn't a copy to RAM.  You've created a loop from/to the drive
 through the samba server and client.  Thus, if you copy from the samba
 share to /media, you're reading from the HD and writing to the HD.  So
 you're getting about 120MB/s aggregate to/from the drive.  Linux
 buffering is likely pumping this number up a bit.  Issue a sync after
 the copy command for flush the write to disk and you'll see a more
 accurate number.

Yes, it's a loop on the same machine but I doesn't copy to the HD. Because
my system run in ram.
I have one HDD with datas on /datas but all other folders are on ram but
I have copied that from /media (ram) to /tmp (ram). (/media is the
mount on /datas).
And the file transferred is very big more than 20Gb, I cancel the copy
after a moment because not have enough memory for copy all the file.
At each time, I have iotop -o opened for look the transfer speed from
HDD.


 Obviously GbE.  This low throughput can have a number of causes, most
 dealing with network performance, not samba.

Yes, it's for that which I try to isolate the cause. Iperf give me very
good performance but after when I try with real file, I doesn't have that
:(


 Are you using jumbo frames?  Which NICs?  Which GbE switch?  Using FTP
 client on Windows PC, what is your GET transfer rate from the Samba
 machine?  If it's less than 80MB/s you may have a network problem.  If
 it's over 90MB/s you may still have some Samba tuning to do.  BTW,
 60MB/s from Samba to Windows over GbE is pretty damn good.  Many people
 can't get over 35-40MB/s with Windows/GbE and Samba

Yes, I have set jumbo frame at 4500 because seem the better value after a
lot of test. More bigger frame reduce performance from my test.
Ethernet controller : Intel Corporation 82574L Gigabit Network Connection
Switch : Netgear GS108T
FTP (proftpd) from Samba server to Windows : 105-110Mo/sec (from /datas
checked with iotop -o not FileZilla)
Yes 60Mo/s it's not bad, but I would understand why I can't use full
bandwidth because all my HDD can sustain ~90-100Mo/s and the network should
be OK.


 Assuming your future 10GbE network is configured and tuned perfectly,
 you'll need a disk that can push over 1,000 MB/s sustained data rate to
 fill the 10GbE pipe.  This requires either a large striped array of
 spinning rust (more than 14 SATA disks in RAID0), or a smaller array of
 fast SSDs (4 in a RAID0).

Yes I know that this speed is almost unreachable actually but I can't reach
1gbps limit now so 10gbps ... :(
I'm almost sure than Samba can use almost full gbps speed but how to
enabled that ? :(


Thank you for your help !
Jean
-- 
To unsubscribe from this list go to the following URL and read the
instructions:  https://lists.samba.org/mailman/options/samba


Re: [Samba] Transfer speed

2012-04-09 Thread Emmanuel Florac
Le Mon, 09 Apr 2012 01:11:53 -0500 vous écriviez:

 Assuming your future 10GbE network is configured and tuned perfectly,
 you'll need a disk that can push over 1,000 MB/s sustained data rate
 to fill the 10GbE pipe.

As a side note, using the same samba version as the OP, I've sustained
750 MB/s on a 10 GigE link without much tuning, backed with 32
SATA disks and using either windows 7 or 2008R2 as clients. I couldn't
come even remotely close to these numbers using either Linux or windows
XP as clients.

-- 

Emmanuel Florac |   Direction technique
|   Intellique
|   eflo...@intellique.com
|   +33 1 78 94 84 02

-- 
To unsubscribe from this list go to the following URL and read the
instructions:  https://lists.samba.org/mailman/options/samba

Re: [Samba] Transfer speed

2012-04-09 Thread Emmanuel Florac
Le Mon, 9 Apr 2012 10:17:25 +0200 vous écriviez:

 I'm almost sure than Samba can use almost full gbps speed but how to
 enabled that ? :(

As I mentioned in my previous post, Samba can achieve full Gb speed
easily but not with any client. Basically, Linux, Mac OS X and old
windows (winXP, win2K3) can't achieve nearly as good performance as
win7-64 or win2K8R2 (usually limited to 60-75% of the latter).

Another rule of the thumb I've determined is that you can achieve about
half the raw disk throughput performance with samba. That means that if
you can read-write locally at 120 MB/s, your samba performance will
reach 60 MB/s but not much more. If you want 750 MB/s, you'll need a
disk subsystem able to sustain 1.5GB/s.

Note that NFS sharing performs way, way better than CIFS under both
Linux and Mac OS X. Mostly the same restrictions apply about relative
disk and network performance, but any Unix box can saturate (115-120
MB/s) a Gb link over NFS, both directions, given that your disk
subsystem is about twice as fast as that.

From my experience, using modern hardware jumbo framing makes no
difference for transfers across a limited number of machines, even over
10GigE ethernet (this is not the case for Gb hardware before 2005 and
10GigE hardware before 2010). OTOH proper framing makes a dramatic
difference when using InfiniBand. 

So what does this mean for your setup? If you want to saturate your
gigabit link, you'll have to use either several linux/XP/Mac clients,
or 1 win7 or win2K8 client; you'll need fast enough disks (a single
drive definitely won't do), and of course a fast enough machine -- but
anything 64 bits capable definitely is.

-- 

Emmanuel Florac |   Direction technique
|   Intellique
|   eflo...@intellique.com
|   +33 1 78 94 84 02

-- 
To unsubscribe from this list go to the following URL and read the
instructions:  https://lists.samba.org/mailman/options/samba

[Samba] UID/GID mapping consistency across at least two Linux machines

2012-04-09 Thread bakytn
I have two SAMBA machines

they both successfully joined to the same Active Directory (actually SAMBA
4)

I have copied the user files from *server 1* to *server 2*

/owner id/ and /group id/s are preserved.

on server 1, when is do: *id user1*
I get *2001*

but on server 2
the same user has different id. 

This is actual for groups as well i.e different id's.

*smb.conf*s are identical

--
View this message in context: 
http://samba.2283325.n4.nabble.com/UID-GID-mapping-consistency-across-at-least-two-Linux-machines-tp4543255p4543255.html
Sent from the Samba - General mailing list archive at Nabble.com.
-- 
To unsubscribe from this list go to the following URL and read the
instructions:  https://lists.samba.org/mailman/options/samba


Re: [Samba] Transfer speed

2012-04-09 Thread Jeremy Allison
On Mon, Apr 09, 2012 at 01:36:22PM +0200, Emmanuel Florac wrote:
 Le Mon, 9 Apr 2012 10:17:25 +0200 vous écriviez:
 
  I'm almost sure than Samba can use almost full gbps speed but how to
  enabled that ? :(
 
 As I mentioned in my previous post, Samba can achieve full Gb speed
 easily but not with any client. Basically, Linux, Mac OS X and old
 windows (winXP, win2K3) can't achieve nearly as good performance as
 win7-64 or win2K8R2 (usually limited to 60-75% of the latter).
 
 Another rule of the thumb I've determined is that you can achieve about
 half the raw disk throughput performance with samba. That means that if
 you can read-write locally at 120 MB/s, your samba performance will
 reach 60 MB/s but not much more. If you want 750 MB/s, you'll need a
 disk subsystem able to sustain 1.5GB/s.
 
 Note that NFS sharing performs way, way better than CIFS under both
 Linux and Mac OS X. Mostly the same restrictions apply about relative
 disk and network performance, but any Unix box can saturate (115-120
 MB/s) a Gb link over NFS, both directions, given that your disk
 subsystem is about twice as fast as that.
 
 From my experience, using modern hardware jumbo framing makes no
 difference for transfers across a limited number of machines, even over
 10GigE ethernet (this is not the case for Gb hardware before 2005 and
 10GigE hardware before 2010). OTOH proper framing makes a dramatic
 difference when using InfiniBand. 
 
 So what does this mean for your setup? If you want to saturate your
 gigabit link, you'll have to use either several linux/XP/Mac clients,
 or 1 win7 or win2K8 client; you'll need fast enough disks (a single
 drive definitely won't do), and of course a fast enough machine -- but
 anything 64 bits capable definitely is.

Before this is taken as gospel :-), I think we should give
Steve French and Jeff a chance to chime in here on behalf
of the Linux CIFSFS client.

I think it's seen a lot of improvements recently w.r.t.
multiple outstanding reads/writes, but I'm not sure
what kernel version this went into.

I think Stevef thinks CIFSFS can give NFS a run for its
money at least Linux - Samba.

Jeremy.
-- 
To unsubscribe from this list go to the following URL and read the
instructions:  https://lists.samba.org/mailman/options/samba


Re: [Samba] UID/GID mapping consistency across at least two Linux machines

2012-04-09 Thread bakytn
I found this: http://lists.samba.org/archive/samba/2004-January/078411.html

How to implement a scenario?

but..how about simpler way...like, may be, running rsync to copy necessary
fiels from server 1 to server 2.

I could do this..but I don't know which files to replicate?

--
View this message in context: 
http://samba.2283325.n4.nabble.com/UID-GID-mapping-consistency-across-at-least-two-Linux-machines-tp4543255p4543292.html
Sent from the Samba - General mailing list archive at Nabble.com.
-- 
To unsubscribe from this list go to the following URL and read the
instructions:  https://lists.samba.org/mailman/options/samba


Re: [Samba] RESOLVED CTDB and Pacemaker - last mile!!! - CTDB complains cluster IP is not a public address

2012-04-09 Thread Dale Schroeder

On 04/05/2012 5:13 PM, Errol Neal wrote:

Errol Neal  wrote:

 This project has been on my bucket list for a long time with a 
higher priority than say visiting Japan :)
For the last several days, I've been knee deep in XCP, OCFS2, Samba, CTDB and 
Pacemaker; trying to get all these technologies to coalesce into one solution, 
and I think I'm at the last mile.
I finally have two debian squeeze VMs (BIM AND BAM) on XCP 1.0 that are running 
Samba 3.6 in an HA configuration! But I have one small problem.. when I connect 
to a share on the cluster IP (pacemaker IPaddr2 resource), I get an access 
denied and an error in log.ctdb:


SNIP

The problem was my smb.conf file. I changed my idmap config to be idmap config 
* versus FOO and my idmap config backend to be tdb.

The symptoms were that wbinfo -u and -g were returning groups and users, but 
getent wasn't and wbinfo -i wasn't working either..

Hope this helps someone in the future.


Errol,

Your listed symptoms regarding the results of wbinfo and getent are 
quite similar to this:

https://bugzilla.samba.org/show_bug.cgi?id=8676
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=652679

The idmap_ad backend has not been previously mentioned, and you're using 
ctdb, still I can't help but wonder if you are seeing another 
manifestation of this bug.

Do you think that's a reasonable possibility?

Dale
--
To unsubscribe from this list go to the following URL and read the
instructions:  https://lists.samba.org/mailman/options/samba


Re: [Samba] UID/GID mapping consistency across at least two Linux machines

2012-04-09 Thread Gaiseric Vandal
On 04/09/12 13:11, bakytn wrote:
 I found this: http://lists.samba.org/archive/samba/2004-January/078411.html

 How to implement a scenario?

 but..how about simpler way...like, may be, running rsync to copy necessary
 fiels from server 1 to server 2.

 I could do this..but I don't know which files to replicate?

 --
 View this message in context: 
 http://samba.2283325.n4.nabble.com/UID-GID-mapping-consistency-across-at-least-two-Linux-machines-tp4543255p4543292.html
 Sent from the Samba - General mailing list archive at Nabble.com.
Are you using winbind for idmapping?   The files you want may be
/var/samba/locks (check testparm -v for the locks and cache
directories.)  Look at the winbind*tdb and idmap*tdb files.  tdbdump
will show you what is in them.
-- 
To unsubscribe from this list go to the following URL and read the
instructions:  https://lists.samba.org/mailman/options/samba


Re: [Samba] UID/GID mapping consistency across at least two Linux machines

2012-04-09 Thread bakytn
Here ist he global section of my smb.conf:

I am not sure if I am using Winbind (I guess yes).

[global]
   workgroup = DOMAIN
   realm = DOMAIN.LOCAL
   preferred master = no

   server string = SAMBA
   security = ADS
   encrypt passwords = yes
   log level = 1
   log file = /var/log/samba/log.%m
   max log size = 1000

   idmap uid = 3000-2
   idmap gid = 3000-2
   template shell = /bin/bash

   winbind enum groups = yes
   winbind enum users = yes
   winbind separator = +
   winbind use default domain = Yes
   winbind nested groups = Yes

   template homedir = /data/files/%U

   syslog = 0

   panic action = /usr/share/samba/panic-action %d
   passdb backend = tdbsam

   obey pam restrictions = yes

   unix password sync = yes

   passwd program = /usr/bin/passwd %u
   passwd chat = *Enter\snew\s*\spassword:* %n\n *Retype\snew\s*\spassword:*
%n\n *password\supdated\ssuccessfully* .

   pam password change = yes

   map to guest = bad user

   usershare allow guests = yes


--
View this message in context: 
http://samba.2283325.n4.nabble.com/UID-GID-mapping-consistency-across-at-least-two-Linux-machines-tp4543255p4543701.html
Sent from the Samba - General mailing list archive at Nabble.com.
-- 
To unsubscribe from this list go to the following URL and read the
instructions:  https://lists.samba.org/mailman/options/samba


Re: [Samba] Transfer speed

2012-04-09 Thread Emmanuel Florac
Le Mon, 9 Apr 2012 10:02:20 -0700 vous écriviez:

 Before this is taken as gospel :-), I think we should give
 Steve French and Jeff a chance to chime in here on behalf
 of the Linux CIFSFS client.

Sure :)

 I think it's seen a lot of improvements recently w.r.t.
 multiple outstanding reads/writes, but I'm not sure
 what kernel version this went into.

True, but there weren't that much of a difference when I tried 3.0 at
least. I still need to check the 3.2.14 I just compiled last week.

 I think Stevef thinks CIFSFS can give NFS a run for its
 money at least Linux - Samba.

Would be good, because getting NFS3 working with krb5 is a PITA. :)

-- 

Emmanuel Florac |   Direction technique
|   Intellique
|   eflo...@intellique.com
|   +33 1 78 94 84 02

-- 
To unsubscribe from this list go to the following URL and read the
instructions:  https://lists.samba.org/mailman/options/samba

[Samba] I cannot access my shares in samba4 alpha 19

2012-04-09 Thread timothy mcdaniel
I cannot access my shares in samba4 alpha 19, I get a element not found
error message when I try to go to my server in windows explorer when they
are mapped as network drives they work fine but when I try to access them
from the \\your.realm.com it gives me the element not found error message
also when I try to access the shares through \\your.realm.com I can access
netlogon and sysvol fine but the other shares I cannot access because it
gives me the above error message(element not found).
could someone please help me fix this?
-- 
To unsubscribe from this list go to the following URL and read the
instructions:  https://lists.samba.org/mailman/options/samba


Re: [Samba] samba Digest, Vol 112, Issue 3

2012-04-09 Thread timothy mcdaniel
-- Forwarded message --
From: Charles Tryon charles.tr...@gmail.com
To: Samba list samba@lists.samba.org
Cc:
Date: Tue, 3 Apr 2012 12:23:54 -0400
Subject: [Samba] Won't execute LOGON.CMD?
This seems like such an easy thing, I must be missing something obvious...
  :-(

I'm working on migrating a domain from S2 to S4 and running the samba_tool
script.  All my users are coming across fine (though I'm not sure why all
the old system accounts like ssh and daemon and halt are getting
created... another issue).  I am using a FreeNAS appliance for my file
sharing, which is also working quite nicely.  I'm now trying to set up some
attributes which didn't get created by the script, such as the home
directory and logon script.

In AD Users and Computers, I open a user's attributes and under the
Profile tab, I add connect H: drive to \\freenas\%USERNAME% and set
logon script to: \\samba4\sysvol\mydomain.org\scripts\LOGON.CMD

The next time I log in as that user, the home drive map is correct, but the
logon script does not appear to run.  If I copy-n-paste the file name into
explorer, it immediately runs without any problem.
Is this a Windows profile setup issue or a server permissions issue?  What
setting am I missing???

You are not supposed to enter in the full path to the logon.cmd you are
supposed to set the logon script just to logon.cmd because it already knows
that the logon script is going to be from the
\\samba\sysvol\mydomain.org\scripts folder
-- 
To unsubscribe from this list go to the following URL and read the
instructions:  https://lists.samba.org/mailman/options/samba


Re: [Samba] UID/GID mapping consistency across at least two Linux machines

2012-04-09 Thread Robert Freeman-Day
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

On 04/09/2012 04:09 PM, bakytn wrote:
 Here ist he global section of my smb.conf:
 
 I am not sure if I am using Winbind (I guess yes).
 
 [global]
workgroup = DOMAIN
realm = DOMAIN.LOCAL
preferred master = no
 
server string = SAMBA
security = ADS
encrypt passwords = yes
log level = 1
log file = /var/log/samba/log.%m
max log size = 1000
 
idmap uid = 3000-2
idmap gid = 3000-2
template shell = /bin/bash
 
winbind enum groups = yes
winbind enum users = yes
winbind separator = +
winbind use default domain = Yes
winbind nested groups = Yes
 
template homedir = /data/files/%U
 
syslog = 0
 
panic action = /usr/share/samba/panic-action %d
passdb backend = tdbsam
 
obey pam restrictions = yes
 
unix password sync = yes
 
passwd program = /usr/bin/passwd %u
passwd chat = *Enter\snew\s*\spassword:* %n\n *Retype\snew\s*\spassword:*
 %n\n *password\supdated\ssuccessfully* .
 
pam password change = yes
 
map to guest = bad user
 
usershare allow guests = yes
 
 
 --
 View this message in context: 
 http://samba.2283325.n4.nabble.com/UID-GID-mapping-consistency-across-at-least-two-Linux-machines-tp4543255p4543701.html
 Sent from the Samba - General mailing list archive at Nabble.com.

I have some notes on what I have done with my machines.  I hope it may
help you out.  Just read it all over and the template files closely
before just jumping on into it.

https://uisapp2.iu.edu/confluence-prd/display/~rmday/Linux+Integration+with+Active+Directory

- -- 


Robert Freeman-Day

https://launchpad.net/~presgas
GPG Public Key:
http://keyserver.ubuntu.com:11371/pks/lookup?op=getsearch=0xBA9DF9ED3E4C7D36
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk+DiG4ACgkQup357T5MfTaMKQCg0HMM00tuKtxZUMWwzWC1lOSM
fxkAoLd8HO0otegVuye7dIf2c/UO1dc/
=lgc5
-END PGP SIGNATURE-
-- 
To unsubscribe from this list go to the following URL and read the
instructions:  https://lists.samba.org/mailman/options/samba


[SCM] Samba Shared Repository - branch master updated

2012-04-09 Thread Andrew Bartlett
The branch, master has been updated
   via  7da56a1 autobuild: Also test a distribution-style build with 
external libs
  from  4a3da81 wafsamba: Return missing libs rather than last syslib.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 7da56a1e37f20d1674e2f1208e4b1f3ca1aad380
Author: Andrew Bartlett abart...@samba.org
Date:   Mon Apr 9 14:52:03 2012 +1000

autobuild: Also test a distribution-style build with external libs

Autobuild-User: Andrew Bartlett abart...@samba.org
Autobuild-Date: Mon Apr  9 10:06:38 CEST 2012 on sn-devel-104

---

Summary of changes:
 script/autobuild.py |   25 -
 1 files changed, 24 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/script/autobuild.py b/script/autobuild.py
index d8a1ad3..6e090fa 100755
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -8,6 +8,7 @@ import os, tarfile, sys, time
 from optparse import OptionParser
 import smtplib
 from email.mime.text import MIMEText
+from distutils.sysconfig import get_python_lib
 
 samba_master = os.getenv('SAMBA_MASTER', 'git://git.samba.org/samba.git')
 samba_master_ssh = os.getenv('SAMBA_MASTER_SSH', 
'git+ssh://git.samba.org/data/git/samba.git')
@@ -17,6 +18,7 @@ cleanup_list = []
 builddirs = {
 samba3  : source3,
 samba4  : .,
+samba4-libs  : .,
 ldb : lib/ldb,
 tdb : lib/tdb,
 tdb2: lib/tdb2,
@@ -29,7 +31,7 @@ builddirs = {
 retry   : .
 }
 
-defaulttasks = [ samba3, samba4, ldb, tdb, tdb2, talloc, 
replace, tevent, pidl ]
+defaulttasks = [ samba3, samba4, samba4-libs, ldb, tdb, tdb2, 
talloc, replace, tevent, pidl ]
 
 tasks = {
 samba3 : [ (autogen, ./autogen.sh, text/plain),
@@ -53,6 +55,26 @@ tasks = {
  (check-clean-tree, script/clean-source-tree.sh, 
text/plain),
  (clean, make clean, text/plain) ],
 
+samba4-libs : [ (talloc-configure, cd lib/talloc  
PYTHONPATH=${PYTHON_PREFIX}/site-packages:$PYTHONPATH 
PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${PREFIX_DIR}/lib/pkgconfig ./configure 
--bundled-libraries=NONE --enable-developer -C ${PREFIX}, text/plain),
+  (talloc-make, cd lib/talloc  make -j, 
text/plain),
+  (talloc-install, cd lib/talloc  make install, 
text/plain),
+
+  (tdb-configure, cd lib/tdb  
PYTHONPATH=${PYTHON_PREFIX}/site-packages:$PYTHONPATH 
PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${PREFIX_DIR}/lib/pkgconfig ./configure 
--bundled-libraries=NONE --enable-developer -C ${PREFIX}, text/plain),
+  (tdb-make, cd lib/tdb  make -j, text/plain),
+  (tdb-install, cd lib/tdb  make install, 
text/plain),
+
+  (tevent-configure, cd lib/tevent  
PYTHONPATH=${PYTHON_PREFIX}/site-packages:$PYTHONPATH 
PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${PREFIX_DIR}/lib/pkgconfig ./configure 
--bundled-libraries=NONE --enable-developer -C ${PREFIX}, text/plain),
+  (tevent-make, cd lib/tevent  make -j, 
text/plain),
+  (tevent-install, cd lib/tevent  make install, 
text/plain),
+
+  (ldb-configure, cd lib/ldb  
PYTHONPATH=${PYTHON_PREFIX}/site-packages:$PYTHONPATH 
PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${PREFIX_DIR}/lib/pkgconfig ./configure 
--bundled-libraries=NONE --disable-tdb2 --enable-developer -C ${PREFIX}, 
text/plain),
+  (ldb-make, cd lib/ldb  make -j, text/plain),
+  (ldb-install, cd lib/ldb  make install, 
text/plain),
+
+  (configure, 
PYTHONPATH=${PYTHON_PREFIX}/site-packages:$PYTHONPATH 
PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${PREFIX_DIR}/lib/pkgconfig ./configure 
--bundled-libraries=!talloc,!tdb,!pytdb,!ldb,!pyldb,!tevent,!pytevent 
--disable-tdb2 --enable-developer -C ${PREFIX}, text/plain),
+  (make, make -j, text/plain),
+  (install, make install, text/plain)],
+
 ldb : [ (configure, ./configure --enable-developer -C ${PREFIX}, 
text/plain),
   (make, make -j, text/plain),
   (install, make install, text/plain),
@@ -176,6 +198,7 @@ class builder(object):
 self.done = True
 return
 (self.stage, self.cmd, self.output_mime_type) = 
self.sequence[self.next]
+self.cmd = self.cmd.replace(${PYTHON_PREFIX}, 
get_python_lib(standard_lib=1, prefix=self.prefix))
 self.cmd = self.cmd.replace(${PREFIX}, --prefix=%s % self.prefix)
 self.cmd = self.cmd.replace(${PREFIX_DIR}, %s % self.prefix)
 #if self.output_mime_type == text/x-subunit:


-- 
Samba Shared Repository


[SCM] Samba Shared Repository - branch master updated

2012-04-09 Thread Volker Lendecke
The branch, master has been updated
   via  5184f41 libreplace: We have a poll replacement based on select
   via  670e85f tevent: Fix a typo
   via  8a907c9 s3: Fix the pthreadpool build on OS/X
   via  5856ab8 s3: Initialize aio_pending_size from aio_pthread
   via  5f3ac4d s3: Initialize aio_pending_size from aio_pthread
   via  eff3609 s3: Move the aio signal init to the vfs module
  from  7da56a1 autobuild: Also test a distribution-style build with 
external libs

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 5184f41cd8f51fd426bb6b7d6fea657df44dd8a4
Author: Volker Lendecke v...@samba.org
Date:   Mon Apr 9 00:44:38 2012 +0200

libreplace: We have a poll replacement based on select

Autobuild-User: Volker Lendecke v...@samba.org
Autobuild-Date: Mon Apr  9 19:39:51 CEST 2012 on sn-devel-104

commit 670e85fde6b5f4970d5e9464446d1a67ee0d0afe
Author: Volker Lendecke v...@samba.org
Date:   Mon Apr 9 00:40:38 2012 +0200

tevent: Fix a typo

commit 8a907c9c6563d9b1df35d31390bd07f76758773c
Author: Volker Lendecke v...@samba.org
Date:   Mon Apr 9 09:17:29 2012 +0200

s3: Fix the pthreadpool build on OS/X

OS/X does not have clock_gettime, and without replace.h we do not
get the replacement macro

commit 5856ab89fa2f5736af641bc05102ad47390e84b7
Author: Volker Lendecke v...@samba.org
Date:   Sun Apr 8 21:49:59 2012 +0200

s3: Initialize aio_pending_size from aio_pthread

commit 5f3ac4d6c4754c98e54eed4b09ccd267bb570fa7
Author: Volker Lendecke v...@samba.org
Date:   Sun Apr 8 21:47:38 2012 +0200

s3: Initialize aio_pending_size from aio_pthread

commit eff36099c12e936a880c9f2e102b9cf8a7166d40
Author: Volker Lendecke v...@samba.org
Date:   Sun Apr 8 20:11:53 2012 +0200

s3: Move the aio signal init to the vfs module

On platforms that don't have an RT signal space, signal initialization
fails. aio_fork and aio_pthread don't need the signal, so this would
block them from running as well.

---

Summary of changes:
 lib/replace/README|1 +
 lib/tevent/tevent_poll.c  |2 +-
 source3/lib/pthreadpool/pthreadpool.c |1 +
 source3/modules/vfs_aio_fork.c|   19 +++
 source3/modules/vfs_aio_pthread.c |   41 +---
 source3/modules/vfs_default.c |8 ++
 source3/smbd/aio.c|   28 +-
 source3/smbd/proto.h  |1 +
 8 files changed, 60 insertions(+), 41 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/replace/README b/lib/replace/README
index bf4e67f..787ee85 100644
--- a/lib/replace/README
+++ b/lib/replace/README
@@ -72,6 +72,7 @@ link
 readlink
 symlink
 realpath
+poll
 
 Types:
 bool
diff --git a/lib/tevent/tevent_poll.c b/lib/tevent/tevent_poll.c
index 0a9c0f0..d2e45c8 100644
--- a/lib/tevent/tevent_poll.c
+++ b/lib/tevent/tevent_poll.c
@@ -177,7 +177,7 @@ static void poll_event_set_fd_flags(struct tevent_fd *fde, 
uint16_t flags)
 }
 
 /*
-  event loop handling using select()
+  event loop handling using poll()
 */
 static int poll_event_loop_poll(struct tevent_context *ev,
struct timeval *tvalp)
diff --git a/source3/lib/pthreadpool/pthreadpool.c 
b/source3/lib/pthreadpool/pthreadpool.c
index fffbd05..0430377 100644
--- a/source3/lib/pthreadpool/pthreadpool.c
+++ b/source3/lib/pthreadpool/pthreadpool.c
@@ -28,6 +28,7 @@
 #include fcntl.h
 #include system/time.h
 #include system/filesys.h
+#include replace.h
 
 #include pthreadpool.h
 #include lib/util/dlinklist.h
diff --git a/source3/modules/vfs_aio_fork.c b/source3/modules/vfs_aio_fork.c
index 0d928cb..d10cc9f 100644
--- a/source3/modules/vfs_aio_fork.c
+++ b/source3/modules/vfs_aio_fork.c
@@ -23,6 +23,7 @@
 #include system/filesys.h
 #include system/shmem.h
 #include smbd/smbd.h
+#include smbd/globals.h
 
 #ifndef MAP_FILE
 #define MAP_FILE 0
@@ -879,7 +880,25 @@ static int aio_fork_suspend(struct vfs_handle_struct 
*handle,
return ret;
 }
 
+static int aio_fork_connect(vfs_handle_struct *handle, const char *service,
+   const char *user)
+{
+   /*
+* How many threads to initialize ?
+* 100 per process seems insane as a default until you realize that
+* (a) Threads terminate after 1 second when idle.
+* (b) Throttling is done in SMB2 via the crediting algorithm.
+* (c) SMB1 clients are limited to max_mux (50) outstanding
+* requests and Windows clients don't use this anyway.
+* Essentially we want this to be unlimited unless smb.conf
+* says different.
+*/
+   

[SCM] Samba Shared Repository - branch master updated

2012-04-09 Thread Jeremy Allison
The branch, master has been updated
   via  5701a4d Move blksize_t and blkcnt_t to replace.h from includes.h. 
Should help with platforms that don't have these.
  from  5184f41 libreplace: We have a poll replacement based on select

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 5701a4d8611ad1e310b76b00b146b0902c9b34ff
Author: Jeremy Allison j...@samba.org
Date:   Mon Apr 9 11:04:07 2012 -0700

Move blksize_t and blkcnt_t to replace.h from includes.h. Should help with 
platforms that don't have these.

Autobuild-User: Jeremy Allison j...@samba.org
Autobuild-Date: Mon Apr  9 21:40:42 CEST 2012 on sn-devel-104

---

Summary of changes:
 lib/replace/README |2 ++
 lib/replace/replace.h  |8 
 source3/configure.in   |6 ++
 source3/include/includes.h |   10 --
 source3/wscript|4 ++--
 5 files changed, 18 insertions(+), 12 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/replace/README b/lib/replace/README
index 787ee85..5399971 100644
--- a/lib/replace/README
+++ b/lib/replace/README
@@ -81,6 +81,8 @@ uint{8,16,32,64}_t
 int{8,16,32,64}_t
 intptr_t
 sig_atomic_t
+blksize_t
+blkcnt_t
 
 Constants:
 PATH_NAME_MAX
diff --git a/lib/replace/replace.h b/lib/replace/replace.h
index 776da8a..debd4da 100644
--- a/lib/replace/replace.h
+++ b/lib/replace/replace.h
@@ -841,4 +841,12 @@ typedef long useconds_t;
 int usleep(useconds_t);
 #endif
 
+#ifndef HAVE_BLKSIZE_T
+typedef long blksize_t;
+#endif
+
+#ifndef HAVE_BLKCNT_T
+typedef long blkcnt_t;
+#endif
+
 #endif /* _LIBREPLACE_REPLACE_H */
diff --git a/source3/configure.in b/source3/configure.in
index 98714d5..bc8afc0 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -2943,6 +2943,9 @@ AC_TRY_RUN([
 #endif
 #include stdio.h
 #include sys/stat.h
+#ifndef HAVE_BLKCNT_T
+typedef long blkcnt_t;
+#endif
 main() { exit((sizeof(blkcnt_t) == 4) ? 0 : 1); }],
 
samba_cv_SIZEOF_BLKCNT_T_4=yes,samba_cv_SIZEOF_BLKCNT_T_4=no,samba_cv_SIZEOF_BLKCNT_T_4=cross)])
 if test x$samba_cv_SIZEOF_BLKCNT_T_4 = xyes; then
@@ -2956,6 +2959,9 @@ AC_TRY_RUN([
 #endif
 #include stdio.h
 #include sys/stat.h
+#ifndef HAVE_BLKCNT_T
+typedef long blkcnt_t;
+#endif
 main() { exit((sizeof(blkcnt_t) == 8) ? 0 : 1); }],
 
samba_cv_SIZEOF_BLKCNT_T_8=yes,samba_cv_SIZEOF_BLKCNT_T_8=no,samba_cv_SIZEOF_BLKCNT_T_8=cross)])
 if test x$samba_cv_SIZEOF_BLKCNT_T_8 = xyes; then
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 7bdd200..88b8b4f 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -317,16 +317,6 @@ typedef uint64_t br_off;
 #define SOFF_T_R(p, ofs, v) (SIVAL(p,(ofs)+4,(v)0x), 
SIVAL(p,ofs,(v)32))
 #define IVAL_TO_SMB_OFF_T(buf,off) ((off_t)(( ((uint64_t)(IVAL((buf),(off 
 ((uint64_t)0x) )))
 
-#ifndef HAVE_BLKSIZE_T
-/* This is mainly for HP/UX which defines st_blksize as long */
-typedef long blksize_t;
-#endif
-
-#ifndef HAVE_BLKCNT_T
-/* This is mainly for HP/UX which doesn't have blkcnt_t */
-typedef long blkcnt_t;
-#endif
-
 /*
  * Type for stat structure.
  */
diff --git a/source3/wscript b/source3/wscript
index 28ef0d9..3c8df0a 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -178,14 +178,14 @@ main() {
conf.CHECK_CODE('''
return sizeof(blkcnt_t) == 4 ? 0 : 1''',
'SIZEOF_BLKCNT_T_4', execute=True,
-   headers='sys/types.h sys/stat.h unistd.h',
+   headers='replace.h sys/types.h sys/stat.h unistd.h',
msg=Checking whether blkcnt_t is 32 bit)
 
 if HAVE_BLKCNT_T in conf.env:
conf.CHECK_CODE('''
return sizeof(blkcnt_t) == 8 ? 0 : 1''',
'SIZEOF_BLKCNT_T_8', execute=True,
-   headers='sys/types.h sys/stat.h unistd.h',
+   headers='replace.h sys/types.h sys/stat.h unistd.h',
msg=Checking whether blkcnt_t is 64 bit)
 
 # Check for POSIX capability support


-- 
Samba Shared Repository


Re: [SCM] Samba Shared Repository - branch master updated

2012-04-09 Thread Jelmer Vernooij
Hi Jeremy,

Am 09/04/12 21:41, schrieb Jeremy Allison:
 The branch, master has been updated
via  5701a4d Move blksize_t and blkcnt_t to replace.h from includes.h. 
 Should help with platforms that don't have these.
   from  5184f41 libreplace: We have a poll replacement based on select

 http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


 - Log -
 commit 5701a4d8611ad1e310b76b00b146b0902c9b34ff
 Author: Jeremy Allison j...@samba.org
 Date:   Mon Apr 9 11:04:07 2012 -0700

 Move blksize_t and blkcnt_t to replace.h from includes.h. Should help 
 with platforms that don't have these.
 
Thanks for moving these to libreplace. It'd be great if you can also
move the relevant tests from configure.in / wscript to the equivalent
files in lib/replace, so libreplace stays self-contained.

Cheers,

Jelmer



signature.asc
Description: OpenPGP digital signature


Re: [SCM] Samba Shared Repository - branch master updated

2012-04-09 Thread Jeremy Allison
On Mon, Apr 09, 2012 at 09:53:25PM +0200, Jelmer Vernooij wrote:
 Hi Jeremy,
 
 Am 09/04/12 21:41, schrieb Jeremy Allison:
  The branch, master has been updated
 via  5701a4d Move blksize_t and blkcnt_t to replace.h from 
  includes.h. Should help with platforms that don't have these.
from  5184f41 libreplace: We have a poll replacement based on select
 
  http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
 
 
  - Log -
  commit 5701a4d8611ad1e310b76b00b146b0902c9b34ff
  Author: Jeremy Allison j...@samba.org
  Date:   Mon Apr 9 11:04:07 2012 -0700
 
  Move blksize_t and blkcnt_t to replace.h from includes.h. Should help 
  with platforms that don't have these.
  
 Thanks for moving these to libreplace. It'd be great if you can also
 move the relevant tests from configure.in / wscript to the equivalent
 files in lib/replace, so libreplace stays self-contained.

Hmmm, ok. This is probably easy for wscript, but I'm not sure
what to change for configure.in.

Jeremy.


[SCM] Samba Shared Repository - branch master updated

2012-04-09 Thread Jelmer Vernooij
The branch, master has been updated
   via  7cf7890 wafsamba: Parse Python versions as integers separated by 
dots.
  from  5701a4d Move blksize_t and blkcnt_t to replace.h from includes.h. 
Should help with platforms that don't have these.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 7cf78902dc63ec0db1f2310aa0e32d884ca96491
Author: Jelmer Vernooij jel...@samba.org
Date:   Mon Apr 9 20:05:06 2012 +0200

wafsamba: Parse Python versions as integers separated by dots.

This causes tdb 1.2.10 to no longer be considered older than 1.2.9.

Autobuild-User: Jelmer Vernooij jel...@samba.org
Autobuild-Date: Mon Apr  9 23:16:17 CEST 2012 on sn-devel-104

---

Summary of changes:
 buildtools/wafsamba/samba_bundled.py |5 -
 1 files changed, 4 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildtools/wafsamba/samba_bundled.py 
b/buildtools/wafsamba/samba_bundled.py
index 7fc0fb9..6df7454 100644
--- a/buildtools/wafsamba/samba_bundled.py
+++ b/buildtools/wafsamba/samba_bundled.py
@@ -209,6 +209,9 @@ def CHECK_BUNDLED_SYSTEM(conf, libname, minversion='0.0.0',
 return False
 
 
+def tuplize_version(version_string):
+return tuple([int(x) for x in version.split(.)])
+
 @runonce
 @conf
 def CHECK_BUNDLED_SYSTEM_PYTHON(conf, libname, modulename, minversion='0.0.0'):
@@ -233,7 +236,7 @@ def CHECK_BUNDLED_SYSTEM_PYTHON(conf, libname, modulename, 
minversion='0.0.0'):
 except AttributeError:
 found = False
 else:
-found = tuple(version.split(.)) = tuple(minversion.split(.))
+found = tuplize_version(version) = tuplize_version(minversion)
 if not found and not conf.LIB_MAY_BE_BUNDLED(libname):
 Logs.error('ERROR: Python module %s of version %s not found, and 
bundling disabled' % (libname, minversion))
 sys.exit(1)


-- 
Samba Shared Repository


autobuild: intermittent test failure detected

2012-04-09 Thread autobuild
The autobuild test system has detected an intermittent failing test in 
the current master tree.

The autobuild log of the failure is available here:

   http://git.samba.org/autobuild.flakey/2012-04-10-0001/flakey.log

The samba3 build logs are available here:

   http://git.samba.org/autobuild.flakey/2012-04-10-0001/samba3.stderr
   http://git.samba.org/autobuild.flakey/2012-04-10-0001/samba3.stdout

The source4 build logs are available here:

   http://git.samba.org/autobuild.flakey/2012-04-10-0001/samba4.stderr
   http://git.samba.org/autobuild.flakey/2012-04-10-0001/samba4.stdout
  
The top commit at the time of the failure was:

commit 7cf78902dc63ec0db1f2310aa0e32d884ca96491
Author: Jelmer Vernooij jel...@samba.org
Date:   Mon Apr 9 20:05:06 2012 +0200

wafsamba: Parse Python versions as integers separated by dots.

This causes tdb 1.2.10 to no longer be considered older than 1.2.9.

Autobuild-User: Jelmer Vernooij jel...@samba.org
Autobuild-Date: Mon Apr  9 23:16:17 CEST 2012 on sn-devel-104


autobuild: intermittent test failure detected

2012-04-09 Thread autobuild
The autobuild test system has detected an intermittent failing test in 
the current master tree.

The autobuild log of the failure is available here:

   http://git.samba.org/autobuild.flakey/2012-04-10-0202/flakey.log

The samba3 build logs are available here:

   http://git.samba.org/autobuild.flakey/2012-04-10-0202/samba3.stderr
   http://git.samba.org/autobuild.flakey/2012-04-10-0202/samba3.stdout

The source4 build logs are available here:

   http://git.samba.org/autobuild.flakey/2012-04-10-0202/samba4.stderr
   http://git.samba.org/autobuild.flakey/2012-04-10-0202/samba4.stdout
  
The top commit at the time of the failure was:

commit 7cf78902dc63ec0db1f2310aa0e32d884ca96491
Author: Jelmer Vernooij jel...@samba.org
Date:   Mon Apr 9 20:05:06 2012 +0200

wafsamba: Parse Python versions as integers separated by dots.

This causes tdb 1.2.10 to no longer be considered older than 1.2.9.

Autobuild-User: Jelmer Vernooij jel...@samba.org
Autobuild-Date: Mon Apr  9 23:16:17 CEST 2012 on sn-devel-104


[SCM] Samba Shared Repository - branch master updated

2012-04-09 Thread Jelmer Vernooij
The branch, master has been updated
   via  800a9d8 wafsamba/bundled: Fix typo in tuplize_version.
  from  7cf7890 wafsamba: Parse Python versions as integers separated by 
dots.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit 800a9d8bc3d6805dd297e65c8d32efc74a1329b3
Author: Jelmer Vernooij jel...@samba.org
Date:   Tue Apr 10 00:45:20 2012 +0200

wafsamba/bundled: Fix typo in tuplize_version.

Autobuild-User: Jelmer Vernooij jel...@samba.org
Autobuild-Date: Tue Apr 10 02:21:39 CEST 2012 on sn-devel-104

---

Summary of changes:
 buildtools/wafsamba/samba_bundled.py   |2 +-
 buildtools/wafsamba/tests/__init__.py  |1 +
 .../tests/{__init__.py = test_bundled.py} |   23 +++-
 3 files changed, 10 insertions(+), 16 deletions(-)
 copy buildtools/wafsamba/tests/{__init__.py = test_bundled.py} (67%)


Changeset truncated at 500 lines:

diff --git a/buildtools/wafsamba/samba_bundled.py 
b/buildtools/wafsamba/samba_bundled.py
index 6df7454..c5b4022 100644
--- a/buildtools/wafsamba/samba_bundled.py
+++ b/buildtools/wafsamba/samba_bundled.py
@@ -209,7 +209,7 @@ def CHECK_BUNDLED_SYSTEM(conf, libname, minversion='0.0.0',
 return False
 
 
-def tuplize_version(version_string):
+def tuplize_version(version):
 return tuple([int(x) for x in version.split(.)])
 
 @runonce
diff --git a/buildtools/wafsamba/tests/__init__.py 
b/buildtools/wafsamba/tests/__init__.py
index c9f2fb6..ae27418 100644
--- a/buildtools/wafsamba/tests/__init__.py
+++ b/buildtools/wafsamba/tests/__init__.py
@@ -24,6 +24,7 @@ from unittest import (
 def test_suite():
 names = [
 'abi',
+'bundled',
 'utils',
 ]
 module_names = ['wafsamba.tests.test_' + name for name in names]
diff --git a/buildtools/wafsamba/tests/__init__.py 
b/buildtools/wafsamba/tests/test_bundled.py
similarity index 67%
copy from buildtools/wafsamba/tests/__init__.py
copy to buildtools/wafsamba/tests/test_bundled.py
index c9f2fb6..c5f0db6 100644
--- a/buildtools/wafsamba/tests/__init__.py
+++ b/buildtools/wafsamba/tests/test_bundled.py
@@ -14,21 +14,14 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-Tests for wafsamba.
+from wafsamba.tests import TestCase
 
-from unittest import (
-TestCase,
-TestLoader,
+from wafsamba.samba_bundled import (
+tuplize_version,
 )
 
-def test_suite():
-names = [
-'abi',
-'utils',
-]
-module_names = ['wafsamba.tests.test_' + name for name in names]
-loader = TestLoader()
-result = loader.suiteClass()
-suite = loader.loadTestsFromNames(module_names)
-result.addTests(suite)
-return result
+
+class TuplizeVersionTests(TestCase):
+
+def test_simple(self):
+self.assertEquals((1, 2, 10), tuplize_version(1.2.10))


-- 
Samba Shared Repository


[SCM] Samba Shared Repository - branch master updated

2012-04-09 Thread Jeremy Allison
The branch, master has been updated
   via  d425a4c On advice from Jelmer and Andrew, move the blksize_t and 
blkcnt_t tests into libreplace to make it standalone.
  from  800a9d8 wafsamba/bundled: Fix typo in tuplize_version.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit d425a4cd3dded853aaefbca8873c95845933d383
Author: Jeremy Allison j...@samba.org
Date:   Mon Apr 9 15:31:23 2012 -0700

On advice from Jelmer and Andrew, move the blksize_t and blkcnt_t tests 
into libreplace to make it standalone.

Autobuild-User: Jeremy Allison j...@samba.org
Autobuild-Date: Tue Apr 10 04:07:11 CEST 2012 on sn-devel-104

---

Summary of changes:
 lib/replace/libreplace.m4 |   12 
 lib/replace/replace.h |8 
 lib/replace/wscript   |2 ++
 source3/configure.in  |2 --
 source3/wscript   |1 -
 5 files changed, 14 insertions(+), 11 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/replace/libreplace.m4 b/lib/replace/libreplace.m4
index 72de917..df3d4c8 100644
--- a/lib/replace/libreplace.m4
+++ b/lib/replace/libreplace.m4
@@ -60,6 +60,18 @@ AC_STRUCT_ST_RDEV
 AC_CHECK_TYPE(ino_t,unsigned)
 AC_CHECK_TYPE(loff_t,off_t)
 AC_CHECK_TYPE(offset_t,loff_t)
+AC_CHECK_TYPE([blksize_t],,
+[AC_DEFINE_UNQUOTED([blksize_t], [long],
+[Define to `long' if
+ sys/stat.h does not define it.])],
+   [],
+   [[#include sys/stat.h]])
+AC_CHECK_TYPE([blkcnt_t],,
+[AC_DEFINE_UNQUOTED([blkcnt_t], [long],
+[Define to `long' if
+ sys/stat.h does not define it.])],
+   [],
+   [[#include sys/stat.h]])
 
 AC_FUNC_MEMCMP
 
diff --git a/lib/replace/replace.h b/lib/replace/replace.h
index debd4da..776da8a 100644
--- a/lib/replace/replace.h
+++ b/lib/replace/replace.h
@@ -841,12 +841,4 @@ typedef long useconds_t;
 int usleep(useconds_t);
 #endif
 
-#ifndef HAVE_BLKSIZE_T
-typedef long blksize_t;
-#endif
-
-#ifndef HAVE_BLKCNT_T
-typedef long blkcnt_t;
-#endif
-
 #endif /* _LIBREPLACE_REPLACE_H */
diff --git a/lib/replace/wscript b/lib/replace/wscript
index 025dda4..d7b0634 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -91,6 +91,8 @@ def configure(conf):
 conf.CHECK_TYPE('offset_t', 'loff_t')
 conf.CHECK_TYPE('volatile int', define='HAVE_VOLATILE')
 conf.CHECK_TYPE('uint_t', 'unsigned int')
+conf.CHECK_TYPE('blksize_t', 'long', headers='sys/types.h sys/stat.h 
unistd.h')
+conf.CHECK_TYPE('blkcnt_t', 'long', headers='sys/types.h sys/stat.h 
unistd.h')
 
 conf.CHECK_SIZEOF('bool char int long long long short size_t ssize_t')
 conf.CHECK_SIZEOF('int8_t uint8_t int16_t uint16_t int32_t uint32_t 
int64_t uint64_t')
diff --git a/source3/configure.in b/source3/configure.in
index bc8afc0..bf777a1 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -2934,8 +2934,6 @@ if test x$samba_cv_HAVE_STAT_ST_BLOCKS = xyes; then
 AC_DEFINE(HAVE_STAT_ST_BLOCKS,1,[Whether the stat struct has a st_block 
property])
 fi
 
-AC_CHECK_TYPES([blksize_t, blkcnt_t], [], [], [[#include sys/stat.h]])
-
 AC_CACHE_CHECK([for 32 bit blkcnt_t],samba_cv_SIZEOF_BLKCNT_T_4,[
 AC_TRY_RUN([
 #if defined(HAVE_UNISTD_H)
diff --git a/source3/wscript b/source3/wscript
index 3c8df0a..24924cc 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -166,7 +166,6 @@ main() {
 msg=Checking for krenel share modes)
 
 # Check for various members of the stat structure
-conf.CHECK_TYPES('blksize_t blkcnt_t')
 conf.CHECK_STRUCTURE_MEMBER('struct stat', 'st_blocks', 
define='HAVE_STAT_ST_BLOCKS',
 headers='sys/stat.h')
 conf.CHECK_STRUCTURE_MEMBER('struct stat', 'st_blksize', 
define='HAVE_STAT_ST_BLKSIZE',


-- 
Samba Shared Repository


autobuild: intermittent test failure detected

2012-04-09 Thread autobuild
The autobuild test system has detected an intermittent failing test in 
the current master tree.

The autobuild log of the failure is available here:

   http://git.samba.org/autobuild.flakey/2012-04-10-0414/flakey.log

The samba3 build logs are available here:

   http://git.samba.org/autobuild.flakey/2012-04-10-0414/samba3.stderr
   http://git.samba.org/autobuild.flakey/2012-04-10-0414/samba3.stdout

The source4 build logs are available here:

   http://git.samba.org/autobuild.flakey/2012-04-10-0414/samba4.stderr
   http://git.samba.org/autobuild.flakey/2012-04-10-0414/samba4.stdout
  
The top commit at the time of the failure was:

commit 800a9d8bc3d6805dd297e65c8d32efc74a1329b3
Author: Jelmer Vernooij jel...@samba.org
Date:   Tue Apr 10 00:45:20 2012 +0200

wafsamba/bundled: Fix typo in tuplize_version.

Autobuild-User: Jelmer Vernooij jel...@samba.org
Autobuild-Date: Tue Apr 10 02:21:39 CEST 2012 on sn-devel-104