[Samba] [HELP] Samba with myob trouble

2011-04-05 Thread Shane 
Take Off

[hfs_acc]
 oplocks = no
locking = no
level2 oplocks = no





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

[Samba] samba ctdb clustering with ldap backend?

2011-04-05 Thread Daniel Müller 
Dear all,

I have two samba servers auth agains ldap, so I use:
idmap backend = ldap:ldap://127.0.0.1

Is it possible to setup ctdb to run with a ldap backend?
I know ctdb uses:
idmap backend = tdb2

Any suggestions?

Greetings
Daniel

---
EDV Daniel Müller

Leitung EDV
Tropenklinik Paul-Lechler-Krankenhaus
Paul-Lechler-Str. 24
72076 Tübingen

Tel.: 07071/206-463, Fax: 07071/206-499
eMail: muel...@tropenklinik.de
Internet: www.tropenklinik.de
---

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

[Samba] acl_xattr access denied when adding permissions for another user

2011-04-05 Thread Thomas Nau 
Dear all
We run Samba 3.5.8 on a Solaris 11 box on top of ZFS We got the
impression that the VFS module acl_xattr provides the best way
of keeping Windows ACLs. We don't have concurrent NFS or local users
so it's Windows only.

The clients as well as the Samba server are members of an AD domain.
Creating files/directories works as expected and also manipulating
permissions for the initial user/group does not raise any problem.
Trying to add permissions for an additional user (looked up in AD)
fails with the Windows XP client side permission denied pop-up box.


the share's config:

[EA]
# public fileserver share
path   = /smb/X
comment= xattr ACL Test
public = no
writable   = yes
browseable = yes
vfs objects= acl_xattr
inherit permissions= yes
inherit acls   = yes


On the server side the relevant parts of the logfile are


[2011/04/05 12:18:16.331704,  2] lib/access.c:406(check_access)
  Allowed connection from  (x.x.x.x)
[2011/04/05 12:18:16.335694,  3] smbd/vfs.c:97(vfs_init_default)
  Initialising default vfs hooks
[2011/04/05 12:18:16.335737,  5] smbd/vfs.c:87(smb_register_vfs)
  Successfully added vfs backend '/[Default VFS]/'
[2011/04/05 12:18:16.335779,  5] smbd/vfs.c:87(smb_register_vfs)
  Successfully added vfs backend 'solarisacl'
[2011/04/05 12:18:16.335802,  3] smbd/vfs.c:122(vfs_init_custom)
  Initialising custom vfs hooks from [/[Default VFS]/]
  Successfully loaded vfs module [/[Default VFS]/] with the new modules system
[2011/04/05 12:18:16.335838,  3] smbd/vfs.c:122(vfs_init_custom)
  Initialising custom vfs hooks from [acl_xattr]
[2011/04/05 12:18:16.335862,  5] smbd/vfs.c:162(vfs_init_custom)
  vfs module [acl_xattr] not loaded - trying to load...
[2011/04/05 12:18:16.336548,  2] lib/module.c:64(do_smb_load_module)
  Module '/smb/sw/lib/vfs/acl_xattr.so' loaded
[2011/04/05 12:18:16.336591,  5] smbd/vfs.c:87(smb_register_vfs)
  Successfully added vfs backend 'acl_xattr'
  Successfully loaded vfs module [acl_xattr] with the new modules system
[2011/04/05 12:18:16.336945,  2] modules/vfs_acl_xattr.c:193(connect_acl_xattr)
  connect_acl_xattr: setting 'inherit acls = true' 'dos filemode = true' and 
'force unknown acl user = true' for service EA
[2011/04/05 12:18:16.337787,  1] smbd/service.c:1070(make_connection_snum)
  x.x.x.x (x.x.x.x) connect to service EA initially as user nau (uid=1, 
gid=1) (pid 23491)

...

[2011/04/05 12:18:16.348517,  3] smbd/vfs.c:1038(check_reduced_name)
  check_reduced_name: D reduced to /smb/X/D
[2011/04/05 12:18:16.350387,  5] smbd/posix_acls.c:1191(unpack_nt_owners)
  unpack_nt_owners: validating owner_sids.
[2011/04/05 12:18:16.350434,  5] smbd/posix_acls.c:1238(unpack_nt_owners)
  unpack_nt_owners: owner_sids validated.
[2011/04/05 12:18:16.351005,  2] smbd/posix_acls.c:2903(set_canon_ace_list)
  set_canon_ace_list: sys_acl_set_file type file failed for file D (Operation 
not applicable).
[2011/04/05 12:18:16.351086,  3] 
smbd/posix_acls.c:3007(convert_canon_ace_to_posix_perms)
  convert_canon_ace_to_posix_perms: Too many ACE entries for file D to convert 
to posix perms.
[2011/04/05 12:18:16.351114,  3] smbd/posix_acls.c:4109(set_nt_acl)
  set_nt_acl: failed to convert file acl to posix permissions for file D.
[2011/04/05 12:18:20.872901,  1] smbd/service.c:1251(close_cnum)
  134.60.1.35 (134.60.1.35) closed connection to service EA


So why do I need POSIX ACLs at all?

Any hints are greatly appreciated!

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

Re: [Samba] acl_xattr access denied when adding permissions for another user

2011-04-05 Thread Volker Lendecke 
On Tue, Apr 05, 2011 at 12:40:12PM +0200, Thomas Nau wrote:
 We run Samba 3.5.8 on a Solaris 11 box on top of ZFS We got the
 impression that the VFS module acl_xattr provides the best way
 of keeping Windows ACLs. We don't have concurrent NFS or local users
 so it's Windows only.

ZFS does NFSv4 ACLs which are quite close, albeit not
perfect. There's a zfs_acl module for Solaris, you might
also give that a try.

 The clients as well as the Samba server are members of an AD domain.
 Creating files/directories works as expected and also manipulating
 permissions for the initial user/group does not raise any problem.
 Trying to add permissions for an additional user (looked up in AD)
 fails with the Windows XP client side permission denied pop-up box.

Does acl_xattr : ignore system acls  help?

Volker

-- 
SerNet GmbH, Bahnhofsallee 1b, 37081 Göttingen
phone: +49-551-37-0, fax: +49-551-37-9
AG Göttingen, HRB 2816, GF: Dr. Johannes Loxen
-- 
To unsubscribe from this list go to the following URL and read the
instructions:  https://lists.samba.org/mailman/options/samba

[Samba] problem with linux server as domain member in samba pdc

2011-04-05 Thread Hervé Hénoch 

Hello,

My problem is the following : I've a domain controller under linux Samba 
3.5.5 with LDAP.
I want to include a Linux Samba as domain member but I've the following 
error :


_netr_ServerAuthenticate2: failed to get machine password for account 
SSCFICHIERS$: NT_STATUS_ACCESS_DENIED


I've put the following in smb.conf :

workgroup = mydomain
wins server = ip of my samba PDC
password server = ip of my samba PDC
security = domain

I've too configured nsswitch.conf / libnss and pam so getent 
passwd/group/shadow  so is connected too the underlying ldap : this is ok.


net rpc join is successful and I can see the entry in my ldap tree and 
the secrets.tdb file is created in /var/lib/samba.


So i've don't understand where is the problem ...

Help appreciate

--
Hervé Hénoch
Responsable informatique
Institut Sainte Catherine
1750, chemin du Lavarin, 84000 Avignon
Téléphone : 04.90.27.57.44
Messagerie : h.hen...@isc84.org


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

Re: [Samba] FW: ACL Lost and unable to set rights from explorer (xp)

2011-04-05 Thread Alex Crow 

On 03/04/11 21:28, L.P.H. van Belle wrote:

Lol, yes the same typo here, but its corrected in my smb.conf en tested it.
( my english is not that good )

Now only my main problem, why i cant set my rights any more.
checked everything, fstab is ok, acl and user_xattr,
rights on folders, checked als from console.
Im lost in this one. I must fix it because is on my mijn PDC.

so if someone has any idees, please trow them at me. ;-)

Louis




I have seen this too. I found the only way to consistently set ACLs and 
avoid this is to do it from the Linux side. You may however try removing 
all the acls (using setfacl -b) and then trying to add them from Windows 
again.


Cheers

Alex

--
This message is intended only for the addressee and may contain
confidential information.  Unless you are that person, you may not
disclose its contents or use it in any way and are requested to delete
the message along with any attachments and notify us immediately.

Transact is operated by Integrated Financial Arrangements plc
Domain House, 5-7 Singer Street, London  EC2A 4BQ
Tel: (020) 7608 4900 Fax: (020) 7608 5300
(Registered office: as above; Registered in England and Wales under number: 
3727592)
Authorised and regulated by the Financial Services Authority (entered on the 
FSA Register; number: 190856)

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

Re: [Samba] FW: ACL Lost and unable to set rights from explorer (xp)

2011-04-05 Thread L . P . H . van Belle 
Ok, i'm going to try this. 

are there new settings needed for acl compaired to 3.2.4 and 3.5.6 ? 

Louis

 

-Oorspronkelijk bericht-
Van: ac...@integrafin.co.uk 
[mailto:samba-boun...@lists.samba.org] Namens Alex Crow
Verzonden: 2011-04-05 14:20
Aan: samba@lists.samba.org
Onderwerp: Re: [Samba] FW: ACL Lost and unable to set rights 
from explorer (xp)

On 03/04/11 21:28, L.P.H. van Belle wrote:
 Lol, yes the same typo here, but its corrected in my 
smb.conf en tested it.
 ( my english is not that good )

 Now only my main problem, why i cant set my rights any more.
 checked everything, fstab is ok, acl and user_xattr,
 rights on folders, checked als from console.
 Im lost in this one. I must fix it because is on my mijn PDC.

 so if someone has any idees, please trow them at me. ;-)

 Louis



I have seen this too. I found the only way to consistently set 
ACLs and 
avoid this is to do it from the Linux side. You may however 
try removing 
all the acls (using setfacl -b) and then trying to add them 
from Windows 
again.

Cheers

Alex

-- 
This message is intended only for the addressee and may contain
confidential information.  Unless you are that person, you may not
disclose its contents or use it in any way and are requested to delete
the message along with any attachments and notify us immediately.

Transact is operated by Integrated Financial Arrangements plc
Domain House, 5-7 Singer Street, London  EC2A 4BQ
Tel: (020) 7608 4900 Fax: (020) 7608 5300
(Registered office: as above; Registered in England and Wales 
under number: 3727592)
Authorised and regulated by the Financial Services Authority 
(entered on the FSA Register; number: 190856)

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




smime.p7s
Description: S/MIME cryptographic signature
-- 
To unsubscribe from this list go to the following URL and read the
instructions:  https://lists.samba.org/mailman/options/samba

Re: [Samba] acl_xattr access denied when adding permissions for another user

2011-04-05 Thread Thomas Nau 
On 04/05/2011 01:02 PM, Volker Lendecke wrote:
 On Tue, Apr 05, 2011 at 12:40:12PM +0200, Thomas Nau wrote:
 We run Samba 3.5.8 on a Solaris 11 box on top of ZFS We got the
 impression that the VFS module acl_xattr provides the best way
 of keeping Windows ACLs. We don't have concurrent NFS or local users
 so it's Windows only.
 
 ZFS does NFSv4 ACLs which are quite close, albeit not
 perfect. There's a zfs_acl module for Solaris, you might
 also give that a try.

We use that with another server for quite a while by now.
I usually does a great job but in rare cases, reason unknown,
either the module or the OS are messing up ACLs. I have to
confess this is one of the real old Sun Samba (3.0.3?) versions
and I haven't tried the latest.
The only hint I got that the problem occurs mostly with
moving folders or accesses by Microsoft Office tools

 The clients as well as the Samba server are members of an AD domain.
 Creating files/directories works as expected and also manipulating
 permissions for the initial user/group does not raise any problem.
 Trying to add permissions for an additional user (looked up in AD)
 fails with the Windows XP client side permission denied pop-up box.
 
 Does acl_xattr : ignore system acls  help?

acl_xattr: ignore system acls = yes


I added

acl_xattr: ignore system acls = yes

but it makes things worse as I cannot even grant myself (the authenticated
user) full access anymore even though I already have the full rights inherited

Is there any additional data I can provide?

Thomas


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

Re: [Samba] acl_xattr access denied when adding permissions for another user

2011-04-05 Thread Thomas Nau 
I quick addition:

 Does acl_xattr : ignore system acls  help?
 
 acl_xattr: ignore system acls = yes
 
 
 I added
 
   acl_xattr: ignore system acls = yes
 
 but it makes things worse as I cannot even grant myself (the authenticated
 user) full access anymore even though I already have the full rights inherited


Seems that behavior was an artifact. I cleaned out the directories and started
from scratch. Now I'm back to the original problem. I can manipulate
my own rights but not add another user. Setting acl_xattr : ignore system acls
doesn't change things

Sorry for the confusion
Thomsa

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

[Samba] researching options need advice

2011-04-05 Thread Aaron E. 
Our current infrastructure is Openldap back end with samba3 pdc. With 
2003 terminal servers Using poledit.exe with policies..


We are in need of upgrade of our terminal servers. I cannot get the old 
way of policies to lock the server down as I need to function on Windows 
Server 2008.


What are other people doing? I can't be the first one to run across this 
and can't seem to find anything substantial in googling.


Advice Greatly appriciated.

Aaron


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

Re: [Samba] samba ctdb clustering with ldap backend?

2011-04-05 Thread Jim McDonough 
On Tue, Apr 5, 2011 at 3:35 AM, Daniel Müller muel...@tropenklinik.de wrote:
 I have two samba servers auth agains ldap, so I use:
 idmap backend = ldap:ldap://127.0.0.1

 Is it possible to setup ctdb to run with a ldap backend?
I don't see why not.  The point of tdb2 was to not get different
uids/gids on different nodes.  However, you'd need to have only one
ldap server that they all use.  Your current setup would not work.

 I know ctdb uses:
 idmap backend = tdb2



-- 
Jim McDonough
Samba Team
SUSE labs
jmcd at samba dot org
jmcd at themcdonoughs dot org
-- 
To unsubscribe from this list go to the following URL and read the
instructions:  https://lists.samba.org/mailman/options/samba

Re: [Samba] researching options need advice

2011-04-05 Thread Aaron E. 
Another Idea I was thinking was to migrate to Windows AD then Migrate to 
Samba4 but this seems like a long process.. Thoughts?


On 04/05/2011 11:58 AM, Aaron E. wrote:

Our current infrastructure is Openldap back end with samba3 pdc. With
2003 terminal servers Using poledit.exe with policies..

We are in need of upgrade of our terminal servers. I cannot get the old
way of policies to lock the server down as I need to function on Windows
Server 2008.

What are other people doing? I can't be the first one to run across this
and can't seem to find anything substantial in googling.

Advice Greatly appriciated.

Aaron




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

Re: [Samba] Can't get 'dos filemode' to work as expected

2011-04-05 Thread Felix Brack 

On 24.03.2011 10:09, Felix Brack wrote:

Hello,

After an upgrade to samba 3.5.8 (from 3.2.5) the option 'dos filemode'
does not seem to work anymore. If I (as a user) do not own the file I
can't change permissions.

I am user 'felix' and member of supplementary group 'Development'. To
test things I use the following share definition:

