Re: [Samba] Update: Winbind+nss working on one centOS 5.2 box but not another

2009-01-23 Thread Ben Tisdall
tim clusters wrote:
 
 What is your id backend? AD or RID? Can you post your smb.conf?
 

Hi Tim  thanks for replying.

This is very minimal smb.conf - the history is that it was copied
verbatim from a Guardian snap appliance  worked perfectly well on 'Box A'.

workgroup = OURDOMAIN
security = ads
server string = Samba Server Version %v
netbios name = testukmcsstor1
realm = OURDOMAIN.PRIV
idmap uid = 1-2
idmap gid = 1-2
;interfaces = lo eth0 192.168.12.2/24 192.168.13.2/24
;hosts allow = 127. 10

# logs split per machine
log file = /var/log/samba/log.%m
# max 50KB per log file, then rotate
max log size = 50
preferred master = no
wins support = yes
;   wins server = w.x.y.z
;   wins proxy = yes

;   dns proxy = yes

load printers = yes
cups options = raw

;   map archive = no
;   map hidden = no
;   map read only = no
;   map system = no
;   store dos attributes = yes

Include = /etc/samba/shares.conf

NB: I can testparm the conf from both boxes  the output diffs perfectly.

-- 
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.

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


Re: [Samba] getent group shows AD groups; getent passwd only shows local users

2009-01-23 Thread Tomasz Chmielewski

Brian Gregorcy schrieb:


In log.winbindd I can see errors like:

[2009/01/22 10:44:55, 3] libads/ldap.c:ads_do_paged_search_args(696)
  ads_do_paged_search_args: 
ldap_search_with_timeout((objectCategory=user)) - Operations error
[2009/01/22 10:44:55, 3] 
libads/ldap_utils.c:ads_do_search_retry_internal(76)
  Reopening ads connection to realm 'GEORGIANUT.COM' after error 
Operations error

[2009/01/22 10:44:55, 5] libads/dns.c:sitename_fetch(677)
  sitename_fetch: Returning sitename for georgianut.com: 
Default-First-Site-Name

[2009/01/22 10:44:55, 6] libads/ldap.c:ads_find_dc(294)
  ads_find_dc: looking for realm 'georgianut.com'
[2009/01/22 10:44:55, 8] libsmb/namequery.c:get_sorted_dc_list(1626)
  get_sorted_dc_list: attempting lookup for name georgianut.com 
(sitename Default-First-Site-Name) using [ads]






check that your clock on the linux box matches the clock on the DC.


Just being curios: what time difference is acceptable? I.e. up to 5 
seconds, 5 minutes? That being said, the clocks are in sync.


When I use tcpdump to see what happens when doing getent passwd, I can 
see such error message:


5012 DIR_ERROR

Google suggest such causes for this error:

i.e. LDAP troubleshooting 
kb.adobe.com/selfservice/viewContent.do?externalId=tn_19576


Cause: The DN specified in the User Search tab is incorrect, wrong, or 
incorrectly formatted.


Cause: User could not be found. Most likely due to DN settings in the 
User Search tab or the suffix or prefix fields in the Settings tab.


Cause: Most likely caused by a bad username or password. Common cause of 
this error is a user trying to login with DOMAIN\login instead of just 
login.



However, this doesn't explain why getent group works, and getent 
passwd doesn't.


--
Tomasz Chmielewski
http://wpkg.org
--
To unsubscribe from this list go to the following URL and read the
instructions:  https://lists.samba.org/mailman/listinfo/samba


[Samba] net getlocasid and getdomainsid not answering on BDC

2009-01-23 Thread lacoste

Hello,

I have one PDC with a local master ldap backend and
one BDC with a local slave ldap backend.
I did not join the PDC nor the BDC to the domain
because I am not using winbind.

I have correct answers from the PDC:

pdc# net getlocalsid
SID for domain PDC is: S-1-5-21-XXX

pdc# net getdomainsid
SID for domain PDC is: S-1-5-21-XXX
SID for domain MYDOMAIN is: S-1-5-21-XXX

The BDC doesn't answer :

bdc# net getlocalsid
[2009/01/22 23:57:10, 0] utils/net.c:net_getlocalsid(497)
 Can't fetch domain SID for name: BDC

bdc# net getdomainsid
Could not fetch local SID

Is this expected ? Did I misconfigured something ?

This is with samba-3.0.22 and openldap-server-2.3.24.

Regards,
Thierry

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


[Samba] first questions

2009-01-23 Thread Pap Zoltán
Dear All,

I'm new in use of samba. I'd like to know more about samba server config. My
aim to make sharing file-system for 10 microsoft windows users with
opportunitiy of usage ftp. First of all I suppose I made a good
configuration (that sould be good more or less) with helping of http SWAT. I
added a new user (like new account or member) for use of this ftp, but I
cannot reach the server.
I don't know exactly what is the problem... maybe the firewall, maybe my
config wasn't so correct.

First trying config of my SWAt is:

[global]
workgroup = ZGT_WORKGROUP
map to guest = Bad User
printcap name = cups
add machine script = /usr/sbin/useradd  -c Machine -d /var/lib/nobody -s
/bin/false %m$
logon path = \\%L\profiles\.msprofile
logon drive = P:
logon home = \\%L\%U\.9xprofile
domain logons = Yes
os level = 65
preferred master = Yes
domain master = Yes
usershare allow guests = Yes
usershare max shares = 5
cups options = raw
include = /etc/samba/dhcp.conf

[homes]
comment = Home Directories
valid users = %S, %D%w%S
read only = No
inherit acls = Yes
browseable = No

[profiles]
comment = Network Profiles Service
path = %H
read only = No
create mask = 0600
directory mask = 0700
store dos attributes = Yes

[users]
comment = All users
path = /home
read only = No
inherit acls = Yes
veto files = /aquota.user/groups/shares/

[groups]
comment = All groups
path = /home/groups
read only = No
inherit acls = Yes

[printers]
comment = All Printers
path = /var/tmp
create mask = 0600
printable = Yes
browseable = No

[print$]
comment = Printer Drivers
path = /var/lib/samba/drivers
write list = @ntadmin, root
force group = ntadmin
create mask = 0664
directory mask = 0775

[netlogon]
comment = Network Logon Service
path = /var/lib/samba/netlogon
write list = root

[/samba/share/zolka]
path = /samba/share/zolka
valid users = zolka
guest ok = Yes
hosts allow = 146.110.169.1
available = No

Can somebody tell me what's wrong with this, and can send me a correct
example of configuration (with how to) for suse linux 11.0? My samba version
is: 3.2.4-4.3-2042-SUSE-SL11.0
That is necessary that my samba server is sharing files and file system for
microsoft users.

I hope sy can help me.
All the best,
zolek
-- 
To unsubscribe from this list go to the following URL and read the
instructions:  https://lists.samba.org/mailman/listinfo/samba


[Samba] implicit locking?

2009-01-23 Thread LÉVAI Dániel

Hi!

Is it possible to introduce an implicit server-side file locking 
mechanism in samba(3.2.5), so if one opens a shared file for writing, 
then a new user won't be able to open it for writing, but only read-only.

Currently the following options are in the config file:
# testparm -v |fgrep -i lock
[...]
kernel oplocks = Yes
lock spin time = 200
oplock break wait time = 0
lock directory =
block size = 1024
veto oplock files =
blocking locks = Yes
fake oplocks = No
locking = Yes
oplocks = Yes
level2 oplocks = Yes
oplock contention limit = 2
posix locking = Yes
strict locking = Auto


Thanks!

Daniel

--
LEVAI Daniel
PGP key ID = 0x4AC0A4B1
Key fingerprint = D037 03B9 C12D D338 4412  2D83 1373 917A 4AC0 A4B1
--
To unsubscribe from this list go to the following URL and read the
instructions:  https://lists.samba.org/mailman/listinfo/samba


Re: [Samba] implicit locking?

2009-01-23 Thread Volker Lendecke
On Fri, Jan 23, 2009 at 03:36:56PM +0100, LÉVAI Dániel wrote:
 Is it possible to introduce an implicit server-side file locking 
 mechanism in samba(3.2.5), so if one opens a shared file for writing, 
 then a new user won't be able to open it for writing, but only read-only.

No. That's the application's duty, it can use so-called
share modes.

Volker


pgpHp3Y3Pi2jm.pgp
Description: PGP signature
-- 
To unsubscribe from this list go to the following URL and read the
instructions:  https://lists.samba.org/mailman/listinfo/samba

Re: [Samba] getent group shows AD groups; getent passwd only shows local users

2009-01-23 Thread Brian Gregorcy



check that your clock on the linux box matches the clock on the DC.


Just being curios: what time difference is acceptable? I.e. up to 5 
seconds, 5 minutes? That being said, the clocks are in sync.





I think the default is 5 minutes.  We have seen odd problems like this when our 
Linux boxes clock skew to far from our DC.

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


[Samba] Samba 3.2.7 - Lost the abiltity to manage domain using user manager for domains

2009-01-23 Thread Victor Medina
Guys

After upgrading my Samba setup, full ldap, 3.0.33 (binaries from sernet
- sles9 and sles10) I have lost the ability to manage the domain using
User Manager for Domains

1.- i can set account policies
2.- i cannot access user account information (for example to unlock an
account, change passoword)

It was perfectly working befor upgrading, it also used to work for
3.2.4, same setup, same smb.conf, same ldap config

Has anybody had this problem before? Am I the only one with this issue?


Victor Medina




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


[Samba] Re: [CentOS] OT? File order on CentOS/Samba server -- SOLVED (kind of...)

2009-01-23 Thread Miguel Medalha



This sounds to me like the dir_index option was applied to a file system
that didn't originally have it and an fsck -Df wasn't run at the time.


That may well be the most relevant information given here! I will 
*certainly* give it a try.


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


[Samba] Re: [CentOS] OT? File order on CentOS/Samba server -- SOLVED (kind of...)

2009-01-23 Thread Miguel Medalha


Did you consider sharing a directory from the machine running distiller 
and cifs-mounting it on the linux side to get ntfs behavior?
That is out of question. The Windows machines are graphic workstations 
which are not all connected all the time and the Distiller service is 
essential to the network.


   Also, I'm curious about the timing of the runs.  It doesn't sound like the file 
operations are grouped atomically.  How do you ensure that the whole set 
is present when distiller starts, or that only one set is present?
This is a very peculiar implementation. As I said om my first post, we 
are a newspaper and, as all newspapers, we don't have a fixed time to 
close the edition. It closes when it is ready, that's all.


The PDFs for print are automatically produced one by one from PostScript 
files. The PS files fall on a folder watched by Acrobat Distiller and 
after being stable for more than 10 seconds the conversion begins. Each 
one contains only one page, which will then be joined to others to form 
a plan for a platesetter.


When all the pages have been produced, one of the graphics people places 
a special text file on a folder watched by Distiller and it begins to 
bulk process all the individual PS files: downsampling images, 
converting the color space to sRGB, consolidating font subsets, creating 
bookmarks and indexes, etc. The result is a multipage PDF for electronic 
distribution, containing the whole newspaper in the sRGB color space.


This always worked flawlessly until some days ago I replaced the win2k 
server with a new CentOS/Samba one. Everything worked better and faster 
except... the pages on this last PDF were in what seemed like an 
aleatory order. Ordering them by hand is a time consuming and error 
prone process, specially when everybody is now tired... Producing a 
newspaper is a pretty tense work, you know.


The difficulty with the scripted solutions proposed here is that we 
cannot know in advance at what time this process will take place and 
what the number of pages involved will be. At the end of each issue 
every minute counts. A watching process would have to poll the status of 
the workflow for several hours with very small intervals, which would be 
a waste of  processor cicles. And not a very elegant thing to do, I feel.



