Re: [Samba] SAMBA+PDC+Mysql authentication Backend

2009-06-15 Thread Collen Blijenberg

Hi Pablo,

First i like to mention that the sql backend might not be the smartest 
choice of backends.


in your debug you attached you'll see an mysql error:

[2009/06/12 15:53:01,  0] pdb_mysql.c:mysqlsam_replace_sam_account(415)
 Error executing UPDATE user SET WHERE user_sid = 
'S-1-5-21-2398918909-2979869015-1347180298-1234', You have an error in your SQL 
syntax; check the manual that corresponds to your MySQL server version for the 
right syntax to use near 'WHERE user_sid = 
'S-1-5-21-2398918909-2979869015-1347180298-1234'' at line 1


that is because the query isn't right ('update user set where', it 
should be 'update user set  where user_sid')

try commenting out all the mysql things (in your smb.conf) except the:
- Backend
- host
- user
- pass
and - database.

the rest is pre defined in the backend it's self..

but like i said, the sql backend lacks some good  things and you might 
be better off with ldap or the pdb backend.

also the sql backend only works with 3.0.x and 3.2.x
the project needs new developers to bring it to a higher plan...

good luck with it... Greets. Collen

ps. i think you might post sql related stuff in pdbsql mailing list, 
rather then the samba list...



Pablo Camera wrote:

I ne w in samba world but i was configured a Samba with shares folder linkable 
to users and it was successfull.

Now i try to extend to PDC but the client can't logon into the server:

the log.smbd could this


  [2009/06/12 15:51:21,  0] smbd/server.c:main(1209)
  smbd version 3.2.3 started.
  Copyright Andrew Tridgell and the Samba Team 1992-2008
[2009/06/12 15:51:21,  1] pdb_mysql.c:mysqlsam_init(607)
  Connecting to database server, host: localhost, user: samba, database: 
samba_auth, port: 3306
[2009/06/12 15:52:58,  0] rpc_server/srv_netlog_nt.c:get_md4pw(331)
  get_md4pw: Workstation MULTI$: BDC secure channel requested but not a server 
trust account
[2009/06/12 15:52:58,  0] 
rpc_server/srv_netlog_nt.c:_netr_ServerAuthenticate2(502)
  _netr_ServerAuthenticate2: failed to get machine password for account MULTI$: 
NT_STATUS_NO_TRUST_SAM_ACCOUNT
[2009/06/12 15:52:58,  0] rpc_server/srv_netlog_nt.c:get_md4pw(331)
  get_md4pw: Workstation MULTI$: BDC secure channel requested but not a server 
trust account
[2009/06/12 15:52:58,  0] 
rpc_server/srv_netlog_nt.c:_netr_ServerAuthenticate2(502)
  _netr_ServerAuthenticate2: failed to get machine password for account MULTI$: 
NT_STATUS_NO_TRUST_SAM_ACCOUNT
[2009/06/12 15:53:01,  0] pdb_mysql.c:mysqlsam_replace_sam_account(415)
  Error executing UPDATE user SET WHERE user_sid = 
'S-1-5-21-2398918909-2979869015-1347180298-1234', You have an error in your SQL 
syntax; check the manual that corresponds to your MySQL server version for the 
right syntax to use near 'WHERE user_sid = 
'S-1-5-21-2398918909-2979869015-1347180298-1234'' at line 1

My smb.conf is this.

[global]
workgroup = MULTI
netbios name = MULTI
security = user

#Modificaciones para hacer de samba un PDC
os level = 64
preferred master = yes
domain master = yes
local master = yes
domain logons = yes
logon path = \\%N\%u
logon drive = H:
logon home = \\multi\%u\perfil
logon script = %u.bdat
add user script = /usr/local/samba/bin/./pdbedit -a %u
#add user to group script = /usr/sbin/groupmod -m %u %g
add machine script = /usr/local/samba/bin/./pdbedit -am %m
delete user script = /usr/local/samba/bin/./pdbedit -x %u
#delete group script = /usr/sbin/groupdel %g
#delete user from group script = /usr/sbin/groupmod -x %u %g
#set primary group script = /usr/sbin/usermod -g %g %u
passwd program = /usr/local/samba/bin/./pdbedit -am %u
passwd chat = *New*password* %n\n *Retype*new*password* %n\n 
*all*authentication*tokens*updated*
idmap uid = 1-15000
idmap gid = 1-15000

#Para enviar password
#lanman auth = Yes
#ntlm auth = No
#lm announce = Yes
#client lanman auth = Yes 
#Fin de password


#Fin de Modificaciones para PDC

#Mapeo de usuarios
username map = /usr/local/samba/lib/smbusers
#Fin de Mapeo de usuarios
 
obey pam restrictions = Yes

#Ultimo cambio de yes a no
encrypt passwords = yes
#fin cambio
update encrypted = no

#client lanman auth = yes
#client plaintext auth = yes

#Para Autenticar usuarios
passdb backend   = mysql:mysql
mysql:mysql host = localhost
mysql:mysql user = samba
mysql:mysql password = 
mysql:mysql database = samba_auth

mysql:fullname column= nt_fullname:
mysql:domain column  = 'multi':
mysql:lanman pass column = NULL:
mysql:nt pass column = NULL:
mysql:plain pass column  = plain_pw:
mysql:unknown_3 column   = NULL
mysql:sid column = user_sid
mysql:nt username column = nt_username
#mysql:nt pass  
smb passwd file = /etc/samba/private/smbpasswd

#Fin de Autenticacion de Usuarios

#Para PDC
[netlogon]
path = /home/netlogon
read only = yes
write list = ntadmin

[profiles]
path = /usr/local/samba/ntprofile
writeable = yes
create mask = 0600
directory mask = 0700

#Fin PDC



[homes]
comment = Home 

[Samba] Samba with ADS

2009-06-15 Thread McGranahan, Jamen
Environment: Sun Solaris 9 sparc
Software: Samba-3.3.3, KRB5-1.6.3, OpenLDAP-2.4.11
Problem:
Am trying to create shares with Samba so that users can map to folders on this 
server using Active Directory. I am successful in creating a Kerberos ticket; I 
can join the domain; and wbinfo -u and -g give me users in the AD. However, 
getent passwd only gives me a list of users on the server and not in the AD. 
The winbindd.log file has a lot of these lines:

[2009/06/15 10:41:59,  0] winbindd/winbindd.c:request_len_recv(616)
  request_len_recv: Invalid request size received: 2088 (expected 2096)
[2009/06/15 10:43:29,  0] winbindd/winbindd.c:request_len_recv(616)
  request_len_recv: Invalid request size received: 2088 (expected 2096)
[2009/06/15 10:47:54,  0] winbindd/winbindd.c:request_len_recv(616)
  request_len_recv: Invalid request size received: 2088 (expected 2096)
[2009/06/15 10:47:54,  0] winbindd/winbindd.c:request_len_recv(616)
  request_len_recv: Invalid request size received: 2088 (expected 2096)
[2009/06/15 10:47:54,  0] winbindd/winbindd.c:request_len_recv(616)
  request_len_recv: Invalid request size received: 2088 (expected 2096)

If you have any advice and/or guidance, I would greatly appreciate it. Thank 
you!

***
* Jamen McGranahan
* Systems Services Librarian
* Library Information Technology Services
* Vanderbilt University
* Suite 700
* 110 21st Avenue South
* Nashville, TN  37240
* (615) 343-1614
* (615) 343-8834 (fax)
* jamen.mcgrana...@vanderbilt.edu
***

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


Re: [Samba] Samba with ADS

2009-06-15 Thread David Eisner
On Mon, Jun 15, 2009 at 12:36 PM, David Eisnerdeis...@gmail.com wrote:
 /usr/lib/nsswinbind.so.1.

That should say /usr/lib/nss_winbind.so.1.

-David

-- 
David Eisner http://cradle.brokenglass.com
-- 
To unsubscribe from this list go to the following URL and read the
instructions:  https://lists.samba.org/mailman/options/samba


Re: [Samba] Samba with ADS

2009-06-15 Thread David Eisner
On Mon, Jun 15, 2009 at 11:50 AM, McGranahan,
Jamenjamen.mcgrana...@vanderbilt.edu wrote:
 [2009/06/15 10:41:59,  0] winbindd/winbindd.c:request_len_recv(616)
  request_len_recv: Invalid request size received: 2088 (expected 2096)