[Temp]
path = /srv/samba/file-shares/tmp
browseable = yes
read only = no
invalid users = root administrator
delete readonly = yes
inherit owner = yes
force group = Development
dos filemode = yes

A 'getfacl' on /srv/samba/file-shares/tmp returns:

# file: srv/samba/file-shares/tmp
# owner: root
# group: root
# flags: -s-
user::rwx
group::r-x
group:Development:rwx
mask::rwx
other::---
default:user::rwx
default:group::r-x
default:group:Development:rwx
default:mask::rwx
default:other::---

 From the 'smb.conf' man page concerning option 'dos filemode':

...
Enabling this parameter allows a user who has write access to the file
(by whatever means, including an ACL permission) to modify the
permissions (including ACL) on it.
...

My understanding: as a member of group 'Development' I do have write
access to '/srv/samba/file-shares/tmp' by means of the ACL.

Trying to modify permissions on a directory or file I create in that
share does not work and reports access denied, no matter if I use
Windows Explorer or smbclient from an other linux box.

What am I misunderstanding here?

Many thanks, Felix



I finally manged to write some code for my Windows box that shows the error:

#include stdio.h
#include tchar.h
#include windows.h

// directory name --
// share name   |
// server name    | |
// |  | |
// v  v v
const wchar_t strFirName[]= LJUPITER\\testshare\\test-dir;

int main(void)
{
BOOL bRet;
DWORD dwError;

// create the directory
bRet= CreateDirectory(strFirName, NULL);
if (bRet != TRUE) {
dwError= GetLastError();
return -1;
}

// now set the file attribute of the newly created directory
bRet= SetFileAttributes(strFirName, FILE_ATTRIBUTE_NORMAL);
if (bRet != TRUE) {
// dwError will be 6 (ERROR_INVALID_HANDLE) in  case of failure
dwError= GetLastError();
return -1;
}

return 0;
}

That's it! Creating a directory and then manipulating the attributes.

The server path to the share is /srv/samba/file-shares/testshare.

The code above fails while setting the attribute if the user (felix) 
connecting to the samba share is _not_ the owner (root) of 
/srv/samba/file-shares/testshare.

'getfacl /srv/samba/file-shares/testshare' returns:
# file: srv/samba/file-shares/testshare
# owner: root
# group: root
# flags: -s-
user::rwx
group::rwx
group:Development:rwx
mask::rwx
other::---
default:user::rwx
default:group::rwx
default:group:Development:rwx
default:mask::rwx
default:other::---

If I type 'chown felix:root /srv/samba/file-shares/testshare' on the 
samba server and then execute the code above, everything is fine.

'getfacl /srv/samba/file-shares/testshare' returns:
# file: srv/samba/file-shares/testshare
# owner: felix
# group: root
# flags: -s-
user::rwx
group::rwx
group:Development:rwx
mask::rwx
other::---
default:user::rwx
default:group::rwx
default:group:Development:rwx
default:mask::rwx
default:other::---

As already stated 'felix' is member of group 'Development'.

Can somebody confirm that the code above works in case the user 
connecting to the share is _not_ owning the share?


Felix

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

Re: [Samba] Unable to join to Windows 2003 PDC using samba 3.5.8 from alinux machine!!

2011-04-05 Thread Rick Gates 
Hi all,

I was on a bit extended weekend .. so got delayed in responding ...

To answer some of the questions:

Is the ADS domain in NT4 compatibility mode or windows 2003 native
mode?I think that NT4 machines can still join ADS domains even if the
ADS domains are in 2000/2003 mode.

I am not sure about this.
How can I find this out?
I still will have to do some googling on this front.

 Also check
   testparm -v | grep resolve
think it is better to have hosts and wins first.

I have now set the value of name resolve order to:

# /usr/local/samba/bin/testparm -sv | grep -i resolve
Load smb config files from /usr/local/samba/lib/smb.conf
rlimit_max: increasing rlimit_max (1024) to minimum Windows limit (16384)
Processing section [homes]
Processing section [printers]
Processing section [Linux]
Loaded services file OK.
Server role: ROLE_DOMAIN_MEMBER
name resolve order = wins host lmhost bcast
#

I set it to WINS first because, my ADS server is a WINS server.
But, the above modificatiosn did not work.

Is the ADS server your DNS server?  Is the samba server using the ADS
server as the DNS server?  DNS should include resource records to help
locate an ADS DC.  I don't think you can have lmhosts entry for an ADS
server.

My ADS server is a WINS server, not a DNS server.

What does your krb5.conf look like?  I suspect it's having trouble
finding a kdc.

My krb5.conf is as follows:

# cat /etc/krb5.conf
[libdefaults]
default_realm = ABCDOM.PQR.COM
default_tkt_enctypes = rc4-hmac
default_tgs_enctypes = rc4-hmac

[realms]
ABCDOM.PQR.COM = {
kdc = 10.25.66.71 :88
admin_server = 10.25.66.71
default_domain = abcdom.pqr.com
}

[domain_realm]
.abcdom.pqr.com = ABCDOM.PQR.COM

#

Regards,
Rick


On Sat, Apr 2, 2011 at 3:22 AM, Andrew Masterson 
andrew.master...@nuvistaenergy.com wrote:


  -Original Message-
  From: samba-boun...@lists.samba.org
 [mailto:samba-boun...@lists.samba.org]
  On Behalf Of Rick Gates
  Sent: Friday, April 01, 2011 10:00 AM
  To: samba@lists.samba.org
  Subject: [Samba] Unable to join to Windows 2003 PDC using samba 3.5.8
 from
  alinux machine!!
 
  Hi all,
 
  I am using samba 3.5.8 on a linux machine.
  I am not able to join the domain of a windows 2003 server in ADS mode.
 
  I am getting the following error message:
 
  # /usr/local/samba/bin/net ads join -U Administrator%password -I
 10.25.66.71
 
  Failed to join domain: failed to find DC for domain ABCDOM.PQR.COM
  #
 
  I am not sure what the issue here.
  It works absolutely fine when I try to join the domain in rpc mode.
 
  # /usr/local/samba/bin/net rpc join -U Administrator%password
  Joined domain ABCDOM.
  #
 
  The smb.conf used is:
 
  # /usr/local/samba/bin/testparm
  Load smb config files from /usr/local/samba/lib/smb.conf
  rlimit_max: increasing rlimit_max (1024) to minimum Windows limit
 (16384)
  Processing section [homes]
  Processing section [printers]
  Processing section [Linux]
  Loaded services file OK.
  Server role: ROLE_DOMAIN_MEMBER
  Press enter to see a dump of your service definitions
 
  [global]
  workgroup = ABCDOM
  realm = ABCDOM.PQR.COM
  server string = Samba Server - Research
  security = ADS
  password server = 10.25.66.71
  log level = 10
  log file = /var/log/samba/%m.log
  max log size = 50
  add user script = /usr/sbin/useradd %u
  delete user script = /usr/sbin/userdel %u
  add group script = /usr/sbin/groupadd %g
  delete group script = /usr/sbin/groupdel %g
  add user to group script = /usr/sbin/usermod -a -G %g %u
  delete user from group script = /usr/sbin/deluser %u %g
  add machine script = /usr/sbin/adduser -n -g machines -c
 Machine -d
  /dev/null -s /bin/false %u
  domain master = No
  dns proxy = No
  wins server = 10.25.66.71
  idmap uid = 200-12
  idmap gid = 200-12
  admin users = root
  cups options = raw
 
  [homes]
  comment = Home Directories
  read only = No
  browseable = No
 
  [printers]
  comment = All Printers
  path = /usr/spool/samba
  printable = Yes
  browseable = No
 
  [Linux]
  comment = Share on this linux machine
  path = /tmp/linux
  read only = No
  #
 
  NOTE: 10.25.66.71 is the IP of my 2003 windows server.
 
  My lmhosts file is:
 
  # cat lmhosts.
  10.25.66.71 ABC3
  10.25.66.71 ABCDOM#1b
  10.25.66.71 ABCDOM#1c
 
  #
 
  It would be great, if any one can tell me if there is anything wrong
 here
  and probably help me sort out this issue.
  Thanks in advance!!


 What does your krb5.conf look like?  I suspect it's having trouble
 finding a kdc.

 -=Andrew

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

Re: [Samba] Unable to join to Windows 2003 PDC using samba 3.5.8 from alinux machine!!

2011-04-05 Thread Rick Gates 
Hi Takahashi and all those in the list,

Sometimes AD specific configuration is needed to krb5.conf.

What kind of AD specific configuration are you talking about.
Can you kindly elaborate?
It may be helpful for me.

Have you set DNS server to 10.25.66.71 and ABCDOM.PQR.COM to the
search or domain directive in your /etc/resolv.conf?
Can you resolve correct SRV record of the domain on your Samba server?

10.25.66.71  is not my DNS server.
In fact 10.25.66.71  is my WINS server.
I have therefore included it in smb.conf:

# /usr/local/samba/bin/testparm -sv | grep -i wins
Load smb config files from /usr/local/samba/lib/smb.conf
rlimit_max: increasing rlimit_max (1024) to minimum Windows limit (16384)
Processing section [homes]
Processing section [printers]
Processing section [Linux]
Loaded services file OK.
Server role: ROLE_DOMAIN_MEMBER
name resolve order = wins host lmhost bcast
max wins ttl = 518400
min wins ttl = 21600
wins proxy = No
*wins server = 10.25.66.71*
wins support = No
wins hook =
#

However, I cannot resolve ABCDOM.PQR.COM.
It should be taken care by WINS, right?

(However, I tried defining ABCDOM.PQR.COM in /etc/hosts file.
and also tried setting /etc/nsswitch.conf file with the entry of:
hosts: files dns
But, nslookup would always first try DNS and return.
Had resolved similar issues with above steps successful on unix machine ...
but I am now working on a RHEL machine and I have not yet found a successful
way to do this)

Any suggestions are welcome.

Regard,
Rick

On Tue, Apr 5, 2011 at 11:59 PM, Rick Gates rick123.ga...@gmail.com wrote:

 Hi all,

 I was on a bit extended weekend .. so got delayed in responding ...

 To answer some of the questions:


 Is the ADS domain in NT4 compatibility mode or windows 2003 native
 mode?I think that NT4 machines can still join ADS domains even if the
 ADS domains are in 2000/2003 mode.

 I am not sure about this.
 How can I find this out?
 I still will have to do some googling on this front.


  Also check
testparm -v | grep resolve
 think it is better to have hosts and wins first.

 I have now set the value of name resolve order to:

 # /usr/local/samba/bin/testparm -sv | grep -i resolve

 Load smb config files from /usr/local/samba/lib/smb.conf
 rlimit_max: increasing rlimit_max (1024) to minimum Windows limit (16384)
 Processing section [homes]
 Processing section [printers]
 Processing section [Linux]
 Loaded services file OK.
 Server role: ROLE_DOMAIN_MEMBER
 name resolve order = wins host lmhost bcast
 #

 I set it to WINS first because, my ADS server is a WINS server.
 But, the above modificatiosn did not work.


 Is the ADS server your DNS server?  Is the samba server using the ADS
 server as the DNS server?  DNS should include resource records to help
 locate an ADS DC.  I don't think you can have lmhosts entry for an ADS
 server.

 My ADS server is a WINS server, not a DNS server.


 What does your krb5.conf look like?  I suspect it's having trouble
 finding a kdc.

 My krb5.conf is as follows:

 # cat /etc/krb5.conf
 [libdefaults]
 default_realm = ABCDOM.PQR.COM
 default_tkt_enctypes = rc4-hmac
 default_tgs_enctypes = rc4-hmac

 [realms]
 ABCDOM.PQR.COM = {
 kdc = 10.25.66.71 :88
 admin_server = 10.25.66.71
 default_domain = abcdom.pqr.com
 }

 [domain_realm]
 .abcdom.pqr.com = ABCDOM.PQR.COM

 #

 Regards,
 Rick



 On Sat, Apr 2, 2011 at 3:22 AM, Andrew Masterson 
 andrew.master...@nuvistaenergy.com wrote:


  -Original Message-
  From: samba-boun...@lists.samba.org
 [mailto:samba-boun...@lists.samba.org]
  On Behalf Of Rick Gates
  Sent: Friday, April 01, 2011 10:00 AM
  To: samba@lists.samba.org
  Subject: [Samba] Unable to join to Windows 2003 PDC using samba 3.5.8
 from
  alinux machine!!
 
  Hi all,
 
  I am using samba 3.5.8 on a linux machine.
  I am not able to join the domain of a windows 2003 server in ADS mode.
 
  I am getting the following error message:
 
  # /usr/local/samba/bin/net ads join -U Administrator%password -I
 10.25.66.71
 
  Failed to join domain: failed to find DC for domain ABCDOM.PQR.COM
  #
 
  I am not sure what the issue here.
  It works absolutely fine when I try to join the domain in rpc mode.
 
  # /usr/local/samba/bin/net rpc join -U Administrator%password
  Joined domain ABCDOM.
  #
 
  The smb.conf used is:
 
  # /usr/local/samba/bin/testparm
  Load smb config files from /usr/local/samba/lib/smb.conf
  rlimit_max: increasing rlimit_max (1024) to minimum Windows limit
 (16384)
  Processing section [homes]
  Processing section [printers]
  Processing section [Linux]
  Loaded services file OK.
  Server role: ROLE_DOMAIN_MEMBER
  Press enter to see a dump of your service definitions
 
  [global]
  workgroup = ABCDOM
  realm = ABCDOM.PQR.COM
  server string = Samba Server - Research
  security = ADS
  password server = 10.25.66.71
  log level = 10
  log file =

Re: [Samba] Mac OS X status

2011-04-05 Thread Andrew Masterson 
 Does anyone actually use self-compiled Samba on Mac OS X ??

Better question: does anybody actually use Mac OSX for server work?

If so, they're crazy IMO.

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

Re: [Samba] Mac OS X status

2011-04-05 Thread Jeremy Allison 
On Sun, Apr 03, 2011 at 05:56:53PM +0200, Volker Lendecke wrote:
 On Mon, Apr 04, 2011 at 12:05:22AM +0900, TAKAHASHI Motonobu wrote:
  H, maybe no one compiled Samba on Mac OS X recently...
 
 That's very obvious from your findings :-)
 
 But now that according to the rumors Apple is about to drop
 Samba, we might revitalize the effort to create a nice
 package on OS/X.

I agree. Fix up what bugs we have and ensure we
have a working package with SMB2 on MacOSX for 3.6.0.

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

Re: [Samba] problem with linux server as domain member in samba pdc

2011-04-05 Thread Allen Chen 

Hervé Hénoch wrote:

Hello,

My problem is the following : I've a domain controller under linux 
Samba 3.5.5 with LDAP.
I want to include a Linux Samba as domain member but I've the 
following error :


_netr_ServerAuthenticate2: failed to get machine password for account 
SSCFICHIERS$: NT_STATUS_ACCESS_DENIED


I've put the following in smb.conf :

workgroup = mydomain
wins server = ip of my samba PDC
password server = ip of my samba PDC
security = domain

I've too configured nsswitch.conf / libnss and pam so getent 
passwd/group/shadow  so is connected too the underlying ldap : this is 
ok.