I am (for now...) convinced that the tip given to me here about 
dir_index and the use of  fsck -fD will solve this problem.

Monday I will know. It will be a lng wait for me.

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


Re: [Samba] Samba 3.2.7 - Lost the abiltity to manage domain using user manager for domains

2009-01-23 Thread William Jojo


 Original message 
Date: Fri, 23 Jan 2009 14:54:16 -0430
From: Victor Medina victor.med...@bws.com.ve  
Subject: [Samba] Samba 3.2.7 - Lost the abiltity to manage domain using user 
manager for domains  
To: samba samba@lists.samba.org

Guys

After upgrading my Samba setup, full ldap, 3.0.33 (binaries from sernet
- sles9 and sles10) I have lost the ability to manage the domain using
User Manager for Domains

1.- i can set account policies
2.- i cannot access user account information (for example to unlock an
account, change passoword)

It was perfectly working befor upgrading, it also used to work for
3.2.4, same setup, same smb.conf, same ldap config

Has anybody had this problem before? Am I the only one with this issue?


This sounds like the bug Jeremy recenly fixed for usermgr.exe non-root issues 
and unable to join domain as non-root user.

I applied a manual patch from that thread (found in git) and it worked 
perfectly. It was literally one line of code that changed.

http://lists.samba.org/archive/samba/2008-December/145364.html


Cheers,
Bill


Victor Medina




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


[Samba] smbpasswd or tdbsam? Which one?

2009-01-23 Thread Aaron Souza
All, I have a site with around 200 concurrent users, with a user count of
over a thousand... I'm currently using just one PDC using the smbpasswd
backend. I currently do not want to go into an LDAP backend... but would
tdbsam be a better alternative?

One of the issues I have is, pretty randomly, I have some machines that
cannot find the domain controller (dell wireless card utility tells you it
cant via login). I'm guessing its because when I grep on 'corrupt' from
/var/log/messages, I have many errors because of poor account managment.
(exists in smbpaswd but not unix /etc/passwd. )

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


Re: [Samba] smbpasswd or tdbsam? Which one?

2009-01-23 Thread Miguel Medalha
According to the Samba documentation, smbpasswd is not even recommended 
for a PDC...

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


Re: [Samba] smbpasswd or tdbsam? Which one?

2009-01-23 Thread Miguel Medalha


I was asking the same question not too many days ago.

I went with LDAP. It is not as difficult as some people think. It seems 
somewhat daunting at first but then you quickly get the grasp of it.


It simply *works* and solves *a lot* of challenges at the same time, 
leaving you ready for future expansion.


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


Re: [Samba] smbpasswd or tdbsam? Which one?

2009-01-23 Thread Ryan Novosielski
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

I think you want tdbsam. There's virtually no downside.

=R

Aaron Souza wrote:
 All, I have a site with around 200 concurrent users, with a user count of
 over a thousand... I'm currently using just one PDC using the smbpasswd
 backend. I currently do not want to go into an LDAP backend... but would
 tdbsam be a better alternative?
 
 One of the issues I have is, pretty randomly, I have some machines that
 cannot find the domain controller (dell wireless card utility tells you it
 cant via login). I'm guessing its because when I grep on 'corrupt' from
 /var/log/messages, I have many errors because of poor account managment.
 (exists in smbpaswd but not unix /etc/passwd. )
 
 Thanks for the support.


- --
  _  _ _  _ ___  _  _  _
 |Y#| |  | |\/| |  \ |\ |  | |Ryan Novosielski - Systems Programmer II
 |$| |__| |  | |__/ | \| _| |novos...@umdnj.edu - 973/972.0922 (2-0922)
 \__/ Univ. of Med. and Dent.|IST/AST - NJMS Medical Science Bldg - C630
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkl6QPwACgkQmb+gadEcsb6fsACgqj0/d95xcq/DalFPRljbkhk7
v3kAoMesOSdMaYct3YROfNmPi9DY6Ob2
=Y9XA
-END PGP SIGNATURE-
-- 
To unsubscribe from this list go to the following URL and read the
instructions:  https://lists.samba.org/mailman/listinfo/samba

[Samba] Re: [CentOS] OT? File order on CentOS/Samba server -- SOLVED (kind of...)

2009-01-23 Thread Miguel Medalha


I was under the impression that the Distiller app was running under 
Windows.  If it isn't, it doesn't make much sense for it to expect NTFS 
filesystem semantics.


  


Yes, Distiller is running under Windows. When pages start to get ready, 
one of the graphic operators opens Distiller on his/her workstation 
which then starts watching a folder *on the server*.


Can't the trigger operation of placing the special text file be replaced 
by that person starting the script instead (perhaps click a button on a 
web page or something similar)?


  
Yes, that would be a possibility. But those people have strong rooted 
habits and they are not in the least technically minded. As such, I 
would prefer to keep a workflow that has been functioning very well.


(By the way, that special text file is a snippet of PostScript code 
that instructs Distiller on where to find the files and how to process 
them. It would be needed anyway.)


Perhaps this obstacle will be removed by applying the correct parameters 
to the EXT3 file system, as suggested by William Maltby and Steve 
Thompson above in this thread: mount option dir_index followed by a 
fsck -Df. I will try this Monday.


Thank you for answering.
--
To unsubscribe from this list go to the following URL and read the
instructions:  https://lists.samba.org/mailman/listinfo/samba


Re: [Samba] Re: [CentOS] OT? File order on CentOS/Samba server -- SOLVED (kind of...)

2009-01-23 Thread Miguel Medalha




I based my speculation on some observations I had made on some of my 
own systems when I implemented dir_index. It so happens that, on that 
system at least, a find /foo -print returns the filenames in sorted 
order. Unfortunately, it isn't true on another system that I just 
checked. So now I will go and stand in the corner :(




:)

Anyway, your tip gave me some precious direction. Monday I will 
investigate and then report.

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


[Samba] changing owner and group

2009-01-23 Thread Marc Fromm
Is there a way to prevent a samba connection from changing the file owner and 
group?
Users connect to the website on a linux box from windows desktops with 
Dreamweaver.
Each time a user edits a file that file's owner and group is changed from 
apache and developers to username and username, thus preventing other users 
from editing the file.
Can I set an option in samba to leave the owner and groups alone?

Thanks

Marc

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


Re: [Samba] smbpasswd or tdbsam? Which one?

2009-01-23 Thread Ryan Novosielski
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Miguel Medalha wrote:
 According to the Samba documentation, smbpasswd is not even recommended
 for a PDC...