When I see this, it's because I'm using an old nss_winbind.so (i.e.
not the one compiled with the winbindd i'm running).  This happens for
one of two reasons: Either I forgot to copy over the new
nss_winbind.so when I installed Samba, or a Solaris update overwrote
/usr/lib/nsswinbind.so.1.

-David

-- 
David Eisner http://cradle.brokenglass.com
--
To unsubscribe from this list go to the following URL and read the
instructions:  https://lists.samba.org/mailman/options/samba


[Samba] RE: Samba with ADS

2009-06-15 Thread Edward Ned Harvey
 Environment: Sun Solaris 9 sparc
 Software: Samba-3.3.3, KRB5-1.6.3, OpenLDAP-2.4.11
 Problem:
 Am trying to create shares with Samba so that users can map to folders
 on this server using Active Directory. I am successful in creating a
 Kerberos ticket; I can join the domain; and wbinfo -u and -g give me
 users in the AD. However, getent passwd only gives me a list of users
 on the server and not in the AD. The winbindd.log file has a lot of
 these lines:
 
 [2009/06/15 10:41:59,  0] winbindd/winbindd.c:request_len_recv(616)
   request_len_recv: Invalid request size received: 2088 (expected 2096)
 [2009/06/15 10:43:29,  0] winbindd/winbindd.c:request_len_recv(616)
   request_len_recv: Invalid request size received: 2088 (expected 2096)
 [2009/06/15 10:47:54,  0] winbindd/winbindd.c:request_len_recv(616)
   request_len_recv: Invalid request size received: 2088 (expected 2096)
 [2009/06/15 10:47:54,  0] winbindd/winbindd.c:request_len_recv(616)
   request_len_recv: Invalid request size received: 2088 (expected 2096)
 [2009/06/15 10:47:54,  0] winbindd/winbindd.c:request_len_recv(616)
   request_len_recv: Invalid request size received: 2088 (expected 2096)
 
 If you have any advice and/or guidance, I would greatly appreciate it.
 Thank you!

I don't think you need to use winbind.  In all of my situations, winbind
only got in the way, and I always have more success with winbind disabled.
It's been a while since I read what winbind was for - I think it's meant to
keep track of UID/username mappings, to ensure consistency among multiple
samba servers if you have more than one.  For this purpose, I just use the
regular passwd files or NIS, both of which I think are more reliable and
simpler to manage.  

Instead of winbind, I just use net join -w DOMAIN -U administrator and use
smb.conf like this:
[global]
workgroup = DOMAIN
realm = DOMAIN.COM
server string = Samba Server
security = DOMAIN
log file = /var/samba/log/log.%m
max log size = 50
unix extensions = No
load printers = No
printcap name = /dev/null
dns proxy = No
wins server = 192.168.x.y
ldap ssl = no
create mask = 0660
security mask = 0660
directory mask = 0770
directory security mask = 0770

[share]
path = /share
read only = No

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


[Samba] RE: Samba with ADS

2009-06-15 Thread James Zuelow

 -Original Message-
 From: 
 samba-bounces+james_zuelow=ci.juneau.ak...@lists.samba.org 
 [mailto:samba-bounces+james_zuelow=ci.juneau.ak...@lists.samba
 .org] On Behalf Of McGranahan, Jamen
 Sent: Monday, 15 June, 2009 07:50
 To: samba@lists.samba.org
 Subject: [Samba] Samba with ADS
 
 Environment: Sun Solaris 9 sparc
 Software: Samba-3.3.3, KRB5-1.6.3, OpenLDAP-2.4.11
 Problem:
 Am trying to create shares with Samba so that users can map 
 to folders on this server using Active Directory. I am 
 successful in creating a Kerberos ticket; I can join the 
 domain; and wbinfo -u and -g give me users in the AD. 
 However, getent passwd only gives me a list of users on the 
 server and not in the AD. The winbindd.log file has a lot of 
 these lines:
--8-- snip --8--
 
 If you have any advice and/or guidance, I would greatly 
 appreciate it. Thank you!
 
The getent passwd trouble may be a red herring.

If you do not have these lines in smb.conf

 Winbind enum users = Yes
 Winbind enum groups = Yes

Then wbinfo -u will work, but getent passwd will not.

Generally you want to leave enumumerating users and groups turned off (the 
default) on larger domains.  In my experience having them turned on can delay 
share access, restart times, etc.

However enumerating users and groups so that getent passwd works is not 
necessary for shares to work correctly or users to map drives in AD.  (At least 
this is true for Debian, I don't know about Solaris.)

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


[Samba] Samba 3.0.24 on OpenWRT

2009-06-15 Thread Kunal Punjabi
Hi,

We have managed to compile samba3 (v 3.0.24 that ships with openwrt/
kamizake) for our ubicom32 platform and programmed a board with it,
however I am not able to access a samba share on the board. When trying
to access the OpenWRT router (using the smbclient command) I get:

Error NT_STATUS_CONNECTION_REFUSED

The device is reachable from my linux box (otherwise I should have seen
a Error NT_STATUS_HOST_UNREACHABLE)

I am hoping you can help us out. Below is a small list of
observations/questions:

 

1. I noticed that the nmbd service is not recognized by our console.
I don't know why that is the case, but the 'smbd' service is. Samba 3
doesn't provide any such menuconfig option to turn nmbd on or off. After
reading the documentation, I learned that nmbd is used for name
registration and resolution requests, and should be started BEFORE smbd.
It looks like under openwrt/build_dir/ubicom32/samba-3.0.24/source/bin,
smbd is present but nmbd is not. It is not getting compiled for some
reason, and the default samba compilation did not compile it or complain
of it not being compiled. I found the target in the Makefile under
samba-3.0.24/source - I believe it is called bin/nmbd (line 948), and it
is called by SBIN_PROGS (line 157). But it still does not get compiled
in with the samba binary.

 

Is the nmbd service required in 3.0.24? If so, why is it not built by
default?

 

According to the samba spec:

The Samba server is made up of the following daemons:

nmbd This daemon handles all name registration and resolution requests.

It is the primary vehicle involved in network browsing. It handles all

UDP-based protocols. The nmbd daemon should be the first command

started as part of the Samba startup process.

smbd This daemon handles all TCP/IP-based connection services for
fileand

print-based operations. It also manages local authentication. It

should be started immediately following the startup of nmbd.

 

2. Is it possible that smb.conf isnt configured correctly. This is a
snippet of smb.conf from the openwrt router board (/etc/samba/smb.conf)

 

[global]

netbios name = openwrt

workgroup = openwrt

server string = openwrt

syslog = 10

encrypt passwords = true

passdb backend = smbpasswd

obey pam restrictions = yes

socket options = TCP_NODELAY

unix charset = ISO-8859-1

preferred master = yes

os level = 20

security = user

guest account = nobody

invalid users = root

smb passwd file = /etc/samba/smbpasswd

 

[homes]

comment = Home Directories

browseable = no

read only = no

create mode = 0750

 

Has anyone tried samba v 3.0.24 on OpenWRT, and does it work for you? Do
you know what the problem could be here and why accessing the share via
the 

Smbclient -L  //hostname/share -U username  command does not work?

 

Thanks

Kunal

--
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.0.24 on OpenWRT

2009-06-15 Thread Volker Lendecke
On Mon, Jun 15, 2009 at 05:16:54PM -0700, Kunal Punjabi wrote:
 We have managed to compile samba3 (v 3.0.24 that ships with openwrt/
 kamizake) for our ubicom32 platform and programmed a board with it,
 however I am not able to access a samba share on the board. When trying
 to access the OpenWRT router (using the smbclient command) I get:
 
 Error NT_STATUS_CONNECTION_REFUSED

Your smb.conf looks fine. If you get
NT_STATUS_CONNECTION_REFUSED, smbd is probably just not
running. Please check if port 139 and 445 are listening.

nmbd is required for normal operations, but if for testing
purposes you connect to that box using the IP address, it is
not.

Volker


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

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-2318-gf92269a

2009-06-15 Thread Karolin Seeger
The branch, master has been updated
   via  f92269a6ce220e12b9b80c15ed3fa2e9e6b4a6dc (commit)
  from  0c3580c5de63265c54924a5f171e858a0bfb2a79 (commit)

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


- Log -
commit f92269a6ce220e12b9b80c15ed3fa2e9e6b4a6dc
Author: Karolin Seeger ksee...@samba.org
Date:   Mon Jun 15 08:33:22 2009 +0200

s3/libsmb: Fix debug message.

This fixes bug #6472.

Karolin

Signed-off-by: Volker Lendecke v...@samba.org

---

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


Changeset truncated at 500 lines:

diff --git a/source3/libsmb/passchange.c b/source3/libsmb/passchange.c
index 45cd392..7747062 100644
--- a/source3/libsmb/passchange.c
+++ b/source3/libsmb/passchange.c
@@ -197,7 +197,7 @@ NTSTATUS remote_password_change(const char *remote_machine, 
const char *user_nam
if (asprintf(err_str, SAMR connection to machine %s 
 failed. Error was %s, but LANMAN password 
 changed are disabled\n,
-nt_errstr(result), remote_machine) == -1) {
+remote_machine, nt_errstr(result)) == -1) {
*err_str = NULL;
}
result = cli_nt_error(cli);


-- 
Samba Shared Repository


[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-1129-ge24c240

2009-06-15 Thread Karolin Seeger
The branch, v3-4-test has been updated
   via  e24c2401750212d7212952f574ed9765fb1f2e8e (commit)
  from  cea3a63a86a733a16c3e91f5a78e972be802eb5c (commit)

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


- Log -
commit e24c2401750212d7212952f574ed9765fb1f2e8e
Author: Karolin Seeger ksee...@samba.org
Date:   Mon Jun 15 08:33:22 2009 +0200

s3/libsmb: Fix debug message.

This fixes bug #6472.

Karolin

Signed-off-by: Volker Lendecke v...@samba.org
(cherry picked from commit f92269a6ce220e12b9b80c15ed3fa2e9e6b4a6dc)

---

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


Changeset truncated at 500 lines:

diff --git a/source3/libsmb/passchange.c b/source3/libsmb/passchange.c
index 45cd392..7747062 100644
--- a/source3/libsmb/passchange.c
+++ b/source3/libsmb/passchange.c
@@ -197,7 +197,7 @@ NTSTATUS remote_password_change(const char *remote_machine, 
const char *user_nam
if (asprintf(err_str, SAMR connection to machine %s 
 failed. Error was %s, but LANMAN password 
 changed are disabled\n,
-nt_errstr(result), remote_machine) == -1) {
+remote_machine, nt_errstr(result)) == -1) {
*err_str = NULL;
}
result = cli_nt_error(cli);


-- 
Samba Shared Repository


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

2009-06-15 Thread Karolin Seeger
The branch, v3-3-test has been updated
   via  7108ebb87902f3b5d2c43ba95d557278ad8e120f (commit)
  from  966a51da8998cfd15875ba047b7f765c84b914dd (commit)

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


- Log -
commit 7108ebb87902f3b5d2c43ba95d557278ad8e120f
Author: Karolin Seeger ksee...@samba.org
Date:   Mon Jun 15 08:33:22 2009 +0200

s3/libsmb: Fix debug message.

This fixes bug #6472.

Karolin

Signed-off-by: Volker Lendecke v...@samba.org

Was commit f92269a6 in master.

---

Summary of changes:
 source/libsmb/passchange.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/libsmb/passchange.c b/source/libsmb/passchange.c
index c7140a9..b662b44 100644
--- a/source/libsmb/passchange.c
+++ b/source/libsmb/passchange.c
@@ -187,7 +187,7 @@ NTSTATUS remote_password_change(const char *remote_machine, 
const char *user_nam
if (asprintf(err_str, SAMR connection to machine %s 
 failed. Error was %s, but LANMAN password 
 changed are disabled\n,
-nt_errstr(result), remote_machine) == -1) {
+remote_machine, nt_errstr(result)) == -1) {
*err_str = NULL;
}
result = cli_nt_error(cli);


-- 
Samba Shared Repository


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

2009-06-15 Thread Karolin Seeger
The branch, v3-2-test has been updated
   via  f2ae8244603a4232331b7c3128661aec08ecd977 (commit)
  from  fb5b65081ea2199e2c3b3a36acfe578b5c2f15d1 (commit)

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


- Log -
commit f2ae8244603a4232331b7c3128661aec08ecd977
Author: Karolin Seeger ksee...@samba.org
Date:   Mon Jun 15 10:25:48 2009 +0200

WHATSNEW: Update changes since 3.2.11.

Karolin

---

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


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index e66594b..5e1defb 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -8,6 +8,7 @@ This is a maintenance release of the Samba 3.2 series.
 
 Major enhancements in 3.2.12 include:
 
+o Fix SAMR and LSA checks (bug #6089, #6289)
 o Fix posix acls when setting an ACL without explicit ACE for the
   owner (bug #2346).
 o Fix force user (bug #6291).
@@ -28,8 +29,10 @@ o   Michael Adam ob...@samba.org
 
 
 o   Jeremy Allison j...@samba.org
+* BUG 6089: Revert the extra SAMR and LSA checks.
 * BUG 6099: Fix joining of Win7 into Samba domain.
 * BUG 6279: Fix Winbind crash.
+* BUG 6289: Revert the extra SAMR and LSA checks.
 * BUG 6291: Fix force user.
 * BUG 6386: Groupdb mapping fix.
 * Fix bug in processing of open modes in POSIX open.
@@ -39,6 +42,7 @@ o   Guenther Deschner g...@samba.org
 * BUG 6099: Fix joining of Win7 into Samba domain.
 * BUG 6301: Fix samr_ConnectVersion enum which is 32bit not 16bit.
 * BUG 6372: Fix usermanager only displaying 1024 groups and aliases.
+* BUG 6465: Fix enumeration of empty aliases (ldb backend).
 * Protect netlogon_creds_server_step() against NULL creds.
 
 
@@ -62,6 +66,10 @@ o   D.L. Meyer dlme...@uiuc.edu
 * BUG 5832: Fix build on RHEL when ccache is not available.
 
 
+o   Sébastien Prud'homme sebastien.prudho...@gmail.com
+* BUG 5945: Fix out of memory error with Winbind idmap.
+
+
 o   Karolin Seeger ksee...@samba.org
 * BUG 5853: Add keyutils-devel to build requires.
 


-- 
Samba Shared Repository


[SCM] Samba Shared Repository - branch v3-2-stable updated - release-3-2-11-52-g98c9a24

2009-06-15 Thread Karolin Seeger
The branch, v3-2-stable has been updated
   via  98c9a24a01c72d25b3b7eeb2697a2964f08b3d76 (commit)
   via  e892c4faa28193a6529464159e759d8d2b0d92d4 (commit)
   via  4afb8f741152282c7426592336b2e1e22abc61dd (commit)
   via  efc993a2aa6d0745c5868080640ebea3409b6818 (commit)
   via  51f6f4343568b19e4c6ba2a3f919931b26228531 (commit)
   via  d0690a1f34658f0c08307d5287eba5ca2d2da9d5 (commit)
  from  8ba1a1f61986132bb6f5b2f36b59a73e952b381d (commit)

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


- Log -
commit 98c9a24a01c72d25b3b7eeb2697a2964f08b3d76
Author: Karolin Seeger ksee...@samba.org
Date:   Mon Jun 15 10:25:48 2009 +0200

WHATSNEW: Update changes since 3.2.11.

Karolin
(cherry picked from commit f2ae8244603a4232331b7c3128661aec08ecd977)

commit e892c4faa28193a6529464159e759d8d2b0d92d4
Author: Karolin Seeger ksee...@samba.org
Date:   Fri Jun 12 15:06:32 2009 +0200

WHATSNEW: Attach old release notes.

Karolin
(cherry picked from commit fb5b65081ea2199e2c3b3a36acfe578b5c2f15d1)

commit 4afb8f741152282c7426592336b2e1e22abc61dd
Author: Sébastien Prud'homme sebastien.prudho...@gmail.com
Date:   Fri Jun 12 09:11:57 2009 +0200

s3/idmap: Fix out of memory error with Winbind idmap.

This fixes bug #5945.
(cherry picked from commit a7735416792f8156e53a04af98e7e2dff0b6707d)

commit efc993a2aa6d0745c5868080640ebea3409b6818
Author: Jeremy Allison j...@samba.org
Date:   Fri Jun 12 10:27:07 2009 +0200

Revert the extra SAMR and LSA checks.

These were added between 3.2.4 and 3.2.5 that have caused users problems.
This fixes among others bug #6089 and #6112.
(cherry picked from commit f2a29585123e6072a75eb9abdd202f99f5a01e1e)

commit 51f6f4343568b19e4c6ba2a3f919931b26228531
Author: Günther Deschner g...@samba.org
Date:   Sun Jun 7 11:23:09 2009 +0200

s3-groupdb: fix enum_aliasmem in ldb branch.

It is totally valid to have an alias with no members.
This fixes bug #6465.

Tridge, please check.

Found by RPC-SAMR torture test.

Guenther
(cherry picked from commit d27c4346397b828e3d7d01473f174577440d950a)

commit d0690a1f34658f0c08307d5287eba5ca2d2da9d5
Author: Günther Deschner g...@samba.org
Date:   Fri Jun 12 00:46:38 2009 +0200

s3-docs: Fix Bug #4280. Shutdown scripts are called as root for privileged 
users.

GUenther
(cherry picked from commit 3938d1e5fa1996f64e92d33d6893bab620d16b23)
(cherry picked from commit 0491f038403036814acf6eacc7bb742345bbe27b)
(cherry picked from commit d4b57dab0beada704fcbeae86ae5b5dd257030a0)
(cherry picked from commit 191f34654b653ed1f376c842d2d023c43eb866e0)

---

Summary of changes:
 WHATSNEW.txt  | 1648 +
 docs-xml/smbdotconf/logon/abortshutdownscript.xml |2 +-
 docs-xml/smbdotconf/logon/shutdownscript.xml  |2 +-
 source/groupdb/mapping_ldb.c  |2 +-
 source/rpc_server/srv_lsa_nt.c|   12 -
 source/rpc_server/srv_samr_nt.c   |   58 -
 source/winbindd/idmap.c   |8 +-
 7 files changed, 1657 insertions(+), 75 deletions(-)


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 684e88c..5e1defb 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -8,6 +8,7 @@ This is a maintenance release of the Samba 3.2 series.
 
 Major enhancements in 3.2.12 include:
 
+o Fix SAMR and LSA checks (bug #6089, #6289)
 o Fix posix acls when setting an ACL without explicit ACE for the
   owner (bug #2346).
 o Fix force user (bug #6291).
@@ -28,8 +29,10 @@ o   Michael Adam ob...@samba.org
 
 
 o   Jeremy Allison j...@samba.org
+* BUG 6089: Revert the extra SAMR and LSA checks.
 * BUG 6099: Fix joining of Win7 into Samba domain.
 * BUG 6279: Fix Winbind crash.
+* BUG 6289: Revert the extra SAMR and LSA checks.
 * BUG 6291: Fix force user.
 * BUG 6386: Groupdb mapping fix.
 * Fix bug in processing of open modes in POSIX open.
@@ -39,6 +42,7 @@ o   Guenther Deschner g...@samba.org
 * BUG 6099: Fix joining of Win7 into Samba domain.
 * BUG 6301: Fix samr_ConnectVersion enum which is 32bit not 16bit.
 * BUG 6372: Fix usermanager only displaying 1024 groups and aliases.
+* BUG 6465: Fix enumeration of empty aliases (ldb backend).
 * Protect netlogon_creds_server_step() against NULL creds.
 
 
@@ -62,6 +66,10 @@ o   D.L. Meyer dlme...@uiuc.edu
 * BUG 5832: Fix build on RHEL when ccache is not available.
 
 
+o   Sébastien Prud'homme sebastien.prudho...@gmail.com
+* BUG 5945: Fix out of memory error with Winbind idmap.
+
+
 o   Karolin Seeger ksee...@samba.org
 * BUG 5853: Add keyutils-devel to build requires.
 
@@ -90,3 +98,1643 @@ database 

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

2009-06-15 Thread Karolin Seeger
The branch, v3-3-test has been updated
   via  bd2f3695c117773032e16958a0266d0d1e75defe (commit)
  from  7108ebb87902f3b5d2c43ba95d557278ad8e120f (commit)

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


- Log -
commit bd2f3695c117773032e16958a0266d0d1e75defe
Author: Jeremy Allison j...@samba.org
Date:   Mon Jun 15 10:43:27 2009 +0200

Revert the extra SAMR and LSA checks.

These were added between 3.2.4 and 3.2.5 that have caused users problems.
This fixes among others bug #6089 and #6112.

---

Summary of changes:
 source/rpc_server/srv_samr_nt.c |   58 ---
 1 files changed, 0 insertions(+), 58 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/rpc_server/srv_samr_nt.c b/source/rpc_server/srv_samr_nt.c
index 05e62fb..c3464a8 100644
--- a/source/rpc_server/srv_samr_nt.c
+++ b/source/rpc_server/srv_samr_nt.c
@@ -862,13 +862,6 @@ NTSTATUS _samr_QuerySecurity(pipes_struct *p,
DEBUG(10,(_samr_QuerySecurity: querying security on SID: %s\n,
  sid_string_dbg(pol_sid)));
 
-   status = access_check_samr_function(acc_granted,
-   STD_RIGHT_READ_CONTROL_ACCESS,
-   _samr_QuerySecurity);
-   if (!NT_STATUS_IS_OK(status)) {
-   return status;
-   }
-
/* Check what typ of SID is beeing queried (e.g Domain SID, User SID, 
Group SID) */
 
/* To query the security of the SAM it self an invalid SID with S-0-0 
is passed to this function */
@@ -1488,13 +1481,6 @@ NTSTATUS _samr_QueryDisplayInfo(pipes_struct *p,
return NT_STATUS_OK;
}
 
-   status = access_check_samr_function(info-acc_granted,
-   SAMR_DOMAIN_ACCESS_ENUM_ACCOUNTS,
-   _samr_QueryDisplayInfo);
-   if (!NT_STATUS_IS_OK(status)) {
-   return status;
-   }
-
/*
 * calculate how many entries we will return.
 * based on
@@ -2077,13 +2063,6 @@ NTSTATUS _samr_LookupRids(pipes_struct *p,
if (!get_lsa_policy_samr_sid(p, r-in.domain_handle, pol_sid, 
acc_granted, NULL))
return NT_STATUS_INVALID_HANDLE;
 
-   status = access_check_samr_function(acc_granted,
-   0, /* Don't know the acc_bits yet */
-   _samr_LookupRids);
-   if (!NT_STATUS_IS_OK(status)) {
-   return status;
-   }
-
if (num_rids  1000) {
DEBUG(0, (Got asked for %d rids (more than 1000) -- according 
  to samba4 idl this is not possible\n, num_rids));
@@ -2634,13 +2613,6 @@ NTSTATUS _samr_QueryUserInfo(pipes_struct *p,
if (!find_policy_by_hnd(p, r-in.user_handle, (void **)(void *)info))
return NT_STATUS_INVALID_HANDLE;
 
-   status = access_check_samr_function(info-acc_granted,
-   SAMR_USER_ACCESS_GET_ATTRIBUTES,
-   _samr_QueryUserInfo);
-   if (!NT_STATUS_IS_OK(status)) {
-   return status;
-   }
-
domain_sid = info-sid;
 
sid_split_rid(domain_sid, rid);
@@ -2901,13 +2873,6 @@ NTSTATUS _samr_QueryDomainInfo(pipes_struct *p,
return NT_STATUS_INVALID_HANDLE;
}
 
-   status = access_check_samr_function(info-acc_granted,
-   SAMR_ACCESS_LOOKUP_DOMAIN,
-   _samr_QueryDomainInfo );
-
-   if ( !NT_STATUS_IS_OK(status) )
-   return status;
-
switch (r-in.level) {
case 0x01:
 
@@ -5649,7 +5614,6 @@ NTSTATUS _samr_SetDomainInfo(pipes_struct *p,
time_t u_expire, u_min_age;
time_t u_logout;
time_t u_lock_duration, u_reset_time;
-   NTSTATUS result;
 
DEBUG(5,(_samr_SetDomainInfo: %d\n, __LINE__));
 
@@ -5657,20 +5621,6 @@ NTSTATUS _samr_SetDomainInfo(pipes_struct *p,
if (!find_policy_by_hnd(p, r-in.domain_handle, (void **)(void *)info))
return NT_STATUS_INVALID_HANDLE;
 
-   /* We do have different access bits for info
-* levels here, but we're really just looking for
-* GENERIC_RIGHTS_DOMAIN_WRITE access. Unfortunately
-* this maps to different specific bits. So
-* assume if we have SAMR_DOMAIN_ACCESS_SET_INFO_1
-* set we are ok. */
-
-   result = access_check_samr_function(info-acc_granted,
-   SAMR_DOMAIN_ACCESS_SET_INFO_1,
-   _samr_SetDomainInfo);
-
-   if (!NT_STATUS_IS_OK(result))
-   return result;
-

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-2323-ged5c270

2009-06-15 Thread Karolin Seeger
The branch, master has been updated
   via  ed5c270b750ce736155a4e02fc7d2c51fe6b8c2a (commit)
   via  59ab1574e41993d24733affbca07d3f7da245fc7 (commit)
   via  1809ff4b2339bd3066532abccea0944da45edf64 (commit)
   via  779eea49de3f53040fe792de4b74b73a0c51ecb3 (commit)
   via  24f9f32fedb92f881658db856db15173e57af0bd (commit)
  from  f92269a6ce220e12b9b80c15ed3fa2e9e6b4a6dc (commit)

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


- Log -
commit ed5c270b750ce736155a4e02fc7d2c51fe6b8c2a
Author: Andreas Schneider m...@cynapses.org
Date:   Mon Jun 15 12:22:58 2009 +0200

Fix the section of the pam_winbind manpage.

Signed-off-by: Andreas Schneider m...@cynapses.org

commit 59ab1574e41993d24733affbca07d3f7da245fc7
Author: Andreas Schneider m...@cynapses.org
Date:   Mon Jun 15 12:21:07 2009 +0200

Move pam_winbind to the right manpage section (8).

Signed-off-by: Andreas Schneider m...@cynapses.org

commit 1809ff4b2339bd3066532abccea0944da45edf64
Author: Andreas Schneider m...@cynapses.org
Date:   Mon Jun 15 12:16:49 2009 +0200

Dcoument the PAM data exports in the pam_winbind manpage.

Signed-off-by: Andreas Schneider m...@cynapses.org

commit 779eea49de3f53040fe792de4b74b73a0c51ecb3
Author: Andreas Schneider m...@cynapses.org
Date:   Mon Jun 15 12:16:15 2009 +0200

Document the try_first_pass option in the pam_winbind manpage.

Signed-off-by: Andreas Schneider m...@cynapses.org

commit 24f9f32fedb92f881658db856db15173e57af0bd
Author: Andreas Schneider m...@cynapses.org
Date:   Mon Jun 15 12:15:26 2009 +0200

Add a synopsis section to the pam_winbind manpage.

Signed-off-by: Andreas Schneider m...@cynapses.org

---

Summary of changes:
 docs-xml/Samba3-HOWTO/manpages.xml |2 +-
 .../{pam_winbind.7.xml = pam_winbind.8.xml}   |   88 ++--
 2 files changed, 81 insertions(+), 9 deletions(-)
 rename docs-xml/manpages-3/{pam_winbind.7.xml = pam_winbind.8.xml} (70%)


Changeset truncated at 500 lines:

diff --git a/docs-xml/Samba3-HOWTO/manpages.xml 
b/docs-xml/Samba3-HOWTO/manpages.xml
index 4de54bf..eef4207 100644
--- a/docs-xml/Samba3-HOWTO/manpages.xml
+++ b/docs-xml/Samba3-HOWTO/manpages.xml
@@ -22,7 +22,7 @@
xi:include href=../manpages-3/nmbd.8.xml/
xi:include href=../manpages-3/nmblookup.1.xml/
xi:include href=../manpages-3/ntlm_auth.1.xml/
-   xi:include href=../manpages-3/pam_winbind.7.xml/
+   xi:include href=../manpages-3/pam_winbind.8.xml/
xi:include href=../manpages-3/pdbedit.8.xml/
xi:include href=../manpages-3/profiles.1.xml/
xi:include href=../manpages-3/rpcclient.1.xml/
diff --git a/docs-xml/manpages-3/pam_winbind.7.xml 
b/docs-xml/manpages-3/pam_winbind.8.xml
similarity index 70%
rename from docs-xml/manpages-3/pam_winbind.7.xml
rename to docs-xml/manpages-3/pam_winbind.8.xml
index ff88de8..730ad96 100644
--- a/docs-xml/manpages-3/pam_winbind.7.xml
+++ b/docs-xml/manpages-3/pam_winbind.8.xml
@@ -1,12 +1,12 @@
 ?xml version=1.0 encoding=iso-8859-1?
 !DOCTYPE refentry PUBLIC -//Samba-Team//DTD DocBook V4.2-Based Variant 
V1.0//EN http://www.samba.org/samba/DTD/samba-doc;
-refentry id=pam_winbind.7
+refentry id=pam_winbind.8
 
 refmeta
refentrytitlepam_winbind/refentrytitle
-   manvolnum7/manvolnum
+   manvolnum8/manvolnum
refmiscinfo class=sourceSamba/refmiscinfo
-   refmiscinfo class=manual7/refmiscinfo
+   refmiscinfo class=manual8/refmiscinfo
refmiscinfo class=version3.5/refmiscinfo
 /refmeta
 
@@ -29,6 +29,31 @@
 /refsect1
 
 refsect1
+   titleSYNOPSIS/title
+
+   para
+   Edit the PAM system config /etc/pam.d/service and modify it as 
the following example shows:
+   programlisting
+   ...
+   auth  requiredpam_env.so
+   auth  sufficient  pam_unix2.so
+   +++ auth  requiredpam_winbind.so  
use_first_pass
+   account   requisite   pam_unix2.so
+   +++ account   requiredpam_winbind.so  
use_first_pass
+   +++ password  sufficient  pam_winbind.so
+   password  requisite   pam_pwcheck.so  cracklib
+   password  requiredpam_unix2.so
use_authtok
+   session   requiredpam_unix2.so
+   +++ session   requiredpam_winbind.so
+   ...
+   /programlisting
+
+   Make sure that pam_winbind is one of the first modules in the 
session part. It may retrieve
+   kerberos tickets which are needed by other modules.
+   /para
+/refsect1
+
+refsect1
 

[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-1134-g9b3d5fc

2009-06-15 Thread Karolin Seeger
The branch, v3-4-test has been updated
   via  9b3d5fc7de1103a634b86ff4d18ceb146ca6b027 (commit)
   via  d547aab1511c72e1cab034e2945f6ad63bda6659 (commit)
   via  5d2dfba6d1699c6e417cc21233a1cc871f3c0ad1 (commit)
   via  24d6f697844bc85a03c047e5470abcfdd53735a2 (commit)
   via  55df96313c5b966f41b0b5c426cf6a420cafa855 (commit)
  from  e24c2401750212d7212952f574ed9765fb1f2e8e (commit)

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


- Log -
commit 9b3d5fc7de1103a634b86ff4d18ceb146ca6b027
Author: Andreas Schneider m...@cynapses.org
Date:   Mon Jun 15 12:22:58 2009 +0200

Fix the section of the pam_winbind manpage.

Signed-off-by: Andreas Schneider m...@cynapses.org

commit d547aab1511c72e1cab034e2945f6ad63bda6659
Author: Andreas Schneider m...@cynapses.org
Date:   Mon Jun 15 12:21:07 2009 +0200

Move pam_winbind to the right manpage section (8).

Signed-off-by: Andreas Schneider m...@cynapses.org
(cherry picked from commit 59ab1574e41993d24733affbca07d3f7da245fc7)

commit 5d2dfba6d1699c6e417cc21233a1cc871f3c0ad1
Author: Andreas Schneider m...@cynapses.org
Date:   Mon Jun 15 12:16:49 2009 +0200

Dcoument the PAM data exports in the pam_winbind manpage.

Signed-off-by: Andreas Schneider m...@cynapses.org
(cherry picked from commit 1809ff4b2339bd3066532abccea0944da45edf64)

commit 24d6f697844bc85a03c047e5470abcfdd53735a2
Author: Andreas Schneider m...@cynapses.org
Date:   Mon Jun 15 12:16:15 2009 +0200

Document the try_first_pass option in the pam_winbind manpage.

Signed-off-by: Andreas Schneider m...@cynapses.org
(cherry picked from commit 779eea49de3f53040fe792de4b74b73a0c51ecb3)

commit 55df96313c5b966f41b0b5c426cf6a420cafa855
Author: Andreas Schneider m...@cynapses.org
Date:   Mon Jun 15 12:15:26 2009 +0200

Add a synopsis section to the pam_winbind manpage.

Signed-off-by: Andreas Schneider m...@cynapses.org
(cherry picked from commit 24f9f32fedb92f881658db856db15173e57af0bd)

---

Summary of changes:
 docs-xml/Samba3-HOWTO/manpages.xml |2 +-
 .../{pam_winbind.7.xml = pam_winbind.8.xml}   |   90 ++--
 2 files changed, 82 insertions(+), 10 deletions(-)
 rename docs-xml/manpages-3/{pam_winbind.7.xml = pam_winbind.8.xml} (70%)


Changeset truncated at 500 lines:

diff --git a/docs-xml/Samba3-HOWTO/manpages.xml 
b/docs-xml/Samba3-HOWTO/manpages.xml
index 4de54bf..eef4207 100644
--- a/docs-xml/Samba3-HOWTO/manpages.xml
+++ b/docs-xml/Samba3-HOWTO/manpages.xml
@@ -22,7 +22,7 @@
xi:include href=../manpages-3/nmbd.8.xml/
xi:include href=../manpages-3/nmblookup.1.xml/
xi:include href=../manpages-3/ntlm_auth.1.xml/
-   xi:include href=../manpages-3/pam_winbind.7.xml/
+   xi:include href=../manpages-3/pam_winbind.8.xml/
xi:include href=../manpages-3/pdbedit.8.xml/
xi:include href=../manpages-3/profiles.1.xml/
xi:include href=../manpages-3/rpcclient.1.xml/
diff --git a/docs-xml/manpages-3/pam_winbind.7.xml 
b/docs-xml/manpages-3/pam_winbind.8.xml
similarity index 70%
rename from docs-xml/manpages-3/pam_winbind.7.xml
rename to docs-xml/manpages-3/pam_winbind.8.xml
index ced6174..730ad96 100644
--- a/docs-xml/manpages-3/pam_winbind.7.xml
+++ b/docs-xml/manpages-3/pam_winbind.8.xml
@@ -1,13 +1,13 @@
 ?xml version=1.0 encoding=iso-8859-1?
 !DOCTYPE refentry PUBLIC -//Samba-Team//DTD DocBook V4.2-Based Variant 
V1.0//EN http://www.samba.org/samba/DTD/samba-doc;
-refentry id=pam_winbind.7
+refentry id=pam_winbind.8
 
 refmeta
refentrytitlepam_winbind/refentrytitle
-   manvolnum7/manvolnum
+   manvolnum8/manvolnum
refmiscinfo class=sourceSamba/refmiscinfo
-   refmiscinfo class=manual7/refmiscinfo
-   refmiscinfo class=version3.4/refmiscinfo
+   refmiscinfo class=manual8/refmiscinfo
+   refmiscinfo class=version3.5/refmiscinfo
 /refmeta
 
 
@@ -29,6 +29,31 @@
 /refsect1
 
 refsect1
+   titleSYNOPSIS/title
+
+   para
+   Edit the PAM system config /etc/pam.d/service and modify it as 
the following example shows:
+   programlisting
+   ...
+   auth  requiredpam_env.so
+   auth  sufficient  pam_unix2.so
+   +++ auth  requiredpam_winbind.so  
use_first_pass
+   account   requisite   pam_unix2.so
+   +++ account   requiredpam_winbind.so  
use_first_pass
+   +++ password  sufficient  pam_winbind.so
+   password  requisite   pam_pwcheck.so  cracklib
+   password  requiredpam_unix2.so
use_authtok
+   session   requiredpam_unix2.so

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

2009-06-15 Thread Karolin Seeger
The branch, v3-3-test has been updated
   via  2f2ef4afae99eadb2b546319aa915f6391acce40 (commit)
   via  c9b89676983c5fd0ec12df121fc5d9e06facdd80 (commit)
   via  282682c989a8008de5f8d30c48c9a740b315a230 (commit)
   via  2ed85b0ebfc50cad847050cc6b5269c470956ea3 (commit)
   via  f738862d9f419fec27c9fb15c880a452aff333d9 (commit)
  from  bd2f3695c117773032e16958a0266d0d1e75defe (commit)

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


- Log -
commit 2f2ef4afae99eadb2b546319aa915f6391acce40
Author: Andreas Schneider m...@cynapses.org
Date:   Mon Jun 15 12:22:58 2009 +0200

Fix the section of the pam_winbind manpage.

Signed-off-by: Andreas Schneider m...@cynapses.org

commit c9b89676983c5fd0ec12df121fc5d9e06facdd80
Author: Andreas Schneider m...@cynapses.org
Date:   Mon Jun 15 12:21:07 2009 +0200

Move pam_winbind to the right manpage section (8).

Signed-off-by: Andreas Schneider m...@cynapses.org
(cherry picked from commit 59ab1574e41993d24733affbca07d3f7da245fc7)
(cherry picked from commit d547aab1511c72e1cab034e2945f6ad63bda6659)

commit 282682c989a8008de5f8d30c48c9a740b315a230
Author: Andreas Schneider m...@cynapses.org
Date:   Mon Jun 15 12:16:49 2009 +0200

Dcoument the PAM data exports in the pam_winbind manpage.

Signed-off-by: Andreas Schneider m...@cynapses.org
(cherry picked from commit 1809ff4b2339bd3066532abccea0944da45edf64)
(cherry picked from commit 5d2dfba6d1699c6e417cc21233a1cc871f3c0ad1)

commit 2ed85b0ebfc50cad847050cc6b5269c470956ea3
Author: Andreas Schneider m...@cynapses.org
Date:   Mon Jun 15 12:16:15 2009 +0200

Document the try_first_pass option in the pam_winbind manpage.

Signed-off-by: Andreas Schneider m...@cynapses.org
(cherry picked from commit 779eea49de3f53040fe792de4b74b73a0c51ecb3)
(cherry picked from commit 24d6f697844bc85a03c047e5470abcfdd53735a2)

commit f738862d9f419fec27c9fb15c880a452aff333d9
Author: Andreas Schneider m...@cynapses.org
Date:   Mon Jun 15 12:15:26 2009 +0200

Add a synopsis section to the pam_winbind manpage.

Signed-off-by: Andreas Schneider m...@cynapses.org
(cherry picked from commit 24f9f32fedb92f881658db856db15173e57af0bd)
(cherry picked from commit 55df96313c5b966f41b0b5c426cf6a420cafa855)

---

Summary of changes:
 docs-xml/Samba3-HOWTO/manpages.xml |2 +-
 .../{pam_winbind.7.xml = pam_winbind.8.xml}   |   88 ++--
 2 files changed, 81 insertions(+), 9 deletions(-)
 rename docs-xml/manpages-3/{pam_winbind.7.xml = pam_winbind.8.xml} (70%)


Changeset truncated at 500 lines:

diff --git a/docs-xml/Samba3-HOWTO/manpages.xml 
b/docs-xml/Samba3-HOWTO/manpages.xml
index 4de54bf..eef4207 100644
--- a/docs-xml/Samba3-HOWTO/manpages.xml
+++ b/docs-xml/Samba3-HOWTO/manpages.xml
@@ -22,7 +22,7 @@
xi:include href=../manpages-3/nmbd.8.xml/
xi:include href=../manpages-3/nmblookup.1.xml/
xi:include href=../manpages-3/ntlm_auth.1.xml/
-   xi:include href=../manpages-3/pam_winbind.7.xml/
+   xi:include href=../manpages-3/pam_winbind.8.xml/
xi:include href=../manpages-3/pdbedit.8.xml/
xi:include href=../manpages-3/profiles.1.xml/
xi:include href=../manpages-3/rpcclient.1.xml/
diff --git a/docs-xml/manpages-3/pam_winbind.7.xml 
b/docs-xml/manpages-3/pam_winbind.8.xml
similarity index 70%
rename from docs-xml/manpages-3/pam_winbind.7.xml
rename to docs-xml/manpages-3/pam_winbind.8.xml
index db402ea..09e93f5 100644
--- a/docs-xml/manpages-3/pam_winbind.7.xml
+++ b/docs-xml/manpages-3/pam_winbind.8.xml
@@ -1,13 +1,13 @@
 ?xml version=1.0 encoding=iso-8859-1?
 !DOCTYPE refentry PUBLIC -//Samba-Team//DTD DocBook V4.2-Based Variant 
V1.0//EN http://www.samba.org/samba/DTD/samba-doc;
-refentry id=pam_winbind.7
+refentry id=pam_winbind.8
 
 refmeta
refentrytitlepam_winbind/refentrytitle
-   manvolnum7/manvolnum
+   manvolnum8/manvolnum
refmiscinfo class=sourceSamba/refmiscinfo
-   refmiscinfo class=manual7/refmiscinfo
refmiscinfo class=version3.3/refmiscinfo
+   refmiscinfo class=manual8/refmiscinfo
 /refmeta
 
 
@@ -29,6 +29,31 @@
 /refsect1
 
 refsect1
+   titleSYNOPSIS/title
+
+   para
+   Edit the PAM system config /etc/pam.d/service and modify it as 
the following example shows:
+   programlisting
+   ...
+   auth  requiredpam_env.so
+   auth  sufficient  pam_unix2.so
+   +++ auth  requiredpam_winbind.so  
use_first_pass
+   account   requisite   pam_unix2.so
+   +++ account   requiredpam_winbind.so  
use_first_pass
+   +++ password  sufficient  

[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-1135-gc2010f1

2009-06-15 Thread Karolin Seeger
The branch, v3-4-test has been updated
   via  c2010f134b6a888e1dcd17b1f5e2c1b2656419a4 (commit)
  from  9b3d5fc7de1103a634b86ff4d18ceb146ca6b027 (commit)

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


- Log -
commit c2010f134b6a888e1dcd17b1f5e2c1b2656419a4
Author: Karolin Seeger ksee...@samba.org
Date:   Mon Jun 15 13:29:15 2009 +0200

s3/docs: Correct version number.

Karolin

---

Summary of changes:
 docs-xml/manpages-3/pam_winbind.8.xml |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/manpages-3/pam_winbind.8.xml 
b/docs-xml/manpages-3/pam_winbind.8.xml
index 730ad96..ce1c0e6 100644
--- a/docs-xml/manpages-3/pam_winbind.8.xml
+++ b/docs-xml/manpages-3/pam_winbind.8.xml
@@ -7,7 +7,7 @@
manvolnum8/manvolnum
refmiscinfo class=sourceSamba/refmiscinfo
refmiscinfo class=manual8/refmiscinfo
-   refmiscinfo class=version3.5/refmiscinfo
+   refmiscinfo class=version3.4/refmiscinfo
 /refmeta
 
 


-- 
Samba Shared Repository


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

2009-06-15 Thread Karolin Seeger
The branch, v3-2-test has been updated
   via  cce2cdf3041bedf14e08b1f839ab8ddfa88dd3d3 (commit)
   via  f0d073d4e787516ae6e1a005e145ef2adf6a6e5d (commit)
   via  15892ce595ea050b58756130b6bc6031ae0752ca (commit)
   via  0619c29d3b0bb59cd31ed48df47878170d4cfd9b (commit)
   via  0669d66d81be3f265eab442c22b2881615d502db (commit)
  from  f2ae8244603a4232331b7c3128661aec08ecd977 (commit)

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


- Log -
commit cce2cdf3041bedf14e08b1f839ab8ddfa88dd3d3
Author: Andreas Schneider m...@cynapses.org
Date:   Mon Jun 15 12:22:58 2009 +0200

Fix the section of the pam_winbind manpage.

Signed-off-by: Andreas Schneider m...@cynapses.org

commit f0d073d4e787516ae6e1a005e145ef2adf6a6e5d
Author: Andreas Schneider m...@cynapses.org
Date:   Mon Jun 15 12:21:07 2009 +0200

Move pam_winbind to the right manpage section (8).

Signed-off-by: Andreas Schneider m...@cynapses.org
(cherry picked from commit 59ab1574e41993d24733affbca07d3f7da245fc7)
(cherry picked from commit d547aab1511c72e1cab034e2945f6ad63bda6659)
(cherry picked from commit c9b89676983c5fd0ec12df121fc5d9e06facdd80)

commit 15892ce595ea050b58756130b6bc6031ae0752ca
Author: Andreas Schneider m...@cynapses.org
Date:   Mon Jun 15 12:16:49 2009 +0200

Dcoument the PAM data exports in the pam_winbind manpage.

Signed-off-by: Andreas Schneider m...@cynapses.org
(cherry picked from commit 1809ff4b2339bd3066532abccea0944da45edf64)
(cherry picked from commit 5d2dfba6d1699c6e417cc21233a1cc871f3c0ad1)
(cherry picked from commit 282682c989a8008de5f8d30c48c9a740b315a230)

commit 0619c29d3b0bb59cd31ed48df47878170d4cfd9b
Author: Andreas Schneider m...@cynapses.org
Date:   Mon Jun 15 12:16:15 2009 +0200

Document the try_first_pass option in the pam_winbind manpage.

Signed-off-by: Andreas Schneider m...@cynapses.org
(cherry picked from commit 779eea49de3f53040fe792de4b74b73a0c51ecb3)
(cherry picked from commit 24d6f697844bc85a03c047e5470abcfdd53735a2)
(cherry picked from commit 2ed85b0ebfc50cad847050cc6b5269c470956ea3)

commit 0669d66d81be3f265eab442c22b2881615d502db
Author: Andreas Schneider m...@cynapses.org
Date:   Mon Jun 15 12:15:26 2009 +0200

Add a synopsis section to the pam_winbind manpage.

Signed-off-by: Andreas Schneider m...@cynapses.org
(cherry picked from commit 24f9f32fedb92f881658db856db15173e57af0bd)
(cherry picked from commit 55df96313c5b966f41b0b5c426cf6a420cafa855)
(cherry picked from commit f738862d9f419fec27c9fb15c880a452aff333d9)

---

Summary of changes:
 docs-xml/Samba3-HOWTO/manpages.xml |2 +-
 .../{pam_winbind.7.xml = pam_winbind.8.xml}   |   88 ++--
 2 files changed, 81 insertions(+), 9 deletions(-)
 rename docs-xml/manpages-3/{pam_winbind.7.xml = pam_winbind.8.xml} (69%)


Changeset truncated at 500 lines:

diff --git a/docs-xml/Samba3-HOWTO/manpages.xml 
b/docs-xml/Samba3-HOWTO/manpages.xml
index 4de54bf..eef4207 100644
--- a/docs-xml/Samba3-HOWTO/manpages.xml
+++ b/docs-xml/Samba3-HOWTO/manpages.xml
@@ -22,7 +22,7 @@
xi:include href=../manpages-3/nmbd.8.xml/
xi:include href=../manpages-3/nmblookup.1.xml/
xi:include href=../manpages-3/ntlm_auth.1.xml/
-   xi:include href=../manpages-3/pam_winbind.7.xml/
+   xi:include href=../manpages-3/pam_winbind.8.xml/
xi:include href=../manpages-3/pdbedit.8.xml/
xi:include href=../manpages-3/profiles.1.xml/
xi:include href=../manpages-3/rpcclient.1.xml/
diff --git a/docs-xml/manpages-3/pam_winbind.7.xml 
b/docs-xml/manpages-3/pam_winbind.8.xml
similarity index 69%
rename from docs-xml/manpages-3/pam_winbind.7.xml
rename to docs-xml/manpages-3/pam_winbind.8.xml
index cf7fd5a..1c886dd 100644
--- a/docs-xml/manpages-3/pam_winbind.7.xml
+++ b/docs-xml/manpages-3/pam_winbind.8.xml
@@ -1,13 +1,13 @@
 ?xml version=1.0 encoding=iso-8859-1?
 !DOCTYPE refentry PUBLIC -//Samba-Team//DTD DocBook V4.2-Based Variant 
V1.0//EN http://www.samba.org/samba/DTD/samba-doc;
-refentry id=pam_winbind.7
+refentry id=pam_winbind.8
 
 refmeta
refentrytitlepam_winbind/refentrytitle
-   manvolnum7/manvolnum
+   manvolnum8/manvolnum
refmiscinfo class=sourceSamba/refmiscinfo
-   refmiscinfo class=manual7/refmiscinfo
refmiscinfo class=version3.2/refmiscinfo
+   refmiscinfo class=manual8/refmiscinfo
 /refmeta
 
 
@@ -29,6 +29,31 @@
 /refsect1
 
 refsect1
+   titleSYNOPSIS/title
+
+   para
+   Edit the PAM system config /etc/pam.d/service and modify it as 
the following example shows:
+   programlisting
+   ...
+   auth  requiredpam_env.so
+   auth  sufficient  pam_unix2.so
+  

[SCM] Samba Shared Repository - branch v3-3-stable updated - release-3-3-4-65-g9aedfc6

2009-06-15 Thread Karolin Seeger
The branch, v3-3-stable has been updated
   via  9aedfc67be4827c758eb14a049369a68993802d6 (commit)
   via  ebf8ef4f2956ee04fad10551715f3dd34a74d0c3 (commit)
   via  c10ecce7cfeac474648cb9268e5afa3f7b753d38 (commit)
   via  9d2e80dcd6d56074a3aa697cea6b165c45f785dd (commit)
   via  645121caa44d270220adc9cbd1230721eb741776 (commit)
   via  1b4f37973cc7cbe0b8e5637bdb8b77b8738c06a7 (commit)
   via  7f57608cf78fbdc43404144a5679a524452715e9 (commit)
   via  3206b944145929bfeb1fe92ea1231560b78dfa3d (commit)
   via  8fdc5ec90c59f3c4df1a9d37e05e133fc51b80b3 (commit)
   via  2ec1b83f8d12a51b305f92030fea7b6ae4dc91c0 (commit)
   via  eb3eee778d2f9c96bfa8338c9131bb9ce0b47355 (commit)
  from  bb1de2107dd60001d27a783401df80952c3b8c45 (commit)

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


- Log -
commit 9aedfc67be4827c758eb14a049369a68993802d6
Author: Andreas Schneider m...@cynapses.org
Date:   Mon Jun 15 12:22:58 2009 +0200

Fix the section of the pam_winbind manpage.

Signed-off-by: Andreas Schneider m...@cynapses.org
(cherry picked from commit 2f2ef4afae99eadb2b546319aa915f6391acce40)

commit ebf8ef4f2956ee04fad10551715f3dd34a74d0c3
Author: Andreas Schneider m...@cynapses.org
Date:   Mon Jun 15 12:21:07 2009 +0200

Move pam_winbind to the right manpage section (8).

Signed-off-by: Andreas Schneider m...@cynapses.org
(cherry picked from commit 59ab1574e41993d24733affbca07d3f7da245fc7)
(cherry picked from commit d547aab1511c72e1cab034e2945f6ad63bda6659)
(cherry picked from commit c9b89676983c5fd0ec12df121fc5d9e06facdd80)

commit c10ecce7cfeac474648cb9268e5afa3f7b753d38
Author: Andreas Schneider m...@cynapses.org
Date:   Mon Jun 15 12:16:49 2009 +0200

Dcoument the PAM data exports in the pam_winbind manpage.

Signed-off-by: Andreas Schneider m...@cynapses.org
(cherry picked from commit 1809ff4b2339bd3066532abccea0944da45edf64)
(cherry picked from commit 5d2dfba6d1699c6e417cc21233a1cc871f3c0ad1)
(cherry picked from commit 282682c989a8008de5f8d30c48c9a740b315a230)

commit 9d2e80dcd6d56074a3aa697cea6b165c45f785dd
Author: Andreas Schneider m...@cynapses.org
Date:   Mon Jun 15 12:16:15 2009 +0200

Document the try_first_pass option in the pam_winbind manpage.

Signed-off-by: Andreas Schneider m...@cynapses.org
(cherry picked from commit 779eea49de3f53040fe792de4b74b73a0c51ecb3)
(cherry picked from commit 24d6f697844bc85a03c047e5470abcfdd53735a2)
(cherry picked from commit 2ed85b0ebfc50cad847050cc6b5269c470956ea3)

commit 645121caa44d270220adc9cbd1230721eb741776
Author: Andreas Schneider m...@cynapses.org
Date:   Mon Jun 15 12:15:26 2009 +0200

Add a synopsis section to the pam_winbind manpage.

Signed-off-by: Andreas Schneider m...@cynapses.org
(cherry picked from commit 24f9f32fedb92f881658db856db15173e57af0bd)
(cherry picked from commit 55df96313c5b966f41b0b5c426cf6a420cafa855)
(cherry picked from commit f738862d9f419fec27c9fb15c880a452aff333d9)

commit 1b4f37973cc7cbe0b8e5637bdb8b77b8738c06a7
Author: Jeremy Allison j...@samba.org
Date:   Mon Jun 15 10:43:27 2009 +0200

Revert the extra SAMR and LSA checks.

These were added between 3.2.4 and 3.2.5 that have caused users problems.
This fixes among others bug #6089 and #6112.
(cherry picked from commit bd2f3695c117773032e16958a0266d0d1e75defe)

commit 7f57608cf78fbdc43404144a5679a524452715e9
Author: Karolin Seeger ksee...@samba.org
Date:   Mon Jun 15 08:33:22 2009 +0200

s3/libsmb: Fix debug message.

This fixes bug #6472.

Karolin

Signed-off-by: Volker Lendecke v...@samba.org

Was commit f92269a6 in master.
(cherry picked from commit 7108ebb87902f3b5d2c43ba95d557278ad8e120f)

commit 3206b944145929bfeb1fe92ea1231560b78dfa3d
Author: Jeremy Allison j...@samba.org
Date:   Fri Jun 12 15:41:20 2009 +0200

Fix bug #6297 - owner of sticky directory cannot delete files created by 
others. The reason we couldn't delete was we were erroring out early if 
requestor was not the owner of the file we wanted to delete, instead of 
checking if the requestor owned the directory as well. If either of these is 
true, we must go on and check the ACL. Karolin, this is a must for 3.4.0 and 
also 3.3.next. I'll update the bug report with patches for 3.4.0 and 3.3.next 
and ask vl to review. Jeremy.
(cherry picked from commit 966a51da8998cfd15875ba047b7f765c84b914dd)

commit 8fdc5ec90c59f3c4df1a9d37e05e133fc51b80b3
Author: Karolin Seeger ksee...@samba.org
Date:   Fri Jun 12 10:15:51 2009 +0200

WHATSNEW: Attach older 3.3 release notes.

Karolin
(cherry picked from commit adbba72c332b59f4ffe87cb25c5ec7f8d90148dc)

commit 2ec1b83f8d12a51b305f92030fea7b6ae4dc91c0
Author: Günther Deschner g...@samba.org
Date:   Sun Jun 7 11:23:09 2009 +0200

s3-groupdb: fix enum_aliasmem in 

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

2009-06-15 Thread Karolin Seeger
The branch, v3-3-test has been updated
   via  80e7638aed61cc908e7d658d208d1925ff16247c (commit)
  from  2f2ef4afae99eadb2b546319aa915f6391acce40 (commit)

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


- Log -
commit 80e7638aed61cc908e7d658d208d1925ff16247c
Author: Karolin Seeger ksee...@samba.org
Date:   Mon Jun 15 14:31:04 2009 +0200

WHATSNEW: Update changes since 3.3.4.

Karolin

---

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


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index d532663..9b5972e 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -8,6 +8,7 @@ This is the latest bugfix release of the Samba 3.3 series.
 
 Major enhancements in Samba 3.3.5 include:
 
+o Fix SAMR and LSA checks (bug #6089, #6289)
 o Fix posix acls when setting an ACL without explicit ACE for the
   owner (bug #2346).
 o Fix joining of Win7 into Samba domain (bug #6099).
@@ -36,7 +37,11 @@ o   Michael Adam ob...@samba.org
 
 
 o   Jeremy Allison j...@samba.org
+* BUG 6089: Revert the extra SAMR and LSA checks.
 * BUG 6099: Fix joining of Win7 into Samba domain.
+* BUG 6289: Revert the extra SAMR and LSA checks.
+* BUG 6297: Owner of sticky directory cannot delete files created by
+  others.
 * BUG 6315: smbd crashes doing vfs_full_audit on IPC$ close event.
 * BUG 6330: Fix DFS on AIX.
 
@@ -47,6 +52,7 @@ o   Guenther Deschner g...@samba.org
 * BUG 6301: Fix joining of Win2000 SP4 clients.
 * BUG 6309: Support remote unjoining of Windows 2003 or greater.
 * BUG 6372: Fix usermanager only displaying 1024 groups and aliases.
+* BUG 6465: Fix enumeration of empty aliases (ldb backend).
 
 
 o   Björn Jacke b...@sernet.de
@@ -79,6 +85,10 @@ o   D.L. Meyer dlme...@uiuc.edu
 * BUG 5832: Fix build on RHEL when ccache is not available.
 
 
+o   Andreas Schneider m...@cynapses.org
+* Some man pam_winbind improvements.
+
+
 o   Karolin Seeger ksee...@samba.org
 * BUG 5853: Add keyutils-devel to build requires to fix build on RHEL.
 


-- 
Samba Shared Repository


[SCM] Samba Shared Repository - branch v3-3-stable updated - release-3-3-4-66-ge503228

2009-06-15 Thread Karolin Seeger
The branch, v3-3-stable has been updated
   via  e503228ffa2637bd4e9dfc0fdd0f829f48234900 (commit)
  from  9aedfc67be4827c758eb14a049369a68993802d6 (commit)

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


- Log -
commit e503228ffa2637bd4e9dfc0fdd0f829f48234900
Author: Karolin Seeger ksee...@samba.org
Date:   Mon Jun 15 14:31:04 2009 +0200

WHATSNEW: Update changes since 3.3.4.

Karolin
(cherry picked from commit 80e7638aed61cc908e7d658d208d1925ff16247c)

---

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


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index d532663..9b5972e 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -8,6 +8,7 @@ This is the latest bugfix release of the Samba 3.3 series.
 
 Major enhancements in Samba 3.3.5 include:
 
+o Fix SAMR and LSA checks (bug #6089, #6289)
 o Fix posix acls when setting an ACL without explicit ACE for the
   owner (bug #2346).
 o Fix joining of Win7 into Samba domain (bug #6099).
@@ -36,7 +37,11 @@ o   Michael Adam ob...@samba.org
 
 
 o   Jeremy Allison j...@samba.org
+* BUG 6089: Revert the extra SAMR and LSA checks.
 * BUG 6099: Fix joining of Win7 into Samba domain.
+* BUG 6289: Revert the extra SAMR and LSA checks.
+* BUG 6297: Owner of sticky directory cannot delete files created by
+  others.
 * BUG 6315: smbd crashes doing vfs_full_audit on IPC$ close event.
 * BUG 6330: Fix DFS on AIX.
 
@@ -47,6 +52,7 @@ o   Guenther Deschner g...@samba.org
 * BUG 6301: Fix joining of Win2000 SP4 clients.
 * BUG 6309: Support remote unjoining of Windows 2003 or greater.
 * BUG 6372: Fix usermanager only displaying 1024 groups and aliases.
+* BUG 6465: Fix enumeration of empty aliases (ldb backend).
 
 
 o   Björn Jacke b...@sernet.de
@@ -79,6 +85,10 @@ o   D.L. Meyer dlme...@uiuc.edu
 * BUG 5832: Fix build on RHEL when ccache is not available.
 
 
+o   Andreas Schneider m...@cynapses.org
+* Some man pam_winbind improvements.
+
+
 o   Karolin Seeger ksee...@samba.org
 * BUG 5853: Add keyutils-devel to build requires to fix build on RHEL.
 


-- 
Samba Shared Repository


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

2009-06-15 Thread Karolin Seeger
The branch, v3-3-test has been updated
   via  acde34bc7d5b038f5965acc0fccaff6f7658f3d5 (commit)
  from  80e7638aed61cc908e7d658d208d1925ff16247c (commit)

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


- Log -
commit acde34bc7d5b038f5965acc0fccaff6f7658f3d5
Author: Karolin Seeger ksee...@samba.org
Date:   Mon Jun 15 15:08:43 2009 +0200

WHATSNEW: Fix typo.

Karolin

---

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


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 9b5972e..70fdb8e 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -90,7 +90,7 @@ o   Andreas Schneider m...@cynapses.org
 
 
 o   Karolin Seeger ksee...@samba.org
-* BUG 5853: Add keyutils-devel to build requires to fix build on RHEL.
+* BUG 5835: Add keyutils-devel to build requires to fix build on RHEL.
 
 
 o   Marc VanHeyningen marc.vanheynin...@isilon.com


-- 
Samba Shared Repository


[SCM] Samba Shared Repository - branch v3-3-stable updated - release-3-3-4-67-g557f917

2009-06-15 Thread Karolin Seeger
The branch, v3-3-stable has been updated
   via  557f9175c3a94ee6904ff7e1af0c361071d80258 (commit)
  from  e503228ffa2637bd4e9dfc0fdd0f829f48234900 (commit)

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


- Log -
commit 557f9175c3a94ee6904ff7e1af0c361071d80258
Author: Karolin Seeger ksee...@samba.org
Date:   Mon Jun 15 15:08:43 2009 +0200

WHATSNEW: Fix typo.

Karolin
(cherry picked from commit acde34bc7d5b038f5965acc0fccaff6f7658f3d5)

---

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


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 9b5972e..70fdb8e 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -90,7 +90,7 @@ o   Andreas Schneider m...@cynapses.org
 
 
 o   Karolin Seeger ksee...@samba.org
-* BUG 5853: Add keyutils-devel to build requires to fix build on RHEL.
+* BUG 5835: Add keyutils-devel to build requires to fix build on RHEL.
 
 
 o   Marc VanHeyningen marc.vanheynin...@isilon.com


-- 
Samba Shared Repository



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

2009-06-15 Thread Karolin Seeger
The branch, v3-2-test has been updated
   via  26b5cb2df0fbf2d0c004da4872c3733f3b75fd62 (commit)
  from  cce2cdf3041bedf14e08b1f839ab8ddfa88dd3d3 (commit)

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


- Log -
commit 26b5cb2df0fbf2d0c004da4872c3733f3b75fd62
Author: Karolin Seeger ksee...@samba.org
Date:   Mon Jun 15 15:13:10 2009 +0200

WHATSNEW: Fix typo.

Karolin

---

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


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 5e1defb..2e98fdf 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -71,7 +71,7 @@ o   Sébastien Prud'homme sebastien.prudho...@gmail.com
 
 
 o   Karolin Seeger ksee...@samba.org
-* BUG 5853: Add keyutils-devel to build requires.
+* BUG 5835: Add keyutils-devel to build requires.
 
 
 o   Simo Sorce sso...@redhat.com


-- 
Samba Shared Repository


[SCM] Samba Shared Repository - branch v3-2-stable updated - release-3-2-11-53-g5dd0213

2009-06-15 Thread Karolin Seeger
The branch, v3-2-stable has been updated
   via  5dd021374cf399278305e390629abc15296dd1fa (commit)
  from  98c9a24a01c72d25b3b7eeb2697a2964f08b3d76 (commit)

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


- Log -
commit 5dd021374cf399278305e390629abc15296dd1fa
Author: Karolin Seeger ksee...@samba.org
Date:   Mon Jun 15 15:13:10 2009 +0200

WHATSNEW: Fix typo.

Karolin
(cherry picked from commit 26b5cb2df0fbf2d0c004da4872c3733f3b75fd62)

---

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


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 5e1defb..2e98fdf 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -71,7 +71,7 @@ o   Sébastien Prud'homme sebastien.prudho...@gmail.com
 
 
 o   Karolin Seeger ksee...@samba.org
-* BUG 5853: Add keyutils-devel to build requires.
+* BUG 5835: Add keyutils-devel to build requires.
 
 
 o   Simo Sorce sso...@redhat.com


-- 
Samba Shared Repository


[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-2324-g3014753

2009-06-15 Thread Volker Lendecke
The branch, master has been updated
   via  3014753ebebd332710e7d5ad75c868f34f00dff6 (commit)
  from  ed5c270b750ce736155a4e02fc7d2c51fe6b8c2a (commit)

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


- Log -
commit 3014753ebebd332710e7d5ad75c868f34f00dff6
Author: Volker Lendecke v...@samba.org
Date:   Mon Jun 15 15:43:19 2009 +0200

Fix the posixtimedlock test

The previous version depended on the fact that smb_raw_lock_send just queued
stuff. This changed with ebf5523b6e2ae0.

---

Summary of changes:
 source4/torture/raw/samba3misc.c |   61 +-
 1 files changed, 53 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/torture/raw/samba3misc.c b/source4/torture/raw/samba3misc.c
index c4c790c..4ec8acc 100644
--- a/source4/torture/raw/samba3misc.c
+++ b/source4/torture/raw/samba3misc.c
@@ -669,6 +669,35 @@ bool torture_samba3_caseinsensitive(struct torture_context 
*torture)
return ret;
 }
 
+static void close_locked_file(struct tevent_context *ev,
+ struct tevent_timer *te,
+ struct timeval now,
+ void *private_data)
+{
+   int *pfd = (int *)private_data;
+
+   TALLOC_FREE(te);
+
+   if (*pfd != -1) {
+   close(*pfd);
+   *pfd = -1;
+   }
+}
+
+struct lock_result_state {
+   NTSTATUS status;
+   bool done;
+};
+
+static void receive_lock_result(struct smbcli_request *req)
+{
+   struct lock_result_state *state =
+   (struct lock_result_state *)req-async.private_data;
+
+   state-status = smbcli_request_simple_recv(req);
+   state-done = true;
+}
+
 /*
  * Check that Samba3 correctly deals with conflicting posix byte range locks
  * on an underlying file
@@ -695,6 +724,9 @@ bool torture_samba3_posixtimedlock(struct torture_context 
*tctx)
union smb_lock io;
struct smb_lock_entry lock_entry;
struct smbcli_request *req;
+   struct lock_result_state lock_result;
+
+   struct tevent_timer *te;
 
if (!torture_open_connection(cli, tctx, 0)) {
ret = false;
@@ -799,17 +831,30 @@ bool torture_samba3_posixtimedlock(struct torture_context 
*tctx)
goto done;
}
 
-   /*
-* Ship the async timed request to the server
-*/
-   event_loop_once(req-transport-socket-event.ctx);
-   msleep(500);
+   lock_result.done = false;
+   req-async.fn = receive_lock_result;
+   req-async.private_data = lock_result;
 
-   close(fd);
+   te = tevent_add_timer(req-transport-socket-event.ctx,
+ tctx, timeval_current_ofs(1, 0),
+ close_locked_file, fd);
+   if (te == NULL) {
+   torture_warning(tctx, tevent_add_timer failed\n);
+   ret = false;
+   goto done;
+   }
 
-   status = smbcli_request_simple_recv(req);
+   while ((fd != -1) || (!lock_result.done)) {
+   if (tevent_loop_once(req-transport-socket-event.ctx)
+   == -1) {
+   torture_warning(tctx, tevent_loop_once failed: %s\n,
+   strerror(errno));
+   ret = false;
+   goto done;
+   }
+   }
 
-   CHECK_STATUS(status, NT_STATUS_OK);
+   CHECK_STATUS(lock_result.status, NT_STATUS_OK);
 
  done:
if (fnum != -1) {


-- 
Samba Shared Repository


[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-2329-gefccef0

2009-06-15 Thread Simo Sorce
The branch, master has been updated
   via  efccef09aec93180a06955b5e03f1ceb99dc39e8 (commit)
   via  e83f4b868b208724a732b45a0aa4f6ee8a08b115 (commit)
   via  7aee9f92e7c3e3eb48c0456d821125b60f8d8259 (commit)
   via  f518e37c0912a54d5434f7639ba44f53d3455582 (commit)
   via  57ba31ca968552f28b2221b740f9b0c5bcd9911a (commit)
  from  3014753ebebd332710e7d5ad75c868f34f00dff6 (commit)

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


- Log -
commit efccef09aec93180a06955b5e03f1ceb99dc39e8
Author: Simo Sorce sso...@redhat.com
Date:   Sun Jun 7 14:10:15 2009 -0400

Add exports file and abi checker for tevent

This is a first attempt at exporting symbols only for public functions
We also provide a rudimentary ABI checker that tries to check that
function signatures are not changed by mistake.
Given our use of macros this is not an API checker.
It's all based on tevent.h contents and the gcc -aux-info option

commit e83f4b868b208724a732b45a0aa4f6ee8a08b115
Author: Simo Sorce sso...@redhat.com
Date:   Sun Jun 7 14:20:36 2009 -0400

Add exports file and abi checker for talloc

This is a first attempt at exporting symbols only for public functions
We also provide a rudimentary ABI checker that tries to check that
function signatures are not changed by mistake.
Given our use of macros this is not an API checker.
It's all based on talloc.h contents and the gcc -aux-info option

commit 7aee9f92e7c3e3eb48c0456d821125b60f8d8259
Author: Simo Sorce i...@samba.org
Date:   Mon Jun 15 16:19:19 2009 -0400

Add exports file and abi checker for tdb

This is a first attempt at exporting symbols only for public functions
We also provide a rudimentary ABI checker that tries to check that
function signatures are not changed by mistake.
Given our use of macros this is not an API checker.
It's all based on tdb.h contents and the gcc -aux-info option

commit f518e37c0912a54d5434f7639ba44f53d3455582
Author: Simo Sorce i...@samba.org
Date:   Mon Jun 15 16:20:06 2009 -0400

Add new replace check for --version-script

Allows us to pass an export files on Linux and Solaris so that we can expose
only symbols that are actually supposed to be global, and keep as local 
anything
else.

commit 57ba31ca968552f28b2221b740f9b0c5bcd9911a
Author: Simo Sorce i...@samba.org
Date:   Mon Jun 15 15:08:25 2009 -0400

Add option to --disable-python on build

---

Summary of changes:
 lib/replace/libreplace_ld.m4 |   16 ++
 lib/talloc/Makefile.in   |6 +++-
 lib/talloc/abi_checks.sh |   32 +
 lib/talloc/configure.ac  |   15 +
 lib/talloc/libtalloc.m4  |5 +++
 lib/talloc/rules.mk  |2 +-
 lib/talloc/talloc.exports|   61 
 lib/talloc/talloc.mk |1 +
 lib/talloc/talloc.signatures |   56 
 lib/tdb/Makefile.in  |7 -
 lib/tdb/abi_checks.sh|   35 +++
 lib/tdb/configure.ac |   12 +++-
 lib/tdb/libtdb.m4|5 +++
 lib/tdb/rules.mk |2 +-
 lib/tdb/tdb.exports  |   64 ++
 lib/tdb/tdb.signatures   |   59 ++
 lib/tevent/Makefile.in   |7 -
 lib/tevent/abi_checks.sh |   31 
 lib/tevent/configure.ac  |1 +
 lib/tevent/libtevent.m4  |5 +++
 lib/tevent/rules.mk  |2 +-
 lib/tevent/tevent.exports|   59 ++
 lib/tevent/tevent.signatures |   54 +++
 23 files changed, 523 insertions(+), 14 deletions(-)
 create mode 100755 lib/talloc/abi_checks.sh
 create mode 100644 lib/talloc/talloc.exports
 create mode 100644 lib/talloc/talloc.signatures
 create mode 100755 lib/tdb/abi_checks.sh
 create mode 100644 lib/tdb/tdb.exports
 create mode 100644 lib/tdb/tdb.signatures
 create mode 100755 lib/tevent/abi_checks.sh
 create mode 100644 lib/tevent/tevent.exports
 create mode 100644 lib/tevent/tevent.signatures


Changeset truncated at 500 lines:

diff --git a/lib/replace/libreplace_ld.m4 b/lib/replace/libreplace_ld.m4
index 8ab5e78..90c5be6 100644
--- a/lib/replace/libreplace_ld.m4
+++ b/lib/replace/libreplace_ld.m4
@@ -248,6 +248,22 @@ AC_DEFUN([AC_LD_SONAMEFLAG],
esac
 ])
 
+AC_DEFUN([AC_LD_VERSIONSCRIPT],
+[
+   AC_SUBST(VERSIONSCRIPT)
+   VERSIONSCRIPT=
+   case $host_os in 
+   *linux*|*gnu*)
+   VERSIONSCRIPT=-Wl,--version-script
+   ;;
+   *solaris*)
+   if test ${GCC} = yes; then
+   VERSIONSCRIPT=-Wl,--version-script
+ 

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-2330-g6f33503

2009-06-15 Thread Tim Prouty
The branch, master has been updated
   via  6f335036fda47a6903b21287824d88333d1b526f (commit)
  from  efccef09aec93180a06955b5e03f1ceb99dc39e8 (commit)

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


- Log -
commit 6f335036fda47a6903b21287824d88333d1b526f
Author: Tim Prouty tpro...@samba.org
Date:   Mon Jun 15 12:13:31 2009 -0700

s3 onefs: Change onefs modules to use the new createfile api

---

Summary of changes:
 source3/modules/onefs.h |6 +---
 source3/modules/onefs_open.c|   40 ++
 source3/modules/vfs_onefs_shadow_copy.c |   41 ++
 3 files changed, 45 insertions(+), 42 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/onefs.h b/source3/modules/onefs.h
index 70f90b5..3e6cd29 100644
--- a/source3/modules/onefs.h
+++ b/source3/modules/onefs.h
@@ -46,8 +46,7 @@ void onefs_init_search_op(struct vfs_handle_struct *handle,
 NTSTATUS onefs_create_file(vfs_handle_struct *handle,
   struct smb_request *req,
   uint16_t root_dir_fid,
-  const char *fname,
-  uint32_t create_file_flags,
+  struct smb_filename *smb_fname,
   uint32_t access_mask,
   uint32_t share_access,
   uint32_t create_disposition,
@@ -58,8 +57,7 @@ NTSTATUS onefs_create_file(vfs_handle_struct *handle,
   struct security_descriptor *sd,
   struct ea_list *ea_list,
   files_struct **result,
-  int *pinfo,
-  SMB_STRUCT_STAT *psbuf);
+  int *pinfo);
 
 int onefs_close(vfs_handle_struct *handle, struct files_struct *fsp);
 
diff --git a/source3/modules/onefs_open.c b/source3/modules/onefs_open.c
index 4198e5f..c773f9e 100644
--- a/source3/modules/onefs_open.c
+++ b/source3/modules/onefs_open.c
@@ -1981,8 +1981,7 @@ static void destroy_onefs_fsp_data(void *p_data)
 NTSTATUS onefs_create_file(vfs_handle_struct *handle,
   struct smb_request *req,
   uint16_t root_dir_fid,
-  const char *fname,
-  uint32_t create_file_flags,
+  struct smb_filename *smb_fname,
   uint32_t access_mask,
   uint32_t share_access,
   uint32_t create_disposition,
@@ -1993,15 +1992,13 @@ NTSTATUS onefs_create_file(vfs_handle_struct *handle,
   struct security_descriptor *sd,
   struct ea_list *ea_list,
   files_struct **result,
-  int *pinfo,
-  SMB_STRUCT_STAT *psbuf)
+  int *pinfo)
 {
connection_struct *conn = handle-conn;
-   struct case_semantics_state *case_state = NULL;
struct onefs_fsp_data fsp_data = {};
-   SMB_STRUCT_STAT sbuf;
int info = FILE_WAS_OPENED;
files_struct *fsp = NULL;
+   char *fname = NULL;
NTSTATUS status;
 
DEBUG(10,(onefs_create_file: access_mask = 0x%x 
@@ -2009,7 +2006,7 @@ NTSTATUS onefs_create_file(vfs_handle_struct *handle,
  create_disposition = 0x%x create_options = 0x%x 
  oplock_request = 0x%x 
  root_dir_fid = 0x%x, ea_list = 0x%p, sd = 0x%p, 
- create_file_flags = 0x%x, fname = %s\n,
+ fname = %s\n,
  (unsigned int)access_mask,
  (unsigned int)file_attributes,
  (unsigned int)share_access,
@@ -2017,7 +2014,7 @@ NTSTATUS onefs_create_file(vfs_handle_struct *handle,
  (unsigned int)create_options,
  (unsigned int)oplock_request,
  (unsigned int)root_dir_fid,
- ea_list, sd, create_file_flags, fname));
+ ea_list, sd, smb_fname_str_dbg(smb_fname)));
 
/* Get the file name if root_dir_fid was specified. */
if (root_dir_fid != 0) {
@@ -2036,7 +2033,8 @@ NTSTATUS onefs_create_file(vfs_handle_struct *handle,
if ((req != NULL)  (req-flags2  FLAGS2_DFS_PATHNAMES)) {
char *resolved_fname;
 
-   status = resolve_dfspath(talloc_tos(), conn, true, fname,
+   status = resolve_dfspath(talloc_tos(), conn, true,
+smb_fname-base_name,
 resolved_fname);
 
if (!NT_STATUS_IS_OK(status)) {
@@ -2048,24 +2046,15 @@ NTSTATUS onefs_create_file(vfs_handle_struct *handle,
 */
 

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-2331-g537aa4c

2009-06-15 Thread Tim Prouty
The branch, master has been updated
   via  537aa4cf51def606de6c73c429f97d12c76333b1 (commit)
  from  6f335036fda47a6903b21287824d88333d1b526f (commit)

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


- Log -
commit 537aa4cf51def606de6c73c429f97d12c76333b1
Author: Tim Prouty tpro...@samba.org
Date:   Mon Jun 15 20:16:07 2009 +

s3 onefs: Fix reading over the end of the array, because the incorrect 
array was being read.

---

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


Changeset truncated at 500 lines:

diff --git a/source3/modules/onefs_config.c b/source3/modules/onefs_config.c
index 6fe74fc..aa0d99e 100644
--- a/source3/modules/onefs_config.c
+++ b/source3/modules/onefs_config.c
@@ -216,8 +216,9 @@ int onefs_load_config(connection_struct *conn)
 bool onefs_get_config(int snum, int config_type,
  struct onefs_vfs_share_config *cfg)
 {
-   if (vfs_share_config[snum].init_flags  config_type)
-   *cfg = vfs_share_config[snum];
+   if ((pvfs_share_config != NULL) 
+   (pvfs_share_config[snum].init_flags  config_type))
+   *cfg = pvfs_share_config[snum];
else
return false;
 


-- 
Samba Shared Repository


Build status as of Tue Jun 16 00:00:02 2009

2009-06-15 Thread build
URL: http://build.samba.org/

--- /home/build/master/cache/broken_results.txt.old 2009-06-15 
00:00:33.0 +
+++ /home/build/master/cache/broken_results.txt 2009-06-16 00:00:50.0 
+
@@ -1,4 +1,4 @@
-Build status as of Mon Jun 15 00:00:02 2009
+Build status as of Tue Jun 16 00:00:02 2009
 
 Build counts:
 Tree Total  Broken Panic 
@@ -8,15 +8,15 @@
 ldb  31 31 0 
 libreplace   31 11 0 
 lorikeet 0  0  0 
-pidl 22 2  0 
+pidl 21 2  0 
 ppp  15 0  0 
 rsync31 9  0 
 samba-docs   0  0  0 
 samba-web0  0  0 
-samba_3_current 29 27 0 
-samba_3_master 30 27 5 
-samba_3_next 30 27 0 
-samba_4_0_test 30 28 1 
-talloc   31 31 0 
-tdb  29 9  0 
+samba_3_current 29 26 0 
+samba_3_master 30 27 6 
+samba_3_next 30 29 1 
+samba_4_0_test 31 28 1 
+talloc   30 31 0 
+tdb  28 22 0 
 


[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-2333-g308de54

2009-06-15 Thread Jelmer Vernooij
The branch, master has been updated
   via  308de544f4dd1e23197d3b6d3be85cef1f5f9ded (commit)
   via  f7ada51c29a517e841843c2a869ac9d16c7057d4 (commit)
  from  537aa4cf51def606de6c73c429f97d12c76333b1 (commit)

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


- Log -
commit 308de544f4dd1e23197d3b6d3be85cef1f5f9ded
Author: Jelmer Vernooij jel...@samba.org
Date:   Tue Jun 16 02:24:43 2009 +0200

python: Provide way to iterate over available shares.

commit f7ada51c29a517e841843c2a869ac9d16c7057d4
Author: Jelmer Vernooij jel...@samba.org
Date:   Tue Jun 16 02:05:18 2009 +0200

python: Add API for accessing available shares.

---

Summary of changes:
 source4/bin/python/samba/tests/shares.py |   74 ++
 source4/param/pyparam.c  |   16 ++
 source4/scripting/python/samba/shares.py |   61 
 source4/selftest/tests.sh|1 +
 4 files changed, 152 insertions(+), 0 deletions(-)
 create mode 100644 source4/bin/python/samba/tests/shares.py
 create mode 100644 source4/scripting/python/samba/shares.py


Changeset truncated at 500 lines:

diff --git a/source4/bin/python/samba/tests/shares.py 
b/source4/bin/python/samba/tests/shares.py
new file mode 100644
index 000..9130c36
--- /dev/null
+++ b/source4/bin/python/samba/tests/shares.py
@@ -0,0 +1,74 @@
+#!/usr/bin/python
+
+# Unix SMB/CIFS implementation. Tests for shares
+# Copyright (C) Jelmer Vernooij jel...@samba.org 2009
+#   
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#   
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#   
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see http://www.gnu.org/licenses/.
+#
+from samba.shares import SharesContainer
+from unittest import TestCase
+
+
+class MockService(object):
+
+def __init__(self, data):
+self.data = data
+
+def __getitem__(self, name):
+return self.data[name]
+
+
+class MockLoadParm(object):
+
+def __init__(self, data):
+self.data = data
+
+def __getitem__(self, name):
+return MockService(self.data[name])
+
+def __contains__(self, name):
+return name in self.data
+
+def __len__(self):
+return len(self.data)
+
+def services(self):
+return self.data.keys()
+
+
+class ShareTests(TestCase):
+
+def _get_shares(self, conf):
+return SharesContainer(MockLoadParm(conf))
+
+def test_len_no_global(self):
+shares = self._get_shares({})
+self.assertEquals(0, len(shares))
+
+def test_iter(self):
+self.assertEquals([], list(self._get_shares({})))
+self.assertEquals([], list(self._get_shares({global:{}})))
+self.assertEquals([bla], list(self._get_shares({global:{}, 
bla:{}})))
+
+def test_len(self):
+shares = self._get_shares({global: {}})
+self.assertEquals(0, len(shares))
+
+def test_getitem_nonexistant(self):
+shares = self._get_shares({global: {}})
+self.assertRaises(KeyError, shares.__getitem__, bla)
+
+def test_getitem_global(self):
+shares = self._get_shares({global: {}})
+self.assertRaises(KeyError, shares.__getitem__, global)
diff --git a/source4/param/pyparam.c b/source4/param/pyparam.c
index d8dabe3..4f6e2ff 100644
--- a/source4/param/pyparam.c
+++ b/source4/param/pyparam.c
@@ -232,6 +232,20 @@ static PyObject *py_lp_ctx_private_path(py_talloc_Object 
*self, PyObject *args)
return ret;
 }
 
+static PyObject *py_lp_ctx_services(py_talloc_Object *self)
+{
+   struct loadparm_context *lp_ctx = 
PyLoadparmContext_AsLoadparmContext(self);
+   const char **names;
+   PyObject *ret;
+   int i;
+   names = lp_server_services(lp_ctx);
+   ret = PyList_New(str_list_length(names));
+   for (i = 0; names[i]; i++) {
+   PyList_SetItem(ret, i, PyString_FromString(names[i]));
+   }
+   return ret;
+}
+
 static PyMethodDef py_lp_ctx_methods[] = {
{ load, (PyCFunction)py_lp_ctx_load, METH_VARARGS, 
S.load(filename) - None\n
@@ -253,6 +267,8 @@ static PyMethodDef py_lp_ctx_methods[] = {
Change a parameter. },
{ private_path, (PyCFunction)py_lp_ctx_private_path, METH_VARARGS,
S.private_path(name) - path\n },
+   { services, (PyCFunction)py_lp_ctx_services, METH_NOARGS,
+   S.services() - list },