Re: [Samba] error in module acl: insufficient access rights (50)

2010-12-07 Thread dobrima...@yahoo.pl
Thanks for answer.

The error code is 50. Actually I can't check it by Wireshark because I don't 
have graphic interface on my server machine where's Samba4 running. 

Please give me a clue why it won't work. It's very important to me. Maybe I 
need to use SASL (but how? which mechanism should I use?).

Regards

--- 7.12.10 (Wt), Andrew Bartlett abart...@samba.org wrote:

 Od: Andrew Bartlett abart...@samba.org
 Temat: Re: [Samba] error in module acl: insufficient access rights (50)
 Do: dobrima...@yahoo.pl dobrima...@yahoo.pl
 DW: samba@lists.samba.org
 Data: 7 Grudzień 2010 (Wtorek), 6:39
 On Sat, 2010-12-04 at 11:48 +, dobrima...@yahoo.pl
 wrote:
  Andrew, yes, bind is successful, I can read records
 without any problems.
 
 Until very recently, we allowed reads by anonymous
 users.  Can you
 actually check the error code, and double-check with
 Wireshark, that the
 bind worked?
 
  Anil, I don't think so, because even if I run the
 script with root privileges I'm getting the same error.
 
 changing the mode to 777 of anything is almost never the
 correct
 solution, and indeed yes, this isn't relevent for LDAP
 anyway. 
 
 Andrew Bartlett
 
 -- 
 Andrew Bartlett           
                
     http://samba.org/~abartlet/
 Authentication Developer, Samba Team     
      http://samba.org
 Samba Developer, Cisco Inc.
 


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

Re: [Samba] error in module acl: insufficient access rights (50)

2010-12-07 Thread Andre Fonseca de Oliveira

Wireshark is not needed on the server.

You only need tcpdump with the -w filename option. This ouput file can 
later be opened with wireshark.


André Fonseca

On 12/07/2010 02:41 PM, dobrima...@yahoo.pl wrote:

Thanks for answer.

The error code is 50. Actually I can't check it by Wireshark because I don't 
have graphic interface on my server machine where's Samba4 running.

Please give me a clue why it won't work. It's very important to me. Maybe I 
need to use SASL (but how? which mechanism should I use?).

Regards

--- 7.12.10 (Wt), Andrew Bartlettabart...@samba.org  wrote:


Od: Andrew Bartlettabart...@samba.org
Temat: Re: [Samba] error in module acl: insufficient access rights (50)
Do: dobrima...@yahoo.pldobrima...@yahoo.pl
DW: samba@lists.samba.org
Data: 7 Grudzień 2010 (Wtorek), 6:39
On Sat, 2010-12-04 at 11:48 +, dobrima...@yahoo.pl
wrote:

Andrew, yes, bind is successful, I can read records

without any problems.

Until very recently, we allowed reads by anonymous
users.  Can you
actually check the error code, and double-check with
Wireshark, that the
bind worked?


Anil, I don't think so, because even if I run the

script with root privileges I'm getting the same error.

changing the mode to 777 of anything is almost never the
correct
solution, and indeed yes, this isn't relevent for LDAP
anyway.

Andrew Bartlett

--
Andrew Bartlett   

 http://samba.org/~abartlet/
Authentication Developer, Samba Team 
  http://samba.org

Samba Developer, Cisco Inc.



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

[Samba] Windows7 roaming user profile can loose parameters after reboot samba server?

2010-12-07 Thread kazabe
Hi.

I have a xen virtualized samba server.  Today i was experiment a very
strange situation.  Practically all the stations are windows XP.  Some
station are vista or 7, but they are not connected to the domain yet.
I have just 1 win7 logged on the domain, and today, after restart the
samba server, the station cant load the apps correctly.

We use roaming users and use a centraliced access application shared
by samba in a public folder, and all the others clients work today
without problems;  only the win7 start with problems (apparenlty is
requesting some dll files).  If we start local session in the win7
station with the local admin user, work perfectly; but wf try to
access with the domain user, present errors.

I give to the domain users all the local permission (is a local
administrator), but the problem continue.

I dont make any change in the samba conf or any server configuration.
Just restart the samba server, because was added more ram.  The win7
station was worked correctly with the domain user before reboot the
server;  After that, is presenting problems.

Why can happen that?  win7 store some cached configuration in the
samba server?

Im very confused.

Thanks in advance.

This is my smb.conf

PDC:# cat /etc/samba/smb.conf
[global]
   netbios name = PDC
   netbios aliases = SRV
   ldap ssl = no
   passwd chat debug = yes
   name resolve order = wins bcast hosts
   idmap gid = 15000-2
   passwd chat = *Enter\snew\sUNIX\spassword:* %n\n
*Retype\snew\sUNIX\spassword:* %n\n *password\supdated\ssuccessfully*
.
   veto files = *.mpg
   passwd program = /usr/bin/passwd %u
   use client driver = Yes
   dns proxy = No
   printing = cups
   idmap uid = 17000-3
   logon script = logon.bat
   local master = yes
   workgroup = COMPANY
   os level = 99
   printcap name = /etc/printcap
   security = user
   add machine script = /usr/sbin/useradd -s /bin/false/ -d
/var/lib/nobody %u
   getwd cache = yes
   delete user script = /usr/sbin/userdel -r %u
   max log size = 1000
   log level = 3
   log file = /var/log/samba/log.%m
   read raw = yes
   add group script = /usr/sbin/groupadd %g
   smb ports = 139 445
   delete group script = /usr/sbin/groupdel %g
   socket options = SO_KEEPALIVE IPTOS_LOWDELAY TCP_NODELAY
SO_SNDBUF=8192 SO_RCVBUF=8192
   add user to group script = /usr/sbin/usernod -G %g %u
   logon drive = P:
   domain master = yes
   username map = /etc/samba/smbusers
   interfaces = eth0 192.168.2.1
   encrypt passwords = yes
   passdb backend = tdbsam
   logon home = \\pdc\%U
   template shell = /bin/false
   wins support = yes
   server string = PDC Server
   enhanced browsing = yes
   unix password sync = yes
   logon path = \\pdc\profiles\%U
   add user script = /usr/sbin/useradd -m %u -g users -G users
   hide special files = Yes
   utmp = Yes
   preferred master = true
   domain logons = yes
   admin users = @sysadmin

[netlogon]
   comment = Samba Network Logon Service
   path = /home/share/netlogon
   case sensitive = no
   guest ok = yes
   locking = no
   writable = no
   public = no
   browseable = yes

[%U]
   comment = %u Home
   read only = no
   create mask = 0660
   directory mask = 0770
   browseable = no
   path = /home/%U/Archivos

[main]
   comment = main shared
   path = /opt/pdc/main
   read only = no
   force group = users
   valid users = @users
   create mask = 0660
   directory mask = 0770
   hide files = /data/templates/
   oplocks = yes

[public]
   comment = Public Dir
   path = /opt/pdc/pub
   read only = no
   force group = users
   valid users = @users
   create mask = 0666
   directory mask = 0777
   writable = yes

[profiles]
   path= /opt/pdc/profiles
   writeable   = yes
   create mask = 0700
   directory mask = 0700
   ;browseable   = no
   guest ok= no
-- 
To unsubscribe from this list go to the following URL and read the
instructions:  https://lists.samba.org/mailman/options/samba


Re: [Samba] samba 3.5.x, pdbedit smb.conf and profiles

2010-12-07 Thread Andy
The per-user values set by pdbedit do override the value in smb.conf. 
The problem I am having is that I set profile path with pdbedit to 
something different than what's in smb.conf, but now I want to go back 
to the value of logon path in smb.conf. Setting the profile path with 
pdbedit to an empty string, , or NULL, does not result in the value 
being read again from smb.conf, it just sets the value to blank.


Thanks.

How do you remove the per-user value with pdbedit and have the value 
read from smb.conf? I have tried setting the per-user value both to  
and NULL.



On 12/6/2010 10:23 AM, TAKAHASHI Motonobu wrote:

Hello,

2010/12/6 Gaiseric Vandalgaiseric.van...@gmail.com:

I would guess that the per-user settings should override the general
smb.conf settings.

If you use modern passdb such as tdbsam or ldapsam, logon path
parameter works only to set the default value for 'profile path'.


I had problems with roaming profiles-  I didn't want to use them but
sometimes on client logins/logouts the XP client would try to load

Set the below line:

   logon path =

2010/12/6 Andyange3...@area5101.com:

How do you force the profile path in pdbedit to get its value from
logon path in smb.conf?

Is it possible to disable roaming profiles by user with pdbedit and leave
logon path set in smb.conf?

The only way is to use old passdb such as smbpasswd or ldapsam_compat.

---
TAKAHASHI Motonobumo...@monyo.com


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


[Samba] OT: permission denied when opening PDF docs with Acrobat Reader X potected mode

2010-12-07 Thread Marcus
Hi,

this might be off topic because it's not a samba problem, but might be
interesting for others too. We are running an older samba 3.0.24 working
as domain controller (no DFS features). When opening a .pdf file with
the Acrobat Reader X from a WinXP SP3 client (maschine is member of the
domain) the Acrobat Reader X shows a permission denied. We see the
following in the samba log:

[2010/12/07 18:29:50, 2] lib/access.c:check_access(323)
   Allowed connection from  (x.x.x.x)
[2010/12/07 18:29:50, 2] smbd/reply.c:reply_tcon_and_X(711)
   Serving IPC$ as a Dfs root
[2010/12/07 18:29:51, 2] smbd/open.c:open_file(352)
   user opened file batch.pdf read=No write=No (numopen=1)
[2010/12/07 18:29:51, 2] smbd/close.c:close_normal_file(344)
   user closed file batch.pdf (numopen=0)
[2010/12/07 18:29:51, 2] smbd/open.c:open_file(352)
   user opened file batch.pdf read=Yes write=No (numopen=1)

The user has full read/write permission to the share. The WinXP Sp3
client is member of the domain.

The only workaround in my case is to deactivated the Protected
Mode [1] in Acrobat Reader X. All security (enhanced) settings e.g.
privileged locations (L: or \\server\file.pdf etc.) don't have any
effects. This sounds strange to me.

Before rolling out a new reader version to my whole network, any input
on this confusing problem is welcome.

Ciao,
Marcus

[1]
http://kb2.adobe.com/cps/860/cpsid_86063.html#main_Unsupported_configurations


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


[Samba] Samba 3.5.6 file error/no disk space message

2010-12-07 Thread Derek Lewis
I have Samba 3.5.6 with the ACL patch running and I was in the process of 
creating a large ~80GB RAR file on the share from my PC, when I encountered 
several messages near the end of the write.  The messages indicated by WinRAR 
were: no disk space remaining or write error.  The computer and share 
connection were active for a long period of time (~1 day) which may have 
contributed to the problem.

I will be checking my Samba logs tonight, though I am interested in other 
debugging steps and whether I should configure my network/Samba differently for 
more stable sessions.
-- 
To unsubscribe from this list go to the following URL and read the
instructions:  https://lists.samba.org/mailman/options/samba


Re: [Samba] OT: permission denied when opening PDF docs with Acrobat Reader X potected mode

2010-12-07 Thread TAKAHASHI Motonobu
Hello,

Do you explicitly set msdfs root = no at [global] section?

The default parameter of msdfs root had been once changed to yes
at Samba 3.0.23,
but it caused problems and was again changed to no at Samba 3.0.25.

2010/12/8 Marcus li...@localguru.de:
 Hi,

 this might be off topic because it's not a samba problem, but might be
 interesting for others too. We are running an older samba 3.0.24 working
 as domain controller (no DFS features). When opening a .pdf file with
 the Acrobat Reader X from a WinXP SP3 client (maschine is member of the
 domain) the Acrobat Reader X shows a permission denied. We see the
 following in the samba log:

 [2010/12/07 18:29:50, 2] lib/access.c:check_access(323)
   Allowed connection from  (x.x.x.x)
 [2010/12/07 18:29:50, 2] smbd/reply.c:reply_tcon_and_X(711)
   Serving IPC$ as a Dfs root
 [2010/12/07 18:29:51, 2] smbd/open.c:open_file(352)
   user opened file batch.pdf read=No write=No (numopen=1)
 [2010/12/07 18:29:51, 2] smbd/close.c:close_normal_file(344)
   user closed file batch.pdf (numopen=0)
 [2010/12/07 18:29:51, 2] smbd/open.c:open_file(352)
   user opened file batch.pdf read=Yes write=No (numopen=1)

 The user has full read/write permission to the share. The WinXP Sp3
 client is member of the domain.

 The only workaround in my case is to deactivated the Protected
 Mode [1] in Acrobat Reader X. All security (enhanced) settings e.g.
 privileged locations (L: or \\server\file.pdf etc.) don't have any
 effects. This sounds strange to me.

 Before rolling out a new reader version to my whole network, any input
 on this confusing problem is welcome.

 Ciao,
 Marcus

 [1]
 http://kb2.adobe.com/cps/860/cpsid_86063.html#main_Unsupported_configurations