I do use it, though, at it works fine mostly. I've heard it explained
that the reasoning for avoiding TDBSAM is that if you're running a PDC,
you probably also need features not provided by TDBSAM. In many cases,
that isn't exactly accurate. We have MANY users, but our needs are
fairly simple (and there are few workstations -- it's just a public lab).

- --
  _  _ _  _ ___  _  _  _
 |Y#| |  | |\/| |  \ |\ |  | |Ryan Novosielski - Systems Programmer II
 |$| |__| |  | |__/ | \| _| |novos...@umdnj.edu - 973/972.0922 (2-0922)
 \__/ Univ. of Med. and Dent.|IST/AST - NJMS Medical Science Bldg - C630
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkl6TPoACgkQmb+gadEcsb6KJgCg5FJq0+rb0Zp70u1nLhTSje0E
xokAoNd3U8i/1CxknkSWmZ7Mq+a95oWR
=niPb
-END PGP SIGNATURE-
-- 
To unsubscribe from this list go to the following URL and read the
instructions:  https://lists.samba.org/mailman/listinfo/samba

Re: [Samba] Re: [CentOS] OT? File order on CentOS/Samba server -- SOLVED (kind of...)

2009-01-23 Thread Steve Thompson

On Fri, 23 Jan 2009, Miguel Medalha wrote:




This sounds to me like the dir_index option was applied to a file system
that didn't originally have it and an fsck -Df wasn't run at the time.


That may well be the most relevant information given here! I will *certainly* 
give it a try.


I based my speculation on some observations I had made on some of my own 
systems when I implemented dir_index. It so happens that, on that system 
at least, a find /foo -print returns the filenames in sorted order. 
Unfortunately, it isn't true on another system that I just checked. So now 
I will go and stand in the corner :(


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


[SCM] Samba Shared Repository - branch v3-3-stable updated - release-3-3-0rc2-167-gc05bd1e

2009-01-23 Thread Karolin Seeger
The branch, v3-3-stable has been updated
   via  c05bd1e52e7a56ae2233b5e2dbfe001994cb28da (commit)
   via  3d0da7fae928197a993f7411a95d36f4cb2f0f51 (commit)
   via  6c9843446df64fd7f517bfeeca0afab654a6f0f5 (commit)
   via  0e491f80e597f83a1b04d6abc8036fa1ba63f719 (commit)
   via  6b93dd04ee4dff93be3d66d7ab223e8b81e77d93 (commit)
  from  5739cc5eb4d222b435a3cc32c1733288bf3d5635 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-stable


- Log -
commit c05bd1e52e7a56ae2233b5e2dbfe001994cb28da
Author: Jeremy Allison j...@samba.org
Date:   Thu Jan 22 16:22:04 2009 -0800

Apply same logic fix for #4308 Excel save operation corrupts file ACLs
to NFSv4 ACL code as this uses the same flawed logic as posix_acls.c.
Jeremy.
(cherry picked from commit cad872fc385ba30fb72baab25ee6341a41396e39)

commit 3d0da7fae928197a993f7411a95d36f4cb2f0f51
Author: Jeremy Allison j...@samba.org
Date:   Thu Jan 22 16:09:26 2009 -0800

Fix logic error in try_chown - we shouldn't arbitrarily chown
to ourselves unless that was passed in.
Jeremy.
(cherry picked from commit db2d56484e21daeb91df4b5e2286d242910336e8)

commit 6c9843446df64fd7f517bfeeca0afab654a6f0f5
Author: Jeremy Allison j...@samba.org
Date:   Thu Jan 22 14:32:32 2009 -0800

Second part of the attemt to fix #4308 - Excel save operation corrupts file 
ACLs.
If the chown succeeds then the ACL set should also. Ensure this is the case
(refactor some of this code to make it simpler to read also).
Jeremy.
(cherry picked from commit 90b660e2382711d005e8c4c4ae1c6adbd5e5b687)

commit 0e491f80e597f83a1b04d6abc8036fa1ba63f719
Author: Jeremy Allison j...@samba.org
Date:   Thu Jan 22 10:59:14 2009 -0800

Another attempt to fix bug #4308 - Excel save operation corrupts file ACLs.
Simo is completely correct. We should be doing the chown *first*, and fail 
the
ACL set if this fails. The long standing assumption I made when writing the
initial POSIX ACL code was that Windows didn't control who could chown a 
file
in the same was as POSIX. In POSIX only root can do this whereas I wasn't 
sure
who could do this in Windows at the time (I didn't understand the privilege
model). So the assumption was that setting the ACL was more important (early
tests showed many failed ACL set's due to inability to chown). But now we 
have
privileges in smbd, and we must always fail an ACL set when we can't chown
first. The key that Simo noticed is that the CREATOR_OWNER bits in the ACL
incoming are relative to the *new* owner, not the old one. This is why the 
old
user owner disappears on ACL set - their access was set via the USER_OBJ in 
the
creator POSIX ACL and when the ownership changes they lose their access.

Patch is simple - just ensure we do the chown first before evaluating the
incoming ACL re-read the owners. We already have code to do this it just 
wasn't
rigorously being applied.
Jeremy.
(cherry picked from commit 96b819e04cd71a6c899801ae68031bf55b54ea46)

commit 6b93dd04ee4dff93be3d66d7ab223e8b81e77d93
Author: todd stecher todd.stec...@gmail.com
Date:   Thu Jan 22 10:17:37 2009 -0800

Memory leaks and other fixes found by Coverity
(cherry picked from commit ba576efa8f884f3dd37bb5035fbb47ae0305c0b0)

---

Summary of changes:
 source/auth/pampass.c   |4 +-
 source/include/proto.h  |2 +-
 source/lib/dprintf.c|   26 ++--
 source/libsmb/clikrb5.c |   10 +-
 source/modules/nfs4_acls.c  |   84 --
 source/modules/vfs_aixacl2.c|2 -
 source/nmbd/nmbd_incomingrequests.c |4 +-
 source/nmbd/nmbd_serverlistdb.c |2 +-
 source/passdb/pdb_interface.c   |6 +
 source/passdb/pdb_ldap.c|1 +
 source/rpc_client/cli_spoolss.c |   66 +---
 source/rpc_parse/parse_buffer.c |   11 +-
 source/rpc_server/srv_pipe.c|4 +-
 source/rpc_server/srv_spoolss_nt.c  |3 +-
 source/rpc_server/srv_svcctl_nt.c   |1 -
 source/smbd/posix_acls.c|  313 +--
 source/utils/net_rpc.c  |   12 +-
 source/winbindd/winbindd_group.c|8 +-
 source/winbindd/winbindd_user.c |8 +-
 source/winbindd/winbindd_util.c |   12 +-
 source/winbindd/winbindd_wins.c |   10 +-
 21 files changed, 322 insertions(+), 267 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/auth/pampass.c b/source/auth/pampass.c
index 9345eed..4312b77 100644
--- a/source/auth/pampass.c
+++ b/source/auth/pampass.c
@@ -462,7 +462,9 @@ static bool smb_pam_end(pam_handle_t *pamh, struct pam_conv 
*smb_pam_conv_ptr)
 static bool smb_pam_start(pam_handle_t **pamh, const char *user, const char 
*rhost, struct pam_conv *pconv)
 {
int 

[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4860-g50b8d5a

2009-01-23 Thread Karolin Seeger
The branch, v3-3-test has been updated
   via  50b8d5a1625d22512cf32b0bcd2f068e364a7403 (commit)
  from  cad872fc385ba30fb72baab25ee6341a41396e39 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -
commit 50b8d5a1625d22512cf32b0bcd2f068e364a7403
Author: Karolin Seeger ksee...@samba.org
Date:   Fri Jan 23 10:36:25 2009 +0100

WHATSNEW: Update changes since 3.3.0rc2.

Karolin

---

Summary of changes:
 WHATSNEW.txt |   63 ++
 1 files changed, 63 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 49d28cc..d1de02d 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -199,6 +199,7 @@ smb.conf changes
 init logon delayed hosts   New 
 init logon delay   New 100
 ldap ssl   Changed Default start tls
+share modesDeprecated
 winbind reconnect delayNew 30
 
 
@@ -207,20 +208,39 @@ Changes since 3.3.0rc2:
 
 
 o   Jeremy Allison j...@samba.org
+* BUG 4308: Fix corrupting of file ACLs during Excel save operations.
 * BUG 5979: Fix level 2 oplocks being granted improperly.
 * BUG 5980: Race condition when granting level2 oplocks can cause break
   notify to be missed.
 * BUG 5986: Editing a stream is broken (rename problems).
 * BUG 5990: Strict allocate should be checked before ftruncate.
 * BUG 6009: Setting min receivefile size = 1 breaks writes.
+* BUG 6016: Alternate Data Streams / Extended Attributes seem to conflict.
+* BUG 6017: Fix magic scripts.
+* BUG 6019: Fix file corruption in Clustered SMB/NFS environment managed 
via
+  CTDB.
+* BUG 6021: smbclient du command does not recuse properly.
+* BUG 6024: Deprecate the share modes parameter.
+* BUG 6030: Add missing th header in Status page.
+* BUG 6035: Fix possible race between fcntl F_SETLKW and alarm delivery.
+* BUG 6040: Calling Samba print server with an aliased DNS-name fails.
 * Fix gcc 4.3.2 warnings.
 * Fix more asprintf errors and error code paths.
+* Attempt to fix crash seen with new CUPS async printcap loading code.
+* Add winbindd_reinit_after_fork(), cleaning out all possible events
+  in a forked child.
+* Make winbindd_cm.c use winbindd_reinit_after_fork().
+* Fix race condition in alarm lock processing.
+* Fixes crash bug in SWAT.
 
 
 o   Michael Adam ob...@samba.org
 * Fix build of pam_winbind.so on older Linux systems.
 * Packaging RHEL-CTDB: Fix build of [u]mount.cifs.
 * Prevent access to root filesystem when connecting with empty service 
name.
+* Fix distclean target and add realdistclean target in the docs build.
+* Add manpage for idmap_tdb2.
+* Clarify idmap manpages.
 
 
 o   Kai Blin k...@samba.org
@@ -229,6 +249,7 @@ o   Kai Blin k...@samba.org
 
 o   Gerald (Jerry) Carter je...@samba.org
 * Fix allow trusted domain so it disables trusted domains.
+* Return immediately on a failed GC connection in ads_connect.
 
 
 o   SATOH Fumiyasu fumi...@osstech.jp
@@ -249,6 +270,7 @@ o   Volker Lendecke v...@samba.org
 * BUG 5913: Fix build error with at least GCC 4.2.2.
 * BUG 5933: Fix incrementing/decrementing of num_validated_vuids.
 * BUG 5953: Make cli_send_smb_direct_writeX use writev.
+* BUG 5965: Fix creation of the first share using SWAT.
 * BUG 5969: Optimize smbclient put command.
 * BUG 6012: Add get_real_filename to full_audit.
 * BUG 6014: Fix segfault when calling mget without arguments.
@@ -261,6 +283,11 @@ o   Volker Lendecke v...@samba.org
 * Fix a bad memleak in vfs_full_audit.
 
 
+o   Derrell Lipman derrell.lip...@unwireduniverse.com
+* BUG 6022: Make smbc_urlencode and smbc_urldecode in libsmbclient.
+* Determine case sensitivity based on file system attributes.
+
+
 o   Stefan Metzmacher me...@samba.org
 * net_status: Use dbwrap to open sessionid.tdb.
 * Fix dbwrap_store_uint32() to match dbwrap_store_int32().
@@ -269,6 +296,16 @@ o   Stefan Metzmacher me...@samba.org
 * Register the client connection via CTDB_CONTROL_TCP_ADD.
 * Don't need to call messaging_reinit() twice.
 * Raise TDBSAM_VERSION.
+* Add manpage for vfs_fileid.
+* Rename 'fd_event' to 'winbindd_fd_event' to avoid confusion.
+* Recreate the per domain check_online_event without relying on global
+  state.
+* Handle the smb signing states the same in the krb5 and ntlmssp cases.
+* Re-add 'fileid:algorithm' option to vfs_fileid.
+* Fix CTDB IPv6 support in cluster setups.
+* Reinit_after_fork() should reinit the event context before the
+  messaging context.
+* Fix PCAP support in 

[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4861-g646468f

2009-01-23 Thread Karolin Seeger
The branch, v3-3-test has been updated
   via  646468f1a504a1ab00b27f9e61d56acbc42ffda9 (commit)
  from  50b8d5a1625d22512cf32b0bcd2f068e364a7403 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -
commit 646468f1a504a1ab00b27f9e61d56acbc42ffda9
Author: Karolin Seeger ksee...@samba.org
Date:   Fri Jan 23 11:09:07 2009 +0100

WHATSNEW: Add  Changes since sections of pre releases and RCs.

Karolin

---

Summary of changes:
 WHATSNEW.txt |  379 ++
 1 files changed, 379 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index d1de02d..7f8e817 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -348,6 +348,385 @@ o   Bo Yang boy...@novell.com
 * Fix bug in get_dc_name_via_netlogon(), null pointer reference.
 
 
+
+Changes since sections of 3.3 previews and release candidates follow:
+===
+
+Changes since 3.3.0rc1:
+
+
+o   Jeremy Allison j...@samba.org
+* BUG 1254: Fix write list in setups using security = share.
+* BUG 5937: Fix filenames with * char hiding other files.
+* BUG 5953: Fix segfaults in smbclient.
+* Fix usrmgr opening a user object as non-root.
+
+
+o   Michael Adam ob...@samba.org
+* BUG 3661: Add support for trusted domains to idmap_ad.
+* Fix default backend handling for ad backends.
+* Fix potential segfault in vfs_tsmsm.
+* Fix several RHEL CTDB packaging issues.
+
+
+o   Guenther Deschner g...@samba.org
+* BUG 5957: Do not abort rename process on valid rename script.
+* Fix various potential memleaks in samr_SetUserInfo.
+* Fix access bits in netapi.
+
+
+o   Steve French ste...@smf-t60p.smfdom
+* BUG 5934: Use USER environment in mount.cifs when no user is specified.
+* variable
+
+
+o   SATOH Fumiyasu fumi...@osstech.co.jp
+* BUG 5688: LPQ process is orphaned if socket address parameter is invalid.
+* Vars for signals must be volatile sig_atomic_t.
+
+
+o   Henning Henkel henning.hen...@fh-furtwangen.de
+* BUG 5929: Fix build of vfs_prealloc with option --with-cluster-support 
and
+  GPFS.
+
+
+o   Tomasz Krasuski kr0...@poczta.onet.pl
+* BUG 5928: Fix 'testparm --version'.
+
+
+o   Jeff Layton jlay...@redhat.com
+* Allow mounts to ipv6 capable servers in mount.cifs.
+
+
+o   Volker Lendecke v...@samba.org
+* Fix crash bug when freeing a non-malloc'ed buffer if the client sends a
+  non-encrypted packet with the crypto state set.
+* Fix error code when smbclient puts a file over an existing directory.
+* Pass the get_real_filename operation through the VFS.
+
+
+o   Stefan Metzmacher me...@samba.org
+* BUG 5749: Re-set acctflags while joining.
+* Fix several issues concerning Alternate Data Streams.
+* Fix valgrind bug lp_parm_const_string().
+* Fix setting of trust passwords using 'net rpc trustdom add'.
+* Correctly detect if the current dc is the closest one.
+
+
+o   Tim Prouty tpro...@samba.org
+* Fix a delete on close divergence from windows.
+
+
+o   Dan Sledz dsl...@isilon.com
+* Fix logging to syslog.
+
+
+o   Yasuma Takeda yas...@osstech.co.jp
+* BUG 5944: Fix starting of nmbd with socket address set to .
+
+
+o   Bo Yang boy...@novell.com
+* Fix script installmo.sh when no .po file exists.
+
+
+
+
+Changes since 3.3.0pre2:
+
+
+o   Michael Adam ob...@samba.org
+* Fix eventlog crash.
+* Make keytab filename argument mandatory to net rpc vampire keytab.
+* Add domain prefix to username in lookup_groupmem().
+* Honour winbind use default domain in lookup_groupmem().
+* Sanely handle NULL domain in add_member().
+* Don't list the domain twice when expanding internal aliases.
+* Prevent negative GM/ cache entries due to broken connections.
+* Use the reconnect methods instead of the rpc methods directly.
+
+
+o   Jeremy Allison j...@samba.org
+* BUG 5080: Fix access to cups-printers with cups 1.3.4.
+* BUG 5814: Fix Winbind crash bug while doing rescan_trusted_domain.
+* BUG 5818: Sort ACEs in smbcacl output properly and honor inheritance.
+* BUG 5825: Fix account locking with an LDAP backend.
+* BUG 5826: Fix truncated filenames when accessing old servers.
+* BUG 5873: Fix ACL inheritance.
+* BUG 5889: Fix delete veto files = no.
+* BUG 5891: Fix smbd crash when viewing the eventlog exported by eventlog
+  list.
+* BUG 5900: Fix vfs_readonly.
+* BUG 5903: Fix breaking of file contents in vfs_streams_xattr.
+* BUG 5904: Fix SIGABRT while servicing getaddrinfo() request caused by
+  libnss_wins.
+* BUG 5914: Fix 

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-107-g2325606

2009-01-23 Thread Stefan Metzmacher
The branch, master has been updated
   via  232560627f97931a62014246e4e3731d6981844e (commit)
  from  b30b1cfcaf81bfe091893f51ce6a33fdf9a6dbc6 (commit)

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


- Log -
commit 232560627f97931a62014246e4e3731d6981844e
Author: Stefan Metzmacher me...@samba.org
Date:   Fri Jan 23 11:24:25 2009 +0100

s4: we're on the way to alhpa7

metze

---

Summary of changes:
 source4/VERSION |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/VERSION b/source4/VERSION
index 2720864..e7d05f6 100644
--- a/source4/VERSION
+++ b/source4/VERSION
@@ -57,7 +57,7 @@ SAMBA_VERSION_TP_RELEASE=
 # e.g. SAMBA_VERSION_ALPHA_RELEASE=1   #
 #  -  4.0.0alpha1   #
 
-SAMBA_VERSION_ALPHA_RELEASE=6
+SAMBA_VERSION_ALPHA_RELEASE=7
 
 
 # For 'pre' releases the version will be   #


-- 
Samba Shared Repository


[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4862-gd74b630

2009-01-23 Thread Stefan Metzmacher
The branch, v3-3-test has been updated
   via  d74b63091781e442e42b1fa7881e903a0bcc928c (commit)
  from  646468f1a504a1ab00b27f9e61d56acbc42ffda9 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -
commit d74b63091781e442e42b1fa7881e903a0bcc928c
Author: Stefan Metzmacher me...@samba.org
Date:   Thu Jan 22 11:52:54 2009 +0100

lib/replace: add defines to let the callers find out if pwrite and pread 
are thread/fork safe

metze
(cherry picked from commit 7fc7ee9331d0539359ad88c527f59d5fdf212209)

---

Summary of changes:
 source/lib/replace/replace.h |6 ++
 1 files changed, 6 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/replace/replace.h b/source/lib/replace/replace.h
index c69ea6c..3fba1c0 100644
--- a/source/lib/replace/replace.h
+++ b/source/lib/replace/replace.h
@@ -328,11 +328,17 @@ char *rep_mkdtemp(char *template);
 #ifndef HAVE_PREAD
 #define pread rep_pread
 ssize_t rep_pread(int __fd, void *__buf, size_t __nbytes, off_t __offset);
+#define LIBREPLACE_PREAD_REPLACED 1
+#else
+#define LIBREPLACE_PREAD_NOT_REPLACED 1
 #endif
 
 #ifndef HAVE_PWRITE
 #define pwrite rep_pwrite
 ssize_t rep_pwrite(int __fd, const void *__buf, size_t __nbytes, off_t 
__offset);
+#define LIBREPLACE_PWRITE_REPLACED 1
+#else
+#define LIBREPLACE_PWRITE_NOT_REPLACED 1
 #endif
 
 #if !defined(HAVE_INET_NTOA) || defined(REPLACE_INET_NTOA)


-- 
Samba Shared Repository


[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3394-g9483b14

2009-01-23 Thread Stefan Metzmacher
The branch, v3-2-test has been updated
   via  9483b143fe473d374e7f5c71f0d497f28f4e69f7 (commit)
  from  7b994fc658ad175bc40af9e38a8f1b870276d980 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -
commit 9483b143fe473d374e7f5c71f0d497f28f4e69f7
Author: Stefan Metzmacher me...@samba.org
Date:   Thu Jan 22 11:52:54 2009 +0100

lib/replace: add defines to let the callers find out if pwrite and pread 
are thread/fork safe

metze
(cherry picked from commit 7fc7ee9331d0539359ad88c527f59d5fdf212209)
(cherry picked from commit d74b63091781e442e42b1fa7881e903a0bcc928c)

---

Summary of changes:
 source/lib/replace/replace.h |6 ++
 1 files changed, 6 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/replace/replace.h b/source/lib/replace/replace.h
index c69ea6c..3fba1c0 100644
--- a/source/lib/replace/replace.h
+++ b/source/lib/replace/replace.h
@@ -328,11 +328,17 @@ char *rep_mkdtemp(char *template);
 #ifndef HAVE_PREAD
 #define pread rep_pread
 ssize_t rep_pread(int __fd, void *__buf, size_t __nbytes, off_t __offset);
+#define LIBREPLACE_PREAD_REPLACED 1
+#else
+#define LIBREPLACE_PREAD_NOT_REPLACED 1
 #endif
 
 #ifndef HAVE_PWRITE
 #define pwrite rep_pwrite
 ssize_t rep_pwrite(int __fd, const void *__buf, size_t __nbytes, off_t 
__offset);
+#define LIBREPLACE_PWRITE_REPLACED 1
+#else
+#define LIBREPLACE_PWRITE_NOT_REPLACED 1
 #endif
 
 #if !defined(HAVE_INET_NTOA) || defined(REPLACE_INET_NTOA)


-- 
Samba Shared Repository


[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4863-g3a4e410

2009-01-23 Thread Karolin Seeger
The branch, v3-3-test has been updated
   via  3a4e410e7802073e159b6e4dfdfb3319053503f9 (commit)
  from  d74b63091781e442e42b1fa7881e903a0bcc928c (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -
commit 3a4e410e7802073e159b6e4dfdfb3319053503f9
Author: Karolin Seeger ksee...@samba.org
Date:   Fri Jan 23 11:51:56 2009 +0100

WHATSNEW: Add note about libsmbclient changes.

Karolin

---

Summary of changes:
 WHATSNEW.txt |   15 +++
 1 files changed, 15 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 7f8e817..dc2de98 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -37,6 +37,8 @@ Major enhancements in Samba 3.3.0 include:
  Libraries:
  o NetApi library implements various new calls for User- and Group
Account Management.
+ o libsmbclient does now determine case sensitivity based on file system
+   attributes.
 
 
 General changes
@@ -184,6 +186,19 @@ A basic config using the current trunk code would look 
like:
 Please refer to the idmap_adex(8) man page for more details.
 
 
+Libraries
+=
+
+libsmbclient will now treat file names case-sensitive by default if the 
filesystem
+we are connecting to supports case sensitivity. This change of behavior is
+considered a bug fix, as it was previously possible to accidentally overwrite a
+file that had the same case-insensitive name but a different case-sensitive 
name
+as a previously-existing file, while creating a new file.
+
+If it is not possible to detect if the filesystem supports case sensitivity,
+the user-specified option value will be used.
+
+
 ##
 Changes
 ###


-- 
Samba Shared Repository


[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-108-gaa2fb0e

2009-01-23 Thread Karolin Seeger
The branch, master has been updated
   via  aa2fb0efb7ce2bc732569b4baf20c57375fdce59 (commit)
  from  232560627f97931a62014246e4e3731d6981844e (commit)

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


- Log -
commit aa2fb0efb7ce2bc732569b4baf20c57375fdce59
Author: Karolin Seeger ksee...@samba.org
Date:   Fri Jan 23 13:02:46 2009 +0100

docs: Fix formatting issue in man libsmbclient.

Karolin

---

Summary of changes:
 docs-xml/manpages-3/libsmbclient.7.xml |7 ---
 1 files changed, 4 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/manpages-3/libsmbclient.7.xml 
b/docs-xml/manpages-3/libsmbclient.7.xml
index ec95004..9257e1c 100644
--- a/docs-xml/manpages-3/libsmbclient.7.xml
+++ b/docs-xml/manpages-3/libsmbclient.7.xml
@@ -18,10 +18,11 @@
 
 refsynopsisdiv
cmdsynopsis
-   commandBrowser URL:/command
para
-smb://[[[domain:]user[:passw...@]]server[/share[/path[/file 
[?options]
-/para
+   Browser URL:
+   command 
moreinfo=nonesmb://[[[domain:]user[:passw...@]]server[/share[/path[/file 
[?options]
+   /command
+   /para
/cmdsynopsis
 /refsynopsisdiv
 


-- 
Samba Shared Repository


[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4864-ge1e3a05

2009-01-23 Thread Karolin Seeger
The branch, v3-3-test has been updated
   via  e1e3a0554fcaabacc5bec51c213622271a83ad04 (commit)
  from  3a4e410e7802073e159b6e4dfdfb3319053503f9 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -
commit e1e3a0554fcaabacc5bec51c213622271a83ad04
Author: Karolin Seeger ksee...@samba.org
Date:   Fri Jan 23 13:02:46 2009 +0100

docs: Fix formatting issue in man libsmbclient.

Karolin
(cherry picked from commit aa2fb0efb7ce2bc732569b4baf20c57375fdce59)

---

Summary of changes:
 docs-xml/manpages-3/libsmbclient.7.xml |7 ---
 1 files changed, 4 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/manpages-3/libsmbclient.7.xml 
b/docs-xml/manpages-3/libsmbclient.7.xml
index e9c9ba4..990f0cb 100644
--- a/docs-xml/manpages-3/libsmbclient.7.xml
+++ b/docs-xml/manpages-3/libsmbclient.7.xml
@@ -18,10 +18,11 @@
 
 refsynopsisdiv
cmdsynopsis
-   commandBrowser URL:/command
para
-smb://[[[domain:]user[:passw...@]]server[/share[/path[/file 
[?options]
-/para
+   Browser URL:
+   command 
moreinfo=nonesmb://[[[domain:]user[:passw...@]]server[/share[/path[/file 
[?options]
+   /command
+   /para
/cmdsynopsis
 /refsynopsisdiv
 


-- 
Samba Shared Repository


[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3395-g84237fb

2009-01-23 Thread Karolin Seeger
The branch, v3-2-test has been updated
   via  84237fb48aad5f11789d75a6767a6f47465f140b (commit)
  from  9483b143fe473d374e7f5c71f0d497f28f4e69f7 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -
commit 84237fb48aad5f11789d75a6767a6f47465f140b
Author: Karolin Seeger ksee...@samba.org
Date:   Fri Jan 23 13:02:46 2009 +0100

docs: Fix formatting issue in man libsmbclient.

Karolin
(cherry picked from commit aa2fb0efb7ce2bc732569b4baf20c57375fdce59)
(cherry picked from commit e1e3a0554fcaabacc5bec51c213622271a83ad04)

---

Summary of changes:
 docs-xml/manpages-3/libsmbclient.7.xml |7 ---
 1 files changed, 4 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/manpages-3/libsmbclient.7.xml 
b/docs-xml/manpages-3/libsmbclient.7.xml
index ec95004..9257e1c 100644
--- a/docs-xml/manpages-3/libsmbclient.7.xml
+++ b/docs-xml/manpages-3/libsmbclient.7.xml
@@ -18,10 +18,11 @@
 
 refsynopsisdiv
cmdsynopsis
-   commandBrowser URL:/command
para
-smb://[[[domain:]user[:passw...@]]server[/share[/path[/file 
[?options]
-/para
+   Browser URL:
+   command 
moreinfo=nonesmb://[[[domain:]user[:passw...@]]server[/share[/path[/file 
[?options]
+   /command
+   /para
/cmdsynopsis
 /refsynopsisdiv
 


-- 
Samba Shared Repository


[SCM] Samba Shared Repository - branch v3-0-test updated - release-3-0-32-125-g2d4997f

2009-01-23 Thread Karolin Seeger
The branch, v3-0-test has been updated
   via  2d4997f9bb7aa7b99c384defe6c7766d5169653d (commit)
  from  11fbc11e396a300aed04a37d44411d287d4c17d3 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-0-test


- Log -
commit 2d4997f9bb7aa7b99c384defe6c7766d5169653d
Author: Karolin Seeger ksee...@samba.org
Date:   Fri Jan 23 13:02:46 2009 +0100

docs: Fix formatting issue in man libsmbclient.

Karolin
(cherry picked from commit aa2fb0efb7ce2bc732569b4baf20c57375fdce59)
(cherry picked from commit e1e3a0554fcaabacc5bec51c213622271a83ad04)
(cherry picked from commit 84237fb48aad5f11789d75a6767a6f47465f140b)

---

Summary of changes:
 docs-xml/manpages-3/libsmbclient.7.xml |7 ---
 1 files changed, 4 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/manpages-3/libsmbclient.7.xml 
b/docs-xml/manpages-3/libsmbclient.7.xml
index fce0b8e..74f8030 100644
--- a/docs-xml/manpages-3/libsmbclient.7.xml
+++ b/docs-xml/manpages-3/libsmbclient.7.xml
@@ -18,10 +18,11 @@
 
 refsynopsisdiv
cmdsynopsis
-   commandBrowser URL:/command
para
-smb://[[[domain:]user[:passw...@]]server[/share[/path[/file 
[?options]
-/para
+   Browser URL:
+   command 
moreinfo=nonesmb://[[[domain:]user[:passw...@]]server[/share[/path[/file 
[?options]
+   /command
+   /para
/cmdsynopsis
 /refsynopsisdiv
 


-- 
Samba Shared Repository


[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-110-g481183a

2009-01-23 Thread Kai Blin
The branch, master has been updated
   via  481183ab025a84dd8d08c1e365251b274597b6c9 (commit)
   via  85b36d95fbede3e65cad3bd98d29689de6e13b2e (commit)
  from  aa2fb0efb7ce2bc732569b4baf20c57375fdce59 (commit)

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


- Log -
commit 481183ab025a84dd8d08c1e365251b274597b6c9
Author: Kai Blin k...@samba.org
Date:   Fri Jan 23 12:25:49 2009 +0100

s4: add ../lib/async_req to the s4 build

commit 85b36d95fbede3e65cad3bd98d29689de6e13b2e
Author: Kai Blin k...@samba.org
Date:   Fri Jan 23 11:54:30 2009 +0100

async_req: Move to top level dir

---

Summary of changes:
 {source3/lib = lib/async_req}/async_req.c |0 
 {source3/include = lib/async_req}/async_req.h |0 
 lib/async_req/config.mk|3 +++
 source3/Makefile.in|2 +-
 source3/configure.in   |1 +
 source4/main.mk|1 +
 6 files changed, 6 insertions(+), 1 deletions(-)
 rename {source3/lib = lib/async_req}/async_req.c (100%)
 rename {source3/include = lib/async_req}/async_req.h (100%)
 create mode 100644 lib/async_req/config.mk


Changeset truncated at 500 lines:

diff --git a/source3/lib/async_req.c b/lib/async_req/async_req.c
similarity index 100%
rename from source3/lib/async_req.c
rename to lib/async_req/async_req.c
diff --git a/source3/include/async_req.h b/lib/async_req/async_req.h
similarity index 100%
rename from source3/include/async_req.h
rename to lib/async_req/async_req.h
diff --git a/lib/async_req/config.mk b/lib/async_req/config.mk
new file mode 100644
index 000..08d5288
--- /dev/null
+++ b/lib/async_req/config.mk
@@ -0,0 +1,3 @@
+[SUBSYSTEM::LIBASYNC_REQ]
+
+LIBASYNC_REQ_OBJ_FILES = $(addprefix ../lib/async_req/, async_req.o)
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 3cbefc8..cbbf821 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -340,7 +340,7 @@ LIB_OBJ = $(LIBSAMBAUTIL_OBJ) $(UTIL_OBJ) $(CRYPTO_OBJ) \
  lib/messages.o librpc/gen_ndr/ndr_messaging.o lib/messages_local.o \
  lib/messages_ctdbd.o lib/packet.o lib/ctdbd_conn.o \
  lib/interfaces.o lib/memcache.o \
- lib/util_transfer_file.o lib/async_req.o \
+ lib/util_transfer_file.o ../lib/async_req/async_req.o \
  lib/async_sock.o \
  $(TDB_LIB_OBJ) \
  $(VERSION_OBJ) lib/charcnv.o lib/debug.o lib/fault.o \
diff --git a/source3/configure.in b/source3/configure.in
index 44a932c..88843a4 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -63,6 +63,7 @@ SAMBA_CPPFLAGS=${SAMBA_CPPFLAGS} ${TEVENT_CFLAGS}
 SAMBA_CPPFLAGS=${SAMBA_CPPFLAGS} ${TDB_CFLAGS}
 SAMBA_CPPFLAGS=${SAMBA_CPPFLAGS} -I${srcdir-.}/libaddns
 SAMBA_CPPFLAGS=${SAMBA_CPPFLAGS} -I${srcdir-.}/librpc
+SAMBA_CPPFLAGS=${SAMBA_CPPFLAGS} -I${srcdir-.}/../lib/async_req
 
 SAMBA_CONFIGURE_CPPFLAGS=${SAMBA_CPPFLAGS} -I${srcdir-.}/../lib/popt
 
diff --git a/source4/main.mk b/source4/main.mk
index df31c90..bfff04d 100644
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -48,3 +48,4 @@ mkinclude libcli/config.mk
 mkinclude scripting/python/config.mk
 mkinclude kdc/config.mk
 mkinclude ../lib/smbconf/config.mk
+mkinclude ../lib/async_req/config.mk


-- 
Samba Shared Repository


Re: [SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-107-g2325606

2009-01-23 Thread Jelmer Vernooij
On Fri, 2009-01-23 at 04:27 -0600, Stefan Metzmacher wrote:
 - Log -
 commit 232560627f97931a62014246e4e3731d6981844e
 Author: Stefan Metzmacher me...@samba.org
 Date:   Fri Jan 23 11:24:25 2009 +0100
 
 s4: we're on the way to alhpa7
Thanks!

I've also updated Samba4/Releasing on the wiki to mention this.

Cheers,

Jelmer
-- 
Jelmer Vernooij jel...@samba.org - http://samba.org/~jelmer/
Jabber: jel...@jabber.fsfe.org


signature.asc
Description: This is a digitally signed message part


Re: [SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-90-g3942e53

2009-01-23 Thread Stefan (metze) Metzmacher
Hi Simo,

 Do not start a transaction this way.
 Because we still want to commit any changes that successfully apply we
 never want to do a global cancel, and because of how transaction nesting
 works that means we never cancel any transaction at the single modify
 operation level.

Who says that? I think it's quite useful to only apply all operations!
We should at least have a command line option to control this.
And also have all ldb tools in sync with this behavior.

Could you please revert that for now. Then we could readd this to all
tools with an option. Where I don't care what default behavior we choose.

metze

 Let each operation start its own transaction so that the transaction is
 properly canceled if any error is returned and half committed operations
 (though plugins failing) are properly reverted on a per operation basis.



signature.asc
Description: OpenPGP digital signature


Re: [SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-90-g3942e53

2009-01-23 Thread simo
On Fri, 2009-01-23 at 19:44 +0100, Stefan (metze) Metzmacher wrote:
 Hi Simo,
 
  Do not start a transaction this way.
  Because we still want to commit any changes that successfully apply we
  never want to do a global cancel, and because of how transaction nesting
  works that means we never cancel any transaction at the single modify
  operation level.
 
 Who says that? I think it's quite useful to only apply all operations!
 We should at least have a command line option to control this.
 And also have all ldb tools in sync with this behavior.
 
 Could you please revert that for now.

Nope, the previous behavior leaves the database in an inconsistent state
if an operation that should modify multiple entries based on a
triggering modify fails.
The reason is that if a module returns an error the transaction is not
canceled. (Tested with a module I am writing)

The intended behavior of ldbmodify was to apply all mods that could be
successfully applied, but it did not do that correctly.
My change fixes a real problem.

If you want to modify the intended behavior I am ok, but the code right
now works correctly. Reverting will make it wrong.

  Then we could readd this to all
 tools with an option. Where I don't care what default behavior we choose.

Unless my change is causing problems I think a revert would be worng,
you can still add an option to have a real global transaction without
any revert.

Simo.

-- 
Simo Sorce
Samba Team GPL Compliance Officer s...@samba.org
Principal Software Engineer at Red Hat, Inc. s...@redhat.com



[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-111-gb7eabeb

2009-01-23 Thread Steven Danneman
The branch, master has been updated
   via  b7eabeb347d6815a7a4a0ece282dba5da94777ca (commit)
  from  481183ab025a84dd8d08c1e365251b274597b6c9 (commit)

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


- Log -
commit b7eabeb347d6815a7a4a0ece282dba5da94777ca
Author: Dan Sledz dsl...@isilon.com
Date:   Thu Jan 8 17:09:28 2009 -0800

s3: OneFS unmappable sids support.

Updates the onefs vfs module to add configurable behavior to deal
with sids that are unknown to us.  The best examples are aces that
come from robocopy/xcopy.

Adds the following share level options (which are specific to the vfs_onefs
module):

onefs: ignore unmappable sids (Default = false)
If this option is set to true, sids which could not be resolved to
a uid/gid are ignored.  If an unmappable sid is encountered as the owner
or group, the owner/group is converted to BUILTIN\Administrators.

onefs: unmappable sids ignore list (Default = empty)
Only the sids in the list are ignored.

onefs: ignore sacls (Default = false)
SACLs are ignored

onefs: unmappable sids deny everyone (Default = false)
If an unmappable sid is found in a deny ACE, the ACE's identity is
changed to Everyone.

---

Summary of changes:
 source3/modules/onefs.h|   10 ++-
 source3/modules/onefs_acl.c|  238 +---
 source3/modules/onefs_system.c |2 +-
 3 files changed, 183 insertions(+), 67 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/onefs.h b/source3/modules/onefs.h
index 6e5eae3..e189fc4 100644
--- a/source3/modules/onefs.h
+++ b/source3/modules/onefs.h
@@ -45,6 +45,14 @@ enum onefs_acl_wire_format
 #define PARM_SIMPLE_FILE_SHARING_COMPATIBILITY_MODE_DEFAULT false
 #define PARM_CREATOR_OWNER_GETS_FULL_CONTROL creator owner gets full control
 #define PARM_CREATOR_OWNER_GETS_FULL_CONTROL_DEFAULT true
+#define PARM_UNMAPPABLE_SIDS_DENY_EVERYONE unmappable sids deny everyone
+#define PARM_UNMAPPABLE_SIDS_DENY_EVERYONE_DEFAULT false
+#define PARM_UNMAPPABLE_SIDS_IGNORE ignore unmappable sids
+#define PARM_UNMAPPABLE_SIDS_IGNORE_DEFAULT false
+#define PARM_UNMAPPABLE_SIDS_IGNORE_LIST unmappable sids ignore list
+#define PARM_UNMAPPABLE_SIDS_IGNORE_LIST_DEFAULT NULL
+#define PARM_IGNORE_SACL ignore sacl
+#define PARM_IGNORE_SACL_DEFAULT false
 
 /*
  * vfs interface handlers
@@ -105,7 +113,7 @@ NTSTATUS onefs_fset_nt_acl(vfs_handle_struct *handle, 
files_struct *fsp,
  * Utility functions
  */
 NTSTATUS onefs_samba_sd_to_sd(uint32 security_info_sent, SEC_DESC *psd,
- struct ifs_security_descriptor *sd);
+ struct ifs_security_descriptor *sd, int snum);
 
 NTSTATUS onefs_split_ntfs_stream_name(TALLOC_CTX *mem_ctx, const char *fname,
  char **pbase, char **pstream);
diff --git a/source3/modules/onefs_acl.c b/source3/modules/onefs_acl.c
index 9258e0c..b9ec2d6 100644
--- a/source3/modules/onefs_acl.c
+++ b/source3/modules/onefs_acl.c
@@ -35,7 +35,8 @@ const struct enum_list enum_onefs_acl_wire_format[] = {
  * Turn SID into UID/GID and setup a struct ifs_identity
  */
 static bool
-onefs_sid_to_identity(const DOM_SID *sid, struct ifs_identity *id, bool 
is_group)
+onefs_sid_to_identity(const DOM_SID *sid, struct ifs_identity *id,
+bool is_group)
 {
enum ifs_identity_type type = IFS_ID_TYPE_LAST+1;
uid_t uid = 0;
@@ -111,18 +112,137 @@ onefs_identity_to_sid(struct ifs_identity *id, DOM_SID 
*sid)
return true;
 }
 
+static bool
+onefs_og_to_identity(DOM_SID *sid, struct ifs_identity * ident,
+bool is_group, int snum)
+{
+   const DOM_SID *b_admin_sid = global_sid_Builtin_Administrators;
+
+   if (!onefs_sid_to_identity(sid, ident, is_group)) {
+   if (!lp_parm_bool(snum, PARM_ONEFS_TYPE,
+PARM_UNMAPPABLE_SIDS_IGNORE,
+PARM_UNMAPPABLE_SIDS_IGNORE_DEFAULT)) {
+   DEBUG(3, (Unresolvable SID (%s) found.\n,
+   sid_string_dbg(sid)));
+   return false;
+   }
+   if (!onefs_sid_to_identity(b_admin_sid, ident, is_group)) {
+   return false;
+   }
+   DEBUG(3, (Mapping unresolvable owner SID (%s) to Builtin 
+   Administrators group.\n,
+   sid_string_dbg(sid)));
+   }
+   return true;
+}
+
+static bool
+sid_in_ignore_list(DOM_SID * sid, int snum)
+{
+   const char ** sid_list = NULL;
+   DOM_SID match;
+
+   sid_list = lp_parm_string_list(snum, PARM_ONEFS_TYPE,
+   PARM_UNMAPPABLE_SIDS_IGNORE_LIST,
+   PARM_UNMAPPABLE_SIDS_IGNORE_LIST_DEFAULT);
+
+   /* Fast path a NULL list */
+  

Build status as of Sat Jan 24 00:00:02 2009

2009-01-23 Thread build
URL: http://build.samba.org/

--- /home/build/master/cache/broken_results.txt.old 2009-01-23 
00:00:32.0 +
+++ /home/build/master/cache/broken_results.txt 2009-01-24 00:00:27.0 
+
@@ -1,4 +1,4 @@
-Build status as of Fri Jan 23 00:00:02 2009
+Build status as of Sat Jan 24 00:00:02 2009
 
 Build counts:
 Tree Total  Broken Panic 
@@ -6,9 +6,9 @@
 ccache   29 6  0 
 ctdb 0  0  0 
 distcc   1  0  0 
-ldb  29 29 0 
+ldb  28 29 0 
 libreplace   28 10 0 
-lorikeet-heimdal 25 16 0 
+lorikeet-heimdal 26 16 0 
 pidl 18 17 0 
 ppp  11 0  0 
 rsync29 9  0 
@@ -16,7 +16,7 @@
 samba-gtk4  4  0 
 samba_3_X_devel 27 26 1 
 samba_3_X_test 27 22 0 
-samba_4_0_test 29 24 1 
+samba_4_0_test 29 26 1 
 smb-build27 6  0 
 talloc   29 29 0 
 tdb  27 8  0 


[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-112-g48a6fee

2009-01-23 Thread Volker Lendecke
The branch, master has been updated
   via  48a6feef402f7b91098341dc6e5eabbfd4beaa91 (commit)
  from  b7eabeb347d6815a7a4a0ece282dba5da94777ca (commit)

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


- Log -
commit 48a6feef402f7b91098341dc6e5eabbfd4beaa91
Author: Volker Lendecke v...@samba.org
Date:   Fri Jan 23 23:15:05 2009 +0100

talloc_free() copes with a NULL pointer just fine

Saved around 10kb of code on my box :-)

---

Summary of changes:
 source3/include/smb_macros.h |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/smb_macros.h b/source3/include/smb_macros.h
index 5149da0..92c60a7 100644
--- a/source3/include/smb_macros.h
+++ b/source3/include/smb_macros.h
@@ -256,7 +256,7 @@ NULL returns on zero request. JRA.
 #define TALLOC_REALLOC(ctx, ptr, count) _talloc_realloc(ctx, ptr, count, 
__location__)
 #define TALLOC_REALLOC_ARRAY(ctx, ptr, type, count) (type 
*)_talloc_realloc_array(ctx, ptr, sizeof(type), count, #type)
 #define talloc_destroy(ctx) talloc_free(ctx)
-#define TALLOC_FREE(ctx) do { if ((ctx) != NULL) {talloc_free(ctx); ctx=NULL;} 
} while(0)
+#define TALLOC_FREE(ctx) do { talloc_free(ctx); ctx=NULL; } while(0)
 
 /* only define PARANOID_MALLOC_CHECKER with --enable-developer */
 


-- 
Samba Shared Repository


[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-113-g0998d17

2009-01-23 Thread Tim Prouty
The branch, master has been updated
   via  0998d172dbeb5f9d7198bbea9ee9124c0558f41b (commit)
  from  48a6feef402f7b91098341dc6e5eabbfd4beaa91 (commit)

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


- Log -
commit 0998d172dbeb5f9d7198bbea9ee9124c0558f41b
Author: Tim Prouty tpro...@samba.org
Date:   Fri Jan 23 16:09:13 2009 -0800

s3 ldb: Fix vasprintf segfault that has been the source of build machine 
failures this week

The bug was introduced when converting samba3's ldb_search interface
to match samba4:
47951fc5d0085e124666b7667715bba98076820e
f3ecb701335b1129947127d4c45eef970b66875c

---

Summary of changes:
 source3/lib/ldb/common/ldb.c |   13 -
 1 files changed, 8 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/ldb/common/ldb.c b/source3/lib/ldb/common/ldb.c
index 6e28528..cef7373 100644
--- a/source3/lib/ldb/common/ldb.c
+++ b/source3/lib/ldb/common/ldb.c
@@ -808,15 +808,18 @@ int ldb_search(struct ldb_context *ldb, TALLOC_CTX 
*mem_ctx, struct ldb_result *
va_list ap;
int ret;
 
+   expression = NULL;
res = NULL;
*result = NULL;
 
-   va_start(ap, exp_fmt);
-   expression = talloc_vasprintf(mem_ctx, exp_fmt, ap);
-   va_end(ap);
+   if (exp_fmt) {
+   va_start(ap, exp_fmt);
+   expression = talloc_vasprintf(mem_ctx, exp_fmt, ap);
+   va_end(ap);
 
-   if ( ! expression) {
-   return LDB_ERR_OPERATIONS_ERROR;
+   if ( ! expression) {
+   return LDB_ERR_OPERATIONS_ERROR;
+   }
}
 
ret = _ldb_search(ldb, ldb, res, base, scope, attrs, expression);


-- 
Samba Shared Repository


[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4866-g75fff60

2009-01-23 Thread Günther Deschner
The branch, v3-3-test has been updated
   via  75fff603625e0259f187e0fa47efd85887092fae (commit)
   via  547c70e896b6890dd5f7b911e4e0ca107c8a3fa3 (commit)
  from  e1e3a0554fcaabacc5bec51c213622271a83ad04 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -
commit 75fff603625e0259f187e0fa47efd85887092fae
Author: Günther Deschner g...@samba.org
Date:   Sat Jan 24 02:10:47 2009 +0100

s3-eventlog: fix various invalid memcpy in read_package_entry().

Guenther

commit 547c70e896b6890dd5f7b911e4e0ca107c8a3fa3
Author: Günther Deschner g...@samba.org
Date:   Sat Jan 24 02:07:40 2009 +0100

s3-eventlog: fix buffer allocation in eventlog read call.

This broke with f6fa3080fee1b20df9f1968500840a88cf0ee592 back in April 
2007...

Guenther

---

Summary of changes:
 source/rpc_parse/parse_eventlog.c   |4 +---
 source/rpc_server/srv_eventlog_nt.c |   10 +-
 2 files changed, 6 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/rpc_parse/parse_eventlog.c 
b/source/rpc_parse/parse_eventlog.c
index 2ff217e..694615d 100644
--- a/source/rpc_parse/parse_eventlog.c
+++ b/source/rpc_parse/parse_eventlog.c
@@ -166,6 +166,7 @@ bool eventlog_io_r_read_eventlog(const char *desc,
/* Now pad with whitespace until the end of the response buffer */
 
if (q_u-max_read_size - r_u-num_bytes_in_resp) {
+   r_u-end_of_entries_padding = PRS_ALLOC_MEM(ps, uint8_t, 
q_u-max_read_size - r_u-num_bytes_in_resp);
if (!r_u-end_of_entries_padding) {
return False;
}
@@ -173,11 +174,8 @@ bool eventlog_io_r_read_eventlog(const char *desc,
if(!(prs_uint8s(False, end of entries padding, ps, 
depth, r_u-end_of_entries_padding,
(q_u-max_read_size - 
r_u-num_bytes_in_resp {
-   free(r_u-end_of_entries_padding);
return False;
}
-
-   free(r_u-end_of_entries_padding);
}
 
/* We had better be DWORD aligned here */
diff --git a/source/rpc_server/srv_eventlog_nt.c 
b/source/rpc_server/srv_eventlog_nt.c
index 54d9dae..7c7d53f 100644
--- a/source/rpc_server/srv_eventlog_nt.c
+++ b/source/rpc_server/srv_eventlog_nt.c
@@ -542,30 +542,30 @@ static Eventlog_entry *read_package_entry( prs_struct * 
ps,
return NULL;
}
offset = entry-data;
-   memcpy( offset, ( entry-data_record.source_name ),
+   memcpy( offset, entry-data_record.source_name,
entry-data_record.source_name_len );
offset += entry-data_record.source_name_len;
-   memcpy( offset, ( entry-data_record.computer_name ),
+   memcpy( offset, entry-data_record.computer_name,
entry-data_record.computer_name_len );
offset += entry-data_record.computer_name_len;
/* SID needs to be DWORD-aligned */
offset += entry-data_record.sid_padding;
entry-record.user_sid_offset =
sizeof( Eventlog_record ) + ( offset - entry-data );
-   memcpy( offset, ( entry-data_record.sid ),
+   memcpy( offset, entry-data_record.sid,
entry-record.user_sid_length );
offset += entry-record.user_sid_length;
/* Now do the strings */
entry-record.string_offset =
sizeof( Eventlog_record ) + ( offset - entry-data );
-   memcpy( offset, ( entry-data_record.strings ),
+   memcpy( offset, entry-data_record.strings,
entry-data_record.strings_len );
offset += entry-data_record.strings_len;
/* Now do the data */
entry-record.data_length = entry-data_record.user_data_len;
entry-record.data_offset =
sizeof( Eventlog_record ) + ( offset - entry-data );
-   memcpy( offset, ( entry-data_record.user_data ),
+   memcpy( offset, entry-data_record.user_data,
entry-data_record.user_data_len );
offset += entry-data_record.user_data_len;
 


-- 
Samba Shared Repository


[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-114-gd629ba4

2009-01-23 Thread Tim Prouty
The branch, master has been updated
   via  d629ba480b7cd7344d842069f18fd07f088c4f2f (commit)
  from  0998d172dbeb5f9d7198bbea9ee9124c0558f41b (commit)

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


- Log -
commit d629ba480b7cd7344d842069f18fd07f088c4f2f
Author: Tim Prouty tpro...@samba.org
Date:   Fri Jan 23 17:29:21 2009 -0800

talloc: Change the two other definitions of TALLOC_FREE to match the 
primary version

Eventually these two other definitions should be removed and all of
the TALLOC macros should live in the same header.  Until then, this
patch eliminates some build warnings.

---

Summary of changes:
 nsswitch/pam_winbind.h |2 +-
 source3/libaddns/dns.h |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/nsswitch/pam_winbind.h b/nsswitch/pam_winbind.h
index d21fc04..0395a1f 100644
--- a/nsswitch/pam_winbind.h
+++ b/nsswitch/pam_winbind.h
@@ -171,6 +171,6 @@ struct pwb_context {
uint32_t ctrl;
 };
 
-#define TALLOC_FREE(ctx) do { if ((ctx) != NULL) {talloc_free(ctx); ctx=NULL;} 
} while(0)
+#define TALLOC_FREE(ctx) do { talloc_free(ctx); ctx=NULL; } while(0)
 #define TALLOC_ZERO_P(ctx, type) (type *)_talloc_zero(ctx, sizeof(type), #type)
 #define TALLOC_P(ctx, type) (type *)talloc_named_const(ctx, sizeof(type), 
#type)
diff --git a/source3/libaddns/dns.h b/source3/libaddns/dns.h
index 3f95c73..42662a2 100644
--- a/source3/libaddns/dns.h
+++ b/source3/libaddns/dns.h
@@ -133,7 +133,7 @@ void *talloc_zeronull(const void *context, size_t size, 
const char *name);
 #define TALLOC_REALLOC(ctx, ptr, count) _talloc_realloc(ctx, ptr, count, 
__location__)
 #define TALLOC_REALLOC_ARRAY(ctx, ptr, type, count) (type 
*)_talloc_realloc_array(ctx, ptr, sizeof(type), count, #type)
 #define talloc_destroy(ctx) talloc_free(ctx)
-#define TALLOC_FREE(ctx) do { if ((ctx) != NULL) {talloc_free(ctx); ctx=NULL;} 
} while(0)
+#define TALLOC_FREE(ctx) do { talloc_free(ctx); ctx=NULL; } while(0)
 
 /***
Type definitions for int16, int32, uint16 and uint32.  Needed


-- 
Samba Shared Repository


[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-117-g5bcd6d7

2009-01-23 Thread Günther Deschner
The branch, master has been updated
   via  5bcd6d760b628832a43271293bee207819784001 (commit)
   via  dd2695fe52374cb72bf0954805ff614eef640eae (commit)
   via  cf41042a3c4ccf613e312570d8d93932b54dcaee (commit)
  from  d629ba480b7cd7344d842069f18fd07f088c4f2f (commit)

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


- Log -
commit 5bcd6d760b628832a43271293bee207819784001
Author: Günther Deschner g...@samba.org
Date:   Sat Jan 24 02:59:24 2009 +0100

Revert s3-eventlog: trying to avoid to pass around full ndr structures in 
rpc_server.

This reverts commit c0f1309010b79be67557af5ffbd1c429a3f3d99a.

commit dd2695fe52374cb72bf0954805ff614eef640eae
Author: Günther Deschner g...@samba.org
Date:   Sat Jan 24 02:10:47 2009 +0100

s3-eventlog: fix various invalid memcpy in read_package_entry().

Guenther

commit cf41042a3c4ccf613e312570d8d93932b54dcaee
Author: Günther Deschner g...@samba.org
Date:   Sat Jan 24 02:07:40 2009 +0100

s3-eventlog: fix buffer allocation in eventlog read call.

This broke with f6fa3080fee1b20df9f1968500840a88cf0ee592 back in April 
2007...

Guenther

---

Summary of changes:
 source3/rpc_parse/parse_eventlog.c   |4 +---
 source3/rpc_server/srv_eventlog_nt.c |   27 +++
 2 files changed, 12 insertions(+), 19 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/rpc_parse/parse_eventlog.c 
b/source3/rpc_parse/parse_eventlog.c
index a55993c..40930a2 100644
--- a/source3/rpc_parse/parse_eventlog.c
+++ b/source3/rpc_parse/parse_eventlog.c
@@ -185,6 +185,7 @@ bool eventlog_io_r_read_eventlog(const char *desc,
/* Now pad with whitespace until the end of the response buffer */
 
if (q_u-max_read_size - r_u-num_bytes_in_resp) {
+   r_u-end_of_entries_padding = PRS_ALLOC_MEM(ps, uint8_t, 
q_u-max_read_size - r_u-num_bytes_in_resp);
if (!r_u-end_of_entries_padding) {
return False;
}
@@ -192,11 +193,8 @@ bool eventlog_io_r_read_eventlog(const char *desc,
if(!(prs_uint8s(False, end of entries padding, ps, 
depth, r_u-end_of_entries_padding,
(q_u-max_read_size - 
r_u-num_bytes_in_resp {
-   free(r_u-end_of_entries_padding);
return False;
}
-
-   free(r_u-end_of_entries_padding);
}
 
/* We had better be DWORD aligned here */
diff --git a/source3/rpc_server/srv_eventlog_nt.c 
b/source3/rpc_server/srv_eventlog_nt.c
index 0bf0730..5f9df1b 100644
--- a/source3/rpc_server/srv_eventlog_nt.c
+++ b/source3/rpc_server/srv_eventlog_nt.c
@@ -539,30 +539,30 @@ static Eventlog_entry *read_package_entry( TALLOC_CTX 
*mem_ctx,
return NULL;
}
offset = entry-data;
-   memcpy( offset, ( entry-data_record.source_name ),
+   memcpy( offset, entry-data_record.source_name,
entry-data_record.source_name_len );
offset += entry-data_record.source_name_len;
-   memcpy( offset, ( entry-data_record.computer_name ),
+   memcpy( offset, entry-data_record.computer_name,
entry-data_record.computer_name_len );
offset += entry-data_record.computer_name_len;
/* SID needs to be DWORD-aligned */
offset += entry-data_record.sid_padding;
entry-record.user_sid_offset =
sizeof( Eventlog_record ) + ( offset - entry-data );
-   memcpy( offset, ( entry-data_record.sid ),
+   memcpy( offset, entry-data_record.sid,
entry-record.user_sid_length );
offset += entry-record.user_sid_length;
/* Now do the strings */
entry-record.string_offset =
sizeof( Eventlog_record ) + ( offset - entry-data );
-   memcpy( offset, ( entry-data_record.strings ),
+   memcpy( offset, entry-data_record.strings,
entry-data_record.strings_len );
offset += entry-data_record.strings_len;
/* Now do the data */
entry-record.data_length = entry-data_record.user_data_len;
entry-record.data_offset =
sizeof( Eventlog_record ) + ( offset - entry-data );
-   memcpy( offset, ( entry-data_record.user_data ),
+   memcpy( offset, entry-data_record.user_data,
entry-data_record.user_data_len );
offset += entry-data_record.user_data_len;
 
@@ -578,17 +578,15 @@ static Eventlog_entry *read_package_entry( TALLOC_CTX 
*mem_ctx,
 /
  /
 
-static bool add_record_to_resp( Eventlog_entry *entry,
-   uint32_t *num_records,
-   

[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3397-ga691e29

2009-01-23 Thread Günther Deschner
The branch, v3-2-test has been updated
   via  a691e29b466fdf1776160d92704e1ca958fa9eee (commit)
   via  632f4b83158d46ae456713286a27ac0c2aa2ee25 (commit)
  from  84237fb48aad5f11789d75a6767a6f47465f140b (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -
commit a691e29b466fdf1776160d92704e1ca958fa9eee
Author: Günther Deschner g...@samba.org
Date:   Sat Jan 24 02:10:47 2009 +0100

s3-eventlog: fix various invalid memcpy in read_package_entry().

Guenther
(cherry picked from commit 75fff603625e0259f187e0fa47efd85887092fae)

commit 632f4b83158d46ae456713286a27ac0c2aa2ee25
Author: Günther Deschner g...@samba.org
Date:   Sat Jan 24 02:07:40 2009 +0100

s3-eventlog: fix buffer allocation in eventlog read call.

This broke with f6fa3080fee1b20df9f1968500840a88cf0ee592 back in April 
2007...

Guenther
(cherry picked from commit 547c70e896b6890dd5f7b911e4e0ca107c8a3fa3)

---

Summary of changes:
 source/rpc_parse/parse_eventlog.c   |4 +---
 source/rpc_server/srv_eventlog_nt.c |   10 +-
 2 files changed, 6 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/rpc_parse/parse_eventlog.c 
b/source/rpc_parse/parse_eventlog.c
index 2ff217e..694615d 100644
--- a/source/rpc_parse/parse_eventlog.c
+++ b/source/rpc_parse/parse_eventlog.c
@@ -166,6 +166,7 @@ bool eventlog_io_r_read_eventlog(const char *desc,
/* Now pad with whitespace until the end of the response buffer */
 
if (q_u-max_read_size - r_u-num_bytes_in_resp) {
+   r_u-end_of_entries_padding = PRS_ALLOC_MEM(ps, uint8_t, 
q_u-max_read_size - r_u-num_bytes_in_resp);
if (!r_u-end_of_entries_padding) {
return False;
}
@@ -173,11 +174,8 @@ bool eventlog_io_r_read_eventlog(const char *desc,
if(!(prs_uint8s(False, end of entries padding, ps, 
depth, r_u-end_of_entries_padding,
(q_u-max_read_size - 
r_u-num_bytes_in_resp {
-   free(r_u-end_of_entries_padding);
return False;
}
-
-   free(r_u-end_of_entries_padding);
}
 
/* We had better be DWORD aligned here */
diff --git a/source/rpc_server/srv_eventlog_nt.c 
b/source/rpc_server/srv_eventlog_nt.c
index 8e758bb..563dc14 100644
--- a/source/rpc_server/srv_eventlog_nt.c
+++ b/source/rpc_server/srv_eventlog_nt.c
@@ -543,30 +543,30 @@ static Eventlog_entry *read_package_entry( prs_struct * 
ps,
return NULL;
}
offset = entry-data;
-   memcpy( offset, ( entry-data_record.source_name ),
+   memcpy( offset, entry-data_record.source_name,
entry-data_record.source_name_len );
offset += entry-data_record.source_name_len;
-   memcpy( offset, ( entry-data_record.computer_name ),
+   memcpy( offset, entry-data_record.computer_name,
entry-data_record.computer_name_len );
offset += entry-data_record.computer_name_len;
/* SID needs to be DWORD-aligned */
offset += entry-data_record.sid_padding;
entry-record.user_sid_offset =
sizeof( Eventlog_record ) + ( offset - entry-data );
-   memcpy( offset, ( entry-data_record.sid ),
+   memcpy( offset, entry-data_record.sid,
entry-record.user_sid_length );
offset += entry-record.user_sid_length;
/* Now do the strings */
entry-record.string_offset =
sizeof( Eventlog_record ) + ( offset - entry-data );
-   memcpy( offset, ( entry-data_record.strings ),
+   memcpy( offset, entry-data_record.strings,
entry-data_record.strings_len );
offset += entry-data_record.strings_len;
/* Now do the data */
entry-record.data_length = entry-data_record.user_data_len;
entry-record.data_offset =
sizeof( Eventlog_record ) + ( offset - entry-data );
-   memcpy( offset, ( entry-data_record.user_data ),
+   memcpy( offset, entry-data_record.user_data,
entry-data_record.user_data_len );
offset += entry-data_record.user_data_len;
 


-- 
Samba Shared Repository


[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-135-gab2ee07

2009-01-23 Thread Günther Deschner
The branch, master has been updated
   via  ab2ee0711e128ac068e54a180fe2deb4b0c082be (commit)
   via  da338efbf94e4210aca0c9cbba60e69e113a4b57 (commit)
   via  2eb5dacbb806a0e943ba2dbadd7d8b7b2ac32ec8 (commit)
   via  ecad0b93351fa6886cad495c27a14e6b437cc123 (commit)
   via  c92ec31d305ee4f8b31f69d576cfbfb90bec8b49 (commit)
   via  bfc2d3bf0a6fe565a61dbe5f55f2c12d0ebc3967 (commit)
   via  d3b8fdd71e16f2ed2f0c24b5d3ad1c22af3c0cc9 (commit)
   via  f1067c0ffcf00286332d44da54e2fbde40cc03df (commit)
   via  a6131f2a8b662ef8acca15d772f3079426f07a48 (commit)
   via  9629897094fe11a7a50011e555efc8905c90dbf4 (commit)
   via  4cac1da142aec103f1022aedeb068d9cc94c7f4e (commit)
   via  b57c37d6aec28ef93c5d47aa3b20382bd8679361 (commit)
   via  466872e9ff6d5aeb7900ca3ae17b1d7def3a9c60 (commit)
   via  ca799da8231841cc7e10350dfe83d35a55316e39 (commit)
   via  7dad861627b2f1f131f019d4c5e3b4ce75a1ccd6 (commit)
   via  ab6e4dd9fdf43407a10fd67235b158e9022ead17 (commit)
   via  02a3a7f1eda576b353207825875f676130874a00 (commit)
   via  321983a68e949db61cbb87c3fee84919231ed2dc (commit)
  from  5bcd6d760b628832a43271293bee207819784001 (commit)

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


- Log -
commit ab2ee0711e128ac068e54a180fe2deb4b0c082be
Author: Günther Deschner g...@samba.org
Date:   Wed Jan 21 00:33:01 2009 +0100

s4-smbtorture: add my copyright.

Guenther

commit da338efbf94e4210aca0c9cbba60e69e113a4b57
Author: Günther Deschner g...@samba.org
Date:   Wed Jan 21 00:25:50 2009 +0100

s4-smbtorture: add BackupLog handling in eventlog test.

Guenther

commit 2eb5dacbb806a0e943ba2dbadd7d8b7b2ac32ec8
Author: Günther Deschner g...@samba.org
Date:   Tue Jan 20 23:01:58 2009 +0100

s3-rpcclient: add eventlog_loginfo command.

Guenther

commit ecad0b93351fa6886cad495c27a14e6b437cc123
Author: Günther Deschner g...@samba.org
Date:   Tue Jan 20 22:18:29 2009 +0100

s3-rpcclient: add eventlog_backuplog command.

Guenther

commit c92ec31d305ee4f8b31f69d576cfbfb90bec8b49
Author: Günther Deschner g...@samba.org
Date:   Tue Jan 20 20:10:16 2009 +0100

s3-rpcclient: add eventlog_registerevsource command.

Guenther

commit bfc2d3bf0a6fe565a61dbe5f55f2c12d0ebc3967
Author: Günther Deschner g...@samba.org
Date:   Tue Jan 20 19:26:41 2009 +0100

s3-rpcclient: add eventlog_reporteventsource command.

Guenther

commit d3b8fdd71e16f2ed2f0c24b5d3ad1c22af3c0cc9
Author: Günther Deschner g...@samba.org
Date:   Tue Jan 20 19:01:43 2009 +0100

s4-smbtorture: add test_GetLogIntormation test.

Guenther

commit f1067c0ffcf00286332d44da54e2fbde40cc03df
Author: Günther Deschner g...@samba.org
Date:   Tue Jan 20 19:09:53 2009 +0100

s3-rpcclient: add eventlog_reportevent command.

Guenther

commit a6131f2a8b662ef8acca15d772f3079426f07a48
Author: Günther Deschner g...@samba.org
Date:   Tue Jan 20 18:42:47 2009 +0100

s4-smbtorture: add ReportEventW test.

Guenther

commit 9629897094fe11a7a50011e555efc8905c90dbf4
Author: Günther Deschner g...@samba.org
Date:   Thu Jan 22 19:35:33 2009 +0100

s3-eventlog: add missing _eventlog_ReportEventAndSourceW stub call.

Guenther

commit 4cac1da142aec103f1022aedeb068d9cc94c7f4e
Author: Günther Deschner g...@samba.org
Date:   Sat Jan 24 03:30:48 2009 +0100

s3: re-run make samba3-idl.

Guenther

commit b57c37d6aec28ef93c5d47aa3b20382bd8679361
Author: Günther Deschner g...@samba.org
Date:   Tue Jan 20 22:18:53 2009 +0100

eventlog: fill in IDL for eventlog_OpenBackupEventLogW.

Guenther

commit 466872e9ff6d5aeb7900ca3ae17b1d7def3a9c60
Author: Günther Deschner g...@samba.org
Date:   Tue Jan 20 22:06:01 2009 +0100

eventlog: fill in IDL for eventlog_BackupEventLogW.

Guenther

commit ca799da8231841cc7e10350dfe83d35a55316e39
Author: Günther Deschner g...@samba.org
Date:   Tue Jan 20 20:00:02 2009 +0100

eventlog: fill in IDL for eventlog_DeregisterEventSource.

Guenther

commit 7dad861627b2f1f131f019d4c5e3b4ce75a1ccd6
Author: Günther Deschner g...@samba.org
Date:   Tue Jan 20 19:58:17 2009 +0100

eventlog: fill in IDL for eventlog_RegisterEventSourceW.

Guenther

commit ab6e4dd9fdf43407a10fd67235b158e9022ead17
Author: Günther Deschner g...@samba.org
Date:   Tue Jan 20 19:20:26 2009 +0100

eventlog: add missing IDL (opnum 24) for eventlog_ReportEventAndSourceW.

Guenther

commit 02a3a7f1eda576b353207825875f676130874a00
Author: Günther Deschner g...@samba.org
Date:   Tue Jan 20 18:56:34 2009 +0100

eventlog: fill in IDL for eventlog_GetLogIntormation.

Guenther

commit 321983a68e949db61cbb87c3fee84919231ed2dc
Author: Günther Deschner g...@samba.org
Date:   Tue Jan 20 18:32:01 2009 +0100

eventlog: fill in IDL for eventlog_ReportEventW.

Guenther


[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-138-gc23f0f1

2009-01-23 Thread Tim Prouty
The branch, master has been updated
   via  c23f0f13b42745a7b9f7c0a5b37f1ad521f886df (commit)
   via  48b0016cff4bad621b94fc0bf678ec15260dd7d7 (commit)
   via  7bb3860f49cd8b09c2015f6646c07fe5ebaa0de3 (commit)
  from  ab2ee0711e128ac068e54a180fe2deb4b0c082be (commit)

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


- Log -
commit c23f0f13b42745a7b9f7c0a5b37f1ad521f886df
Author: todd stecher todd.stec...@gmail.com
Date:   Fri Jan 23 16:55:18 2009 -0800

Modify OneFS module to support new NTIMES interfaces

commit 48b0016cff4bad621b94fc0bf678ec15260dd7d7
Author: todd stecher todd.stec...@gmail.com
Date:   Fri Jan 23 14:40:19 2009 -0800

Extend NTIMES to allow setting create_time

1) Add in smb_file_time struct to clarify code and make room for createtime.
2) Get and set create time from SMB messages.
3) Fixup existing VFS modules + examples Some OS'es allow for the
setting of the birthtime through kernel interfaces. This value is
generically used for Windows createtime, but is not settable in the
code today.

commit 7bb3860f49cd8b09c2015f6646c07fe5ebaa0de3
Author: todd stecher todd.stec...@gmail.com
Date:   Fri Jan 23 14:38:40 2009 -0800

This change allows for the autoconfigre detection of sub-second time 
resolution in the FreeBSD stat structure

---

Summary of changes:
 examples/VFS/skel_opaque.c |4 +-
 examples/VFS/skel_transparent.c|4 +-
 source3/configure.in   |   40 +++-
 source3/include/proto.h|5 +-
 source3/include/smb.h  |7 ++
 source3/include/vfs.h  |4 +-
 source3/lib/time.c |   12 
 source3/modules/onefs.h|3 +
 source3/modules/onefs_streams.c|  128 
 source3/modules/vfs_cap.c  |5 +-
 source3/modules/vfs_catia.c|4 +-
 source3/modules/vfs_default.c  |   15 ++--
 source3/modules/vfs_full_audit.c   |6 +-
 source3/modules/vfs_onefs.c|   35 ++
 source3/modules/vfs_recycle.c  |   10 ++-
 source3/modules/vfs_shadow_copy2.c |4 +-
 source3/smbd/close.c   |8 +-
 source3/smbd/dosmode.c |   13 ++--
 source3/smbd/reply.c   |   46 +++--
 source3/smbd/trans2.c  |   99 ---
 source3/torture/cmd_vfs.c  |   11 ++-
 21 files changed, 320 insertions(+), 143 deletions(-)


Changeset truncated at 500 lines:

diff --git a/examples/VFS/skel_opaque.c b/examples/VFS/skel_opaque.c
index 3df1fcd..48b4979 100644
--- a/examples/VFS/skel_opaque.c
+++ b/examples/VFS/skel_opaque.c
@@ -231,9 +231,9 @@ static char *skel_getwd(vfs_handle_struct *handle,  char 
*buf)
return vfswrap_getwd(NULL,  buf);
 }
 
-static int skel_ntimes(vfs_handle_struct *handle,  const char *path, const 
struct timespec ts[2])
+static int skel_ntimes(vfs_handle_struct *handle,  const char *path, struct 
smb_file_time *ft)
 {
-   return vfswrap_ntimes(NULL,  path, ts);
+   return vfswrap_ntimes(NULL,  path, ft);
 }
 
 static int skel_ftruncate(vfs_handle_struct *handle, files_struct *fsp, 
SMB_OFF_T offset)
diff --git a/examples/VFS/skel_transparent.c b/examples/VFS/skel_transparent.c
index e6dee97..f5562a5 100644
--- a/examples/VFS/skel_transparent.c
+++ b/examples/VFS/skel_transparent.c
@@ -224,9 +224,9 @@ static char *skel_getwd(vfs_handle_struct *handle,  char 
*buf)
return SMB_VFS_NEXT_GETWD(handle, buf);
 }
 
-static int skel_ntimes(vfs_handle_struct *handle,  const char *path, const 
struct timespec ts[2])
+static int skel_ntimes(vfs_handle_struct *handle,  const char *path, struct 
smb_file_time *ft)
 {
-   return SMB_VFS_NEXT_NTIMES(handle, path, ts);
+   return SMB_VFS_NEXT_NTIMES(handle, path, ft);
 }
 
 static int skel_ftruncate(vfs_handle_struct *handle, files_struct *fsp, 
SMB_OFF_T offset)
diff --git a/source3/configure.in b/source3/configure.in
index 88843a4..3219248 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -1308,7 +1308,8 @@ fi
 
 #
 # Check whether struct stat has timestamps with sub-second resolution.
-# At least IRIX and Solaris have these.
+# At least IRIX and Solaris have these.  FREEBSD does as well,
+# but with different members
 #
 # We check that
 #  all of st_mtim, st_atim and st_ctim exist
@@ -1317,6 +1318,43 @@ fi
 # There is some conflicting standards weirdness about whether we should use
 # struct timespec or timespec_t. Linux doesn't have timespec_t, so we
 # prefer struct timespec.
+AC_CACHE_CHECK([whether struct stat has timespec timestamps],
+samba_cv_stat_timespec_hires,
+  [
+  AC_TRY_COMPILE(
+ [
+#if TIME_WITH_SYS_TIME
+# include sys/time.h
+# include time.h
+#else
+# if HAVE_SYS_TIME_H
+#