net rpc join is successful and I can see the entry in my ldap tree and 
the secrets.tdb file is created in /var/lib/samba.


So i've don't understand where is the problem ...

I have a similar installation, but works fine.
PDC: samba 3.4.5 ( use source) and ldap
member server: samba-3.0.28 (comes with RHEL 5.2)
On member server, I did this:
# /usr/bin/net rpc join -S PDC-host-name -Uadminuid%adminpass
# service smb start

Can you make sure
1. there is no ldap config in smb.conf on the member server;
2. getent passwd / getent group show you the same results on PDC and 
member server.


Allen


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

Re: [Samba] acl_xattr access denied when adding permissions for another user

2011-04-05 Thread Jeremy Allison 
On Tue, Apr 05, 2011 at 12:40:12PM +0200, Thomas Nau wrote:
 Dear all
 We run Samba 3.5.8 on a Solaris 11 box on top of ZFS We got the
 impression that the VFS module acl_xattr provides the best way
 of keeping Windows ACLs. We don't have concurrent NFS or local users
 so it's Windows only.
 
 The clients as well as the Samba server are members of an AD domain.
 Creating files/directories works as expected and also manipulating
 permissions for the initial user/group does not raise any problem.
 Trying to add permissions for an additional user (looked up in AD)
 fails with the Windows XP client side permission denied pop-up box.

If you're using ZFS (which has native NFSv4 ACLs) why not use
the vfs_zfsacl module ?

Jeremy.
-- 
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

2011-04-05 Thread Volker Lendecke 
The branch, master has been updated
   via  fe35ff2 s3: Make vlp printing work by default
   via  0f08e9d s3: Fix print_spool_end
  from  4b78956 s4 samba-tool: Implement testparm command

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


- Log -
commit fe35ff2bf98c166b2f3bfbaa171a58727e1ba091
Author: Volker Lendecke v...@samba.org
Date:   Sat Apr 2 18:51:55 2011 +0200

s3: Make vlp printing work by default

Autobuild-User: Volker Lendecke vlen...@samba.org
Autobuild-Date: Tue Apr  5 13:12:14 CEST 2011 on sn-devel-104

commit 0f08e9d9b97cfea3fa5c9ac633790cc4f76d
Author: Volker Lendecke v...@samba.org
Date:   Sat Apr 2 18:46:58 2011 +0200

s3: Fix print_spool_end

We have to use the spoolss pipe instance opened in print_spool_open, 
otherwise
the spoolss server won't be able to find the right printer and job.

---

Summary of changes:
 source3/param/loadparm.c|   63 ++-
 source3/printing/printspoolss.c |   12 ---
 2 files changed, 55 insertions(+), 20 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 172e5c4..0f76f09 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -4864,15 +4864,62 @@ static void init_printer_values(struct service 
*pService)
 #if defined(DEVELOPER) || defined(ENABLE_BUILD_FARM_HACKS)
 
case PRINT_TEST:
-   case PRINT_VLP:
-   string_set(pService-szPrintcommand, vlp print %p %s);
-   string_set(pService-szLpqcommand, vlp lpq %p);
-   string_set(pService-szLprmcommand, vlp lprm %p %j);
-   string_set(pService-szLppausecommand, vlp lppause %p %j);
-   string_set(pService-szLpresumecommand, vlp lpresume %p %j);
-   string_set(pService-szQueuepausecommand, vlp queuepause %p);
-   string_set(pService-szQueueresumecommand, vlp queueresume 
%p);
+   case PRINT_VLP: {
+   const char *tdbfile;
+   char *tmp;
+
+   tdbfile = talloc_asprintf(
+   talloc_tos(), tdbfile=%s,
+   lp_parm_const_string(-1, vlp, tdbfile,
+/tmp/vlp.tdb));
+   if (tdbfile == NULL) {
+   tdbfile=tdbfile=/tmp/vlp.tdb;
+   }
+
+   tmp = talloc_asprintf(talloc_tos(), vlp %s print %%p %%s,
+ tdbfile);
+   string_set(pService-szPrintcommand,
+  tmp ? tmp : vlp print %p %s);
+   TALLOC_FREE(tmp);
+
+   tmp = talloc_asprintf(talloc_tos(), vlp %s lpq %%p,
+ tdbfile);
+   string_set(pService-szLpqcommand,
+  tmp ? tmp : vlp lpq %p);
+   TALLOC_FREE(tmp);
+
+   tmp = talloc_asprintf(talloc_tos(), vlp %s lprm %%p %%j,
+ tdbfile);
+   string_set(pService-szLprmcommand,
+  tmp ? tmp : vlp lprm %p %j);
+   TALLOC_FREE(tmp);
+
+   tmp = talloc_asprintf(talloc_tos(), vlp %s lppause %%p %%j,
+ tdbfile);
+   string_set(pService-szLppausecommand,
+  tmp ? tmp : vlp lppause %p %j);
+   TALLOC_FREE(tmp);
+
+   tmp = talloc_asprintf(talloc_tos(), vlp %s lpresume %%p %%j,
+ tdbfile);
+   string_set(pService-szLpresumecommand,
+  tmp ? tmp : vlp lpresume %p %j);
+   TALLOC_FREE(tmp);
+
+   tmp = talloc_asprintf(talloc_tos(), vlp %s queuepause %%p,
+ tdbfile);
+   string_set(pService-szQueuepausecommand,
+  tmp ? tmp : vlp queuepause %p);
+   TALLOC_FREE(tmp);
+
+   tmp = talloc_asprintf(talloc_tos(), vlp %s queueresume %%p,
+ tdbfile);
+   string_set(pService-szQueueresumecommand,
+  tmp ? tmp : vlp queueresume %p);
+   TALLOC_FREE(tmp);
+
break;
+   }
 #endif /* DEVELOPER */
 
}
diff --git a/source3/printing/printspoolss.c b/source3/printing/printspoolss.c
index 01137df..352fcb8 100644
--- a/source3/printing/printspoolss.c
+++ b/source3/printing/printspoolss.c
@@ -277,18 +277,6 @@ void print_spool_end(files_struct *fsp, enum 
file_close_type close_type)
WERROR werr;
struct dcerpc_binding_handle *b = NULL;
 
-   status = rpc_pipe_open_interface(fsp-conn,
-ndr_table_spoolss.syntax_id,
-

[SCM] Samba Shared Repository - branch v3-6-test updated

2011-04-05 Thread Volker Lendecke 
The branch, v3-6-test has been updated
   via  38995cb s3: Make vlp printing work by default
   via  1b80e06 s3: Fix print_spool_end
  from  0c3a359 s3-net: add command net idmap check

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


- Log -
commit 38995cb98a01d01c683d19df5db21cc0faebad3b
Author: Volker Lendecke v...@samba.org
Date:   Sat Apr 2 18:51:55 2011 +0200

s3: Make vlp printing work by default

Autobuild-User: Volker Lendecke vlen...@samba.org
Autobuild-Date: Tue Apr  5 13:12:14 CEST 2011 on sn-devel-104
(cherry picked from commit fe35ff2bf98c166b2f3bfbaa171a58727e1ba091)

commit 1b80e06e8e34a6febfe35d9ffd5592d5f6566729
Author: Volker Lendecke v...@samba.org
Date:   Sat Apr 2 18:46:58 2011 +0200

s3: Fix print_spool_end

We have to use the spoolss pipe instance opened in print_spool_open, 
otherwise
the spoolss server won't be able to find the right printer and job.
(cherry picked from commit 0f08e9d9b97cfea3fa5c9ac633790cc4f76d)

---

Summary of changes:
 source3/param/loadparm.c|   63 ++-
 source3/printing/printspoolss.c |   12 ---
 2 files changed, 55 insertions(+), 20 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 09f8458..b601932 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -4863,15 +4863,62 @@ static void init_printer_values(struct service 
*pService)
 #if defined(DEVELOPER) || defined(ENABLE_BUILD_FARM_HACKS)
 
case PRINT_TEST:
-   case PRINT_VLP:
-   string_set(pService-szPrintcommand, vlp print %p %s);
-   string_set(pService-szLpqcommand, vlp lpq %p);
-   string_set(pService-szLprmcommand, vlp lprm %p %j);
-   string_set(pService-szLppausecommand, vlp lppause %p %j);
-   string_set(pService-szLpresumecommand, vlp lpresume %p %j);
-   string_set(pService-szQueuepausecommand, vlp queuepause %p);
-   string_set(pService-szQueueresumecommand, vlp queueresume 
%p);
+   case PRINT_VLP: {
+   const char *tdbfile;
+   char *tmp;
+
+   tdbfile = talloc_asprintf(
+   talloc_tos(), tdbfile=%s,
+   lp_parm_const_string(-1, vlp, tdbfile,
+/tmp/vlp.tdb));
+   if (tdbfile == NULL) {
+   tdbfile=tdbfile=/tmp/vlp.tdb;
+   }
+
+   tmp = talloc_asprintf(talloc_tos(), vlp %s print %%p %%s,
+ tdbfile);
+   string_set(pService-szPrintcommand,
+  tmp ? tmp : vlp print %p %s);
+   TALLOC_FREE(tmp);
+
+   tmp = talloc_asprintf(talloc_tos(), vlp %s lpq %%p,
+ tdbfile);
+   string_set(pService-szLpqcommand,
+  tmp ? tmp : vlp lpq %p);
+   TALLOC_FREE(tmp);
+
+   tmp = talloc_asprintf(talloc_tos(), vlp %s lprm %%p %%j,
+ tdbfile);
+   string_set(pService-szLprmcommand,
+  tmp ? tmp : vlp lprm %p %j);
+   TALLOC_FREE(tmp);
+
+   tmp = talloc_asprintf(talloc_tos(), vlp %s lppause %%p %%j,
+ tdbfile);
+   string_set(pService-szLppausecommand,
+  tmp ? tmp : vlp lppause %p %j);
+   TALLOC_FREE(tmp);
+
+   tmp = talloc_asprintf(talloc_tos(), vlp %s lpresume %%p %%j,
+ tdbfile);
+   string_set(pService-szLpresumecommand,
+  tmp ? tmp : vlp lpresume %p %j);
+   TALLOC_FREE(tmp);
+
+   tmp = talloc_asprintf(talloc_tos(), vlp %s queuepause %%p,
+ tdbfile);
+   string_set(pService-szQueuepausecommand,
+  tmp ? tmp : vlp queuepause %p);
+   TALLOC_FREE(tmp);
+
+   tmp = talloc_asprintf(talloc_tos(), vlp %s queueresume %%p,
+ tdbfile);
+   string_set(pService-szQueueresumecommand,
+  tmp ? tmp : vlp queueresume %p);
+   TALLOC_FREE(tmp);
+
break;
+   }
 #endif /* DEVELOPER */
 
}
diff --git a/source3/printing/printspoolss.c b/source3/printing/printspoolss.c
index d7ce971..6494fc5 100644
--- a/source3/printing/printspoolss.c
+++ b/source3/printing/printspoolss.c
@@ -276,18 +276,6 @@ void print_spool_end(files_struct *fsp, enum 
file_close_type close_type)
WERROR werr;
struct dcerpc_binding_handle *b = NULL;
 
-

[SCM] Samba Shared Repository - branch v3-6-test updated

2011-04-05 Thread Günther Deschner 
The branch, v3-6-test has been updated
   via  0a4ed25 lib-util: put data_blob back in the public library
   via  8b236bd dcerpc: we do not need these as public headers
  from  38995cb s3: Make vlp printing work by default

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


- Log -
commit 0a4ed25d46831af44be8fef83e86eea047ee8fba
Author: Simo Sorce i...@samba.org
Date:   Thu Mar 17 09:02:57 2011 -0400

lib-util: put data_blob back in the public library

data_blob is defined ina public header, so it needs to be exposed in the 
public
library.

Autobuild-User: Simo Sorce i...@samba.org
Autobuild-Date: Thu Mar 17 15:39:08 CET 2011 on sn-devel-104
(cherry picked from commit 5d55ae0a2907b5ead5fb7d131aa00788d806ed9a)

commit 8b236bded96637e5d55983b7cc0d35a61d6b6809
Author: Simo Sorce i...@samba.org
Date:   Wed Mar 16 15:32:53 2011 -0400

dcerpc: we do not need these as public headers

latest openchange doesn't need these headers either
fix _PRINTF_ATTRIBUTE in tdr.h, as it was failing to work after removing
proto.h due to side effects. PRINTF_ATTRIBUTE is ok and is define in 
talloc.h
which is included by tdr.h

Autobuild-User: Simo Sorce i...@samba.org
Autobuild-Date: Wed Mar 16 23:45:20 CET 2011 on sn-devel-104
(cherry picked from commit 2a608ba856a4f28c13f295ac554e46168f3f045c)

---

Summary of changes:
 lib/tdr/tdr.h|2 +-
 lib/util/wscript_build   |4 ++--
 source3/wscript_build|2 +-
 source4/rpc_server/wscript_build |2 --
 4 files changed, 4 insertions(+), 6 deletions(-)
 mode change 100644 = 100755 lib/util/wscript_build
 mode change 100644 = 100755 source3/wscript_build
 mode change 100644 = 100755 source4/rpc_server/wscript_build


Changeset truncated at 500 lines:

diff --git a/lib/tdr/tdr.h b/lib/tdr/tdr.h
index cd4785e..fa0a4d7 100644
--- a/lib/tdr/tdr.h
+++ b/lib/tdr/tdr.h
@@ -95,6 +95,6 @@ struct tdr_push *tdr_push_init(TALLOC_CTX *mem_ctx);
 struct tdr_pull *tdr_pull_init(TALLOC_CTX *mem_ctx);
 
 NTSTATUS tdr_push_to_fd(int fd, tdr_push_fn_t push_fn, const void *p);
-void tdr_print_debug_helper(struct tdr_print *tdr, const char *format, ...) 
_PRINTF_ATTRIBUTE(2,3);
+void tdr_print_debug_helper(struct tdr_print *tdr, const char *format, ...) 
PRINTF_ATTRIBUTE(2,3);
 
 #endif /* __TDR_H__ */