-- 
To unsubscribe from this list go to the following URL and read the
instructions:  https://lists.samba.org/mailman/options/samba


Re: [Samba] OT: permission denied when opening PDF docs with Acrobat Reader X potected mode

2010-12-07 Thread Marcus
Hi,

Am Mittwoch, den 08.12.2010, 07:58 +0900 schrieb TAKAHASHI Motonobu:
 Hello,
 
 Do you explicitly set msdfs root = no at [global] section?
 
 The default parameter of msdfs root had been once changed to yes
 at Samba 3.0.23,
 but it caused problems and was again changed to no at Samba 3.0.25.

I've checked the smb.conf and msdfs root is not explicitly set to
no, but a testparm -v /etc/samba/smb.conf | grep msdfs shows the
following:

host msdfs = Yes
msdfs root = Yes
msdfs proxy = 

Should I disable host msdfs and msdfs root to No?

Ciao!


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


Re: [Samba] OT: permission denied when opening PDF docs with Acrobat Reader X potected mode

2010-12-07 Thread TAKAHASHI Motonobu
 Should I disable host msdfs and msdfs root to No?

I recommend to disable those, unless  you want to explicitly set to yes.

2010/12/8 Marcus li...@localguru.de:
 Hi,

 Am Mittwoch, den 08.12.2010, 07:58 +0900 schrieb TAKAHASHI Motonobu:
 Hello,

 Do you explicitly set msdfs root = no at [global] section?

 The default parameter of msdfs root had been once changed to yes
 at Samba 3.0.23,
 but it caused problems and was again changed to no at Samba 3.0.25.

 I've checked the smb.conf and msdfs root is not explicitly set to
 no, but a testparm -v /etc/samba/smb.conf | grep msdfs shows the
 following:

        host msdfs = Yes
        msdfs root = Yes
        msdfs proxy =

 Should I disable host msdfs and msdfs root to No?
-- 
To unsubscribe from this list go to the following URL and read the
instructions:  https://lists.samba.org/mailman/options/samba


Re: [Samba] OT: permission denied when opening PDF docs with Acrobat Reader X potected mode

2010-12-07 Thread Marcus
Hi,

Am Mittwoch, den 08.12.2010, 08:46 +0900 schrieb TAKAHASHI Motonobu:
  Should I disable host msdfs and msdfs root to No?
 
 I recommend to disable those, unless  you want to explicitly set to yes.

I don't think I use any dfs features. Therefore I could set host msdfs
and msdfs root to No. But I'm just reading through the list and
found a posting from Josh Kelley msdfs root problems even after a
reboot? posted on 04th June 2007), where he describes some problems on
client side after changing host msdfs and msdfs root to No even if
the clients were rebooted:

... We fixed the problem by updating our logon scripts to unmap and
remap drives and by instructing users to remap drives if they
encountered problems.

Just to be sure. My dynamically generated logon script for a user looks
like this:


NET USE h: /DELETE /yes  null
NET USE h: \\server\homes /yes
NET USE i: /DELETE /yes  null
NET USE i: \\server\vol01 /yes
...

I think this is what he meant by unmap and remap drives, right?  I'm a
little bit scared because it's a live systems with hundreds of users and
I don't to run into any trouble.

Ciao!


 2010/12/8 Marcus li...@localguru.de:
  Hi,
 
  Am Mittwoch, den 08.12.2010, 07:58 +0900 schrieb TAKAHASHI Motonobu:
  Hello,
 
  Do you explicitly set msdfs root = no at [global] section?
 
  The default parameter of msdfs root had been once changed to yes
  at Samba 3.0.23,
  but it caused problems and was again changed to no at Samba 3.0.25.
 
  I've checked the smb.conf and msdfs root is not explicitly set to
  no, but a testparm -v /etc/samba/smb.conf | grep msdfs shows the
  following:
 
 host msdfs = Yes
 msdfs root = Yes
 msdfs proxy =
 
  Should I disable host msdfs and msdfs root to No?

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


[SCM] build.samba.org - branch master updated

2010-12-07 Thread Jelmer Vernooij
The branch, master has been updated
   via  1b79908 Cope with multiple builds with the same checksum.
  from  f9d4536 Don't create subunit files on disk, rather just extract 
them out of the master file.

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


- Log -
commit 1b79908e5043852d221b86d7cf4edae98fabdc15
Author: Jelmer Vernooij jel...@samba.org
Date:   Tue Dec 7 09:39:19 2010 +0100

Cope with multiple builds with the same checksum.

---

Summary of changes:
 import-and-analyse.py |1 -
 1 files changed, 0 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/import-and-analyse.py b/import-and-analyse.py
index 2273b42..9df77a3 100755
--- a/import-and-analyse.py
+++ b/import-and-analyse.py
@@ -17,7 +17,6 @@ from buildfarm.build import (
 from buildfarm import BuildFarm
 from buildfarm.web import build_uri
 from email.mime.text import MIMEText
-import logging
 import optparse
 import resource
 import smtplib


-- 
build.samba.org


[SCM] build.samba.org - branch master updated

2010-12-07 Thread Jelmer Vernooij
The branch, master has been updated
   via  1d47f19 ... and commit the right file
  from  1b79908 Cope with multiple builds with the same checksum.

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


- Log -
commit 1d47f199949889de4bdf55a5a8c31fadf1f6ab7b
Author: Jelmer Vernooij jel...@samba.org
Date:   Tue Dec 7 09:40:07 2010 +0100

... and commit the right file

---

Summary of changes:
 buildfarm/build.py |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildfarm/build.py b/buildfarm/build.py
index e5993ef..b6602ab 100644
--- a/buildfarm/build.py
+++ b/buildfarm/build.py
@@ -562,8 +562,8 @@ class BuildResultStore(object):
 def get_by_checksum(self, checksum):
 from buildfarm.sqldb import Cast
 result = self.store.find(StormBuild,
-Cast(StormBuild.checksum, TEXT) == Cast(checksum, TEXT))
-ret = result.one()
+Cast(StormBuild.checksum, TEXT) == Cast(checksum, 
TEXT)).order_by(Desc(StormBuild.upload_time))
+ret = result.first()
 if ret is None:
 raise NoSuchBuildError(None, None, None, None)
 return ret


-- 
build.samba.org


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

2010-12-07 Thread Günther Deschner
The branch, v3-6-test has been updated
   via  bead53a s3-waf: add pam configure checks.
  from  deaf310 s3: Fix bug 7844: Race in winbind

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


- Log -
commit bead53a52b33a36f4145ceef27f790fff39be986
Author: Günther Deschner g...@samba.org
Date:   Wed Dec 1 21:26:49 2010 +0100

s3-waf: add pam configure checks.

Guenther

Autobuild-User: Günther Deschner g...@samba.org
Autobuild-Date: Mon Dec  6 17:34:45 CET 2010 on sn-devel-104
(cherry picked from commit b73e4e36f5307316e2896d9731377f4252d0e444)

---

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


Changeset truncated at 500 lines:

diff --git a/source3/wscript b/source3/wscript
index 3354ec1..b91c6fa 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -743,8 +743,75 @@ return krb5_kt_resolve(context, WRFILE:api, keytab);
 conf.DEFINE('HAVE_ICONV', 1)
 
 if Options.options.with_pam:
-conf.CHECK_HEADERS('security/pam_appl.h security/pam_modules.h 
pam/pam_modules.h', together=True)
-conf.CHECK_FUNCS_IN('pam_start', 'pam', checklibc=True, 
headers='security/pam_appl.h')
+conf.CHECK_HEADERS('security/pam_appl.h pam/pam_appl.h')
+if not conf.CONFIG_SET('HAVE_SECURITY_PAM_APPL_H') and not 
conf.CONFIG_SET('HAVE_PAM_PAM_APPL_H'):
+print --with-pam=yes but pam_appl.h not found
+sys.exit(1)
+conf.CHECK_FUNCS_IN('pam_get_data', 'pam', mandatory=True)
+   conf.CHECK_HEADERS('security/pam_modules.h pam/pam_modules.h')
+   if not conf.CONFIG_SET('HAVE_SECURITY_PAM_MODULES_H') and not 
conf.CONFIG_SET('HAVE_PAM_PAM_MODULES_H'):
+print --with-pam=yes but pam_modules.h not found
+sys.exit(1)
+conf.CHECK_HEADERS('security/pam_ext.h security/_pam_macros.h')
+conf.CHECK_HEADERS('pam/pam_ext.h pam/_pam_macros.h')
+conf.CHECK_FUNCS_IN('pam_vsyslog', 'pam')
+   conf.CHECK_CODE('''
+#if defined(HAVE_SECURITY_PAM_APPL_H)
+#include security/pam_appl.h
+#elif defined(HAVE_PAM_PAM_APPL_H)
+#include pam/pam_appl.h
+#endif
+pam_set_item(0, PAM_RHOST, 0);
+''',
+'HAVE_PAM_RHOST',
+lib='pam',
+msg=Checking whether PAM_RHOST is available);
+   conf.CHECK_CODE('''
+#if defined(HAVE_SECURITY_PAM_APPL_H)
+#include security/pam_appl.h
+#elif defined(HAVE_PAM_PAM_APPL_H)
+#include pam/pam_appl.h
+#endif
+pam_set_item(0, PAM_TTY, 0);
+''',
+'HAVE_PAM_TTY',
+lib='pam',
+msg=Checking whether PAM_TTY is available);
+   conf.CHECK_CODE('''
+#if (!defined(LINUX))
+
+#define PAM_EXTERN extern
+#if defined(HAVE_SECURITY_PAM_APPL_H)
+#include security/pam_appl.h
+#elif defined(HAVE_PAM_PAM_APPL_H)
+#include pam/pam_appl.h
+#endif
+
+#endif
+
+#if defined(HAVE_SECURITY_PAM_MODULES_H)
+#include security/pam_modules.h
+#elif defined(HAVE_PAM_PAM_MODULES_H)
+#include pam/pam_modules.h
+#endif
+
+#if defined(HAVE_SECURITY__PAM_MACROS_H)
+#include security/_pam_macros.h
+#elif defined(HAVE_PAM__PAM_MACROS_H)
+#include pam/_pam_macros.h
+#endif
+
+#ifdef HAVE_SECURITY_PAM_EXT_H
+#include security/pam_ext.h
+#endif
+
+int i; i = PAM_RADIO_TYPE;
+''',
+'HAVE_PAM_RADIO_TYPE',
+lib='pam',
+msg=Checking whether PAM_RADIO_TYPE is available);
+conf.DEFINE('WITH_PAM', 1)
+conf.DEFINE('WITH_PAM_MODULES', 1)
 
 seteuid = False
 if not seteuid:


-- 
Samba Shared Repository


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

2010-12-07 Thread Karolin Seeger
The branch, v3-5-test has been updated
   via  a257253 s3: Fix bug 7841: WINBINDD_LOOKUPRIDS asks the wrong domain
  from  0c45b32 Fix bug #7835 - vfs_fill_sparse() doesn't use 
posix_fallocate when strict allocate is on

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


- Log -
commit a257253f8f82bcab52508273b12cd92fadd3ba1a
Author: Volker Lendecke v...@samba.org
Date:   Sat Dec 4 20:31:36 2010 +0100

s3: Fix bug 7841: WINBINDD_LOOKUPRIDS asks the wrong domain

---

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


Changeset truncated at 500 lines:

diff --git a/source3/winbindd/winbindd_lookuprids.c 
b/source3/winbindd/winbindd_lookuprids.c
index f2cb879..51cd4d8 100644
--- a/source3/winbindd/winbindd_lookuprids.c
+++ b/source3/winbindd/winbindd_lookuprids.c
@@ -61,7 +61,7 @@ struct tevent_req *winbindd_lookuprids_send(TALLOC_CTX 
*mem_ctx,
return tevent_req_post(req, ev);
}
 
-   domain = find_domain_from_sid_noinit(sid);
+   domain = find_lookup_domain_from_sid(sid);
if (domain == NULL) {
DEBUG(5, (Domain for sid %s not found\n,
  sid_string_dbg(sid)));


-- 
Samba Shared Repository


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

2010-12-07 Thread Karolin Seeger
The branch, v3-5-test has been updated
   via  0737a34 s3: Fix bug 7842: WINBINDD_LOOKUPRIDS does not return the 
domain name
  from  a257253 s3: Fix bug 7841: WINBINDD_LOOKUPRIDS asks the wrong domain

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


- Log -
commit 0737a34a12e46d53e4332ea06eac0ba948608fff
Author: Volker Lendecke v...@samba.org
Date:   Sat Dec 4 20:34:05 2010 +0100

s3: Fix bug 7842: WINBINDD_LOOKUPRIDS does not return the domain name

---

Summary of changes:
 source3/librpc/gen_ndr/cli_wbint.c |5 +++
 source3/librpc/gen_ndr/cli_wbint.h |2 +
 source3/librpc/gen_ndr/ndr_wbint.c |   48 
 source3/librpc/gen_ndr/srv_wbint.c |   11 +++
 source3/librpc/gen_ndr/wbint.h |1 +
 source3/librpc/idl/wbint.idl   |1 +
 source3/winbindd/winbindd_dual_srv.c   |2 +
 source3/winbindd/winbindd_lookuprids.c |3 +-
 8 files changed, 72 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/librpc/gen_ndr/cli_wbint.c 
b/source3/librpc/gen_ndr/cli_wbint.c
index 592b27b..7200d2a 100644
--- a/source3/librpc/gen_ndr/cli_wbint.c
+++ b/source3/librpc/gen_ndr/cli_wbint.c
@@ -2509,6 +2509,7 @@ struct tevent_req 
*rpccli_wbint_LookupRids_send(TALLOC_CTX *mem_ctx,
struct tevent_context *ev,
struct rpc_pipe_client *cli,
struct wbint_RidArray *_rids /* 
[in] [ref] */,
+   const char **_domain_name /* 
[out] [ref,charset(UTF8)] */,
struct wbint_Principals *_names 
/* [out] [ref] */)
 {
struct tevent_req *req;
@@ -2527,6 +2528,7 @@ struct tevent_req 
*rpccli_wbint_LookupRids_send(TALLOC_CTX *mem_ctx,
state-orig.in.rids = _rids;
 
/* Out parameters */
+   state-orig.out.domain_name = _domain_name;
state-orig.out.names = _names;
 
/* Result */
@@ -2575,6 +2577,7 @@ static void rpccli_wbint_LookupRids_done(struct 
tevent_req *subreq)
}
 
/* Copy out parameters */
+   *state-orig.out.domain_name = *state-tmp.out.domain_name;
*state-orig.out.names = *state-tmp.out.names;
 
/* Copy result */
@@ -2612,6 +2615,7 @@ NTSTATUS rpccli_wbint_LookupRids_recv(struct tevent_req 
*req,
 NTSTATUS rpccli_wbint_LookupRids(struct rpc_pipe_client *cli,
 TALLOC_CTX *mem_ctx,
 struct wbint_RidArray *rids /* [in] [ref] */,
+const char **domain_name /* [out] 
[ref,charset(UTF8)] */,
 struct wbint_Principals *names /* [out] [ref] 
*/)
 {
struct wbint_LookupRids r;
@@ -2635,6 +2639,7 @@ NTSTATUS rpccli_wbint_LookupRids(struct rpc_pipe_client 
*cli,
}
 
/* Return variables */
+   *domain_name = *r.out.domain_name;
*names = *r.out.names;
 
/* Return result */
diff --git a/source3/librpc/gen_ndr/cli_wbint.h 
b/source3/librpc/gen_ndr/cli_wbint.h
index 4528d43..c4f9a81 100644
--- a/source3/librpc/gen_ndr/cli_wbint.h
+++ b/source3/librpc/gen_ndr/cli_wbint.h
@@ -224,6 +224,7 @@ struct tevent_req *rpccli_wbint_LookupRids_send(TALLOC_CTX 
*mem_ctx,
struct tevent_context *ev,
struct rpc_pipe_client *cli,
struct wbint_RidArray *_rids /* 
[in] [ref] */,
+   const char **_domain_name /* 
[out] [ref,charset(UTF8)] */,
struct wbint_Principals *_names 
/* [out] [ref] */);
 NTSTATUS rpccli_wbint_LookupRids_recv(struct tevent_req *req,
  TALLOC_CTX *mem_ctx,
@@ -231,6 +232,7 @@ NTSTATUS rpccli_wbint_LookupRids_recv(struct tevent_req 
*req,
 NTSTATUS rpccli_wbint_LookupRids(struct rpc_pipe_client *cli,
 TALLOC_CTX *mem_ctx,
 struct wbint_RidArray *rids /* [in] [ref] */,
+const char **domain_name /* [out] 
[ref,charset(UTF8)] */,
 struct wbint_Principals *names /* [out] [ref] 
*/);
 struct tevent_req *rpccli_wbint_CheckMachineAccount_send(TALLOC_CTX *mem_ctx,
 struct tevent_context 
*ev,
diff --git a/source3/librpc/gen_ndr/ndr_wbint.c 
b/source3/librpc/gen_ndr/ndr_wbint.c
index 50f781c..5bb6832 100644
--- a/source3/librpc/gen_ndr/ndr_wbint.c
+++ b/source3/librpc/gen_ndr/ndr_wbint.c
@@ -2082,6 +2082,16 @@ static enum ndr_err_code 
ndr_push_wbint_LookupRids(struct 

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

2010-12-07 Thread Karolin Seeger
The branch, v3-5-test has been updated
   via  50c8b42 s3: Fix bug 7843: Expand the local SAMs aliases
  from  0737a34 s3: Fix bug 7842: WINBINDD_LOOKUPRIDS does not return the 
domain name

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


- Log -
commit 50c8b426385df953d2e3748a39041d4b92cd7ed9
Author: Jeremy Allison j...@samba.org
Date:   Sun Dec 5 20:40:21 2010 +0100

s3: Fix bug 7843: Expand the local SAMs aliases

---

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


Changeset truncated at 500 lines:

diff --git a/source3/winbindd/wb_gettoken.c b/source3/winbindd/wb_gettoken.c
index ca407b2..f2fbe4c 100644
--- a/source3/winbindd/wb_gettoken.c
+++ b/source3/winbindd/wb_gettoken.c
@@ -106,7 +106,7 @@ static void wb_gettoken_gotgroups(struct tevent_req *subreq)
/*
 * Expand our domain's aliases
 */
-   domain = find_our_domain();
+   domain = find_domain_from_sid_noinit(get_global_sam_sid());
if (domain == NULL) {
tevent_req_nterror(req, NT_STATUS_INTERNAL_ERROR);
return;
@@ -137,7 +137,7 @@ static void wb_gettoken_gotlocalgroups(struct tevent_req 
*subreq)
tevent_req_nterror(req, status);
return;
}
-   domain = find_our_domain();
+   domain = find_domain_from_sid_noinit(get_global_sam_sid());
if (!wb_add_rids_to_sids(state, state-num_sids, state-sids,
 domain-sid, num_rids, rids)) {
tevent_req_nterror(req, NT_STATUS_NO_MEMORY);


-- 
Samba Shared Repository


[SCM] Samba Shared Repository - branch master updated

2010-12-07 Thread Günther Deschner
The branch, master has been updated
   via  6b1ba79 s3-waf: add support for --with-dnsupdate.
   via  0745f3f s3-waf: fix the build of nsstest in the non-devel build.
   via  ffc7434 s3-waf: fix library names (we installed liblibsmbclient, 
etc.)
   via  8be11b2 s3-waf: fix pam dependencies of the RPC_SAMR server.
  from  f7d9786 s3: Fix bug 7844: Race in winbind

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


- Log -
commit 6b1ba79fbf64afd7a8bc77eec7c8bdce48bb620f
Author: Günther Deschner g...@samba.org
Date:   Tue Dec 7 12:20:09 2010 +0100

s3-waf: add support for --with-dnsupdate.

Guenther

Autobuild-User: Günther Deschner g...@samba.org
Autobuild-Date: Tue Dec  7 13:07:51 CET 2010 on sn-devel-104

commit 0745f3fef920d81228366ecaa90f224718ad29dc
Author: Günther Deschner g...@samba.org
Date:   Tue Dec 7 12:04:35 2010 +0100

s3-waf: fix the build of nsstest in the non-devel build.

Guenther

commit ffc7434e2b58ea66b21a48c0d9b8ab02f9ded22a
Author: Günther Deschner g...@samba.org
Date:   Tue Dec 7 12:04:11 2010 +0100

s3-waf: fix library names (we installed liblibsmbclient, etc.)

Guenther

commit 8be11b247701fb704d1c0ac0a19daa7c4fca8232
Author: Günther Deschner g...@samba.org
Date:   Tue Dec 7 11:49:57 2010 +0100

s3-waf: fix pam dependencies of the RPC_SAMR server.

Guenther

---

Summary of changes:
 source3/libaddns/wscript_build   |4 +-
 source3/rpc_server/wscript_build |1 +
 source3/wscript  |   11 +-
 source3/wscript_build|   77 +++---
 4 files changed, 52 insertions(+), 41 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/libaddns/wscript_build b/source3/libaddns/wscript_build
index c4c83a9..69a4716 100644
--- a/source3/libaddns/wscript_build
+++ b/source3/libaddns/wscript_build
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
-bld.SAMBA_LIBRARY('libaddns',
+bld.SAMBA_LIBRARY('addns',
source='dnsrecord.c dnsutils.c dnssock.c dnsgss.c 
dnsmarshall.c error.c',
-   public_deps='talloc krb5 k5crypto com_err gssapi 
gssapi_krb5',
+   public_deps='talloc krb5 k5crypto com_err gssapi 
gssapi_krb5 uuid',
private_library=True,
vars=locals())
diff --git a/source3/rpc_server/wscript_build b/source3/rpc_server/wscript_build
index dc368bf..c56a234 100644
--- a/source3/rpc_server/wscript_build
+++ b/source3/rpc_server/wscript_build
@@ -24,6 +24,7 @@ bld.SAMBA_SUBSYSTEM('rpc',
 
 bld.SAMBA_SUBSYSTEM('RPC_SAMR',
 source=RPC_SAMR_SRC,
+deps='PLAINTEXT_AUTH',
 vars=locals())
 
 bld.SAMBA_SUBSYSTEM('RPC_LSARPC',
diff --git a/source3/wscript b/source3/wscript
index b91c6fa..264bda2 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -62,6 +62,7 @@ def set_options(opt):
 opt.SAMBA3_ADD_OPTION('avahi', with_name=enable, without_name=disable)
 opt.SAMBA3_ADD_OPTION('iconv')
 opt.SAMBA3_ADD_OPTION('acl-support')
+opt.SAMBA3_ADD_OPTION('dnsupdate')
 
 
 def configure(conf):
@@ -855,7 +856,15 @@ int i; i = PAM_RADIO_TYPE;
execute=True,
mandatory=True,
msg=Checking whether setuidx is available)
-
+if Options.options.with_dnsupdate:
+conf.CHECK_HEADERS('uuid/uuid.h')
+conf.CHECK_FUNCS_IN('uuid_generate', 'uuid')
+if not conf.CONFIG_SET('HAVE_UUID_UUID_H') and not 
conf.CONFIG_SET('HAVE_UUID_GENERATE'):
+print --with-dnsupdate=yes but uuid support not sufficient
+sys.exit(1)
+conf.DEFINE('WITH_DNS_UPDATES', 1)
+else:
+conf.SET_TARGET_TYPE('uuid', 'EMPTY')
 
 conf.SAMBA_CONFIG_H('include/config.h')
 
diff --git a/source3/wscript_build b/source3/wscript_build
index 876b4be..983b670 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -752,7 +752,7 @@ bld.RECURSE('../libcli/security')
 bld.SAMBA_SUBSYSTEM('WBCOMMON',
 source=WBCOMMON_SRC)
 
-bld.SAMBA_LIBRARY('libwbclient',
+bld.SAMBA_LIBRARY('wbclient',
 source='''../nsswitch/libwbclient/wbc_guid.c
   ../nsswitch/libwbclient/wbc_idmap.c
   ../nsswitch/libwbclient/wbclient.c
@@ -764,9 +764,9 @@ bld.SAMBA_LIBRARY('libwbclient',
 private_library=True,
 public_deps='talloc WBCOMMON')
 
-bld.SAMBA_LIBRARY('libnetapi',
+bld.SAMBA_LIBRARY('netapi',
 source=LIBNETAPI_SRC,
-public_deps='''talloc tdb cap libwbclient LIB_NONSMBD 
LIBSMB KRBCLIENT
+public_deps='''talloc tdb cap wbclient LIB_NONSMBD LIBSMB 
KRBCLIENT
 

[SCM] Samba Shared Repository - branch master updated

2010-12-07 Thread Günther Deschner
The branch, master has been updated
   via  af4a4f5 s3-waf: build vfs_fileid module if possible.
  from  6b1ba79 s3-waf: add support for --with-dnsupdate.

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


- Log -
commit af4a4f58b5192ba7c80f096f9c7bc26c128c007c
Author: Günther Deschner g...@samba.org
Date:   Tue Dec 7 12:46:50 2010 +0100

s3-waf: build vfs_fileid module if possible.

Guenther

Autobuild-User: Günther Deschner g...@samba.org
Autobuild-Date: Tue Dec  7 14:01:46 CET 2010 on sn-devel-104

---

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


Changeset truncated at 500 lines:

diff --git a/source3/wscript b/source3/wscript
index 264bda2..7fe142d 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -322,6 +322,12 @@ return acl_get_perm_np(permset_d, perm);
 if conf.CHECK_FUNCS('dirfd'):
 conf.DEFINE('HAVE_DIRFD_DECL', 1)
 
+conf.CHECK_CODE('struct statfs fsd; fsid_t fsid = fsd.f_fsid; return 
statfs(., fsd);',
+'HAVE_STATFS_F_FSID',
+msg=vfs_fileid: checking for statfs() and struct 
statfs.f_fsid,
+headers='sys/types.h sys/statfs.h',
+execute=True)
+
 default_static_modules=TO_LIST('''pdb_smbpasswd pdb_tdbsam pdb_wbc_sam 
pdb_ldap rpc_lsarpc rpc_samr
   rpc_winreg rpc_initshutdown rpc_dssetup 
rpc_wkssvc rpc_svcctl
   rpc_ntsvcs rpc_netlogon rpc_netdfs 
rpc_srvsvc rpc_spoolss
@@ -349,6 +355,9 @@ return acl_get_perm_np(permset_d, perm);
 if conf.CONFIG_SET('HAVE_DIRFD_DECL'):
default_shared_modules.extend(TO_LIST('vfs_syncops vfs_dirsort'))
 
+if conf.CONFIG_SET('HAVE_STATFS_F_FSID'):
+   default_shared_modules.extend(TO_LIST('vfs_fileid'))
+
 explicit_shared_modules = TO_LIST(Options.options.shared_modules, 
delimiter=',')
 explicit_static_modules = TO_LIST(Options.options.static_modules, 
delimiter=',')
 


-- 
Samba Shared Repository


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

2010-12-07 Thread Günther Deschner
The branch, v3-6-test has been updated
   via  9ae2692 s3-waf: build vfs_fileid module if possible.
   via  db72558 s3-waf: add support for --with-dnsupdate.
   via  d1e9cf1 s3-waf: fix the build of nsstest in the non-devel build.
   via  1742381 s3-waf: fix library names (we installed liblibsmbclient, 
etc.)
   via  cc99f6a s3-waf: fix pam dependencies of the RPC_SAMR server.
  from  bead53a s3-waf: add pam configure checks.

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


- Log -
commit 9ae26920ac46af94baf3cb96b9fa6a9b8cb69e99
Author: Günther Deschner g...@samba.org
Date:   Tue Dec 7 12:46:50 2010 +0100

s3-waf: build vfs_fileid module if possible.

Guenther

Autobuild-User: Günther Deschner g...@samba.org
Autobuild-Date: Tue Dec  7 14:01:46 CET 2010 on sn-devel-104
(cherry picked from commit af4a4f58b5192ba7c80f096f9c7bc26c128c007c)

commit db725582bf29cadca3ea585960d4619850f9554c
Author: Günther Deschner g...@samba.org
Date:   Tue Dec 7 12:20:09 2010 +0100

s3-waf: add support for --with-dnsupdate.

Guenther

Autobuild-User: Günther Deschner g...@samba.org
Autobuild-Date: Tue Dec  7 13:07:51 CET 2010 on sn-devel-104
(cherry picked from commit 6b1ba79fbf64afd7a8bc77eec7c8bdce48bb620f)

commit d1e9cf1df20888635cefc6de0b12eb9ead936437
Author: Günther Deschner g...@samba.org
Date:   Tue Dec 7 12:04:35 2010 +0100

s3-waf: fix the build of nsstest in the non-devel build.

Guenther
(cherry picked from commit 0745f3fef920d81228366ecaa90f224718ad29dc)

commit 174238156fefed4399455394012c7f4be20de19c
Author: Günther Deschner g...@samba.org
Date:   Tue Dec 7 12:04:11 2010 +0100

s3-waf: fix library names (we installed liblibsmbclient, etc.)

Guenther
(cherry picked from commit ffc7434e2b58ea66b21a48c0d9b8ab02f9ded22a)

commit cc99f6ae3b91bb8f2ac2ad7fec6499c4f0c02778
Author: Günther Deschner g...@samba.org
Date:   Tue Dec 7 11:49:57 2010 +0100

s3-waf: fix pam dependencies of the RPC_SAMR server.

Guenther
(cherry picked from commit 8be11b247701fb704d1c0ac0a19daa7c4fca8232)

---

Summary of changes:
 source3/libaddns/wscript_build   |4 +-
 source3/rpc_server/wscript_build |1 +
 source3/wscript  |   20 +-
 source3/wscript_build|   77 +++---
 4 files changed, 61 insertions(+), 41 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/libaddns/wscript_build b/source3/libaddns/wscript_build
index c4c83a9..69a4716 100644
--- a/source3/libaddns/wscript_build
+++ b/source3/libaddns/wscript_build
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
-bld.SAMBA_LIBRARY('libaddns',
+bld.SAMBA_LIBRARY('addns',
source='dnsrecord.c dnsutils.c dnssock.c dnsgss.c 
dnsmarshall.c error.c',
-   public_deps='talloc krb5 k5crypto com_err gssapi 
gssapi_krb5',
+   public_deps='talloc krb5 k5crypto com_err gssapi 
gssapi_krb5 uuid',
private_library=True,
vars=locals())
diff --git a/source3/rpc_server/wscript_build b/source3/rpc_server/wscript_build
index dc368bf..c56a234 100644
--- a/source3/rpc_server/wscript_build
+++ b/source3/rpc_server/wscript_build
@@ -24,6 +24,7 @@ bld.SAMBA_SUBSYSTEM('rpc',
 
 bld.SAMBA_SUBSYSTEM('RPC_SAMR',
 source=RPC_SAMR_SRC,
+deps='PLAINTEXT_AUTH',
 vars=locals())
 
 bld.SAMBA_SUBSYSTEM('RPC_LSARPC',
diff --git a/source3/wscript b/source3/wscript
index b91c6fa..7fe142d 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -62,6 +62,7 @@ def set_options(opt):
 opt.SAMBA3_ADD_OPTION('avahi', with_name=enable, without_name=disable)
 opt.SAMBA3_ADD_OPTION('iconv')
 opt.SAMBA3_ADD_OPTION('acl-support')
+opt.SAMBA3_ADD_OPTION('dnsupdate')
 
 
 def configure(conf):
@@ -321,6 +322,12 @@ return acl_get_perm_np(permset_d, perm);
 if conf.CHECK_FUNCS('dirfd'):
 conf.DEFINE('HAVE_DIRFD_DECL', 1)
 
+conf.CHECK_CODE('struct statfs fsd; fsid_t fsid = fsd.f_fsid; return 
statfs(., fsd);',
+'HAVE_STATFS_F_FSID',
+msg=vfs_fileid: checking for statfs() and struct 
statfs.f_fsid,
+headers='sys/types.h sys/statfs.h',
+execute=True)
+
 default_static_modules=TO_LIST('''pdb_smbpasswd pdb_tdbsam pdb_wbc_sam 
pdb_ldap rpc_lsarpc rpc_samr
   rpc_winreg rpc_initshutdown rpc_dssetup 
rpc_wkssvc rpc_svcctl
   rpc_ntsvcs rpc_netlogon rpc_netdfs 
rpc_srvsvc rpc_spoolss
@@ -348,6 +355,9 @@ return acl_get_perm_np(permset_d, perm);
 if conf.CONFIG_SET('HAVE_DIRFD_DECL'):
default_shared_modules.extend(TO_LIST('vfs_syncops vfs_dirsort'))
 
+  

[SCM] Samba Shared Repository - branch master updated

2010-12-07 Thread Michael Adam
The branch, master has been updated
   via  d911897 s3:registry: improve debug messages about regdb refcount 
changes
  from  af4a4f5 s3-waf: build vfs_fileid module if possible.

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


- Log -
commit d91189727adf6b4cbe219da71a21bfc7bc2bff7f
Author: Michael Adam ob...@samba.org
Date:   Fri Oct 22 12:16:20 2010 +0200

s3:registry: improve debug messages about regdb refcount changes

Autobuild-User: Michael Adam ob...@samba.org
Autobuild-Date: Tue Dec  7 15:18:03 CET 2010 on sn-devel-104

---

Summary of changes:
 source3/registry/reg_backend_db.c |   15 ++-
 1 files changed, 10 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/registry/reg_backend_db.c 
b/source3/registry/reg_backend_db.c
index 322cabf..8445d52 100644
--- a/source3/registry/reg_backend_db.c
+++ b/source3/registry/reg_backend_db.c
@@ -497,8 +497,8 @@ WERROR regdb_init(void)
WERROR werr;
 
if (regdb) {
-   DEBUG(10, (regdb_init: incrementing refcount (%d)\n,
- regdb_refcount));
+   DEBUG(10, (regdb_init: incrementing refcount (%d-%d)\n,
+  regdb_refcount, regdb_refcount+1));
regdb_refcount++;
return WERR_OK;
}
@@ -519,6 +519,8 @@ WERROR regdb_init(void)
}
 
regdb_refcount = 1;
+   DEBUG(10, (regdb_init: registry db openend. refcount reset (%d)\n,
+  regdb_refcount));
 
expected_version = REGVER_V2;
 
@@ -574,7 +576,8 @@ WERROR regdb_open( void )
WERROR result = WERR_OK;
 
if ( regdb ) {
-   DEBUG(10,(regdb_open: incrementing refcount (%d)\n, 
regdb_refcount));
+   DEBUG(10, (regdb_open: incrementing refcount (%d-%d)\n,
+  regdb_refcount, regdb_refcount+1));
regdb_refcount++;
return WERR_OK;
}
@@ -592,7 +595,8 @@ WERROR regdb_open( void )
unbecome_root();
 
regdb_refcount = 1;
-   DEBUG(10,(regdb_open: refcount reset (%d)\n, regdb_refcount));
+   DEBUG(10, (regdb_open: registry db opened. refcount reset (%d)\n,
+  regdb_refcount));
 
return result;
 }
@@ -608,7 +612,8 @@ int regdb_close( void )
 
regdb_refcount--;
 
-   DEBUG(10,(regdb_close: decrementing refcount (%d)\n, regdb_refcount));
+   DEBUG(10, (regdb_close: decrementing refcount (%d-%d)\n,
+  regdb_refcount+1, regdb_refcount));
 
if ( regdb_refcount  0 )
return 0;


-- 
Samba Shared Repository


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

2010-12-07 Thread Michael Adam
The branch, v3-6-test has been updated
   via  504538b s3:registry: improve debug messages about regdb refcount 
changes
  from  9ae2692 s3-waf: build vfs_fileid module if possible.

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


- Log -
commit 504538bdb030601cbe2966a496b2fda18ff7834f
Author: Michael Adam ob...@samba.org
Date:   Fri Oct 22 12:16:20 2010 +0200

s3:registry: improve debug messages about regdb refcount changes

Autobuild-User: Michael Adam ob...@samba.org
Autobuild-Date: Tue Dec  7 15:18:03 CET 2010 on sn-devel-104

---

Summary of changes:
 source3/registry/reg_backend_db.c |   15 ++-
 1 files changed, 10 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/registry/reg_backend_db.c 
b/source3/registry/reg_backend_db.c
index 322cabf..8445d52 100644
--- a/source3/registry/reg_backend_db.c
+++ b/source3/registry/reg_backend_db.c
@@ -497,8 +497,8 @@ WERROR regdb_init(void)
WERROR werr;
 
if (regdb) {
-   DEBUG(10, (regdb_init: incrementing refcount (%d)\n,
- regdb_refcount));
+   DEBUG(10, (regdb_init: incrementing refcount (%d-%d)\n,
+  regdb_refcount, regdb_refcount+1));
regdb_refcount++;
return WERR_OK;
}
@@ -519,6 +519,8 @@ WERROR regdb_init(void)
}
 
regdb_refcount = 1;
+   DEBUG(10, (regdb_init: registry db openend. refcount reset (%d)\n,
+  regdb_refcount));
 
expected_version = REGVER_V2;
 
@@ -574,7 +576,8 @@ WERROR regdb_open( void )
WERROR result = WERR_OK;
 
if ( regdb ) {
-   DEBUG(10,(regdb_open: incrementing refcount (%d)\n, 
regdb_refcount));
+   DEBUG(10, (regdb_open: incrementing refcount (%d-%d)\n,
+  regdb_refcount, regdb_refcount+1));
regdb_refcount++;
return WERR_OK;
}
@@ -592,7 +595,8 @@ WERROR regdb_open( void )
unbecome_root();
 
regdb_refcount = 1;
-   DEBUG(10,(regdb_open: refcount reset (%d)\n, regdb_refcount));
+   DEBUG(10, (regdb_open: registry db opened. refcount reset (%d)\n,
+  regdb_refcount));
 
return result;
 }
@@ -608,7 +612,8 @@ int regdb_close( void )
 
regdb_refcount--;
 
-   DEBUG(10,(regdb_close: decrementing refcount (%d)\n, regdb_refcount));
+   DEBUG(10, (regdb_close: decrementing refcount (%d-%d)\n,
+  regdb_refcount+1, regdb_refcount));
 
if ( regdb_refcount  0 )
return 0;


-- 
Samba Shared Repository


[SCM] Samba Shared Repository - branch master updated

2010-12-07 Thread Matthias Dieter Wallnöfer
The branch, master has been updated
   via  055a3e0 s4:libnet_samsync_ldb.c - simplify a talloc steal call
   via  a07d208 s4:libnet_samsync_ldb.c - introduce an error message on 
failed domain synchronisation
  from  d911897 s3:registry: improve debug messages about regdb refcount 
changes

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


- Log -
commit 055a3e0fae1c59567057239d5d6e3f20cf962c33
Author: Matthias Dieter Wallnöfer m...@samba.org
Date:   Tue Dec 7 14:58:52 2010 +0100

s4:libnet_samsync_ldb.c - simplify a talloc steal call

Autobuild-User: Matthias Dieter Wallnöfer m...@samba.org
Autobuild-Date: Tue Dec  7 16:05:30 CET 2010 on sn-devel-104

commit a07d20821ac9d09831bac10eca91ae8cb7b5106f
Author: Matthias Dieter Wallnöfer m...@samba.org
Date:   Tue Dec 7 14:57:17 2010 +0100

s4:libnet_samsync_ldb.c - introduce an error message on failed domain 
synchronisation

---

Summary of changes:
 source4/libnet/libnet_samsync_ldb.c |   12 +++-
 1 files changed, 7 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/libnet/libnet_samsync_ldb.c 
b/source4/libnet/libnet_samsync_ldb.c
index 9626341..07e085e 100644
--- a/source4/libnet/libnet_samsync_ldb.c
+++ b/source4/libnet/libnet_samsync_ldb.c
@@ -222,9 +222,12 @@ static NTSTATUS samsync_ldb_handle_domain(TALLOC_CTX 
*mem_ctx,
/* TODO: Account lockout, password properties */

ret = dsdb_replace(state-sam_ldb, msg, 0);
-
-   if (ret) {
-   return NT_STATUS_INTERNAL_ERROR;
+   if (ret != LDB_SUCCESS) {
+   *error_string = talloc_asprintf(mem_ctx,
+   Failed to modify domain record 
%s: %s,
+   ldb_dn_get_linearized(msg-dn),
+   ldb_errstring(state-sam_ldb));
+   return NT_STATUS_INTERNAL_DB_CORRUPTION;
}
return NT_STATUS_OK;
 }
@@ -308,8 +311,7 @@ static NTSTATUS samsync_ldb_handle_user(TALLOC_CTX *mem_ctx,

/* Try to put things in the same location as the remote 
server */
} else if (add) {
-   msg-dn = remote_msgs[0]-dn;
-   talloc_steal(msg, remote_msgs[0]-dn);
+   msg-dn = talloc_steal(msg, remote_msgs[0]-dn);
}
}
 


-- 
Samba Shared Repository


[SCM] Samba Shared Repository - branch master updated

2010-12-07 Thread Günther Deschner
The branch, master has been updated
   via  94cfb49 s3-waf: add configure/declaration checks for fdatasync, 
readahead and splice.
   via  c5b2fd0 s3-waf: add valgrind configure checks.
  from  055a3e0 s4:libnet_samsync_ldb.c - simplify a talloc steal call

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


- Log -
commit 94cfb49bb7051c7e979bcf168e467328b96ee631
Author: Günther Deschner g...@samba.org
Date:   Tue Dec 7 15:33:51 2010 +0100

s3-waf: add configure/declaration checks for fdatasync, readahead and 
splice.

Guenther

Autobuild-User: Günther Deschner g...@samba.org
Autobuild-Date: Tue Dec  7 16:50:23 CET 2010 on sn-devel-104

commit c5b2fd05afcf3e4e3e733ed917539add9c12e0b8
Author: Günther Deschner g...@samba.org
Date:   Tue Dec 7 14:59:53 2010 +0100

s3-waf: add valgrind configure checks.

Guenther

---

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


Changeset truncated at 500 lines:

diff --git a/source3/wscript b/source3/wscript
index 7fe142d..da9a9db 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -121,6 +121,18 @@ def configure(conf):
 #FIXME: for some reason this one still fails
 conf.CHECK_FUNCS_IN('yp_get_default_domain', 'nsl')
 conf.CHECK_FUNCS_IN('dn_expand _dn_expand __dn_expand', 'resolv')
+conf.CHECK_DECLS('fdatasync', reverse=True)
+conf.CHECK_DECLS('readahead', reverse=True, headers='fcntl.h')
+
+if conf.CHECK_CODE('''
+#if defined(HAVE_UNISTD_H)
+#include unistd.h
+#endif
+long ret = splice(0,0,1,0,400,0);
+''',
+'HAVE_LINUX_SPLICE',
+headers='fcntl.h'):
+conf.CHECK_DECLS('splice', reverse=True, headers='fcntl.h')
 
 # Check for inotify support
 conf.CHECK_HEADERS('linux/inotify.h asm/unistd.h sys/inotify.h')
@@ -874,6 +886,10 @@ int i; i = PAM_RADIO_TYPE;
 conf.DEFINE('WITH_DNS_UPDATES', 1)
 else:
 conf.SET_TARGET_TYPE('uuid', 'EMPTY')
+conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h valgrind/memcheck.h')
+if Options.options.developer:
+if conf.CONFIG_SET('HAVE_VALGRIND_H') or 
conf.CONFIG_SET('HAVE_VALGRIND_VALGRIND_H'):
+conf.DEFINE('VALGRIND', '1')
 
 conf.SAMBA_CONFIG_H('include/config.h')
 


-- 
Samba Shared Repository


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

2010-12-07 Thread Günther Deschner
The branch, v3-6-test has been updated
   via  5fad400 s3-waf: add configure/declaration checks for fdatasync, 
readahead and splice.
   via  d1fa3f4 s3-waf: add valgrind configure checks.
  from  504538b s3:registry: improve debug messages about regdb refcount 
changes

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


- Log -
commit 5fad400d15915f490f5344f452a53ec8ed4303f7
Author: Günther Deschner g...@samba.org
Date:   Tue Dec 7 15:33:51 2010 +0100

s3-waf: add configure/declaration checks for fdatasync, readahead and 
splice.

Guenther

Autobuild-User: Günther Deschner g...@samba.org
Autobuild-Date: Tue Dec  7 16:50:23 CET 2010 on sn-devel-104
(cherry picked from commit 94cfb49bb7051c7e979bcf168e467328b96ee631)

commit d1fa3f4d782b1c20b8ae5b41425bcfba387341b6
Author: Günther Deschner g...@samba.org
Date:   Tue Dec 7 14:59:53 2010 +0100

s3-waf: add valgrind configure checks.

Guenther
(cherry picked from commit c5b2fd05afcf3e4e3e733ed917539add9c12e0b8)

---

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


Changeset truncated at 500 lines:

diff --git a/source3/wscript b/source3/wscript
index 7fe142d..da9a9db 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -121,6 +121,18 @@ def configure(conf):
 #FIXME: for some reason this one still fails
 conf.CHECK_FUNCS_IN('yp_get_default_domain', 'nsl')
 conf.CHECK_FUNCS_IN('dn_expand _dn_expand __dn_expand', 'resolv')
+conf.CHECK_DECLS('fdatasync', reverse=True)
+conf.CHECK_DECLS('readahead', reverse=True, headers='fcntl.h')
+
+if conf.CHECK_CODE('''
+#if defined(HAVE_UNISTD_H)
+#include unistd.h
+#endif
+long ret = splice(0,0,1,0,400,0);
+''',
+'HAVE_LINUX_SPLICE',
+headers='fcntl.h'):
+conf.CHECK_DECLS('splice', reverse=True, headers='fcntl.h')
 
 # Check for inotify support
 conf.CHECK_HEADERS('linux/inotify.h asm/unistd.h sys/inotify.h')
@@ -874,6 +886,10 @@ int i; i = PAM_RADIO_TYPE;
 conf.DEFINE('WITH_DNS_UPDATES', 1)
 else:
 conf.SET_TARGET_TYPE('uuid', 'EMPTY')
+conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h valgrind/memcheck.h')
+if Options.options.developer:
+if conf.CONFIG_SET('HAVE_VALGRIND_H') or 
conf.CONFIG_SET('HAVE_VALGRIND_VALGRIND_H'):
+conf.DEFINE('VALGRIND', '1')
 
 conf.SAMBA_CONFIG_H('include/config.h')
 


-- 
Samba Shared Repository


[SCM] Samba Shared Repository - branch master updated

2010-12-07 Thread Michael Adam
The branch, master has been updated
   via  6acbcd1 Make sure that user exists after running add user script 
before adding sam account.
  from  94cfb49 s3-waf: add configure/declaration checks for fdatasync, 
readahead and splice.

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


- Log -
commit 6acbcd1b0ce6529eb381ea94573a707e677eebb4
Author: Bjoern Baumbach b...@sernet.de
Date:   Tue Dec 7 14:36:44 2010 +0100

Make sure that user exists after running add user script before adding sam 
account.

Autobuild-User: Michael Adam ob...@samba.org
Autobuild-Date: Tue Dec  7 17:37:52 CET 2010 on sn-devel-104

---

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


Changeset truncated at 500 lines:

diff --git a/source3/passdb/pdb_interface.c b/source3/passdb/pdb_interface.c
index a6fe2e0..1361c17 100644
--- a/source3/passdb/pdb_interface.c
+++ b/source3/passdb/pdb_interface.c
@@ -476,6 +476,11 @@ static NTSTATUS pdb_default_create_user(struct pdb_methods 
*methods,
flush_pwnam_cache();
 
pwd = Get_Pwnam_alloc(tmp_ctx, name);
+
+   if(pwd == NULL) {
+   DEBUG(3, (Could not find user %s, add script did not 
work\n, name));
+   return NT_STATUS_NO_SUCH_USER;
+   }
}
 
/* we have a valid SID coming out of this call */


-- 
Samba Shared Repository


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

2010-12-07 Thread Michael Adam
The branch, v3-6-test has been updated
   via  f7073e9 Make sure that user exists after running add user script 
before adding sam account.
  from  5fad400 s3-waf: add configure/declaration checks for fdatasync, 
readahead and splice.

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


- Log -
commit f7073e9dd30292beeb62dcb7178e637e2b58dd85
Author: Bjoern Baumbach b...@sernet.de
Date:   Tue Dec 7 14:36:44 2010 +0100

Make sure that user exists after running add user script before adding sam 
account.

Autobuild-User: Michael Adam ob...@samba.org
Autobuild-Date: Tue Dec  7 17:37:52 CET 2010 on sn-devel-104
(cherry picked from commit 6acbcd1b0ce6529eb381ea94573a707e677eebb4)

---

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


Changeset truncated at 500 lines:

diff --git a/source3/passdb/pdb_interface.c b/source3/passdb/pdb_interface.c
index a6fe2e0..1361c17 100644
--- a/source3/passdb/pdb_interface.c
+++ b/source3/passdb/pdb_interface.c
@@ -476,6 +476,11 @@ static NTSTATUS pdb_default_create_user(struct pdb_methods 
*methods,
flush_pwnam_cache();
 
pwd = Get_Pwnam_alloc(tmp_ctx, name);
+
+   if(pwd == NULL) {
+   DEBUG(3, (Could not find user %s, add script did not 
work\n, name));
+   return NT_STATUS_NO_SUCH_USER;
+   }
}
 
/* we have a valid SID coming out of this call */


-- 
Samba Shared Repository


[SCM] Samba Shared Repository - branch master updated

2010-12-07 Thread Stefan Metzmacher
The branch, master has been updated
   via  15c33ad libcli/auth: let spnego_write_mech_types() check the 
asn1_load() return
   via  f802075 s3:ntlm_auth: support clients which offer a spnego mechs we 
don't support
   via  ee4f5ac s3:ntlm_auth: free session key, as we don't use it (at 
least for now)
   via  9a56ade s3:ntlm_auth: fix memory leak in the raw ntlmssp code path
  from  6acbcd1 Make sure that user exists after running add user script 
before adding sam account.

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


- Log -
commit 15c33ada6b897ac46141aaae0f0333816b94448b
Author: Stefan Metzmacher me...@samba.org
Date:   Thu Dec 2 00:40:01 2010 +0100

libcli/auth: let spnego_write_mech_types() check the asn1_load() return

metze

Autobuild-User: Stefan Metzmacher me...@samba.org
Autobuild-Date: Tue Dec  7 18:23:41 CET 2010 on sn-devel-104

commit f802075f08fe0d86f3d176f2302236aeb5834f3d
Author: Stefan Metzmacher me...@samba.org
Date:   Thu Dec 2 00:39:23 2010 +0100

s3:ntlm_auth: support clients which offer a spnego mechs we don't support

Before we rejected the authentication if we don't support the
first spnego mech the client offered.

We now negotiate the first mech we support.

This fix works arround problems, when a client
sends the NEGOEX (1.3.6.1.4.1.311.2.2.30) oid,
which we don't support.

metze

commit ee4f5ac6182969bcab91955e6d6581e408d222f1
Author: Stefan Metzmacher me...@samba.org
Date:   Wed Dec 1 05:52:29 2010 +0100

s3:ntlm_auth: free session key, as we don't use it (at least for now)

metze

commit 9a56ade6b1d627126418c75de4602610b4482503
Author: Stefan Metzmacher me...@samba.org
Date:   Wed Dec 1 05:50:59 2010 +0100

s3:ntlm_auth: fix memory leak in the raw ntlmssp code path

metze

---

Summary of changes:
 libcli/auth/spnego_parse.c |4 +
 source3/utils/ntlm_auth.c  |  280 +++-
 2 files changed, 175 insertions(+), 109 deletions(-)


Changeset truncated at 500 lines:

diff --git a/libcli/auth/spnego_parse.c b/libcli/auth/spnego_parse.c
index 86b083d..27ede1b 100644
--- a/libcli/auth/spnego_parse.c
+++ b/libcli/auth/spnego_parse.c
@@ -380,6 +380,10 @@ bool spnego_write_mech_types(TALLOC_CTX *mem_ctx,
 {
struct asn1_data *asn1 = asn1_init(mem_ctx);
 
+   if (asn1 == NULL) {
+   return false;
+   }
+
/* Write mechTypes */
if (mech_types  *mech_types) {
int i;
diff --git a/source3/utils/ntlm_auth.c b/source3/utils/ntlm_auth.c
index 9f0c839..43af0fd 100644
--- a/source3/utils/ntlm_auth.c
+++ b/source3/utils/ntlm_auth.c
@@ -82,6 +82,8 @@ struct ntlm_auth_state {
struct ntlmssp_state *ntlmssp_state;
uint32_t neg_flags;
char *want_feature_list;
+   char *spnego_mech;
+   char *spnego_mech_oid;
bool have_session_key;
DATA_BLOB session_key;
DATA_BLOB initial_message;
@@ -1192,11 +1194,12 @@ static void offer_gss_spnego_mechs(void) {
 
/* Server negTokenInit (mech offerings) */
spnego.type = SPNEGO_NEG_TOKEN_INIT;
-   spnego.negTokenInit.mechTypes = talloc_array(ctx, const char *, 3);
+   spnego.negTokenInit.mechTypes = talloc_array(ctx, const char *, 4);
 #ifdef HAVE_KRB5
spnego.negTokenInit.mechTypes[0] = talloc_strdup(ctx, 
OID_KERBEROS5_OLD);
-   spnego.negTokenInit.mechTypes[1] = talloc_strdup(ctx, OID_NTLMSSP);
-   spnego.negTokenInit.mechTypes[2] = NULL;
+   spnego.negTokenInit.mechTypes[1] = talloc_strdup(ctx, OID_KERBEROS5);
+   spnego.negTokenInit.mechTypes[2] = talloc_strdup(ctx, OID_NTLMSSP);
+   spnego.negTokenInit.mechTypes[3] = NULL;
 #else
spnego.negTokenInit.mechTypes[0] = talloc_strdup(ctx, OID_NTLMSSP);
spnego.negTokenInit.mechTypes[1] = NULL;
@@ -1266,9 +1269,10 @@ bool spnego_parse_krb5_wrap(TALLOC_CTX *ctx, DATA_BLOB 
blob, DATA_BLOB *ticket,
 static void manage_gss_spnego_request(struct ntlm_auth_state *state,
char *buf, int length)
 {
-   static struct ntlmssp_state *ntlmssp_state = NULL;
struct spnego_data request, response;
DATA_BLOB token;
+   DATA_BLOB raw_in_token = data_blob_null;
+   DATA_BLOB raw_out_token = data_blob_null;
NTSTATUS status;
ssize_t len;
TALLOC_CTX *ctx = talloc_tos();
@@ -1279,6 +1283,7 @@ static void manage_gss_spnego_request(struct 
ntlm_auth_state *state,
const char *reply_code;
char   *reply_base64;
char *reply_argument = NULL;
+   char *supportedMech = NULL;
 
if (strlen(buf)  2) {
DEBUG(1, (SPENGO query [%s] invalid\n, buf));
@@ -1287,7 +1292,9 @@ static void manage_gss_spnego_request(struct 
ntlm_auth_state *state,

[SCM] Samba Shared Repository - branch master updated

2010-12-07 Thread Michael Adam
The branch, master has been updated
   via  a52a587 docs: clarify the idmap_rid manpage (bug #7788)
   via  91d9cb4 docs: clarify the idmap_ad manpage (bug #6322)
  from  15c33ad libcli/auth: let spnego_write_mech_types() check the 
asn1_load() return

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


- Log -
commit a52a587783e058f75815fa8add1f46b1c1d6f2d3
Author: Michael Adam ob...@samba.org
Date:   Tue Dec 7 17:30:27 2010 +0100

docs: clarify the idmap_rid manpage (bug #7788)

The idmap_rid module should not be used as a default backend.
Also mention that the old snytax idmap backend = rid:domain=range ...
is not supported any more.

Autobuild-User: Michael Adam ob...@samba.org
Autobuild-Date: Tue Dec  7 19:07:57 CET 2010 on sn-devel-104

commit 91d9cb48a5224c7dc443747505f9dd1071f822ed
Author: Michael Adam ob...@samba.org
Date:   Tue Dec 7 15:47:52 2010 +0100

docs: clarify the idmap_ad manpage (bug #6322)

The idmap_ad module can not be used as a default backend.

---

Summary of changes:
 docs-xml/manpages-3/idmap_ad.8.xml  |   17 +
 docs-xml/manpages-3/idmap_rid.8.xml |   18 ++
 2 files changed, 35 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/manpages-3/idmap_ad.8.xml 
b/docs-xml/manpages-3/idmap_ad.8.xml
index 9b445df..3ecb07e 100644
--- a/docs-xml/manpages-3/idmap_ad.8.xml
+++ b/docs-xml/manpages-3/idmap_ad.8.xml
@@ -25,6 +25,23 @@
by the administrator by adding the posixAccount/posixGroup
classes and relative attribute/value pairs to the user and
group objects in the AD./para
+
+   para
+   Note that the idmap_ad module has changed considerably since
+   Samba versions 3.0 and 3.2.
+   Currently, the parameterad/parameter backend
+   does not work as the the default idmap backend, but one has
+   to configure it separately for each domain for which one wants
+   to use it, using disjoint ranges. One usually needs to configure
+   a writeable default idmap range, using for example the
+   parametertdb/parameter or parameterldap/parameter)
+   backend, in order to be able to map the BUILTIN sids and
+   possibly other trusted domains. The writeable default config
+   is also needed in order to be able to create group mappings.
+   This catch-all default idmap configuration should have a range
+   that is disjoint from any explicitly configured domain with
+   idmap backend parameterad/parameter. See the example below.
+   /para
 /refsynopsisdiv
 
 refsect1
diff --git a/docs-xml/manpages-3/idmap_rid.8.xml 
b/docs-xml/manpages-3/idmap_rid.8.xml
index 33200b8..a2a1c58 100644
--- a/docs-xml/manpages-3/idmap_rid.8.xml
+++ b/docs-xml/manpages-3/idmap_rid.8.xml
@@ -21,6 +21,24 @@
paraThe idmap_rid backend provides a way to use an algorithmic
mapping scheme to map UIDs/GIDs and SIDs. No database is required
in this case as the mapping is deterministic./para
+
+   para
+   Note that the idmap_rid module has changed considerably since Samba
+   versions 3.0. and 3.2.
+   Currently, there should to be an explicit idmap configuration for each
+   domain that should use the idmap_rid backend, using disjoint ranges.
+   One usually needs to define a writeable default idmap range, using
+   a backent like parametertdb/parameter or parameterldap/parameter
+   that can create unix ids, in order to be able to map the BUILTIN sids
+   and other domains, and also in order to be able to create group 
mappings.
+   See the example below.
+   /para
+
+   para
+   Note that the old syntax
+   parameteridmap backend = rid:DOM1=range DOM2=range2 .../parameter
+   is not supported any more since Samba version 3.0.25.
+   /para
 /refsynopsisdiv
 
 refsect1


-- 
Samba Shared Repository


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

2010-12-07 Thread Michael Adam
The branch, v3-6-test has been updated
   via  329d865 docs: clarify the idmap_rid manpage (bug #7788)
   via  18cd0fe docs: clarify the idmap_ad manpage (bug #6322)
  from  f7073e9 Make sure that user exists after running add user script 
before adding sam account.

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


- Log -
commit 329d865e326673dd534456189b1b52ed052ace62
Author: Michael Adam ob...@samba.org
Date:   Tue Dec 7 17:30:27 2010 +0100

docs: clarify the idmap_rid manpage (bug #7788)

The idmap_rid module should not be used as a default backend.
Also mention that the old snytax idmap backend = rid:domain=range ...
is not supported any more.

Autobuild-User: Michael Adam ob...@samba.org
Autobuild-Date: Tue Dec  7 19:07:57 CET 2010 on sn-devel-104
(cherry picked from commit a52a587783e058f75815fa8add1f46b1c1d6f2d3)

commit 18cd0fe87277e08d4fbcf59be7b5ccba225f6750
Author: Michael Adam ob...@samba.org
Date:   Tue Dec 7 15:47:52 2010 +0100

docs: clarify the idmap_ad manpage (bug #6322)

The idmap_ad module can not be used as a default backend.
(cherry picked from commit 91d9cb48a5224c7dc443747505f9dd1071f822ed)

---

Summary of changes:
 docs-xml/manpages-3/idmap_ad.8.xml  |   17 +
 docs-xml/manpages-3/idmap_rid.8.xml |   18 ++
 2 files changed, 35 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/manpages-3/idmap_ad.8.xml 
b/docs-xml/manpages-3/idmap_ad.8.xml
index 9b445df..3ecb07e 100644
--- a/docs-xml/manpages-3/idmap_ad.8.xml
+++ b/docs-xml/manpages-3/idmap_ad.8.xml
@@ -25,6 +25,23 @@
by the administrator by adding the posixAccount/posixGroup
classes and relative attribute/value pairs to the user and
group objects in the AD./para
+
+   para
+   Note that the idmap_ad module has changed considerably since
+   Samba versions 3.0 and 3.2.
+   Currently, the parameterad/parameter backend
+   does not work as the the default idmap backend, but one has
+   to configure it separately for each domain for which one wants
+   to use it, using disjoint ranges. One usually needs to configure
+   a writeable default idmap range, using for example the
+   parametertdb/parameter or parameterldap/parameter)
+   backend, in order to be able to map the BUILTIN sids and
+   possibly other trusted domains. The writeable default config
+   is also needed in order to be able to create group mappings.
+   This catch-all default idmap configuration should have a range
+   that is disjoint from any explicitly configured domain with
+   idmap backend parameterad/parameter. See the example below.
+   /para
 /refsynopsisdiv
 
 refsect1
diff --git a/docs-xml/manpages-3/idmap_rid.8.xml 
b/docs-xml/manpages-3/idmap_rid.8.xml
index 33200b8..a2a1c58 100644
--- a/docs-xml/manpages-3/idmap_rid.8.xml
+++ b/docs-xml/manpages-3/idmap_rid.8.xml
@@ -21,6 +21,24 @@
paraThe idmap_rid backend provides a way to use an algorithmic
mapping scheme to map UIDs/GIDs and SIDs. No database is required
in this case as the mapping is deterministic./para
+
+   para
+   Note that the idmap_rid module has changed considerably since Samba
+   versions 3.0. and 3.2.
+   Currently, there should to be an explicit idmap configuration for each
+   domain that should use the idmap_rid backend, using disjoint ranges.
+   One usually needs to define a writeable default idmap range, using
+   a backent like parametertdb/parameter or parameterldap/parameter
+   that can create unix ids, in order to be able to map the BUILTIN sids
+   and other domains, and also in order to be able to create group 
mappings.
+   See the example below.
+   /para
+
+   para
+   Note that the old syntax
+   parameteridmap backend = rid:DOM1=range DOM2=range2 .../parameter
+   is not supported any more since Samba version 3.0.25.
+   /para
 /refsynopsisdiv
 
 refsect1


-- 
Samba Shared Repository


[SCM] build.samba.org - branch master updated

2010-12-07 Thread Matthieu Patou
The branch, master has been updated
   via  e2710d3 Remove patching for bitfield
   via  a187aee Add -g for Sernet-solaris8
   via  ccee335 Add -g for sunX
  from  1d47f19 ... and commit the right file

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


- Log -
commit e2710d3f8dd7dd917db5d25c646560c6e37f9e00
Author: Matthieu Patou m...@matws.net
Date:   Wed Dec 8 00:06:30 2010 +0300

Remove patching for bitfield

commit a187aeec03203e7e5a2a11ccdd2e5066eb539efe
Author: Matthieu Patou m...@matws.net
Date:   Mon Nov 29 00:38:05 2010 +0300

Add -g for Sernet-solaris8

commit ccee33549fc9d1cd4345cf9ad3d6a65d272ba291
Author: Matthieu Patou m...@matws.net
Date:   Mon Nov 29 00:33:20 2010 +0300

Add -g for sunX

---

Summary of changes:
 SerNet-solaris8.fns |3 ++-
 sunX.fns|2 ++
 2 files changed, 4 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/SerNet-solaris8.fns b/SerNet-solaris8.fns
index 1fc220d..a652f2a 100644
--- a/SerNet-solaris8.fns
+++ b/SerNet-solaris8.fns
@@ -19,13 +19,14 @@ prehook_configure()
 {
 case $tree in
samba_4*)
-   (cd ${builddir}/..; gpatch -p 1 $HOME/build_farm/patch)
;;
*)
;;
 esac
 }
 
+CFLAGS=-g $CFLAGS
+export CFLAGS
 compilers=cc gcc
 
 for compiler in $compilers; do
diff --git a/sunX.fns b/sunX.fns
index 60ff7f6..c982ffd 100644
--- a/sunX.fns
+++ b/sunX.fns
@@ -7,6 +7,8 @@ TORTURE_MAXTIME=3600
 SMBD_MAXTIME=42200
 SAMBA_MAXTIME=42200
 export MAXTIME TORTURE_MAXTIME SMBD_MAXTIME SAMBA_MAXTIME
+CFLAGS=-g $CFLAGS
+export CFLAGS
 
 compilers=cc gcc
 for compiler in $compilers; do


-- 
build.samba.org


[SCM] build.samba.org - branch master updated

2010-12-07 Thread Björn Jacke
The branch, master has been updated
   via  fb9c5e0 delete unneeded SerNet-imini.fns to eliminate duplicate 
compile runs
  from  e2710d3 Remove patching for bitfield

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


- Log -
commit fb9c5e016a6b58654b86282ae2b0f11384d0f02b
Author: Björn Jacke b...@sernet.de
Date:   Tue Dec 7 23:40:57 2010 +0100

delete unneeded SerNet-imini.fns to eliminate duplicate compile runs

---

Summary of changes:
 SerNet-imini.fns |   17 -
 1 files changed, 0 insertions(+), 17 deletions(-)
 delete mode 100644 SerNet-imini.fns


Changeset truncated at 500 lines:

diff --git a/SerNet-imini.fns b/SerNet-imini.fns
deleted file mode 100644
index fee132f..000
--- a/SerNet-imini.fns
+++ /dev/null
@@ -1,17 +0,0 @@
-per_run_hook
-
-global_lock
-
-compilers=gcc cc
-
-for compiler in $compilers; do
-   . common.fns
-
-   test_tree samba_4_0_test source4 $compiler
-
-   test_tree samba_3_current source $compiler
-   test_tree samba_3_next source $compiler
-   test_tree samba_3_master source $compiler
-done
-
-global_unlock


-- 
build.samba.org


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

2010-12-07 Thread Jeremy Allison
The branch, v3-6-test has been updated
   via  aab5998 libcli/auth: let spnego_write_mech_types() check the 
asn1_load() return
   via  da8ea03 s3:ntlm_auth: support clients which offer a spnego mechs we 
don't support
   via  3dc4eb5 s3:ntlm_auth: free session key, as we don't use it (at 
least for now)
   via  84b4754 s3:ntlm_auth: fix memory leak in the raw ntlmssp code path
  from  329d865 docs: clarify the idmap_rid manpage (bug #7788)

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


- Log -
commit aab5998ac9a2b103776c6707369480bf8afb0f08
Author: Stefan Metzmacher me...@samba.org
Date:   Thu Dec 2 00:40:01 2010 +0100

libcli/auth: let spnego_write_mech_types() check the asn1_load() return

metze

Autobuild-User: Stefan Metzmacher me...@samba.org
Autobuild-Date: Tue Dec  7 18:23:41 CET 2010 on sn-devel-104
(cherry picked from commit 15c33ada6b897ac46141aaae0f0333816b94448b)

commit da8ea0363d8cd5a2d86a02d61bbd43a598fd5a44
Author: Stefan Metzmacher me...@samba.org
Date:   Thu Dec 2 00:39:23 2010 +0100

s3:ntlm_auth: support clients which offer a spnego mechs we don't support

Before we rejected the authentication if we don't support the
first spnego mech the client offered.

We now negotiate the first mech we support.

This fix works arround problems, when a client
sends the NEGOEX (1.3.6.1.4.1.311.2.2.30) oid,
which we don't support.

metze
(cherry picked from commit f802075f08fe0d86f3d176f2302236aeb5834f3d)

commit 3dc4eb518d7efd2c4b5b89cb3b999729594d2dcb
Author: Stefan Metzmacher me...@samba.org
Date:   Wed Dec 1 05:52:29 2010 +0100

s3:ntlm_auth: free session key, as we don't use it (at least for now)

metze
(cherry picked from commit ee4f5ac6182969bcab91955e6d6581e408d222f1)

commit 84b4754a36d453fb35d002ce24a8301b970cdc67
Author: Stefan Metzmacher me...@samba.org
Date:   Wed Dec 1 05:50:59 2010 +0100

s3:ntlm_auth: fix memory leak in the raw ntlmssp code path

metze
(cherry picked from commit 9a56ade6b1d627126418c75de4602610b4482503)

---

Summary of changes:
 libcli/auth/spnego_parse.c |4 +
 source3/utils/ntlm_auth.c  |  280 +++-
 2 files changed, 175 insertions(+), 109 deletions(-)


Changeset truncated at 500 lines:

diff --git a/libcli/auth/spnego_parse.c b/libcli/auth/spnego_parse.c
index 86b083d..27ede1b 100644
--- a/libcli/auth/spnego_parse.c
+++ b/libcli/auth/spnego_parse.c
@@ -380,6 +380,10 @@ bool spnego_write_mech_types(TALLOC_CTX *mem_ctx,
 {
struct asn1_data *asn1 = asn1_init(mem_ctx);
 
+   if (asn1 == NULL) {
+   return false;
+   }
+
/* Write mechTypes */
if (mech_types  *mech_types) {
int i;
diff --git a/source3/utils/ntlm_auth.c b/source3/utils/ntlm_auth.c
index 9f0c839..43af0fd 100644
--- a/source3/utils/ntlm_auth.c
+++ b/source3/utils/ntlm_auth.c
@@ -82,6 +82,8 @@ struct ntlm_auth_state {
struct ntlmssp_state *ntlmssp_state;
uint32_t neg_flags;
char *want_feature_list;
+   char *spnego_mech;
+   char *spnego_mech_oid;
bool have_session_key;
DATA_BLOB session_key;
DATA_BLOB initial_message;
@@ -1192,11 +1194,12 @@ static void offer_gss_spnego_mechs(void) {
 
/* Server negTokenInit (mech offerings) */
spnego.type = SPNEGO_NEG_TOKEN_INIT;
-   spnego.negTokenInit.mechTypes = talloc_array(ctx, const char *, 3);
+   spnego.negTokenInit.mechTypes = talloc_array(ctx, const char *, 4);
 #ifdef HAVE_KRB5
spnego.negTokenInit.mechTypes[0] = talloc_strdup(ctx, 
OID_KERBEROS5_OLD);
-   spnego.negTokenInit.mechTypes[1] = talloc_strdup(ctx, OID_NTLMSSP);
-   spnego.negTokenInit.mechTypes[2] = NULL;
+   spnego.negTokenInit.mechTypes[1] = talloc_strdup(ctx, OID_KERBEROS5);
+   spnego.negTokenInit.mechTypes[2] = talloc_strdup(ctx, OID_NTLMSSP);
+   spnego.negTokenInit.mechTypes[3] = NULL;
 #else
spnego.negTokenInit.mechTypes[0] = talloc_strdup(ctx, OID_NTLMSSP);
spnego.negTokenInit.mechTypes[1] = NULL;
@@ -1266,9 +1269,10 @@ bool spnego_parse_krb5_wrap(TALLOC_CTX *ctx, DATA_BLOB 
blob, DATA_BLOB *ticket,
 static void manage_gss_spnego_request(struct ntlm_auth_state *state,
char *buf, int length)
 {
-   static struct ntlmssp_state *ntlmssp_state = NULL;
struct spnego_data request, response;
DATA_BLOB token;
+   DATA_BLOB raw_in_token = data_blob_null;
+   DATA_BLOB raw_out_token = data_blob_null;
NTSTATUS status;
ssize_t len;
TALLOC_CTX *ctx = talloc_tos();
@@ -1279,6 +1283,7 @@ static void manage_gss_spnego_request(struct 
ntlm_auth_state *state,
const char *reply_code;
char   

[SCM] build.samba.org - branch master updated

2010-12-07 Thread Matthieu Patou
The branch, master has been updated
   via  58c09d2 reintroduce specific host file for tru64, in order to 
remove CPPFLAGS for S4
  from  fb9c5e0 delete unneeded SerNet-imini.fns to eliminate duplicate 
compile runs

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


- Log -
commit 58c09d20afafafb18b2016d7bca2cbe6f0ed143b
Author: Matthieu Patou m...@matws.net
Date:   Wed Dec 8 02:27:10 2010 +0300

reintroduce specific host file for tru64, in order to remove CPPFLAGS for S4

---

Summary of changes:
 SerNet-Tru64.fns |   30 --
 1 files changed, 28 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/SerNet-Tru64.fns b/SerNet-Tru64.fns
index 629747d..37a5540 100644
--- a/SerNet-Tru64.fns
+++ b/SerNet-Tru64.fns
@@ -1,8 +1,34 @@
-compilers=cc
+per_run_hook
+
+global_lock
+compilers=cc
 
 MAXTIME=18000
 SMBD_MAXTIME=8500
 SAMBA_MAXTIME=8500
 export MAXTIME SMBD_MAXTIME SAMBA_MAXTIME
 
-. generic.fns
+CFLAGS=-g $CFLAGS
+export CFLAGS
+
+for compiler in $compilers; do
+
+   . common.fns
+   TDB_NO_FSYNC=1
+   SAVED_CPPFLAGS=$CPPFLAGS
+   CPPFLAGS=
+   export TDB_NO_FSYNC
+   export CPPFLAGS
+   test_tree samba_4_0_test source4 $compiler
+   CPPFLAGS=$SAVED_CPPFLAGS
+   export CPPFLAGS
+
+   test_tree samba_3_current source $compiler
+   test_tree samba_3_next source $compiler
+   test_tree samba_3_master source $compiler
+   TDB_NO_FSYNC=0
+   export TDB_NO_FSYNC
+
+done
+
+global_unlock


-- 
build.samba.org


[SCM] Samba Shared Repository - branch master updated

2010-12-07 Thread Matthieu Patou
The branch, master has been updated
   via  994bcf3 build: fix hpux build pb
  from  a52a587 docs: clarify the idmap_rid manpage (bug #7788)

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


- Log -
commit 994bcf35d2c547edc7f567a0f1b6e4db73a3ee73
Author: Matthieu Patou m...@matws.net
Date:   Tue Dec 7 23:42:15 2010 +0300

build: fix hpux build pb

Pair-Programmed-With: Thomas Nagy tnagy2po...@gmail.com

Fix the library extension from .so to .sl
Add full path to library when linking this is needed due to a strange
behavior of HP-UX:

This command: gcc demo demo.c -L dir1/dir2/ -lsomelib
will give a binary with a hard coded lib like dir1/dir2/libsomelib.sl.
Somehow like a partial rpath, it has the first impact of fooling waf
detection of wether the plateform support libraries or not (leading to
being unable to compile samba on HPUX) and the impact of having non
functionnal binaries.

Autobuild-User: Matthieu Patou m...@samba.org
Autobuild-Date: Wed Dec  8 00:32:50 CET 2010 on sn-devel-104

---

Summary of changes:
 buildtools/wafsamba/hpuxcc.py   |   56 +++
 buildtools/wafsamba/wafsamba.py |1 +
 2 files changed, 57 insertions(+), 0 deletions(-)
 create mode 100644 buildtools/wafsamba/hpuxcc.py


Changeset truncated at 500 lines:

diff --git a/buildtools/wafsamba/hpuxcc.py b/buildtools/wafsamba/hpuxcc.py
new file mode 100644
index 000..abdf2a8
--- /dev/null
+++ b/buildtools/wafsamba/hpuxcc.py
@@ -0,0 +1,56 @@
+# compiler definition for HPUX
+# based on suncc.py from waf
+
+import os, optparse, sys
+import Utils, Options, Configure
+import ccroot, ar
+from Configure import conftest
+import gcc
+
+
+...@conftest
+def gcc_modifier_hpux(conf):
+v=conf.env
+v['CCFLAGS_DEBUG']=['-g']
+v['CCFLAGS_RELEASE']=['-O2']
+v['CC_SRC_F']=''
+v['CC_TGT_F']=['-c','-o','']
+v['CPPPATH_ST']='-I%s'
+if not v['LINK_CC']:v['LINK_CC']=v['CC']
+v['CCLNK_SRC_F']=''
+v['CCLNK_TGT_F']=['-o','']
+v['LIB_ST']='-l%s'
+v['LIBPATH_ST']='-L%s'
+v['STATICLIB_ST']='-l%s'
+v['STATICLIBPATH_ST']='-L%s'
+v['RPATH_ST']='-Wl,-rpath,%s'
+v['CCDEFINES_ST']='-D%s'
+v['SONAME_ST']='-Wl,-h,%s'
+v['SHLIB_MARKER']=['-Wl,-Bdynamic']
+#v['STATICLIB_MARKER']='-Wl,-Bstatic'
+v['FULLSTATIC_MARKER']='-static'
+v['program_PATTERN']='%s'
+v['shlib_CCFLAGS']=['-fPIC','-DPIC']
+v['shlib_LINKFLAGS']=['-shared']
+v['shlib_PATTERN']='lib%s.sl'
+#   v['staticlib_LINKFLAGS']=['-Wl,-Bstatic']
+v['staticlib_PATTERN']='lib%s.a'
+
+gcc.gcc_modifier_hpux = gcc_modifier_hpux
+
+from TaskGen import feature, after
+...@feature('cprogram', 'cshlib')
+...@after('apply_link', 'apply_lib_vars', 'apply_obj_vars')
+def hpux_addfullpath(self):
+  if sys.platform == 'hp-ux11':
+link = getattr(self, 'link_task', None)
+if link:
+lst = link.env.LINKFLAGS
+buf = []
+for x in lst:
+   if x.startswith('-L'):
+   p2 = x[2:]
+   if not os.path.isabs(p2):
+   x = x[:2] + self.bld.srcnode.abspath(link.env) + /../ + 
x[2:].lstrip('.')
+   buf.append(x)
+link.env.LINKFLAGS = buf
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 5d13fa1..1d3ced1 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -23,6 +23,7 @@ import samba_conftests
 import samba_abi
 import tru64cc
 import irixcc
+import hpuxcc
 import generic_cc
 import samba_dist
 import samba_wildcard


-- 
Samba Shared Repository


[SCM] Samba Shared Repository - branch master updated

2010-12-07 Thread Andrew Bartlett
The branch, master has been updated
   via  d7cd2ad s4-provision Always run slaptest to convert the config file
   via  87e2d68 s4-provision Add an invalid names check for 'domain == 
netbiosname'
  from  994bcf3 build: fix hpux build pb

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


- Log -
commit d7cd2ad4383ea6eff73e9cb2135ca5e3eda70a6d
Author: Andrew Bartlett abart...@samba.org
Date:   Sat Dec 4 13:47:05 2010 +1100

s4-provision Always run slaptest to convert the config file

If the directory exists, it does not mean that it is configured - we
may be on a re-run of the provision.

Andrew Bartlett

Autobuild-User: Andrew Bartlett abart...@samba.org
Autobuild-Date: Wed Dec  8 05:19:12 CET 2010 on sn-devel-104

commit 87e2d68305570ab024f801d0c063e07f076cc46f
Author: Andrew Bartlett abart...@samba.org
Date:   Sat Dec 4 12:34:44 2010 +1100

s4-provision Add an invalid names check for 'domain == netbiosname'

(This is also invalid)

Andrew Bartlett

---

Summary of changes:
 .../scripting/python/samba/provision/__init__.py   |5 +++-
 .../scripting/python/samba/provision/backend.py|   26 ++--
 2 files changed, 17 insertions(+), 14 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/scripting/python/samba/provision/__init__.py 
b/source4/scripting/python/samba/provision/__init__.py
index 7f19699..3e402b2 100644
--- a/source4/scripting/python/samba/provision/__init__.py
+++ b/source4/scripting/python/samba/provision/__init__.py
@@ -515,6 +515,9 @@ def guess_names(lp=None, hostname=None, domain=None, 
dnsdomain=None,
 
 if domaindn is None:
 domaindn = DC= + dnsdomain.replace(., ,DC=)
+
+if domain == netbiosname:
+raise ProvisioningError(guess_names: Domain '%s' must not be 
equal to short host name '%s'! % (domain, netbiosname))
 else:
 domain = netbiosname
 if domaindn is None:
@@ -525,7 +528,7 @@ def guess_names(lp=None, hostname=None, domain=None, 
dnsdomain=None,
 
 if hostname.upper() == realm:
 raise ProvisioningError(guess_names: Realm '%s' must not be equal to 
hostname '%s'! % (realm, hostname))
-if netbiosname == realm:
+if netbiosname.upper() == realm:
 raise ProvisioningError(guess_names: Realm '%s' must not be equal to 
netbios hostname '%s'! % (realm, netbiosname))
 if domain == realm:
 raise ProvisioningError(guess_names: Realm '%s' must not be equal to 
short domain name '%s'! % (realm, domain))
diff --git a/source4/scripting/python/samba/provision/backend.py 
b/source4/scripting/python/samba/provision/backend.py
index 809dd4f..34f64e3 100644
--- a/source4/scripting/python/samba/provision/backend.py
+++ b/source4/scripting/python/samba/provision/backend.py
@@ -540,29 +540,29 @@ class OpenLDAPBackend(LDAPBackend):
 # DN and simple bind
 self.credentials.set_username(samba-admin)
 
+# Wipe the old sam.ldb databases away
+shutil.rmtree(self.olcdir, True)
+os.makedirs(self.olcdir, 0770)
+
 # If we were just looking for crashes up to this point, it's a
 # good time to exit before we realise we don't have OpenLDAP on
 # this system
 if self.ldap_dryrun_mode:
 sys.exit(0)
 
-# Finally, convert the configuration into cn=config style!
-if not os.path.isdir(self.olcdir):
-os.makedirs(self.olcdir, 0770)
-
-slapd_cmd = [self.slapd_path, -Ttest, -n, 0, -f,
+slapd_cmd = [self.slapd_path, -Ttest, -n, 0, -f,
  self.slapdconf, -F, self.olcdir]
-retcode = subprocess.call(slapd_cmd, close_fds=True, shell=False)
+retcode = subprocess.call(slapd_cmd, close_fds=True, shell=False)
 
-if retcode != 0:
-self.logger.error(conversion from slapd.conf to cn=config 
failed slapd started with: %s %  \' + \' \'.join(slapd_cmd) + \')
-raise ProvisioningError(conversion from slapd.conf to 
cn=config failed)
+if retcode != 0:
+self.logger.error(conversion from slapd.conf to cn=config failed 
slapd started with: %s %  \' + \' \'.join(slapd_cmd) + \')
+raise ProvisioningError(conversion from slapd.conf to cn=config 
failed)
 
-if not os.path.exists(os.path.join(self.olcdir, cn=config.ldif)):
-raise ProvisioningError(conversion from slapd.conf to 
cn=config failed)
+if not os.path.exists(os.path.join(self.olcdir, cn=config.ldif)):
+raise ProvisioningError(conversion from slapd.conf to cn=config 
failed)
 
-# Don't confuse the admin by leaving the slapd.conf around
-os.remove(self.slapdconf)
+# Don't confuse the admin by leaving the slapd.conf around
+

[SCM] Samba Shared Repository - branch master updated

2010-12-07 Thread Andrew Tridgell
The branch, master has been updated
   via  b352ecb waf: added -Wmissing-prototypes to build
   via  be99d84 waf: make all generators depend on their rules
   via  16c36a8 s3-waf: fixed version number handling
   via  4debe69 s4-heimdal: enable symbol versioning in heimdal
   via  3513421 waf: use -Wl,--version-script if available
   via  d0c93ba waf: added configure test for -Wl,--version-script
   via  84ac1f8 s4-dns: dlz_bind9 doesn't need to link to gensec any more
   via  d5bf525 s4-waf: get the version number right on private libraries
   via  18177f1 s4-dns: use ldb hooks for samba extensions in dlz_bind9
   via  cba7397 s4-ldb: use RTLD_DEEPBIND if available for ldb modules
   via  591e18a s4-dns: allow a remote ldap server to be used with dlz_bind9
   via  be53dcd s4-dsdb: register samba handlers in dsdb module
   via  1b016f5 s4-ldb: ensure ldb_register_samba_handlers() is not done 
twice
   via  9013f93 wintest: use --add-ref for RODC replication
   via  545932f samba-tools: more reasonable defaults for samba-tool 
commands
   via  249afc8 samba-tools: export doesn't need any credentials
  from  d7cd2ad s4-provision Always run slaptest to convert the config file

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


- Log -
commit b352ecb1cf3bfb92cf8a2479a3ebe4d80ee2de60
Author: Andrew Tridgell tri...@samba.org
Date:   Wed Dec 8 15:04:33 2010 +1100

waf: added -Wmissing-prototypes to build

This ensures that we always have a prototype for any function we
declare

Autobuild-User: Andrew Tridgell tri...@samba.org
Autobuild-Date: Wed Dec  8 06:12:07 CET 2010 on sn-devel-104

commit be99d84972de8fd64c90aea3be4e0f06dd060065
Author: Andrew Tridgell tri...@samba.org
Date:   Wed Dec 8 15:03:35 2010 +1100

waf: make all generators depend on their rules

this ensures we rebuild when a constructed rule changes

commit 16c36a8cb56f3a74927cdb7c46dfb6158f328beb
Author: Andrew Tridgell tri...@samba.org
Date:   Wed Dec 8 14:58:12 2010 +1100

s3-waf: fixed version number handling

commit 4debe69b731b69aebd95386c2f1a36bb2a53d047
Author: Andrew Tridgell tri...@samba.org
Date:   Wed Dec 8 14:57:31 2010 +1100

s4-heimdal: enable symbol versioning in heimdal

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

commit 35134214ae819ad26ec388fa44dd37b24d72d3c4
Author: Andrew Tridgell tri...@samba.org
Date:   Wed Dec 8 14:52:43 2010 +1100

waf: use -Wl,--version-script if available

This enables symbol version on our libraries, if the system supports
it

If the library is a public library, then set the symbol version based
on the major number. If it is a private library then set it based on
the full version number (which will include the git hash if
available).

This ensures that applications using our libraries don't use symbols
from other libraries that they may be linked to. It also ensures we
only use the right version of any private libraries.

Note that the linker ends up generating both a version and unversioned
symbol for all symbols. This means existing users of our public
libraries will continue to work, with symbols resolved to the
unversioned symbol. When applications are re-linked they will bind to
the specific symbol version.

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

commit d0c93ba115a942403982011d01c443aa18513fe7
Author: Andrew Tridgell tri...@samba.org
Date:   Wed Dec 8 11:26:32 2010 +1100

waf: added configure test for -Wl,--version-script

this checks that the linker supports --version-script

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

commit 84ac1f8f6a633f363f64a0f49d063ae7750d11b5
Author: Andrew Tridgell tri...@samba.org
Date:   Wed Dec 8 11:29:34 2010 +1100

s4-dns: dlz_bind9 doesn't need to link to gensec any more

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

commit d5bf5255917862f35bb6849a407539c43cde2b04
Author: Andrew Tridgell tri...@samba.org
Date:   Wed Dec 8 11:25:28 2010 +1100

s4-waf: get the version number right on private libraries

use the first digit of the version number for the library version

Pair-Programmed-With: Jelmer Vernooij jel...@samba.org

commit 18177f1e52e2767e1266f44ea32a8f8d82a17b74
Author: Andrew Tridgell tri...@samba.org
Date:   Wed Dec 8 09:58:52 2010 +1100

s4-dns: use ldb hooks for samba extensions in dlz_bind9

this avoids linking dlz_bind9 directly to heimdal, which allows a
RTLD_DEEPBIND in ldb module loading to find the right kerberos version

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

commit cba73975c2868bb657962229c0c5e77009c0197d

[SCM] Samba Shared Repository - branch master updated

2010-12-07 Thread Matthieu Patou
The branch, master has been updated
   via  53b49d4 build: tru64 needs -shared for building libs
  from  b352ecb waf: added -Wmissing-prototypes to build

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


- Log -
commit 53b49d4091205cfefabf424a2fefc2df756613d9
Author: Matthieu Patou m...@matws.net
Date:   Wed Dec 8 09:47:36 2010 +0300

build: tru64 needs -shared for building libs

Autobuild-User: Matthieu Patou m...@samba.org
Autobuild-Date: Wed Dec  8 08:33:54 CET 2010 on sn-devel-104

---

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


Changeset truncated at 500 lines:

diff --git a/buildtools/wafsamba/tru64cc.py b/buildtools/wafsamba/tru64cc.py
index c4a0dca..7e85701 100644
--- a/buildtools/wafsamba/tru64cc.py
+++ b/buildtools/wafsamba/tru64cc.py
@@ -58,7 +58,7 @@ def tru64cc_common_flags(conf):
 
# shared library
 #  v['shlib_CCFLAGS']   = ['-Kpic', '-DPIC']
-#  v['shlib_LINKFLAGS'] = ['-G']
+   v['shlib_LINKFLAGS'] = ['-shared']
v['shlib_PATTERN']   = 'lib%s.so'
 
# static lib


-- 
Samba Shared Repository