diff --git a/lib/util/wscript_build b/lib/util/wscript_build
old mode 100644
new mode 100755
index e8883a3..7c18075
--- a/lib/util/wscript_build
+++ b/lib/util/wscript_build
@@ -6,7 +6,7 @@ bld.SAMBA_LIBRARY('samba-util-common',
   source='''talloc_stack.c smb_threads.c xfile.c
   util_file.c time.c rbtree.c rfc1738.c select.c
   genrand.c fsusage.c blocking.c become_daemon.c
-  data_blob.c signal.c system.c params.c util.c util_id.c 
util_net.c
+  signal.c system.c params.c util.c util_id.c util_net.c
   util_strlist.c idtree.c debug.c''',
   public_deps='talloc pthread LIBCRYPTO',
   # until we get all the dependencies in this library in common
@@ -20,7 +20,7 @@ bld.SAMBA_LIBRARY('samba-util-common',
 
 if bld.env._SAMBA_BUILD_ == 4:
 bld.SAMBA_LIBRARY('samba-util',
-  source='''dprintf.c fault.c
+  source='''dprintf.c fault.c data_blob.c
   ms_fnmatch.c parmlist.c substitute.c util_str.c
   ''',
   deps='samba-util-common',
diff --git a/source3/wscript_build b/source3/wscript_build
old mode 100644
new mode 100755
index c389a19..3d7418f
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -964,7 +964,7 @@ bld.SAMBA3_SUBSYSTEM('CHARSET3',
 deps='DYNCONFIG')
 
 bld.SAMBA3_SUBSYSTEM('samba-util3',
-source='',
+source='../lib/util/data_blob.c',
 deps='talloc CHARSET3 samba-util-common')
 
 bld.SAMBA3_SUBSYSTEM('ldb3',
diff --git a/source4/rpc_server/wscript_build b/source4/rpc_server/wscript_build
old mode 100644
new mode 100755
index a1d1fc5..f1d3c0d
--- a/source4/rpc_server/wscript_build
+++ b/source4/rpc_server/wscript_build
@@ -9,8 +9,6 @@ bld.SAMBA_SUBSYSTEM('DCERPC_SHARE',
 bld.SAMBA_SUBSYSTEM('DCERPC_COMMON',
source='common/forward.c common/reply.c dcesrv_auth.c',
autoproto='common/proto.h',
-   public_headers='common/common.h common/proto.h',
-   header_path='dcerpc_server',
deps='ldb DCERPC_SHARE samba_server_gensec'
)
 


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2011-04-05 Thread Günther Deschner 
The branch, master has been updated
   via  a7ba4b5 s3-waf: fix typo in ctdb checks.
  from  fe35ff2 s3: Make vlp printing work by default

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


- Log -
commit a7ba4b5baa18501a99c7b0f0d3eee1c347ed2e68
Author: Günther Deschner g...@samba.org
Date:   Tue Apr 5 14:15:24 2011 +0200

s3-waf: fix typo in ctdb checks.

Guenther

Autobuild-User: Günther Deschner g...@samba.org
Autobuild-Date: Tue Apr  5 17:20:19 CEST 2011 on sn-devel-104

---

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


Changeset truncated at 500 lines:

diff --git a/source3/wscript b/source3/wscript
index e6e0b5a..ebcb1b6 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -1626,7 +1626,7 @@ main() {
 msg='Checking for SCHEDULE_FOR_DELETION control')
 
 if not 
conf.CONFIG_SET('HAVE_CTDB_CONTROL_SCHEDULE_FOR_DELETION_DECL'):
-if not Options.optinons.enable_old_ctdb:
+if not Options.options.enable_old_ctdb:
 have_cluster_support = False
 ctdb_broken = SCHEDULE_FOR_DELETION control missing
 else:


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2011-04-05 Thread Björn Jacke 
The branch, master has been updated
   via  dca465f s3/vfs_gpfs: s/syncops/gpfs
  from  a7ba4b5 s3-waf: fix typo in ctdb checks.

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


- Log -
commit dca465fa53f4d16cdce1353685b11010aa8ff0c7
Author: Björn Jacke b...@sernet.de
Date:   Sun Apr 3 16:19:11 2011 +0200

s3/vfs_gpfs: s/syncops/gpfs

as pointed out by Metze in bug #8031

Autobuild-User: Björn Jacke b...@sernet.de
Autobuild-Date: Tue Apr  5 18:08:42 CEST 2011 on sn-devel-104

---

Summary of changes:
 source3/modules/vfs_gpfs.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c
index 7297677..39969e2 100644
--- a/source3/modules/vfs_gpfs.c
+++ b/source3/modules/vfs_gpfs.c
@@ -1253,7 +1253,7 @@ int vfs_gpfs_connect(struct vfs_handle_struct *handle, 
const char *service,
   hsm, false);
 
SMB_VFS_HANDLE_SET_DATA(handle, config,
-   NULL, struct syncops_config_data,
+   NULL, struct gpfs_config_data,
return -1);
 
return 0;


-- 
Samba Shared Repository

autobuild: intermittent test failure detected

2011-04-05 Thread Andrew Tridgell 
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/2011-04-05-1825/flakey.log

The samba3 build logs are available here:

   http://git.samba.org/autobuild.flakey/2011-04-05-1825/samba3.stderr
   http://git.samba.org/autobuild.flakey/2011-04-05-1825/samba3.stdout

The source4 build logs are available here:

   http://git.samba.org/autobuild.flakey/2011-04-05-1825/samba4.stderr
   http://git.samba.org/autobuild.flakey/2011-04-05-1825/samba4.stdout
  
The top commit at the time of the failure was:

commit a7ba4b5baa18501a99c7b0f0d3eee1c347ed2e68
Author: Günther Deschner g...@samba.org
Date:   Tue Apr 5 14:15:24 2011 +0200

s3-waf: fix typo in ctdb checks.

Guenther

Autobuild-User: Günther Deschner g...@samba.org
Autobuild-Date: Tue Apr  5 17:20:19 CEST 2011 on sn-devel-104

[SCM] Samba Shared Repository - branch master updated

2011-04-05 Thread Volker Lendecke 
The branch, master has been updated
   via  378c4b2 s3: Add maintainers for s3/auth
  from  dca465f s3/vfs_gpfs: s/syncops/gpfs

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


- Log -
commit 378c4b221a6be75e1d32cb6fb3a773ce5de6dbda
Author: Volker Lendecke v...@samba.org
Date:   Tue Apr 5 10:32:37 2011 +0200

s3: Add maintainers for s3/auth

Autobuild-User: Volker Lendecke vlen...@samba.org
Autobuild-Date: Tue Apr  5 19:09:14 CEST 2011 on sn-devel-104

---

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


Changeset truncated at 500 lines:

diff --git a/MAINTAINERS.txt b/MAINTAINERS.txt
index 466ae54..64696c7 100644
--- a/MAINTAINERS.txt
+++ b/MAINTAINERS.txt
@@ -72,6 +72,21 @@ policy:
  Other non-trivial (typo, etc) commits require pre- or post-push 
review by the
  maintainer or one of the maintainers of the containing subsystem.
 
+directory: source3/auth
+maintainers:
+ Günther Deschner g...@samba.org
+ Jeremy Allison j...@samba.org
+ Stefan Metzmacher me...@samba.org
+ Volker Lendecke v...@samba.org
+policy:
+ All commits require review by a maintainer.
+
+ If no maintainer is available for longer than a week
+ discussion on the samba-technical list and review by 2
+ Samba-Team members is needed.
+
+ Larger changes need also discussion on the samba-technical list
+ and review by all maintainers.
 
 ===
 


-- 
Samba Shared Repository

autobuild: intermittent test failure detected

2011-04-05 Thread Andrew Tridgell 
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/2011-04-05-2024/flakey.log

The samba3 build logs are available here:

   http://git.samba.org/autobuild.flakey/2011-04-05-2024/samba3.stderr
   http://git.samba.org/autobuild.flakey/2011-04-05-2024/samba3.stdout

The source4 build logs are available here:

   http://git.samba.org/autobuild.flakey/2011-04-05-2024/samba4.stderr
   http://git.samba.org/autobuild.flakey/2011-04-05-2024/samba4.stdout
  
The top commit at the time of the failure was:

commit 378c4b221a6be75e1d32cb6fb3a773ce5de6dbda
Author: Volker Lendecke v...@samba.org
Date:   Tue Apr 5 10:32:37 2011 +0200

s3: Add maintainers for s3/auth

Autobuild-User: Volker Lendecke vlen...@samba.org
Autobuild-Date: Tue Apr  5 19:09:14 CEST 2011 on sn-devel-104

[SCM] Samba Shared Repository - branch v3-6-test updated

2011-04-05 Thread Günther Deschner 
The branch, v3-6-test has been updated
   via  9c5c43d s3-waf: fix typo in ctdb checks.
   via  b31d77e s3-samr: make getgrgid() failure a little more visible in 
_samr_CreateDomAlias().
   via  f4e215e s3-idmap: fix the build of idmap_hash on FreeBSD.
   via  7ad3806 rep_parse_prs: remove some dead, unused code.
   via  a9c16fc lib/util/util_pw: share more code between 
lib/util/util_pw.c and source3/lib/username.c
   via  b77dcd2 lib/util/util_pw: share sys_get{pw,gr} group of calls.
   via  78c4561 lib/util/util_pw: temporary rename of getpwnam_alloc and 
getpwuid_alloc.
  from  0a4ed25 lib-util: put data_blob back in the public library

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


- Log -
commit 9c5c43df39da2453ddb05b61c64de349047f973f
Author: Günther Deschner g...@samba.org
Date:   Tue Apr 5 14:15:24 2011 +0200

s3-waf: fix typo in ctdb checks.

Guenther

Autobuild-User: Günther Deschner g...@samba.org
Autobuild-Date: Tue Apr  5 17:20:19 CEST 2011 on sn-devel-104
(cherry picked from commit a7ba4b5baa18501a99c7b0f0d3eee1c347ed2e68)

commit b31d77e9a635ace5d7cab9cbfb048d9fd99de82e
Author: Günther Deschner g...@samba.org
Date:   Thu Mar 31 00:08:57 2011 +0200

s3-samr: make getgrgid() failure a little more visible in 
_samr_CreateDomAlias().

Guenther

Autobuild-User: Günther Deschner g...@samba.org
Autobuild-Date: Thu Mar 31 01:00:42 CEST 2011 on sn-devel-104
(cherry picked from commit 0e46e09122b43ff237ca45173129813a875767bd)

commit f4e215eaddc2a31dde173a1bb11e6d4638cbea8f
Author: Günther Deschner g...@samba.org
Date:   Thu Mar 31 00:08:19 2011 +0200

s3-idmap: fix the build of idmap_hash on FreeBSD.

Guenther
(cherry picked from commit e54f292a4f4e9ea9726479333883d63035efc8d4)

commit 7ad38067dabad5bb189e4433f9dd45e1c37443b1
Author: Günther Deschner g...@samba.org
Date:   Wed Mar 30 23:17:25 2011 +0200

rep_parse_prs: remove some dead, unused code.

Guenther
(cherry picked from commit 5fcb4d328ce28e6c4f413f2b31d70e07818c0527)

commit a9c16fcef30551aa236f512ae1f6e5e958a8295f
Author: Günther Deschner g...@samba.org
Date:   Wed Mar 2 16:11:00 2011 +0100

lib/util/util_pw: share more code between lib/util/util_pw.c and 
source3/lib/username.c

Guenther
(cherry picked from commit 96487959e90b1aeec071d94e7f2c744af17fb5d0)

commit b77dcd2d8870edf5ce7c03106d76d6aa318a0564
Author: Günther Deschner g...@samba.org
Date:   Wed Mar 2 16:06:32 2011 +0100

lib/util/util_pw: share sys_get{pw,gr} group of calls.

Guenther
(cherry picked from commit 64421129b672d0ce55c5aa235e5038dd2ea1b32b)

commit 78c456123e4fa1a36c8a296d89690f4e4f37ffa8
Author: Günther Deschner g...@samba.org
Date:   Wed Mar 2 16:31:01 2011 +0100

lib/util/util_pw: temporary rename of getpwnam_alloc and getpwuid_alloc.

Guenther
(cherry picked from commit f4868ab6467ad7e6fae78bd14b83aeae68026769)

---

Summary of changes:
 lib/util/util_pw.c|   66 -
 source3/smbd/noquotas.c = lib/util/util_pw.h |   40 ++--
 lib/util/wscript_build|5 +
 source3/Makefile.in   |2 +-
 source3/auth/auth_util.c  |1 +
 source3/auth/token_util.c |1 +
 source3/include/proto.h   |9 -
 source3/lib/system.c  |   44 ---
 source3/lib/username.c|   36 +---
 source3/lib/util.c|1 +
 source3/lib/winbind_util.c|1 +
 source3/passdb/passdb.c   |1 +
 source3/passdb/pdb_interface.c|1 +
 source3/passdb/pdb_ldap.c |1 +
 source3/passdb/util_unixsids.c|1 +
 source3/registry/reg_parse_prs.c  |  401 -
 source3/registry/reg_parse_prs.h  |   20 --
 source3/rpc_server/samr/srv_samr_nt.c |2 +-
 source3/rpc_server/srvsvc/srv_srvsvc_nt.c |1 +
 source3/smbd/ntquotas.c   |1 +
 source3/torture/cmd_vfs.c |1 +
 source3/utils/smbpasswd.c |1 +
 source3/winbindd/idmap_hash/mapfile.c |1 +
 source3/wscript   |2 +-
 source3/wscript_build |2 +-
 25 files changed, 104 insertions(+), 538 deletions(-)
 copy source3/smbd/noquotas.c = lib/util/util_pw.h (51%)


Changeset truncated at 500 lines:

diff --git a/lib/util/util_pw.c b/lib/util/util_pw.c
index 11e46ec..c6e4680 100644
--- a/lib/util/util_pw.c
+++ b/lib/util/util_pw.c
@@ -3,7 +3,12 @@
 
Safe versions of getpw* calls
 
+   Copyright (C) Andrew Tridgell 1992-1998
+   Copyright (C)

[SCM] Samba Shared Repository - branch v3-6-test updated

2011-04-05 Thread Günther Deschner 
The branch, v3-6-test has been updated
   via  7a6fc7e s3: move filename_util.c out of source3/smbd to source3/lib.
   via  cbdaee6 s3-build: only include intl protos where needed.
   via  5fc6d3a s3-passdb: finally stop including passdb.h globaly.
   via  8932b4d s3-passdb: use passdb headers where needed.
   via  a902431 s3-passdb: move util_builtin.c out of passdb.
   via  35287ce s3-passdb: move util_unixsids.c out of passdb.
   via  7298bd1 s3-passdb: move util_wellknown.c out of passdb.
   via  207a731 s3-winbindd: copy acct_info to wb_acct_info so we dont need 
passdb for it.
   via  15102b8 s3-passdb: add machine_sid.h and lookup_sid.h
   via  70f1709 s3-proto: add some forward declarations.
   via  0aeaa36 s3-passdb: add passdb.h where needed.
   via  63389f6 s3-passdb: move mapping.h into passdb.h, its needed here.
   via  a2ad545 s3-passdb: move passdb headers to passdb/proto.h.
   via  ed81ef5 s3-groupdb: move groupdb headers to groupdb/proto.h.
   via  66beea4 s3: create_builtin_users/administrators belongs to passdb 
not auth.
   via  735dc19 s3-build: only include transfer_file.h where needed.
   via  867d243 registry: create and use shared libcli/registry/util_reg.h 
header.
   via  07a91bd s3-includes: no point in including all security headers 
globally.
   via  8f13c73 s3-includes: remove EILSEQ check, this is handled by 
../lib/replace/system/iconv.h already.
   via  335adb7 s3-includes: only include system/filesys.h when needed.
   via  6de3ef1 s3-includes: remove global include of system/network.h
   via  28e82ee s3-includes: only include system/passwd.h when needed.
   via  0354b4a s3-includes: only include system/shmem.h when needed.
   via  2843bc4 s3-includes: remove global include of system/select.h.
   via  cf63a08 s3-includes: only include system/terminal.h when needed.
   via  5155b66 s3-includes: only include system/capability.h when needed.
   via  2912e03 s3-includes: only include system/glob.h when needed.
   via  631a86d s3-includes: only include system/iconv.h when needed.
   via  a5331b6 s3-includes: only include system/syslog.h when needed.
   via  f423255 s3-trans2: only include trans2.h where needed.
   via  6cbd884 s3-winbind: remove global inclusion of libwbclient.
  from  9c5c43d s3-waf: fix typo in ctdb checks.

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


- Log -
commit 7a6fc7e2dcb736dd3dff33a35f49b60dbf0dd1aa
Author: Günther Deschner g...@samba.org
Date:   Tue Mar 22 21:45:44 2011 +0100

s3: move filename_util.c out of source3/smbd to source3/lib.

Guenther
(cherry picked from commit 8560c00a507126c0d315d0b790ab154a3a75a426)

commit cbdaee6ce7d07c0d9be5b815c35bbb2f53b07e75
Author: Günther Deschner g...@samba.org
Date:   Tue Mar 22 23:58:21 2011 +0100

s3-build: only include intl protos where needed.

Guenther
(cherry picked from commit 6b76909f5ef5f279cb73decf83f23d3dbf8adaf8)

commit 5fc6d3a35113b51b05e4c2756023161e1fb6451b
Author: Günther Deschner g...@samba.org
Date:   Tue Mar 22 23:32:56 2011 +0100

s3-passdb: finally stop including passdb.h globaly.

Guenther
(cherry picked from commit 60d2816c5e914f1674267a3b388c302335f93466)

commit 8932b4d391ab16341cb33cbee7c527aaadc6fe0c
Author: Günther Deschner g...@samba.org
Date:   Tue Mar 22 16:50:02 2011 +0100

s3-passdb: use passdb headers where needed.

Guenther
(cherry picked from commit 235f1485901774bfbeb0f052bc4e1397f4ef0b88)

commit a902431b89cb34bc392b1efc7823e6936d11ac97
Author: Günther Deschner g...@samba.org
Date:   Wed Mar 23 14:57:08 2011 +0100

s3-passdb: move util_builtin.c out of passdb.

Guenther
(cherry picked from commit a22a53ea44c18378481d3a432fb0e667117da5bd)

commit 35287ce18909763e410e97f42347d5440cada929
Author: Günther Deschner g...@samba.org
Date:   Tue Mar 22 23:23:17 2011 +0100

s3-passdb: move util_unixsids.c out of passdb.

Guenther
(cherry picked from commit 7d798ac485b47483c9f99c67f7be196d55587a09)

commit 7298bd1547ef638b779b65fa19a48c9719437b06
Author: Günther Deschner g...@samba.org
Date:   Tue Mar 22 23:20:49 2011 +0100

s3-passdb: move util_wellknown.c out of passdb.

Guenther
(cherry picked from commit bcee6c1fe209b458e546b5788a9148eecc8715f1)

commit 207a7318fb4f9e58b275c2e43d406ba0195f324e
Author: Günther Deschner g...@samba.org
Date:   Tue Mar 22 17:43:39 2011 +0100

s3-winbindd: copy acct_info to wb_acct_info so we dont need passdb for it.

Guenther
(cherry picked from commit cc94bcb952b1bf16e1d3f335e5288f793ee4ca96)

commit 15102b871bf5f0e68eccfd54f4aea82c21324b73
Author: Günther Deschner g...@samba.org
Date:   Tue Mar 22 16:48:05 2011 +0100

s3-passdb: add machine_sid.h and lookup_sid.h

Guenther
(cherry picked

[SCM] Samba Shared Repository - branch v3-6-test updated

2011-04-05 Thread Günther Deschner 
The branch, v3-6-test has been updated
   via  5899d4f s3-rpcclient: include rpc_client/cli_pipe.h globally in 
rpcclient.h
   via  ea965bf s3-build: make it a little easier to build smbtorture4.
  from  7a6fc7e s3: move filename_util.c out of source3/smbd to source3/lib.

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


- Log -
commit 5899d4f800150524c45da8434aed1c0dd0feea25
Author: Günther Deschner g...@samba.org
Date:   Wed Mar 30 23:21:42 2011 +0200

s3-rpcclient: include rpc_client/cli_pipe.h globally in rpcclient.h

Guenther
(cherry picked from commit 2352e7cb7fe43b2a3cb5c4876f21cd655823288a)

commit ea965bff9e2aa0de59815b255ad1858663c5c21a
Author: Günther Deschner g...@samba.org
Date:   Wed Mar 30 22:24:42 2011 +0200

s3-build: make it a little easier to build smbtorture4.

Only configure with --enable-socket-wrapper --enable-nss-wrapper
--enable-uid-wrapper, not --enable-developer which turns on at least one 
-Werror
switch.

Guenther

Autobuild-User: Günther Deschner g...@samba.org
Autobuild-Date: Wed Mar 30 23:12:42 CEST 2011 on sn-devel-104
(cherry picked from commit 9ede19fdccaf09303012208129a093197403ef2c)

---

Summary of changes:
 source3/Makefile-smbtorture4 |2 +-
 source3/rpcclient/cmd_drsuapi.c  |1 -
 source3/rpcclient/cmd_lsarpc.c   |1 -
 source3/rpcclient/cmd_netlogon.c |1 -
 source3/rpcclient/cmd_samr.c |1 -
 source3/rpcclient/cmd_spoolss.c  |1 -
 source3/rpcclient/cmd_test.c |1 -
 source3/rpcclient/rpcclient.c|1 -
 source3/rpcclient/rpcclient.h|2 ++
 9 files changed, 3 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/Makefile-smbtorture4 b/source3/Makefile-smbtorture4
index 939d4d4..4a1bed7 100644
--- a/source3/Makefile-smbtorture4
+++ b/source3/Makefile-smbtorture4
@@ -6,7 +6,7 @@ SAMBA4_BINARIES=smbtorture,ndrdump
 samba4-configure:
@(cd ..  \
CFLAGS='' $(WAF) reconfigure || \
-   CFLAGS='' $(WAF) configure --enable-developer 
--nonshared-binary=$(SAMBA4_BINARIES) --enable-auto-reconfigure )
+   CFLAGS='' $(WAF) configure --enable-socket-wrapper 
--enable-nss-wrapper --enable-uid-wrapper --nonshared-binary=$(SAMBA4_BINARIES) 
--enable-auto-reconfigure )
 
 .PHONY: samba4-configure
 
diff --git a/source3/rpcclient/cmd_drsuapi.c b/source3/rpcclient/cmd_drsuapi.c
index d0329c1..3f1ecab 100644
--- a/source3/rpcclient/cmd_drsuapi.c
+++ b/source3/rpcclient/cmd_drsuapi.c
@@ -20,7 +20,6 @@
 
 #include includes.h
 #include rpcclient.h
-#include rpc_client/cli_pipe.h
 #include ../librpc/gen_ndr/ndr_drsuapi_c.h
 
 static WERROR cracknames(struct rpc_pipe_client *cli,
diff --git a/source3/rpcclient/cmd_lsarpc.c b/source3/rpcclient/cmd_lsarpc.c
index 02aa079..4b065d0 100644
--- a/source3/rpcclient/cmd_lsarpc.c
+++ b/source3/rpcclient/cmd_lsarpc.c
@@ -22,7 +22,6 @@
 
 #include includes.h
 #include rpcclient.h
-#include rpc_client/cli_pipe.h
 #include ../libcli/auth/libcli_auth.h
 #include ../librpc/gen_ndr/ndr_lsa.h
 #include ../librpc/gen_ndr/ndr_lsa_c.h
diff --git a/source3/rpcclient/cmd_netlogon.c b/source3/rpcclient/cmd_netlogon.c
index 4801d7d..63057ac 100644
--- a/source3/rpcclient/cmd_netlogon.c
+++ b/source3/rpcclient/cmd_netlogon.c
@@ -21,7 +21,6 @@
 
 #include includes.h
 #include rpcclient.h
-#include rpc_client/cli_pipe.h
 #include ../libcli/auth/libcli_auth.h
 #include ../librpc/gen_ndr/ndr_netlogon.h
 #include ../librpc/gen_ndr/ndr_netlogon_c.h
diff --git a/source3/rpcclient/cmd_samr.c b/source3/rpcclient/cmd_samr.c
index 9f33c6c..727c9d1 100644
--- a/source3/rpcclient/cmd_samr.c
+++ b/source3/rpcclient/cmd_samr.c
@@ -24,7 +24,6 @@
 
 #include includes.h
 #include rpcclient.h
-#include rpc_client/cli_pipe.h
 #include ../libcli/auth/libcli_auth.h
 #include ../librpc/gen_ndr/ndr_samr.h
 #include ../librpc/gen_ndr/ndr_samr_c.h
diff --git a/source3/rpcclient/cmd_spoolss.c b/source3/rpcclient/cmd_spoolss.c
index 43d95db..712b237 100644
--- a/source3/rpcclient/cmd_spoolss.c
+++ b/source3/rpcclient/cmd_spoolss.c
@@ -24,7 +24,6 @@
 
 #include includes.h
 #include rpcclient.h
-#include rpc_client/cli_pipe.h
 #include ../librpc/gen_ndr/ndr_spoolss_c.h
 #include rpc_client/cli_spoolss.h
 #include rpc_client/init_spoolss.h
diff --git a/source3/rpcclient/cmd_test.c b/source3/rpcclient/cmd_test.c
index 0ad1dfd..591ae8c 100644
--- a/source3/rpcclient/cmd_test.c
+++ b/source3/rpcclient/cmd_test.c
@@ -20,7 +20,6 @@
 
 #include includes.h
 #include rpcclient.h
-#include rpc_client/cli_pipe.h
 #include ../librpc/gen_ndr/ndr_lsa_c.h
 #include rpc_client/cli_lsarpc.h
 #include ../librpc/gen_ndr/ndr_samr.h
diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c
index e80bee7..17a4cc9 100644
--- a/source3/rpcclient/rpcclient.c

[SCM] Samba Shared Repository - branch master updated

2011-04-05 Thread Jeremy Allison 
The branch, master has been updated
   via  b6a30be Fix bug #7080 - Quota only shown when logged as root.
  from  378c4b2 s3: Add maintainers for s3/auth

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


- Log -
commit b6a30be70266c07733ddfa2ae08d127e08560868
Author: Jeremy Allison j...@samba.org
Date:   Tue Apr 5 11:24:39 2011 -0700

Fix bug #7080 - Quota only shown when logged as root.

Remove the final incorrect uses of conn-session_info-utok.uid.
When we're in the admin users list, then this value is not set
to zero.

Inspired by the comment on this bug by Dmitry Butskoy dmi...@butskoy.name.

I'll create a different fix for 3.5.x.

Jeremy.

Autobuild-User: Jeremy Allison j...@samba.org
Autobuild-Date: Tue Apr  5 21:53:59 CEST 2011 on sn-devel-104

---

Summary of changes:
 source3/modules/onefs_open.c |4 ++--
 source3/smbd/nttrans.c   |4 ++--
 source3/smbd/trans2.c|5 ++---
 3 files changed, 6 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/onefs_open.c b/source3/modules/onefs_open.c
index 19b2ea0..80f799c 100644
--- a/source3/modules/onefs_open.c
+++ b/source3/modules/onefs_open.c
@@ -1310,7 +1310,7 @@ NTSTATUS onefs_open_file_ntcreate(connection_struct *conn,
new_file_created = True;
}
 
-   set_share_mode(lck, fsp, conn-session_info-utok.uid, 0,
+   set_share_mode(lck, fsp, get_current_uid(conn), 0,
   fsp-oplock_type);
 
/* Handle strange delete on close create semantics. */
@@ -1666,7 +1666,7 @@ static NTSTATUS onefs_open_directory(connection_struct 
*conn,
return NT_STATUS_DELETE_PENDING;
}
 
-   set_share_mode(lck, fsp, conn-session_info-utok.uid, 0, NO_OPLOCK);
+   set_share_mode(lck, fsp, get_current_uid(conn), 0, NO_OPLOCK);
 
/*
 * For directories the delete on close bit at open time seems
diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index a7da776..2b54018 100644
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -2512,7 +2512,7 @@ static void 
call_nt_transact_get_user_quota(connection_struct *conn,
ZERO_STRUCT(qt);
 
/* access check */
-   if (conn-session_info-utok.uid != 0) {
+   if (get_current_uid(conn) != 0) {
DEBUG(1,(get_user_quota: access_denied service [%s] user 
 [%s]\n, lp_servicename(SNUM(conn)),
 conn-session_info-unix_name));
@@ -2782,7 +2782,7 @@ static void 
call_nt_transact_set_user_quota(connection_struct *conn,
ZERO_STRUCT(qt);
 
/* access check */
-   if (conn-session_info-utok.uid != 0) {
+   if (get_current_uid(conn) != 0) {
DEBUG(1,(set_user_quota: access_denied service [%s] user 
 [%s]\n, lp_servicename(SNUM(conn)),
 conn-session_info-unix_name));
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 4890de3..fe06538 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -3203,7 +3203,7 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n, 
(unsigned int)bsize, (unsigned
fsp.fnum = -1;
 
/* access check */
-   if (conn-session_info-utok.uid != sec_initial_uid()) {
+   if (get_current_uid(conn) != 0) {
DEBUG(0,(set_user_quota: access_denied 
 service [%s] user [%s]\n,
 lp_servicename(SNUM(conn)),
@@ -3698,8 +3698,7 @@ cap_low = 0x%x, cap_high = 0x%x\n,
ZERO_STRUCT(quotas);
 
/* access check */
-   if ((conn-session_info-utok.uid != 
sec_initial_uid())
-   ||!CAN_WRITE(conn)) {
+   if ((get_current_uid(conn) != 0) || 
!CAN_WRITE(conn)) {
DEBUG(0,(set_user_quota: access_denied 
service [%s] user [%s]\n,
 lp_servicename(SNUM(conn)),
 
conn-session_info-unix_name));


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch v3-6-test updated

2011-04-05 Thread Günther Deschner 
The branch, v3-6-test has been updated
   via  eb444c6 s3-libndr: add ../librpc/ndr/libndr.h include in some 
places.
   via  2d46141 s3-vfs: try to fix build of aio_fork module.
   via  8778648 s3-smbd: try to fix the irix build.
   via  6dc94ab s3-vfs acl modules: more non-linux build fixes.
   via  fe452e1 s3-passdb: move LOOKUP_NAME_ flags to passdb where they 
belong to.
   via  d1b40fb s3-passdb: move some passdb defines to passdb.h
   via  0aa8387 s3-proto: pure cosmetics, remove some generated comments.
   via  a827f8d s3-winbind: try to fix the build on hosts w/o winbind 
support.
   via  fe9027f s3-vfs_solarisacl: try to fix the solaris build.
   via  e833163 s3: try to fix the build on some non-linux buildfarm 
machines.
   via  97b2e2a s3-rpc_server: move access check functions out of samr 
server.
   via  108e451 s3: only include ntioctl.h where needed.
   via  428e613 s3: only include lib/privileges.h where needed.
   via  9bbfc6b s3: include ../librpc/gen_ndr/lsa.h where needed.
   via  4a8ed4a s3-passdb: move lsa_dom_info and lsa_name_info out of smb.h 
into passdb.
   via  827a92f s3-includes: only include ntdomain.h where needed.
   via  d72582b pidl: add an include for ntdomain.h for s3 server stubs.
   via  93ca820 s3-messages: make ndr_messaging.h part of messages.h.
   via  36007af s3-messages: only include messages.h where needed.
   via  c8d89a2 s3-prototyes: user_in_netgroup and user_in_list moved to 
auth, out of smbd.
   via  26a854a s3-includes: finally remove global include of auth.h.
   via  4a0ecfc s3-auth: vfs modules need auth.h
   via  1c182fc s3-auth: printing needs auth.h
   via  cca3b18 s3-auth: smbd needs auth.h
   via  0bc1323 s3-auth: rpc_server needs auth.h
   via  ed8e5bb s3-auth: use auth.h where needed.
   via  923f663 s3-auth: move auth prototypes to auth/proto.h.
   via  ca7162a s3-libsmb: put namequery headers to nmblib.h
   via  453098f s3-locking: move locking prototypes out of proto.h.
   via  de2848f s3: finally remove global include of smbd prototypes.
   via  cb82d6f s3: rpc_server needs parts of smbd.
   via  8ce5d3f s3: printing needs parts of smbd.
   via  0ea8b2c s3: auth also needs parts of smbd.
   via  4b9a402 s3-vfs: include smbd/smbd.h in vfs modules.
   via  e539c7d s3: include smbd/smbd.h where needed.
   via  8f64dcb s3-smbd: add smbd.h and move smbd prototypes to 
smbd/proto.h.
  from  5899d4f s3-rpcclient: include rpc_client/cli_pipe.h globally in 
rpcclient.h

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


- Log -
commit eb444c63e80b48042cbc99b55b2bc1c94b62366c
Author: Günther Deschner g...@samba.org
Date:   Wed Mar 30 23:47:34 2011 +0200

s3-libndr: add ../librpc/ndr/libndr.h include in some places.

Guenther
(cherry picked from commit a730dff78318a0bfe8c6b2b8a2cefed63cc586e8)

commit 2d46141ecae13d6f4624028b249d4d61f6b0d5df
Author: Günther Deschner g...@samba.org
Date:   Wed Mar 30 22:24:18 2011 +0200

s3-vfs: try to fix build of aio_fork module.

Guenther
(cherry picked from commit 3800bae260ed3998317ce5e492a8f0a42fb2fd5f)

commit 87786480bcbc3c4a20cc286109095d83d2e3ecd0
Author: Günther Deschner g...@samba.org
Date:   Wed Mar 30 16:18:38 2011 +0200

s3-smbd: try to fix the irix build.

Guenther

Autobuild-User: Günther Deschner g...@samba.org
Autobuild-Date: Wed Mar 30 17:17:58 CEST 2011 on sn-devel-104
(cherry picked from commit 220db5aad629451d24fcf678a5aa2f3637bc5eeb)

commit 6dc94ab6938d78c49a4f168190d39a2e716f23b9
Author: Günther Deschner g...@samba.org
Date:   Wed Mar 30 15:14:05 2011 +0200

s3-vfs acl modules: more non-linux build fixes.

Guenther

Autobuild-User: Günther Deschner g...@samba.org
Autobuild-Date: Wed Mar 30 16:00:02 CEST 2011 on sn-devel-104
(cherry picked from commit 53bdf43acab2f8808fb205a719ff6323543a6440)

commit fe452e1b6896a314901fb5fe81ee0d723ee4c436
Author: Günther Deschner g...@samba.org
Date:   Wed Mar 30 15:09:10 2011 +0200

s3-passdb: move LOOKUP_NAME_ flags to passdb where they belong to.

Guenther
(cherry picked from commit 33082d016ee27537af0514d5eebcdaf0360fa4f7)

commit d1b40fbb88cbb53eeb55f9f77eed2972c7968b08
Author: Günther Deschner g...@samba.org
Date:   Wed Mar 30 14:49:37 2011 +0200

s3-passdb: move some passdb defines to passdb.h

Guenther
(cherry picked from commit 3253d5ad0515198083b0b185c06b659fc6972830)

commit 0aa83877d81a5461b1242374217d3fbb0f0966b4
Author: Günther Deschner g...@samba.org
Date:   Wed Mar 30 14:48:18 2011 +0200

s3-proto: pure cosmetics, remove some generated comments.

Guenther
(cherry picked from commit c8ed33ae9c26a63fd8adffa2041fe46a2542f0ba)

commit a827f8da4b752e16a894965b5497909b421f5a6c
Author:

[SCM] Samba Shared Repository - branch v3-6-test updated

2011-04-05 Thread Jeremy Allison 
The branch, v3-6-test has been updated
   via  3650b38 Fix bug #7080 - Quota only shown when logged as root.
  from  eb444c6 s3-libndr: add ../librpc/ndr/libndr.h include in some 
places.

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


- Log -
commit 3650b386ccdaa65e8c8e8db719c16616ead8ec43
Author: Jeremy Allison j...@samba.org
Date:   Tue Apr 5 11:24:39 2011 -0700

Fix bug #7080 - Quota only shown when logged as root.

Remove the final incorrect uses of conn-session_info-utok.uid.
When we're in the admin users list, then this value is not set
to zero.

Inspired by the comment on this bug by Dmitry Butskoy dmi...@butskoy.name.

I'll create a different fix for 3.5.x.

Jeremy.

Autobuild-User: Jeremy Allison j...@samba.org
Autobuild-Date: Tue Apr  5 21:53:59 CEST 2011 on sn-devel-104
(cherry picked from commit b6a30be70266c07733ddfa2ae08d127e08560868)

---

Summary of changes:
 source3/modules/onefs_open.c |4 ++--
 source3/smbd/nttrans.c   |4 ++--
 source3/smbd/trans2.c|5 ++---
 3 files changed, 6 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/onefs_open.c b/source3/modules/onefs_open.c
index 19b2ea0..80f799c 100644
--- a/source3/modules/onefs_open.c
+++ b/source3/modules/onefs_open.c
@@ -1310,7 +1310,7 @@ NTSTATUS onefs_open_file_ntcreate(connection_struct *conn,
new_file_created = True;
}
 
-   set_share_mode(lck, fsp, conn-session_info-utok.uid, 0,
+   set_share_mode(lck, fsp, get_current_uid(conn), 0,
   fsp-oplock_type);
 
/* Handle strange delete on close create semantics. */
@@ -1666,7 +1666,7 @@ static NTSTATUS onefs_open_directory(connection_struct 
*conn,
return NT_STATUS_DELETE_PENDING;
}
 
-   set_share_mode(lck, fsp, conn-session_info-utok.uid, 0, NO_OPLOCK);
+   set_share_mode(lck, fsp, get_current_uid(conn), 0, NO_OPLOCK);
 
/*
 * For directories the delete on close bit at open time seems
diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index a7da776..2b54018 100644
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -2512,7 +2512,7 @@ static void 
call_nt_transact_get_user_quota(connection_struct *conn,
ZERO_STRUCT(qt);
 
/* access check */
-   if (conn-session_info-utok.uid != 0) {
+   if (get_current_uid(conn) != 0) {
DEBUG(1,(get_user_quota: access_denied service [%s] user 
 [%s]\n, lp_servicename(SNUM(conn)),
 conn-session_info-unix_name));
@@ -2782,7 +2782,7 @@ static void 
call_nt_transact_set_user_quota(connection_struct *conn,
ZERO_STRUCT(qt);
 
/* access check */
-   if (conn-session_info-utok.uid != 0) {
+   if (get_current_uid(conn) != 0) {
DEBUG(1,(set_user_quota: access_denied service [%s] user 
 [%s]\n, lp_servicename(SNUM(conn)),
 conn-session_info-unix_name));
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 4890de3..fe06538 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -3203,7 +3203,7 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n, 
(unsigned int)bsize, (unsigned
fsp.fnum = -1;
 
/* access check */
-   if (conn-session_info-utok.uid != sec_initial_uid()) {
+   if (get_current_uid(conn) != 0) {
DEBUG(0,(set_user_quota: access_denied 
 service [%s] user [%s]\n,
 lp_servicename(SNUM(conn)),
@@ -3698,8 +3698,7 @@ cap_low = 0x%x, cap_high = 0x%x\n,
ZERO_STRUCT(quotas);
 
/* access check */
-   if ((conn-session_info-utok.uid != 
sec_initial_uid())
-   ||!CAN_WRITE(conn)) {
+   if ((get_current_uid(conn) != 0) || 
!CAN_WRITE(conn)) {
DEBUG(0,(set_user_quota: access_denied 
service [%s] user [%s]\n,
 lp_servicename(SNUM(conn)),
 
conn-session_info-unix_name));


-- 
Samba Shared Repository

[SCM] CTDB repository - branch master updated - ctdb-1.10-181-gc7652c4

2011-04-05 Thread Michael Adam 
The branch, master has been updated
   via  c7652c4038e012b7ef9bc1da352dd2c02d60dc29 (commit)
   via  afb26e38b617b85cdac14a7cd6dd3c85b8fddbc4 (commit)
   via  4137d2a7d31cdce22847cebfc0239cfe2d8e937c (commit)
  from  fb6987c2f747d6dbf9bb3899a480124d1c242a90 (commit)

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


- Log -
commit c7652c4038e012b7ef9bc1da352dd2c02d60dc29
Author: Michael Adam ob...@samba.org
Date:   Tue Apr 5 13:58:09 2011 +0200

packaging: remove the dependency to tdbtool and tdbdump from the spec file

The init script does now check for the availability of tdbdump
and tdbtool check and issues warnings if they are not available.
This can remove a dependency loop with building samba RPMs.

commit afb26e38b617b85cdac14a7cd6dd3c85b8fddbc4
Author: Michael Adam ob...@samba.org
Date:   Tue Apr 5 13:50:00 2011 +0200

ctdb.init: print a warning when tdbdump is found but tdbtoo or tdbtool 
check is not available

commit 4137d2a7d31cdce22847cebfc0239cfe2d8e937c
Author: Michael Adam ob...@samba.org
Date:   Tue Apr 5 13:43:56 2011 +0200

ctdb.init: check for availability of tdbtool check and tdbdump

Print a warning if neither is available.

---

Summary of changes:
 config/ctdb.init   |   40 ++--
 packaging/RPM/ctdb.spec.in |1 -
 2 files changed, 38 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/config/ctdb.init b/config/ctdb.init
index 25e158f..1dc051c 100755
--- a/config/ctdb.init
+++ b/config/ctdb.init
@@ -114,8 +114,6 @@ build_ctdb_options () {
 check_tdb () {
local PDBASE=$1
 
-   local TDBTOOL_HAS_CHECK=`echo help | /usr/bin/tdbtool | grep check | 
wc -l`
-
test x$TDBTOOL_HAS_CHECK = x1  {
#
# Note tdbtool always exits with 0
@@ -146,6 +144,44 @@ check_persistent_databases () {
 test x$ERRCOUNT != x0  {
return 0;
 }
+
+if test -x /usr/bin/tdbtool ; then
+HAVE_TDBTOOL=1
+else
+HAVE_TDBTOOL=0
+fi
+
+if test x$HAVE_TDBTOOL = x1 ; then
+TDBTOOL_HAS_CHECK=`echo help | /usr/bin/tdbtool | grep check | wc -l`
+else
+TDBTOOL_HAS_CHECK=0
+fi
+
+if test -x /usr/bin/tdbdump ; then
+HAVE_TDBDUMP=1
+else
+HAVE_TDBDUMP=0
+fi
+
+if test x$HAVE_TDBDUMP = x0 -a x$TDBTOOL_HAS_CHECK = x0 ; then
+echo WARNING: Cannot check persistent databases since
+echo neither 'tdbdump' nor 'tdbtool check' is available.
+echo Consider installing tdbtool or at least tdbdump!
+return 0
+fi
+
+if test x$HAVE_TDBDUMP = x1 -a x$TDBTOOL_HAS_CHECK = x0 ; then
+if test x$HAVE_TDBTOOL = x0; then
+echo WARNING: 'tdbtool' is not available. Using 'tdbdump' to
+echo check the persistent databases.
+echo Consider installing a recent 'tdbtool' for better checks!
+else
+echo WARNING: The installed 'tdbtool' does not offer the 'check'
+echo subcommand. Using 'tdbdump' for persistent database checks.
+echo Consider updating 'tdbtool' for better checks!
+fi
+fi
+
 for PDBASE in `ls $PERSISTENT_DB_DIR/*.tdb.[0-9] 2/dev/null`; do
check_tdb $PDBASE || {
echo Persistent database $PDBASE is corrupted! CTDB will not 
start.
diff --git a/packaging/RPM/ctdb.spec.in b/packaging/RPM/ctdb.spec.in
index 1f43825..4a0cc32 100644
--- a/packaging/RPM/ctdb.spec.in
+++ b/packaging/RPM/ctdb.spec.in
@@ -14,7 +14,6 @@ Source: ctdb-%{version}.tar.gz
 
 Prereq: /bin/mktemp /usr/bin/killall
 Prereq: fileutils sed /etc/init.d
-Prereq: /usr/bin/tdbdump /usr/bin/tdbtool
 
 Provides: ctdb = %{version}
 


-- 
CTDB repository

[SCM] CTDB repository - branch 1.2 updated - ctdb-1.9.1-411-g2af29fa

2011-04-05 Thread Michael Adam 
The branch, 1.2 has been updated
   via  2af29fa1007ca32713f382d950f29bd81e2b7f07 (commit)
   via  21d7b9f19c2915f453af5af3c54322694c95c0fb (commit)
   via  271b94b273570398a7ddee4ec195fdfd4a580f08 (commit)
  from  afdde23217250775f078f5d95912e76a3b2962eb (commit)

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


- Log -
commit 2af29fa1007ca32713f382d950f29bd81e2b7f07
Author: Michael Adam ob...@samba.org
Date:   Tue Apr 5 13:58:09 2011 +0200

packaging: remove the dependency to tdbtool and tdbdump from the spec file

The init script does now check for the availability of tdbdump
and tdbtool check and issues warnings if they are not available.
This can remove a dependency loop with building samba RPMs.

commit 21d7b9f19c2915f453af5af3c54322694c95c0fb
Author: Michael Adam ob...@samba.org
Date:   Tue Apr 5 13:50:00 2011 +0200

ctdb.init: print a warning when tdbdump is found but tdbtoo or tdbtool 
check is not available

commit 271b94b273570398a7ddee4ec195fdfd4a580f08
Author: Michael Adam ob...@samba.org
Date:   Tue Apr 5 13:43:56 2011 +0200

ctdb.init: check for availability of tdbtool check and tdbdump

Print a warning if neither is available.

---

Summary of changes:
 config/ctdb.init   |   40 ++--
 packaging/RPM/ctdb.spec.in |1 -
 2 files changed, 38 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/config/ctdb.init b/config/ctdb.init
index 25e158f..1dc051c 100755
--- a/config/ctdb.init
+++ b/config/ctdb.init
@@ -114,8 +114,6 @@ build_ctdb_options () {
 check_tdb () {
local PDBASE=$1
 
-   local TDBTOOL_HAS_CHECK=`echo help | /usr/bin/tdbtool | grep check | 
wc -l`
-
test x$TDBTOOL_HAS_CHECK = x1  {
#
# Note tdbtool always exits with 0
@@ -146,6 +144,44 @@ check_persistent_databases () {
 test x$ERRCOUNT != x0  {
return 0;
 }
+
+if test -x /usr/bin/tdbtool ; then
+HAVE_TDBTOOL=1
+else
+HAVE_TDBTOOL=0
+fi
+
+if test x$HAVE_TDBTOOL = x1 ; then
+TDBTOOL_HAS_CHECK=`echo help | /usr/bin/tdbtool | grep check | wc -l`
+else
+TDBTOOL_HAS_CHECK=0
+fi
+
+if test -x /usr/bin/tdbdump ; then
+HAVE_TDBDUMP=1
+else
+HAVE_TDBDUMP=0
+fi
+
+if test x$HAVE_TDBDUMP = x0 -a x$TDBTOOL_HAS_CHECK = x0 ; then
+echo WARNING: Cannot check persistent databases since
+echo neither 'tdbdump' nor 'tdbtool check' is available.
+echo Consider installing tdbtool or at least tdbdump!
+return 0
+fi
+
+if test x$HAVE_TDBDUMP = x1 -a x$TDBTOOL_HAS_CHECK = x0 ; then
+if test x$HAVE_TDBTOOL = x0; then
+echo WARNING: 'tdbtool' is not available. Using 'tdbdump' to
+echo check the persistent databases.
+echo Consider installing a recent 'tdbtool' for better checks!
+else
+echo WARNING: The installed 'tdbtool' does not offer the 'check'
+echo subcommand. Using 'tdbdump' for persistent database checks.
+echo Consider updating 'tdbtool' for better checks!
+fi
+fi
+
 for PDBASE in `ls $PERSISTENT_DB_DIR/*.tdb.[0-9] 2/dev/null`; do
check_tdb $PDBASE || {
echo Persistent database $PDBASE is corrupted! CTDB will not 
start.
diff --git a/packaging/RPM/ctdb.spec.in b/packaging/RPM/ctdb.spec.in
index 00cead2..55c1fe3 100644
--- a/packaging/RPM/ctdb.spec.in
+++ b/packaging/RPM/ctdb.spec.in
@@ -14,7 +14,6 @@ Source: ctdb-%{version}.tar.gz
 
 Prereq: /bin/mktemp /usr/bin/killall
 Prereq: fileutils sed /etc/init.d
-Prereq: /usr/bin/tdbdump /usr/bin/tdbtool
 
 Provides: ctdb = %{version}
 


-- 
CTDB repository

[SCM] Samba Shared Repository - branch v3-6-test updated

2011-04-05 Thread Günther Deschner 
The branch, v3-6-test has been updated
   via  fda0c07 s3-net: fix the build of utils/net_idmap_check.c on a 
variety of platforms.
  from  3650b38 Fix bug #7080 - Quota only shown when logged as root.

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


- Log -
commit fda0c07bb905c913680c02df27b6b418fb6535c3
Author: Günther Deschner g...@samba.org
Date:   Tue Apr 5 23:42:56 2011 +0200

s3-net: fix the build of utils/net_idmap_check.c on a variety of platforms.

Gregor, please check.

Guenther

---

Summary of changes:
 source3/utils/net_idmap_check.c |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/utils/net_idmap_check.c b/source3/utils/net_idmap_check.c
index 6c6bcd9..5231461 100644
--- a/source3/utils/net_idmap_check.c
+++ b/source3/utils/net_idmap_check.c
@@ -25,6 +25,7 @@
 
 #include net_idmap_check.h
 #include includes.h
+#include system/filesys.h
 #include dbwrap.h
 #include net.h
 #include ../libcli/security/dom_sid.h


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2011-04-05 Thread Andrew Bartlett 
The branch, master has been updated
   via  48646ee s3-auth: Make server_info const in create_local_token()
   via  86baefe kdc: always ldb escape the realm
   via  663dc94 auth: Move auth_session_info into IDL
   via  f261266 s4-auth: Always talloc_zero() the struct auth_session_info
   via  1c34842 pidl: Add support for the [ignore] property
   via  917b0a2 librpc/idl Add [nopython] to krb5pac ndrdump functions
  from  b6a30be Fix bug #7080 - Quota only shown when logged as root.

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


- Log -
commit 48646ee69aeb8f963d5d34abdaec783283efea71
Author: Andrew Bartlett abart...@samba.org
Date:   Wed Apr 6 06:46:26 2011 +1000

s3-auth: Make server_info const in create_local_token()

Andreas Schneider a...@samba.org correctly points out that this input
parameter should now be const, and that found a bug where I used then
used it incorrectly as a talloc context.

Andrew Bartlett

Autobuild-User: Andrew Bartlett abart...@samba.org
Autobuild-Date: Wed Apr  6 00:33:31 CEST 2011 on sn-devel-104

commit 86baefe2245a74f1777418b1e2c7b97e33c42529
Author: Andrew Bartlett abart...@samba.org
Date:   Tue Apr 5 16:21:14 2011 +1000

kdc: always ldb escape the realm

commit 663dc94e630910b0b5b61801a03622641b2b83b4
Author: Andrew Bartlett abart...@samba.org
Date:   Tue Apr 5 16:15:27 2011 +1000

auth: Move auth_session_info into IDL

This changes auth_session_info_transport to just be a wrapper, rather
than a copy that has to be kept in sync.

As auth_session_info was already wrapped in python, this required
changes to the existing pyauth wrapper and it's users.

Andrew Bartlett

commit f261266c9d66d7143a867f4719d1549f58915036
Author: Andrew Bartlett abart...@samba.org
Date:   Tue Apr 5 15:57:42 2011 +1000

s4-auth: Always talloc_zero() the struct auth_session_info

commit 1c34842db43db04abf8aa3449c56e2049fee3eb0
Author: Andrew Bartlett abart...@samba.org
Date:   Tue Apr 5 15:55:07 2011 +1000

pidl: Add support for the [ignore] property

This is implemented to simply never push this pointer, but to push a
NULL in it's place.  Likewise a pull will simply return a NULL.

Andrew Bartlett

commit 917b0a23a6d7c8f0926792ff51e718d793670d33
Author: Andrew Bartlett abart...@samba.org
Date:   Tue Apr 5 15:50:08 2011 +1000

librpc/idl Add [nopython] to krb5pac ndrdump functions

These functions are not real RPC functions, but are used to help
ndrdump operate.  They don't need python bindings.

Andrew Bartlett

---

Summary of changes:
 libcli/security/session.h  |   11 +---
 librpc/idl/auth.idl|   18 +-
 librpc/idl/krb5pac.idl |   10 ++--
 librpc/ndr/{ndr_misc.c = ndr_auth.c}  |   27 +---
 .../ntvfs/common/init.c = librpc/ndr/ndr_auth.h   |   20 +++---
 librpc/wscript_build   |2 +-
 pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm   |   31 ++---
 source3/Makefile.in|2 +-
 source3/auth/auth_util.c   |8 +-
 source3/auth/proto.h   |2 +-
 source3/rpc_server/rpc_ncacn_np.c  |   33 ++---
 source3/rpc_server/rpc_server.c|   18 +++--
 source4/auth/gensec/pygensec.c |2 +-
 source4/auth/pyauth.c  |   76 +---
 source4/auth/pyauth.h  |2 -
 source4/auth/session.c |   42 ---
 source4/kdc/db-glue.c  |   12 +++-
 source4/lib/ldb-samba/pyldb.c  |4 +-
 source4/librpc/ndr/py_auth.c   |   74 +++
 source4/librpc/wscript_build   |   11 +++
 20 files changed, 225 insertions(+), 180 deletions(-)
 copy librpc/ndr/{ndr_misc.c = ndr_auth.c} (52%)
 copy source4/ntvfs/common/init.c = librpc/ndr/ndr_auth.h (54%)
 create mode 100644 source4/librpc/ndr/py_auth.c


Changeset truncated at 500 lines:

diff --git a/libcli/security/session.h b/libcli/security/session.h
index 1f0d486..ee9187d 100644
--- a/libcli/security/session.h
+++ b/libcli/security/session.h
@@ -35,16 +35,7 @@ struct cli_credentials;
 struct security_token;
 struct auth_user_info;
 struct auth_user_info_torture;
-
-struct auth_session_info {
-   struct security_token *security_token;
-   struct security_unix_token *unix_token;
-   struct auth_user_info *info;
-   struct auth_user_info_unix *unix_info;
-   struct auth_user_info_torture *torture;
-   DATA_BLOB session_key;
-   struct cli_credentials *credentials;
-};
+struct

[SCM] Samba Shared Repository - branch v3-6-test updated

2011-04-05 Thread Jeremy Allison 
The branch, v3-6-test has been updated
   via  a56727e s3/vfs_gpfs: s/syncops/gpfs
  from  fda0c07 s3-net: fix the build of utils/net_idmap_check.c on a 
variety of platforms.

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


- Log -
commit a56727ee0a9fab29ee9bd6231e3372596a8e19ae
Author: Björn Jacke b...@sernet.de
Date:   Sun Apr 3 16:19:11 2011 +0200

s3/vfs_gpfs: s/syncops/gpfs

as pointed out by Metze in bug #8031

Autobuild-User: Björn Jacke b...@sernet.de
Autobuild-Date: Tue Apr  5 18:08:42 CEST 2011 on sn-devel-104
(cherry picked from commit dca465fa53f4d16cdce1353685b11010aa8ff0c7)

---

Summary of changes:
 source3/modules/vfs_gpfs.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c
index 7297677..39969e2 100644
--- a/source3/modules/vfs_gpfs.c
+++ b/source3/modules/vfs_gpfs.c
@@ -1253,7 +1253,7 @@ int vfs_gpfs_connect(struct vfs_handle_struct *handle, 
const char *service,
   hsm, false);
 
SMB_VFS_HANDLE_SET_DATA(handle, config,
-   NULL, struct syncops_config_data,
+   NULL, struct gpfs_config_data,
return -1);
 
return 0;


-- 
Samba Shared Repository

[SCM] Samba Shared Repository - branch master updated

2011-04-05 Thread Michael Adam 
The branch, master has been updated
   via  82e0ba2 docs: fix the missing parameter description section in the 
smb.conf manpage
   via  f52b318 packaging(RHEL-CTDB): Fix debuginfo builds
   via  c2738b2 packaging(RHEL-CTDB): add BuildRequires to ctdb-devel = 
1.2.25
   via  86a3c39 packaging(RHEL-CTDB): replace Prereq by Requires.
  from  48646ee s3-auth: Make server_info const in create_local_token()

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


- Log -
commit 82e0ba22ce51659d9c455c477d217bc8bbaf71b3
Author: Michael Adam ob...@samba.org
Date:   Tue Apr 5 23:07:01 2011 +0200

docs: fix the missing parameter description section in the smb.conf manpage

The smb.conf (5) manpage recently sometimes failed to contain the
contents of the description of each parameter section. The reason
was a unreliable chain of dependencies in the Makefile.

The error can be reproduced by touching manpages-3/smb.conf.5.xml
and then building the manpages.
Then smb.conf.5.xml is newer than any of the smbdotconf/*/*.xml
files and hence the intermediate inexistent parameters.*.xml
don't get generated.

This patch fixes this problem by introducing a phony parameters
target referencing the parameters.*.xml targets, so that they
get build unconditionally.

Autobuild-User: Michael Adam ob...@samba.org
Autobuild-Date: Wed Apr  6 01:22:00 CEST 2011 on sn-devel-104

commit f52b3180fe314dbfb6bfd0f27b36ceb7a49e8231
Author: Michael Adam ob...@samba.org
Date:   Fri Dec 3 02:13:46 2010 -0700

packaging(RHEL-CTDB): Fix debuginfo builds

At least on RHEL 5.5, we observed broken debuginfo packages
when either old build directories were still present or old
debuginfo packages (of samba) were installed.

This patch removes the debuginfo samba RPMs and old RPM build
directories, giving the user a 10 second chance to quit.

commit c2738b2a2b544fd7d218f44239f2754576125836
Author: Michael Adam ob...@samba.org
Date:   Tue Apr 5 15:49:39 2011 +0200

packaging(RHEL-CTDB): add BuildRequires to ctdb-devel = 1.2.25

This should make sure we build against ctdb with SCHEDULE_FOR_DELETION 
control.

commit 86a3c39fa8b8304fc346083b8d7765a38af53120
Author: Michael Adam ob...@samba.org
Date:   Thu Feb 10 07:33:56 2011 +0100

packaging(RHEL-CTDB): replace Prereq by Requires.

In RHEL6, Prereq is deprecated.

---

Summary of changes:
 docs-xml/Makefile   |   10 -
 packaging/RHEL-CTDB/makerpms.sh |   38 +++
 packaging/RHEL-CTDB/samba.spec.tmpl |9 ---
 3 files changed, 52 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/Makefile b/docs-xml/Makefile
index 40a6c7b..40aa161 100644
--- a/docs-xml/Makefile
+++ b/docs-xml/Makefile
@@ -181,7 +181,15 @@ $(TEXINFODIR)/%.info: $(TEXINFODIR)/%.texi
$(MAKEINFO) --no-validate --force -o $@ $
 
 # Manpages
-$(MANPAGEDIR3)/smb.conf.5.xml: $(SMBDOTCONFDOC)/parameters.all.xml 
$(SMBDOTCONFDOC)/parameters.service.xml $(SMBDOTCONFDOC)/parameters.global.xml
+$(MANPAGEDIR3)/smb.conf.5.xml: parameters
+
+# The phony parameters target exists in order to always create the
+# the parameters xml files. Otherwise, when parameters.*.xml does not exist
+# yet, the parameters are not generated when smb.conf.5.xml is newer than
+# any smbdotconf/*/*.xml file ...
+.PHONY: parameters
+
+parameters: $(SMBDOTCONFDOC)/parameters.all.xml 
$(SMBDOTCONFDOC)/parameters.service.xml $(SMBDOTCONFDOC)/parameters.global.xml
 
 $(SMBDOTCONFDOC)/parameters.all.xml: $(wildcard $(SMBDOTCONFDOC)/*/*.xml) 
$(SMBDOTCONFDOC)/generate-file-list.sh
$(SMBDOTCONFDOC)/generate-file-list.sh $(SMBDOTCONFDOC)  $@
diff --git a/packaging/RHEL-CTDB/makerpms.sh b/packaging/RHEL-CTDB/makerpms.sh
index 74d5f7b..c1a4b70 100755
--- a/packaging/RHEL-CTDB/makerpms.sh
+++ b/packaging/RHEL-CTDB/makerpms.sh
@@ -18,6 +18,7 @@ EXTRA_OPTIONS=$1
 
 RPMSPECDIR=`rpm --eval %_specdir`
 RPMSRCDIR=`rpm --eval %_sourcedir`
+RPMBUILDDIR=`rpm --eval %_builddir`
 
 # At this point the RPMSPECDIR and RPMSRCDIR variables must have a value!
 
@@ -42,6 +43,43 @@ case $RPMVER in
 esac
 
 ##
+## Delete the old debuginfo remnants:
+##
+## At least on RHEL 5.5, we observed broken debuginfo packages
+## when either old build directories were still present or old
+## debuginfo packages (of samba) were installed.
+##
+## Remove the debuginfo samba RPMs and old RPM build
+## directories, giving the user a 10 second chance to quit.
+##
+
+if rpm -qa | grep -q samba-debuginfo || test -n $(echo ${RPMBUILDDIR}/samba* 
| grep -v \*) ; then
+   echo Removing debuginfo remnants to fix debuginfo build:
+   if rpm -qa | grep -q samba-debuginfo ; then
+   echo Uninstalling the samba-debuginfo

autobuild: intermittent test failure detected

2011-04-05 Thread Andrew Tridgell 
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/2011-04-06-0225/flakey.log

The samba3 build logs are available here:

   http://git.samba.org/autobuild.flakey/2011-04-06-0225/samba3.stderr
   http://git.samba.org/autobuild.flakey/2011-04-06-0225/samba3.stdout

The source4 build logs are available here:

   http://git.samba.org/autobuild.flakey/2011-04-06-0225/samba4.stderr
   http://git.samba.org/autobuild.flakey/2011-04-06-0225/samba4.stdout
  
The top commit at the time of the failure was:

commit 82e0ba22ce51659d9c455c477d217bc8bbaf71b3
Author: Michael Adam ob...@samba.org
Date:   Tue Apr 5 23:07:01 2011 +0200

docs: fix the missing parameter description section in the smb.conf manpage

The smb.conf (5) manpage recently sometimes failed to contain the
contents of the description of each parameter section. The reason
was a unreliable chain of dependencies in the Makefile.

The error can be reproduced by touching manpages-3/smb.conf.5.xml
and then building the manpages.
Then smb.conf.5.xml is newer than any of the smbdotconf/*/*.xml
files and hence the intermediate inexistent parameters.*.xml
don't get generated.

This patch fixes this problem by introducing a phony parameters
target referencing the parameters.*.xml targets, so that they
get build unconditionally.

Autobuild-User: Michael Adam ob...@samba.org
Autobuild-Date: Wed Apr  6 01:22:00 CEST 2011 on sn-devel-104

[SCM] CTDB repository - branch master updated - ctdb-1.10-182-gbf3bf29

2011-04-05 Thread Ronnie Sahlberg 
The branch, master has been updated
   via  bf3bf2967e3781c918e33b3a210e68e0ccca0c51 (commit)
  from  c7652c4038e012b7ef9bc1da352dd2c02d60dc29 (commit)

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


- Log -
commit bf3bf2967e3781c918e33b3a210e68e0ccca0c51
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date:   Wed Apr 6 10:26:27 2011 +1000

NATGW: dont set arp_ignore in 11.natgw anymore since we no longer
need this for the natgw functionality

---

Summary of changes:
 config/events.d/11.natgw |4 
 1 files changed, 0 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/config/events.d/11.natgw b/config/events.d/11.natgw
index 1d5ba0f..ba6d7a5 100755
--- a/config/events.d/11.natgw
+++ b/config/events.d/11.natgw
@@ -24,8 +24,6 @@ delete_all() {
[ -z $CTDB_NATGW_PUBLIC_IFACE ] || {
delete_ip_from_iface $CTDB_NATGW_PUBLIC_IFACE $_ip $_maskbits 
2/dev/null
}
-   delete_ip_from_iface lo $_ip 32
-
ip route del 0.0.0.0/0 metric 10 /dev/null 2/dev/null
 
# Delete the masquerading setup from a previous iteration where we
@@ -47,8 +45,6 @@ case $1 in
exit 1
}
 
-   # do not respond to ARPs that are for ip addresses with scope 'host'
-   echo 3  /proc/sys/net/ipv4/conf/all/arp_ignore
# do not send out arp requests from loopback addresses
echo 2  /proc/sys/net/ipv4/conf/all/arp_announce
;;


-- 
CTDB repository

[SCM] CTDB repository - branch 1.2 updated - ctdb-1.9.1-412-g92da906

2011-04-05 Thread Ronnie Sahlberg 
The branch, 1.2 has been updated
   via  92da906d41086abd1d159769728bae4624c65a34 (commit)
  from  2af29fa1007ca32713f382d950f29bd81e2b7f07 (commit)

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


- Log -
commit 92da906d41086abd1d159769728bae4624c65a34
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date:   Wed Apr 6 10:26:27 2011 +1000

NATGW: dont set arp_ignore in 11.natgw anymore since we no longer
need this for the natgw functionality

---

Summary of changes:
 config/events.d/11.natgw |4 
 1 files changed, 0 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/config/events.d/11.natgw b/config/events.d/11.natgw
index 1d5ba0f..ba6d7a5 100755
--- a/config/events.d/11.natgw
+++ b/config/events.d/11.natgw
@@ -24,8 +24,6 @@ delete_all() {
[ -z $CTDB_NATGW_PUBLIC_IFACE ] || {
delete_ip_from_iface $CTDB_NATGW_PUBLIC_IFACE $_ip $_maskbits 
2/dev/null
}
-   delete_ip_from_iface lo $_ip 32
-
ip route del 0.0.0.0/0 metric 10 /dev/null 2/dev/null
 
# Delete the masquerading setup from a previous iteration where we
@@ -47,8 +45,6 @@ case $1 in
exit 1
}
 
-   # do not respond to ARPs that are for ip addresses with scope 'host'
-   echo 3  /proc/sys/net/ipv4/conf/all/arp_ignore
# do not send out arp requests from loopback addresses
echo 2  /proc/sys/net/ipv4/conf/all/arp_announce
;;


-- 
CTDB repository

[SCM] Samba Shared Repository - branch master updated

2011-04-05 Thread Andrew Bartlett 
The branch, master has been updated
   via  d84a8d5 s3-selftest Add tests to show kerberos works across a 
password change
   via  0415a57 s3-librpc Fix creation of in-memory keytab for previous 
password
   via  747ebc1 s3-selftest names into DNS hosts file to avoid NBT lookups
   via  457c665 libcli/nbt Cope with blank lines in DNS hosts file
  from  82e0ba2 docs: fix the missing parameter description section in the 
smb.conf manpage

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


- Log -
commit d84a8d534374072fc96fd5da34e0021c81005f1a
Author: Andrew Bartlett abart...@samba.org
Date:   Wed Apr 6 09:12:15 2011 +1000

s3-selftest Add tests to show kerberos works across a password change

It is important that a machine account password change does not
invalidate existing tickets.

This is only for the default kerberos method with a password in
secrets.tdb.  The keytab based methods are still not tested.

Andrew Bartlett

Autobuild-User: Andrew Bartlett abart...@samba.org
Autobuild-Date: Wed Apr  6 05:24:48 CEST 2011 on sn-devel-104

commit 0415a5736e7e68f076fcf63dc16a7d33da4e569d
Author: Andrew Bartlett abart...@samba.org
Date:   Wed Apr 6 09:10:13 2011 +1000

s3-librpc Fix creation of in-memory keytab for previous password

We set the current password twice, rather than the current and old
password.

Andrew Bartlett

commit 747ebc118a5cff75e71341e1f39b8127e96e41cd
Author: Andrew Bartlett abart...@samba.org
Date:   Wed Apr 6 12:10:03 2011 +1000

s3-selftest names into DNS hosts file to avoid NBT lookups

NBT lookups cause trouble and variablity in 'make test', so it's much
better if we just use the fake DNS code.  This code is only used by
smbtorture4 at this time, but the other client tools are generally
told to contact by IP address.

We need to contact by name to test Kerberos, and this should make the
kerberos tests much more reliable.

Andrew Bartlett

commit 457c665be2777513ff8aed1de53d8ea4eb462adc
Author: Andrew Bartlett abart...@samba.org
Date:   Wed Apr 6 12:09:41 2011 +1000

libcli/nbt Cope with blank lines in DNS hosts file

---

Summary of changes:
 libcli/nbt/dns_hosts_file.c|6 ++--
 selftest/target/Samba3.pm  |   23 ---
 source3/librpc/crypto/gse_krb5.c   |2 +-
 .../{ktest-krb5_ccache = ktest-krb5_ccache-2} |  Bin 11966 - 11966 bytes
 source3/selftest/ktest-krb5_ccache-3   |  Bin 0 - 6031 bytes
 source3/selftest/ktest-secrets.tdb |  Bin 45056 - 45056 bytes
 source3/selftest/tests.py  |5 +++-
 7 files changed, 27 insertions(+), 9 deletions(-)
 rename source3/selftest/{ktest-krb5_ccache = ktest-krb5_ccache-2} (100%)
 create mode 100644 source3/selftest/ktest-krb5_ccache-3


Changeset truncated at 500 lines:

diff --git a/libcli/nbt/dns_hosts_file.c b/libcli/nbt/dns_hosts_file.c
index c6491a9..8013936 100644
--- a/libcli/nbt/dns_hosts_file.c
+++ b/libcli/nbt/dns_hosts_file.c
@@ -85,15 +85,15 @@ static bool getdns_hosts_fileent(TALLOC_CTX *ctx, XFILE 
*fp, char **pp_name, cha
++count;
if (next_token_talloc(ctx, ptr, name, NULL))
++count;
-   if (strcasecmp(name_type, A) == 0) {
+   if (name_type  strcasecmp(name_type, A) == 0) {
if (next_token_talloc(ctx, ptr, ip, NULL))
++count;
-   } else if (strcasecmp(name_type, SRV) == 0) {
+   } else if (name_type  strcasecmp(name_type, SRV) == 0) {
if (next_token_talloc(ctx, ptr, next_name, NULL))
++count;
if (next_token_talloc(ctx, ptr, port, NULL))
++count;
-   } else if (strcasecmp(name_type, CNAME) == 0) {
+   } else if (name_type  strcasecmp(name_type, CNAME) == 0) {
if (next_token_talloc(ctx, ptr, next_name, NULL))
++count;
}
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index de3fffb..b6c851a 100644
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -298,19 +298,29 @@ $ret-{USERNAME} = KTEST\\Administrator
 # ticket_lifetime = 799718400
 # renew_lifetime = 799718400
 #
-# The commands run were:
+# The commands for the -2 keytab where were:
 # kinit administra...@ktest.samba.example.com
 # kvno host/localkte...@ktest.samba.example.com
 # kvno cifs/localkte...@ktest.samba.example.com
 # kvno host/localkte...@ktest.samba.example.com
 # kvno cifs/localkte...@ktest.samba.example.com
 #
-# This creates a credential cache with

[SCM] Samba Shared Repository - branch master updated

2011-04-05 Thread Andrew Tridgell 
The branch, master has been updated
   via  59b588a waf: a better way to detect duplicated symbols
   via  0846b3c s4: Update/Set local USN only on attribute that have been 
modified/created
  from  d84a8d5 s3-selftest Add tests to show kerberos works across a 
password change

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


- Log -
commit 59b588a16c7be9ccfe42703e7d4b161fa513da76
Author: Andrew Tridgell tri...@samba.org
Date:   Wed Apr 6 13:35:49 2011 +1000

waf: a better way to detect duplicated symbols

this detects when we have the same symbol linked in twice in any
binary by using ldd and nm on the binary and its associated libraries.

Some of these duplicates are caused by a subsystem being linked twice,
and some are caused by two versions of the same function name being
linked into a binary

Pair-Programmed-With: Andrew Bartlett abart...@samba.org

Autobuild-User: Andrew Tridgell tri...@samba.org
Autobuild-Date: Wed Apr  6 06:44:14 CEST 2011 on sn-devel-104

commit 0846b3c8a28fa1baa4215694d098a32c83d59d6f
Author: Matthieu Patou m...@matws.net
Date:   Tue Apr 5 14:49:05 2011 +0400

s4: Update/Set local USN only on attribute that have been modified/created

Signed-off-by: Andrew Tridgell tri...@samba.org

---

Summary of changes:
 buildtools/wafsamba/symbols.py  |  102 ++-
 source4/dsdb/samdb/ldb_modules/repl_meta_data.c |   24 --
 2 files changed, 97 insertions(+), 29 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildtools/wafsamba/symbols.py b/buildtools/wafsamba/symbols.py
index 0e862cb..5059c60 100644
--- a/buildtools/wafsamba/symbols.py
+++ b/buildtools/wafsamba/symbols.py
@@ -17,6 +17,7 @@ from samba_utils import *
 #
 # bld.env.syslib_symbols: dictionary mapping system library name to set of 
symbols
 # for that library
+# bld.env.library_dict  : dictionary mapping built library paths to subsystem 
names
 #
 # LOCAL_CACHE(bld, 'TARGET_TYPE') : dictionary mapping subsystem name to 
target type
 
@@ -30,11 +31,11 @@ def symbols_extract(objfiles, dynamic=False):
 if dynamic:
 # needed for some .so files
 cmd.append(-D)
-cmd.extend(objfiles)
+cmd.extend(list(objfiles))
 
 nmpipe = subprocess.Popen(cmd, stdout=subprocess.PIPE).stdout
 if len(objfiles) == 1:
-filename = objfiles[0]
+filename = list(objfiles)[0]
 ret[filename] = { PUBLIC: set(), UNDEFINED : set()}
 
 for line in nmpipe:
@@ -68,6 +69,35 @@ def real_name(name):
 return name
 
 
+def get_ldd_libs(bld, binname):
+'''find the list of linked libraries for any binary or library
+binname is the path to the binary/library on disk
+'''
+ret = set()
+lddpipe = subprocess.Popen(['ldd', binname], stdout=subprocess.PIPE).stdout
+for line in lddpipe:
+line = line.strip()
+cols = line.split( )
+if len(cols)  3 or cols[1] != = or cols[2] == '':
+continue
+ret.add(os.path.realpath(cols[2]))
+return ret
+
+
+def get_ldd_libs_recursive(bld, binname, seen=set()):
+'''find the recursive list of linked libraries for any binary or library
+binname is the path to the binary/library on disk. seen is a set used
+to prevent loops
+'''
+if binname in seen:
+return set()
+ret = get_ldd_libs(bld, binname)
+seen.add(binname)
+for lib in ret:
+ret = ret.union(get_ldd_libs_recursive(bld, lib, seen))
+return ret
+
+
 def find_syslib_path(bld, libname, deps):
 '''find the path to the syslib we will link against'''
 # the strategy is to use the targets that depend on the library, and run 
ldd
@@ -160,6 +190,20 @@ def build_symbol_sets(bld, tgt_list):
 bld.env.used_symbols[name] = 
bld.env.used_symbols[name].union(t2.used_symbols)
 
 
+def build_library_dict(bld, tgt_list):
+'''build the library_dict dictionary'''
+
+if bld.env.library_dict:
+return
+
+bld.env.library_dict = {}
+
+for t in tgt_list:
+if t.samba_type in [ 'LIBRARY', 'PYTHON' ]:
+linkpath = 
os.path.realpath(t.link_task.outputs[0].abspath(bld.env))
+bld.env.library_dict[linkpath] = t.sname
+
+
 def build_syslib_sets(bld, tgt_list):
 '''build the public_symbols for all syslibs'''
 
@@ -444,6 +488,37 @@ def symbols_whyneeded(task):
 Logs.info(target '%s' uses symbols %s from '%s' % (target, overlap, 
subsystem))
 
 
+def report_duplicate(bld, binname, sym, libs):
+'''report duplicated symbols'''
+if sym in ['_init', '_fini']:
+return
+libnames = []
+for lib in libs:
+if lib in bld.env.library_dict:
+libnames.append(bld.env.library_dict[lib])
+else:
+libnames.append(lib)
+