[Samba] Samba 3.3.4-31 ssh/winbind login failure

2009-06-23 Thread Adrian Graham
Folks,

Fixed it, looks like 'make install' doesn't move pam_winbind.so over to
/lib/security either so I was using an old version. The libnss* libs not
going over correctly really should've given me a hint given that the
resulting error (request size 2088, expected 2096) is the same.

Create a link from /lib/security/pam_winbind.so to
/usr/lib/security/pam_winbind.so and suddenly all my problems vanished. I
can now:

map network drives to the samba box and create files with the correct Active
Directory user/group names
smbclient onto the samba box
ssh onto the samba box as an AD user, pick up the correct home directory and
use the correct user/group names.

-- 
--
adrian/witchy
Owner of Binary Dinosaurs, the UK's biggest home  computer collection?
www.binarydinosaurs.co.uk
-- 
To unsubscribe from this list go to the following URL and read the
instructions:  https://lists.samba.org/mailman/options/samba


[Samba] 3.3.5 not compiling on solaris 10 (libtalloc.so.1)

2009-06-23 Thread christoph . beyer

Hi,

I found some hints but no solution that worked for me actually, I try to 
compile 3.3.5 on Solaris 10 and it does not find libtalloc:


Linking shared library bin/libtalloc.so.1
/usr/ccs/bin/ld: cannot open linker script file 
/scratch/samba-3.3.5/source/exports/libtalloc.so.1: No such file or 
directory

gmake: *** [bin/libtalloc.so.1] Error 1

Obviously because it's not there :( :

[printsrv9] /scratch/samba-3.3.5/source # ls 
/scratch/samba-3.3.5/source/exports/

libaddns.symslibtalloc.syms   modules-darwin.syms


Any hints someone ???

cheers
~christoph


--
/*   Christoph Beyer |   Office: Building 2b / 23 *\
 *   DESY|Phone: 040-8998-2317*
 *   - IT -  |  Fax: 040-8998-4060*
\*   22603 Hamburg   | http://www.desy.de */


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


Re: [Samba] Copy *just* user accounts from LDAP?

2009-06-23 Thread Adam Williams
ldapsearch -v -x -h roark.mdah.state.ms.us -D 
cn=Manager,dc=mdah,dc=state,dc=ms,dc=us -w  -b 
ou=People,dc=mdah,dc=state,dc=ms,dc=us  somefile


scp somefile over.  load it with slapadd or ldapadd.


jo...@primebuchholz.com wrote:

Greetings All,

I have a Samba-controlled domain, with everything in LDAP.

I also have an off-site server that I rsync all our files to every couple 
hours. 

What I'd like to do is set up a new Samba domain on the off-site server so 
users can log into it for disaster recovery purposes - and I'd like to 
keep the user account information synchronized with the main server so 
user's passwords are the same, etc. - while leaving behind workstation 
accounts, etc.


Does anyone have any ideas on how best to approach this?  I guess what I'm 
asking is, I'm OK with slapcat/slapadd'ing periodically from the main 
server to the off-site server, but does anyone have ideas for how to 
filter just the user accounts into the LDIF?


Thanks in advance,

-John

--
Please consider the environment before printing this e-mail.
 
	This e-mail is intended only for the named person or entity to which it

is addressed and contains valuable business information that is
privileged, confidential and/or otherwise protected from disclosure.
Dissemination, distribution or copying of this e-mail or the information
herein by anyone other than the intended recipient, or an employee, or
agent responsible for delivering the message to the intended recipient,
is strictly prohibited.  All contents are the copyright property of the
sender.  If you are not the intended recipient, you are nevertheless
bound to respect the sender's worldwide legal rights.  We require that
unintended recipients delete the e-mail and destroy all electronic
copies in their system, retaining no copies in any media.  If you have
received this e-mail in error, please immediately notify us by calling
our Help Desk at (603) 433-1143, or e-mail to i...@primebuchholz.com.
We appreciate your cooperation.

  


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


Re: [Samba] Samba PDC

2009-06-23 Thread Adam Williams

what is the output of net getdomainsid?

Boris Höffgen wrote:

Hello,

i migrate the machine and user accounts into a Samba PDC from a 
Windows NT domain with the command net. After that i generated the 
user passwords with the util smbpasswd. Samba is now the master and 
the domain PDC. But when the users try to login, the following error 
appeares in the logs:

netlogon_creds_server_check failed. Rejecting auth request from client
WS06 machine account WS06$.
What must i do to solve the problem?

pdbedit -Lv WS06$:
Unix username:WS06$
NT username:  WS06$
Account Flags:[W  ]
User SID: S-1-5-21-372180226-160714707-1039276024-1018
Primary Group SID:S-1-5-21-372180226-160714707-1039276024-513
Full Name:
Home Directory:   \\dc011\profiles\98\ws06_
HomeDir Drive:H:
Logon Script: /home/samba/netlogon/ws06_.cmd
Profile Path: \\dc011\profiles\xp\ws06_
Domain:   BILLE
Account desc:
Workstations:
Munged dial:
Logon time:   0
Logoff time:  never
Kickoff time: never
Password last set:Di, 09 Jun 2009 11:46:19 CEST
Password can change:  Di, 09 Jun 2009 11:46:19 CEST
Password must change: Di, 21 Jul 2009 11:46:19 CEST
Last bad password   : 0
Bad password count  : 0
Logon hours : FF


passwd:
WS06$:x:1014:1010::/dev/null:/bin/false

shadow:
WS06$:!:14362:0:9:7:::

Thanks and regards
Boris



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


Re: [Samba] Set up Samba client to backup Windows XP home edition files

2009-06-23 Thread Adam Williams

it would probably be easier to use smbtar.

rocky Ou wrote:

Hey,

It seems that samba client could be used to back up Windows files. Am
I right?

To achieve this, I apt-get installed samba and set up it accordingly.
Below is my smb.conf file
/*==Begin=*/
[global]
   workgroup = HWWKM
   os level = 65
   preferred master = Yes
   domain master = Yes
   wins support = Yes

[KMOfficeShare]
   comment = For backup
   path = /home/samba
   read only = No
/*End===*/
From my Windows XP home edition's Network Neighborhood I can see
KMOfficeShare folder and can create file in it.

At my Windows XP home edition machine, I have set WINS server IP to
samba server IP and changed the workgroup to HWWKM for Windows
machine.

The smbclient -L gives me the below output:
/*Smbclient Begin==*/
hww-debian1:/etc/samba# smbclient -L localhost
Enter root's password:
Domain=[HWW-DEBIAN1] OS=[Unix] Server=[Samba 3.2.5]

   Sharename   Type  Comment
   -     ---
   IPC$IPC   IPC Service (Samba 3.2.5)
   KMOfficeShare   Disk  For backup
Domain=[HWW-DEBIAN1] OS=[Unix] Server=[Samba 3.2.5]

   Server   Comment
   ----

   WorkgroupMaster
   ----
   HWWKMHWW-DEBIAN1
/*Smbclient end==*/
The Windows XP machine (named hww-laptop) is not listed at all.

I'm runing Debian Lenny with Samba 3.2.5 installed. Can any of you
tell me what I need to do to be able to use smbclient to access the
Windows XP files and do the back up please? I really appreciate your
help.

Blessings,
Rocky
  


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


Re: [Samba] Samba PDC

2009-06-23 Thread Boris Höffgen

Hi!

Adam Williams schrieb:

what is the output of net getdomainsid?

SID for local machine DC011 is: S-1-5-21-3019101499-2136775595-2697463099
SID for domain BILLE is: S-1-5-21-372180226-160714707-1039276024

The old PDC is DC01 and the samba server (new PDC) is DC011. Thanks!



Boris Höffgen wrote:

Hello,

i migrate the machine and user accounts into a Samba PDC from a 
Windows NT domain with the command net. After that i generated the 
user passwords with the util smbpasswd. Samba is now the master and 
the domain PDC. But when the users try to login, the following error 
appeares in the logs:

netlogon_creds_server_check failed. Rejecting auth request from client
WS06 machine account WS06$.
What must i do to solve the problem?

pdbedit -Lv WS06$:
Unix username:WS06$
NT username:  WS06$
Account Flags:[W  ]
User SID: S-1-5-21-372180226-160714707-1039276024-1018
Primary Group SID:S-1-5-21-372180226-160714707-1039276024-513
Full Name:
Home Directory:   \\dc011\profiles\98\ws06_
HomeDir Drive:H:
Logon Script: /home/samba/netlogon/ws06_.cmd
Profile Path: \\dc011\profiles\xp\ws06_
Domain:   BILLE
Account desc:
Workstations:
Munged dial:
Logon time:   0
Logoff time:  never
Kickoff time: never
Password last set:Di, 09 Jun 2009 11:46:19 CEST
Password can change:  Di, 09 Jun 2009 11:46:19 CEST
Password must change: Di, 21 Jul 2009 11:46:19 CEST
Last bad password   : 0
Bad password count  : 0
Logon hours : FF


passwd:
WS06$:x:1014:1010::/dev/null:/bin/false

shadow:
WS06$:!:14362:0:9:7:::

Thanks and regards
Boris





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


[Samba] Samba - PANIC: sys_setgroups failed

2009-06-23 Thread Jamen McGranahan
Environment: SunOS lib240 5.9 Generic_122300-41 sun4u sparc
SUNW,Sun-Fire-V240
Samba version: 3.3.3

I am hoping someone on here can help. I'm running out of ideas. Samba acts
like it works, giving me data with wbinfo -u and wbinfo -g AND it returns
users in my Active Directory with getent passwd  getent group. However, if
I try to connect to this server (either from itself or from another samba
server), it fails and gives me the following error in the log file:

lib240.log
[2009/06/22 09:31:44,  0] lib/util.c:smb_panic(1673)
  PANIC (pid 5473): sys_setgroups failed
[2009/06/22 09:31:44,  0] lib/util.c:log_stack_trace(1827)
  unable to produce a stack trace on this platform
[2009/06/22 09:31:44,  0] lib/fault.c:dump_core(231)
  dumping core in /usr/local/samba/var/cores/smbd

At first, I thought my idmap uid/gid ranges were too large, so I put them at
1-2 (was set to 1-20). However, there has been no change
after restarting samba. Here is my smb.conf file:

[global]

workgroup = VANDERBILT
netbios name = lib240
server string = lib240
security = ADS
realm = DS.VANDERBILT.EDU
encrypt passwords = yes
log file = /opt/samba/var/%m.log
max log size = 1000
socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192
local master = no
domain master = no
preferred master = no
dns proxy = no
   winbind use default domain = yes
   template shell = /bin/false
   template homedir = /home/%U
   idmap uid = 1-2
   idmap gid = 1-2
   name resolve order = wins lmhosts host bcast
   wins server = 129.59.1.15
   winbind enum users = Yes
   winbind enum groups = Yes

Please advise. Thank you!

Jamen McGranahan



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


Re: [Samba] 3.3.5 not compiling on solaris 10 (libtalloc.so.1)

2009-06-23 Thread David Markey
Have you tried:

mv /bin/sh /bin/sh.old  
ln -s /bin/bash /bin/sh 

try configure/make again

rm /bin/sh   mv  /bin/sh.old /bin/sh




On Tue, 23 Jun 2009 15:18:04 +0200 (CEST), christoph.be...@desy.de wrote:
 Hi,
 
 I found some hints but no solution that worked for me actually, I try to 
 compile 3.3.5 on Solaris 10 and it does not find libtalloc:
 
 Linking shared library bin/libtalloc.so.1
 /usr/ccs/bin/ld: cannot open linker script file 
 /scratch/samba-3.3.5/source/exports/libtalloc.so.1: No such file or 
 directory
 gmake: *** [bin/libtalloc.so.1] Error 1
 
 Obviously because it's not there :( :
 
 [printsrv9] /scratch/samba-3.3.5/source # ls 
 /scratch/samba-3.3.5/source/exports/
 libaddns.symslibtalloc.syms   modules-darwin.syms
 
 
 Any hints someone ???
 
 cheers
   ~christoph
 
 
 -- 
 /*   Christoph Beyer |   Office: Building 2b / 23 *\
   *   DESY|Phone: 040-8998-2317*
   *   - IT -  |  Fax: 040-8998-4060*
 \*   22603 Hamburg   | http://www.desy.de */
-- 
To unsubscribe from this list go to the following URL and read the
instructions:  https://lists.samba.org/mailman/options/samba


[Samba] [Announce] Samba 3.0.35 Security Release Available for Download

2009-06-23 Thread Karolin Seeger
Release Announcements
=

This is a security release in order to address CVE-2009-1888.

   o CVE-2009-1888:
 In Samba 3.0.31 to 3.3.5 (inclusive), an uninitialized read of a
 data value can potentially affect access control when dos filemode
 is set to yes.


##
Changes
###

Changes since 3.0.34



o   Jeremy Allison j...@samba.org
* Fix for CVE-2009-1888.


##
Reporting bugs  Development Discussion
###

Please discuss this release on the samba-technical mailing list or by
joining the #samba-technical IRC channel on irc.freenode.net.

If you do report problems then please try to send high quality
feedback. If you don't provide vital information to help us track down
the problem then you will probably be ignored.  All bug reports should
be filed under the Samba 3.0 product in the project's Bugzilla
database (https://bugzilla.samba.org/).


==
== Our Code, Our Bugs, Our Responsibility.
== The Samba Team
==



Download Details


The uncompressed tarballs and patch files have been signed
using GnuPG (ID 6568B7EA).  The source code can be downloaded
from:

http://download.samba.org/samba/ftp/

The release notes are available online at:

http://www.samba.org/samba/ftp/history/samba-3.0.35.html

Binary packages will be made available on a volunteer basis from

http://download.samba.org/samba/ftp/Binary_Packages/

Our Code, Our Bugs, Our Responsibility.
(https://bugzilla.samba.org/)

--Enjoy
The Samba Team




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

[Samba] [Announce] Samba 3.2.13 Security Release Available for Download

2009-06-23 Thread Karolin Seeger
Release Announcements
=

This is a security release in order to address CVE-2009-1886 and CVE-2009-1888.

   o CVE-2009-1886:
 In Samba 3.2.0 to 3.2.12 (inclusive), the smbclient commands dealing
 with file names treat user input as a format string to asprintf.
 With a maliciously crafted file name smbclient can be made
 to execute code triggered by the server.

   o CVE-2009-1888:
 In Samba 3.0.31 to 3.3.5 (inclusive), an uninitialized read of a data
 value can potentially affect access control when dos filemode
 is set to yes.


##
Changes
###

Changes since 3.2.12



o   Jeremy Allison j...@samba.org
* Fix for CVE-2009-1886.
* Fix for CVE-2009-1888.



Download Details


The uncompressed tarballs and patch files have been signed
using GnuPG (ID 6568B7EA).  The source code can be downloaded
from:

http://download.samba.org/samba/ftp/

The release notes are available online at:

http://www.samba.org/samba/ftp/history/samba-3.2.13.html

Binary packages will be made available on a volunteer basis from

http://download.samba.org/samba/ftp/Binary_Packages/

Our Code, Our Bugs, Our Responsibility.
(https://bugzilla.samba.org/)

--Enjoy
The Samba Team




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

[Samba] [Announce] Samba 3.3.6 Security Release Available for Download

2009-06-23 Thread Karolin Seeger
Release Announcements
=

This is a security release in order to address CVE-2009-1888.

   o CVE-2009-1888:
 In Samba 3.0.31 to 3.3.5 (inclusive), an uninitialized read of a
 data value can potentially affect access control when dos filemode
 is set to yes.


##
Changes
###


Changes since 3.3.5:



o   Jeremy Allison j...@samba.org
* BUG 6488: Fix for CVE-2009-1888.



Download Details


The uncompressed tarballs and patch files have been signed
using GnuPG (ID 6568B7EA).  The source code can be downloaded
from:

http://download.samba.org/samba/ftp/

The release notes are available online at:

http://www.samba.org/samba/ftp/history/samba-3.3.6.html

Binary packages will be made available on a volunteer basis from

http://download.samba.org/samba/ftp/Binary_Packages/

Our Code, Our Bugs, Our Responsibility.
(https://bugzilla.samba.org/)

--Enjoy
The Samba Team





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

Re: [Samba] Samba - PANIC: sys_setgroups failed

2009-06-23 Thread Christian McHugh
On Tuesday 23 June 2009 07:24:26 am Jamen McGranahan wrote:
 [2009/06/22 09:31:44,  0] lib/util.c:smb_panic(1673)
   PANIC (pid 5473): sys_setgroups failed
 [2009/06/22 09:31:44,  0] lib/util.c:log_stack_trace(1827)
   unable to produce a stack trace on this platform
 [2009/06/22 09:31:44,  0] lib/fault.c:dump_core(231)
   dumping core in /usr/local/samba/var/cores/smbd

Is your user in more than 16 groups? Solaris does not seem to like users with 
more than 16 groups.

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


[Samba] Re: Samba - PANIC: sys_setgroups failed

2009-06-23 Thread Jamen McGranahan
Honestly, I don't think that is the issue. I have two other Solaris 10 boxes 
running the same version of Samba and they see to be working as expected (I 
can map to the share and read/write). I'm about to re-configure Samba and 
see if that will help. Nothing else seems to work.

Jamen McGranahan
Vanderbilt University

Christian McHugh christian.mch...@nau.edu wrote in message 
news:200906230835.32740.christian.mch...@nau.edu...
 On Tuesday 23 June 2009 07:24:26 am Jamen McGranahan wrote:
 [2009/06/22 09:31:44,  0] lib/util.c:smb_panic(1673)
   PANIC (pid 5473): sys_setgroups failed
 [2009/06/22 09:31:44,  0] lib/util.c:log_stack_trace(1827)
   unable to produce a stack trace on this platform
 [2009/06/22 09:31:44,  0] lib/fault.c:dump_core(231)
   dumping core in /usr/local/samba/var/cores/smbd

 Is your user in more than 16 groups? Solaris does not seem to like users 
 with
 more than 16 groups.

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



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


[Samba] Very slow transfers to Samba on Ubuntu

2009-06-23 Thread Raghu A

I mounted a samba volume on XP. XP and Ubuntu are connected over 100Mbps
ethernet (router).

I am writing a 4GB file from XP to Ubuntu and the transfer is extremely slow
: only around 1-1.5 MB/s.

This is not a network or disk issue since at the same time this transfer is
gonig on, I can scp the same file from XP to Ubuntu at 3-4 times faster
(around 6MB/s).

What could be wrong? Even for this slow transfer, smbd seems to be taking
quite a bit CPU (more than sshd for the transfer rate).

Reading from Ubuntu on this Samba volume is not much faster. only above
3MB/s.

It is pretty surprising. Please let me know if you need any more info about
the problem.

The only changes I made to smb.conf are for adding shares. I have latest
Ubuntu Jaunty packages.

FYI: netstat on the connection from XP on Ubuntu shows around 1K of data on
receive buffer. Seems to indicate smbd is not processing fast enough.

Thanks,
Raghu.

-- 
View this message in context: 
http://www.nabble.com/Very-slow-transfers-to-Samba-on-Ubuntu-tp24168452p24168452.html
Sent from the Samba - General mailing list archive at Nabble.com.

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


[Samba] PDC - BDC Question

2009-06-23 Thread Nick Pappin
Hi Everyone,
 I was wondering I am setting up a BDC at another physically separate
location on a different subnet, and I am currently working on what files I
need to have copied between the computers and which need to be made on each
server. The specific question I am dealing with is what TDB files I need to
replicate filesystems between the two servers.  Below is a list of what the
files I see in my samba directory are:

account_policy.tdb
ntdrivers.tdb
ntforms.tdb
share_info.tdb
group_mapping.ldb
ntprinters.tdb
registry.tdb
wins.dat
private/schannel_store.tdb
private/secrets.tdb

I am wondering first which of these need to be replicated from server to
server and which need to be unique to each server? For instance I know that
account_policy.tdb can be replicated and needs to be because it holds all of
the account policy information. The second thing I am wondering is what does
each of these files do? I was hoping that someone could do a brief sentence
or two about what each of these files do. Thanks for the help.

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


[Samba] CIFS mount not applying setuids

2009-06-23 Thread Ben Tyger
Hello all,
I've been dealing with this problem for years now and I am a bit fed
up with it.  Maybe some of you all can shed some light on the situation.
I am having problems with my samba server setting the
uid/gid/permissions incorrectly when a file is written to the server
filesystem over cifs.   I currently use the account remotemounter for
mounting samba shares.   Even with the 'setuids' options set, it still
defaults back to writing files as the remotemounter's default
user:group:umask settings.  I know that samba will rollback to standard
UID/GID of the mounting username if CIFS Unix Extensions are
unavailable.  I don't know why CIFS Unix Extensions wouldn't be
available.  Anybody have any ideas?



---Client mount command ---
hydr...@bran ~ $ sudo mount -vv /mnt/Multimedia/
parsing options:
rw,credentials=/etc/samba/cred-remotemounter,setuids,acl,noperms

mount.cifs kernel mount options
unc=//brigid.tygerclan.local\multimedia,ip=192.168.1.4,user=remotemounter,pass={mypassword},ver=1,rw,credentials=/etc/samba/cred-remotemounter,setuids,acl,noperms

Client: Gentoo Linux
net-fs/mount-cifs-3.0.30
net-fs/samba-3.0.33
--

--- Server Config
[global]
dos charset = CP850
unix charset = UTF-8
display charset = LOCALE
workgroup = TYGERCLAN
realm =
netbios name = BRIGID
netbios aliases =
netbios scope =
server string = brigid.tygerclan.net
interfaces =
bind interfaces only = No
security = USER
auth methods =
encrypt passwords = Yes
update encrypted = No
client schannel = Auto
server schannel = Auto
allow trusted domains = Yes
map to guest = Bad User
null passwords = No
obey pam restrictions = No
password server = *
smb passwd file = /etc/samba/smbpasswd
private dir = /etc/samba
passdb backend = ldapsam:ldap://ldap-slave.tygerclan.local
algorithmic rid base = 1000
root directory =
guest account = nobody
enable privileges = Yes
pam password change = No
passwd program =
passwd chat = *new*password* %n\n *new*password* %n\n *changed*
passwd chat debug = No
passwd chat timeout = 2
check password script =
username map =
password level = 0
username level = 0
unix password sync = No
restrict anonymous = 0
lanman auth = No
ntlm auth = Yes
client NTLMv2 auth = No
client lanman auth = Yes
client plaintext auth = No
preload modules =
use kerberos keytab = No
log level = 0
syslog = 1
syslog only = No
log file = /var/log/samba/log.%m
max log size = 50
debug timestamp = Yes
debug prefix timestamp = No
debug hires timestamp = No
debug pid = No
debug uid = No
enable core files = Yes
smb ports = 445 139
large readwrite = Yes
max protocol = NT1
min protocol = CORE
read bmpx = No
read raw = Yes
write raw = Yes
disable netbios = No
reset on zero vc = No
acl compatibility = auto
defer sharing violations = Yes
nt pipe support = Yes
nt status support = Yes
announce version = 4.9
announce as = NT
max mux = 50
max xmit = 16644
name resolve order = lmhosts wins host bcast
max ttl = 259200
max wins ttl = 518400
min wins ttl = 21600
time server = No
unix extensions = Yes
use spnego = Yes
client signing = auto
server signing = No
client use spnego = Yes
enable asu support = No
svcctl list =
deadtime = 0
getwd cache = Yes
keepalive = 300
lpq cache time = 30
max smbd processes = 0
paranoid server security = Yes
max disk size = 0
max open files = 1
open files database hash size = 10007
socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192
use mmap = Yes
hostname lookups = No
name cache timeout = 660
load printers = Yes
printcap cache time = 750
printcap name = cups
cups server =
iprint server =
disable spoolss = No
addport command =
enumports command =
addprinter command =
deleteprinter command =
show add printer wizard = Yes
os2 driver map =
mangling method = hash2
mangle prefix = 1
max stat cache size = 1024
stat cache = Yes
machine password timeout = 604800
add user script = /usr/sbin/smbldap-useradd '%u'
rename user script =
delete user script = /usr/sbin/smbldap-userdel '%u'
add group script = /usr/sbin/smbldap-groupadd '%g' 

Re: [Samba] Very slow transfers to Samba on Ubuntu

2009-06-23 Thread Raghu A


Sample tcpdump for such a connection : Notice that there are only couple of
1KB chunks for each millisecond : 

18:50:57.948157 IP 192.168.0.100.4366  192.168.0.104.445: P 2184:3276(1092)
ack 103 win 64719
18:50:57.948374 IP 192.168.0.104.445  192.168.0.100.4366: P 103:154(51) ack
3276 win 65535
18:50:57.948897 IP 192.168.0.100.4366  192.168.0.104.445: P 3276:4368(1092)
ack 154 win 64668
18:50:57.949074 IP 192.168.0.104.445  192.168.0.100.4366: P 154:205(51) ack
4368 win 65535
18:50:57.949615 IP 192.168.0.100.4366  192.168.0.104.445: P 4368:5460(1092)
ack 205 win 64617
18:50:57.949831 IP 192.168.0.104.445  192.168.0.100.4366: P 205:256(51) ack
5460 win 65535
18:50:57.950437 IP 192.168.0.100.4366  192.168.0.104.445: P 5460:6552(1092)
ack 256 win 64566
18:50:57.950649 IP 192.168.0.104.445  192.168.0.100.4366: P 256:307(51) ack
6552 win 65535
18:50:57.951152 IP 192.168.0.100.4366  192.168.0.104.445: P 6552:7644(1092)
ack 307 win 64515
18:50:57.951389 IP 192.168.0.104.445  192.168.0.100.4366: P 307:358(51) ack
7644 win 65535
18:50:57.951911 IP 192.168.0.100.4366  192.168.0.104.445: P 7644:8736(1092)
ack 358 win 64464
18:50:57.952090 IP 192.168.0.104.445  192.168.0.100.4366: P 358:409(51) ack
8736 win 65535
18:50:57.952608 IP 192.168.0.100.4366  192.168.0.104.445: P 8736:9828(1092)
ack 409 win 64413
18:50:57.952801 IP 192.168.0.104.445  192.168.0.100.4366: P 409:460(51) ack
9828 win 65535
18:50:57.953299 IP 192.168.0.100.4366  192.168.0.104.445: P
9828:10920(1092) ack 460 win 64362
18:50:57.953489 IP 192.168.0.104.445  192.168.0.100.4366: P 460:511(51) ack
10920 win 65535
18:50:57.954038 IP 192.168.0.100.4366  192.168.0.104.445: P
10920:12012(1092) ack 511 win 64311
18:50:57.954286 IP 192.168.0.104.445  192.168.0.100.4366: P 511:562(51) ack
12012 win 65535
18:50:57.954794 IP 192.168.0.100.4366  192.168.0.104.445: P
12012:13104(1092) ack 562 win 65535
18:50:57.954982 IP 192.168.0.104.445  192.168.0.100.4366: P 562:613(51) ack
13104 win 65535
18:50:57.955531 IP 192.168.0.100.4366  192.168.0.104.445: P
13104:14196(1092) ack 613 win 65484
18:50:57.955702 IP 192.168.0.104.445  192.168.0.100.4366: P 613:664(51) ack
14196 win 65535
18:50:57.956207 IP 192.168.0.100.4366  192.168.0.104.445: P
14196:15288(1092) ack 664 win 65433
18:50:57.956497 IP 192.168.0.104.445  192.168.0.100.4366: P 664:715(51) ack
15288 win 65535
18:50:57.956984 IP 192.168.0.100.4366  192.168.0.104.445: P
15288:16380(1092) ack 715 win 65382
18:50:57.957213 IP 192.168.0.104.445  192.168.0.100.4366: P 715:766(51) ack
16380 win 65535
18:50:57.957765 IP 192.168.0.100.4366  192.168.0.104.445: P
16380:17472(1092) ack 766 win 65331
18:50:57.957963 IP 192.168.0.104.445  192.168.0.100.4366: P 766:817(51) ack
17472 win 65535
18:50:57.958462 IP 192.168.0.100.4366  192.168.0.104.445: P
17472:18564(1092) ack 817 win 65280
18:50:57.958658 IP 192.168.0.104.445  192.168.0.100.4366: P 817:868(51) ack
18564 win 65535
18:50:57.959198 IP 192.168.0.100.4366  192.168.0.104.445: P
18564:19656(1092) ack 868 win 65229
18:50:57.959367 IP 192.168.0.104.445  192.168.0.100.4366: P 868:919(51) ack
19656 win 65535
18:50:57.959880 IP 192.168.0.100.4366  192.168.0.104.445: P
19656:20748(1092) ack 919 win 65178




Raghu A wrote:
 
 I mounted a samba volume on XP. XP and Ubuntu are connected over 100Mbps
 ethernet (router).
 
 I am writing a 4GB file from XP to Ubuntu and the transfer is extremely
 slow : only around 1-1.5 MB/s.
 
 This is not a network or disk issue since at the same time this transfer
 is gonig on, I can scp the same file from XP to Ubuntu at 3-4 times faster
 (around 6MB/s).
 
 What could be wrong? Even for this slow transfer, smbd seems to be taking
 quite a bit CPU (more than sshd for the transfer rate).
 
 

-- 
View this message in context: 
http://www.nabble.com/Very-slow-transfers-to-Samba-on-Ubuntu-tp24168452p24178268.html
Sent from the Samba - General mailing list archive at Nabble.com.

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


[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-42-g451a73e

2009-06-23 Thread Günther Deschner
The branch, master has been updated
   via  451a73e3ddd93b3bad9775d6c57c3eeb73646e99 (commit)
   via  ed8c0ed6bd037b8f9fa1665318d8f0e36682217a (commit)
  from  5a4d61810961af199859dfb52981632bfe594e95 (commit)

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


- Log -
commit 451a73e3ddd93b3bad9775d6c57c3eeb73646e99
Author: Günther Deschner g...@samba.org
Date:   Tue Jun 23 10:58:04 2009 +0200

s3: re-run make idl.

Guenther

commit ed8c0ed6bd037b8f9fa1665318d8f0e36682217a
Author: Günther Deschner g...@samba.org
Date:   Tue Jun 23 10:55:05 2009 +0200

samr: add samr_UserInfoLevel and samr_DomainInfoClass enums based on 
MS-SAMR.

Guenther

---

Summary of changes:
 librpc/gen_ndr/cli_samr.c |   14 +++---
 librpc/gen_ndr/cli_samr.h |   14 +++---
 librpc/gen_ndr/ndr_samr.c |  124 +
 librpc/gen_ndr/ndr_samr.h |2 +
 librpc/gen_ndr/samr.h |  104 +++---
 librpc/idl/samr.idl   |   58 ++---
 6 files changed, 267 insertions(+), 49 deletions(-)


Changeset truncated at 500 lines:

diff --git a/librpc/gen_ndr/cli_samr.c b/librpc/gen_ndr/cli_samr.c
index 1e3bd12..4f1ca36 100644
--- a/librpc/gen_ndr/cli_samr.c
+++ b/librpc/gen_ndr/cli_samr.c
@@ -345,7 +345,7 @@ NTSTATUS rpccli_samr_OpenDomain(struct rpc_pipe_client *cli,
 NTSTATUS rpccli_samr_QueryDomainInfo(struct rpc_pipe_client *cli,
 TALLOC_CTX *mem_ctx,
 struct policy_handle *domain_handle /* 
[in] [ref] */,
-uint16_t level /* [in]  */,
+enum samr_DomainInfoClass level /* [in]  
*/,
 union samr_DomainInfo **info /* [out] 
[ref,switch_is(level)] */)
 {
struct samr_QueryDomainInfo r;
@@ -387,7 +387,7 @@ NTSTATUS rpccli_samr_QueryDomainInfo(struct rpc_pipe_client 
*cli,
 NTSTATUS rpccli_samr_SetDomainInfo(struct rpc_pipe_client *cli,
   TALLOC_CTX *mem_ctx,
   struct policy_handle *domain_handle /* [in] 
[ref] */,
-  uint16_t level /* [in]  */,
+  enum samr_DomainInfoClass level /* [in]  */,
   union samr_DomainInfo *info /* [in] 
[ref,switch_is(level)] */)
 {
struct samr_SetDomainInfo r;
@@ -1545,7 +1545,7 @@ NTSTATUS rpccli_samr_DeleteUser(struct rpc_pipe_client 
*cli,
 NTSTATUS rpccli_samr_QueryUserInfo(struct rpc_pipe_client *cli,
   TALLOC_CTX *mem_ctx,
   struct policy_handle *user_handle /* [in] 
[ref] */,
-  uint16_t level /* [in]  */,
+  enum samr_UserInfoLevel level /* [in]  */,
   union samr_UserInfo **info /* [out] 
[ref,switch_is(level)] */)
 {
struct samr_QueryUserInfo r;
@@ -1587,7 +1587,7 @@ NTSTATUS rpccli_samr_QueryUserInfo(struct rpc_pipe_client 
*cli,
 NTSTATUS rpccli_samr_SetUserInfo(struct rpc_pipe_client *cli,
 TALLOC_CTX *mem_ctx,
 struct policy_handle *user_handle /* [in] 
[ref] */,
-uint16_t level /* [in]  */,
+enum samr_UserInfoLevel level /* [in]  */,
 union samr_UserInfo *info /* [in] 
[ref,switch_is(level)] */)
 {
struct samr_SetUserInfo r;
@@ -1979,7 +1979,7 @@ NTSTATUS rpccli_samr_RemoveMemberFromForeignDomain(struct 
rpc_pipe_client *cli,
 NTSTATUS rpccli_samr_QueryDomainInfo2(struct rpc_pipe_client *cli,
  TALLOC_CTX *mem_ctx,
  struct policy_handle *domain_handle /* 
[in] [ref] */,
- uint16_t level /* [in]  */,
+ enum samr_DomainInfoClass level /* [in]  
*/,
  union samr_DomainInfo **info /* [out] 
[ref,switch_is(level)] */)
 {
struct samr_QueryDomainInfo2 r;
@@ -2021,7 +2021,7 @@ NTSTATUS rpccli_samr_QueryDomainInfo2(struct 
rpc_pipe_client *cli,
 NTSTATUS rpccli_samr_QueryUserInfo2(struct rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx,
struct policy_handle *user_handle /* [in] 
[ref] */,
-   uint16_t level /* [in]  */,
+   enum samr_UserInfoLevel level /* [in]  */,
union samr_UserInfo **info /* [out] 
[ref,switch_is(level)] */)
 {
struct samr_QueryUserInfo2 r;
@@ -2517,7 +2517,7 @@ NTSTATUS rpccli_samr_Connect2(struct 

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-43-ge4dec23

2009-06-23 Thread Günther Deschner
The branch, master has been updated
   via  e4dec230e971a761d3ff9a31013f130d55e63fd0 (commit)
  from  451a73e3ddd93b3bad9775d6c57c3eeb73646e99 (commit)

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


- Log -
commit e4dec230e971a761d3ff9a31013f130d55e63fd0
Author: Günther Deschner g...@samba.org
Date:   Wed Apr 8 19:18:13 2009 +0200

s3-eventlog: implement _eventlog_ReportEventW().

Guenther

---

Summary of changes:
 source3/rpc_server/srv_eventlog_nt.c |   83 +++---
 1 files changed, 77 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/rpc_server/srv_eventlog_nt.c 
b/source3/rpc_server/srv_eventlog_nt.c
index 7143ad6..8e3922d 100644
--- a/source3/rpc_server/srv_eventlog_nt.c
+++ b/source3/rpc_server/srv_eventlog_nt.c
@@ -675,6 +675,83 @@ NTSTATUS _eventlog_FlushEventLog(pipes_struct *p,
return NT_STATUS_ACCESS_DENIED;
 }
 
+/
+ /
+
+static NTSTATUS evlog_report_to_record(TALLOC_CTX *mem_ctx,
+  const struct eventlog_ReportEventW *r,
+  const char *logname,
+  struct EVENTLOGRECORD *e)
+{
+   uint32_t i;
+   ZERO_STRUCTP(e);
+
+   e-TimeGenerated= r-in.timestamp;
+   e-TimeWritten  = time(NULL);
+   e-EventID  = r-in.event_id;
+   e-EventType= r-in.event_type;
+   e-NumStrings   = r-in.num_of_strings;
+   e-EventCategory= r-in.event_category;
+   e-ReservedFlags= r-in.flags;
+   e-DataLength   = r-in.data_size;
+   e-SourceName   = talloc_strdup(mem_ctx, logname);
+   NT_STATUS_HAVE_NO_MEMORY(e-SourceName);
+   if (r-in.servername-string) {
+   e-Computername = r-in.servername-string;
+   } else {
+   e-Computername = talloc_strdup(mem_ctx, );
+   NT_STATUS_HAVE_NO_MEMORY(e-Computername);
+   }
+   if (r-in.user_sid) {
+   e-UserSid  = *r-in.user_sid;
+   }
+   e-Strings  = talloc_array(mem_ctx, const char *, 
e-NumStrings);
+   NT_STATUS_HAVE_NO_MEMORY(e-Strings);
+
+   for (i=0; i  e-NumStrings; i++) {
+   e-Strings[i] = talloc_strdup(e-Strings,
+ r-in.strings[i]-string);
+   NT_STATUS_HAVE_NO_MEMORY(e-Strings[i]);
+   }
+   e-Data = r-in.data;
+
+   return NT_STATUS_OK;
+}
+
+/
+_eventlog_ReportEventW
+ /
+
+NTSTATUS _eventlog_ReportEventW(pipes_struct *p,
+   struct eventlog_ReportEventW *r)
+{
+   NTSTATUS status;
+   struct EVENTLOGRECORD record;
+
+   EVENTLOG_INFO *info = find_eventlog_info_by_hnd(p, r-in.handle);
+   if (!info) {
+   return NT_STATUS_INVALID_HANDLE;
+   }
+
+   status = evlog_report_to_record(p-mem_ctx, r, info-logname, record);
+   if (!NT_STATUS_IS_OK(status)) {
+   return status;
+   }
+
+   status = evlog_push_record(p-mem_ctx,
+  ELOG_TDB_CTX(info-etdb),
+  record,
+  r-out.record_number);
+   if (!NT_STATUS_IS_OK(status)) {
+   return status;
+   }
+
+   return NT_STATUS_OK;
+}
+
+/
+ /
+
 NTSTATUS _eventlog_DeregisterEventSource(pipes_struct *p, struct 
eventlog_DeregisterEventSource *r)
 {
p-rng_fault_state = True;
@@ -699,12 +776,6 @@ NTSTATUS _eventlog_OpenBackupEventLogW(pipes_struct *p, 
struct eventlog_OpenBack
return NT_STATUS_NOT_IMPLEMENTED;
 }
 
-NTSTATUS _eventlog_ReportEventW(pipes_struct *p, struct eventlog_ReportEventW 
*r)
-{
-   p-rng_fault_state = True;
-   return NT_STATUS_NOT_IMPLEMENTED;
-}
-
 NTSTATUS _eventlog_ClearEventLogA(pipes_struct *p, struct 
eventlog_ClearEventLogA *r)
 {
p-rng_fault_state = True;


-- 
Samba Shared Repository


[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-44-ga6ab195

2009-06-23 Thread Günther Deschner
The branch, master has been updated
   via  a6ab195d72ab5b986f278662f1fbbb5d983effec (commit)
  from  e4dec230e971a761d3ff9a31013f130d55e63fd0 (commit)

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


- Log -
commit a6ab195d72ab5b986f278662f1fbbb5d983effec
Author: Günther Deschner g...@samba.org
Date:   Tue Jun 23 11:16:23 2009 +0200

s3-lsa: Fix error path in _lsa_EnumAccountRights.

This needs to return NT_STATUS_OBJECT_NAME_NOT_FOUND
again as described in MS-LSAD 3.1.4.5.10 and tested with the
RPC-SAMR-USER-PRIVILEGES test.

Guenther

---

Summary of changes:
 source3/rpc_server/srv_lsa_nt.c |   13 +++--
 1 files changed, 11 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/rpc_server/srv_lsa_nt.c b/source3/rpc_server/srv_lsa_nt.c
index 8773c29..3e44c8e 100644
--- a/source3/rpc_server/srv_lsa_nt.c
+++ b/source3/rpc_server/srv_lsa_nt.c
@@ -2152,9 +2152,18 @@ NTSTATUS _lsa_EnumAccountRights(pipes_struct *p,
 
sid_copy( sid, r-in.sid );
 
-   get_privileges_for_sids(mask, sid, 1);
+   /* according to MS-LSAD 3.1.4.5.10 it is required to return
+* NT_STATUS_OBJECT_NAME_NOT_FOUND if the account sid was not found in
+* the lsa database */
 
-   privilege_set_init( privileges );
+   if (!get_privileges_for_sids(mask, sid, 1)) {
+   return NT_STATUS_OBJECT_NAME_NOT_FOUND;
+   }
+
+   status = privilege_set_init(privileges);
+   if (!NT_STATUS_IS_OK(status)) {
+   return status;
+   }
 
se_priv_to_privilege_set(privileges, mask);
 


-- 
Samba Shared Repository


[SCM] SAMBA-CTDB repository - branch v3-4-ctdb updated - 42a7c48712b418acdc030d141a37d10a02c37223

2009-06-23 Thread Michael Adam
The branch, v3-4-ctdb has been updated
   via  42a7c48712b418acdc030d141a37d10a02c37223 (commit)
  from  84750d556d0a42b5d8b134308311e2cb9a533b58 (commit)

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


- Log -
commit 42a7c48712b418acdc030d141a37d10a02c37223
Author: Michael Adam ob...@samba.org
Date:   Tue Jun 16 16:03:41 2009 +0200

add README.v3-4-ctdb

Michael

---

Summary of changes:
 README.v3-4-ctdb |   12 
 1 files changed, 12 insertions(+), 0 deletions(-)
 create mode 100644 README.v3-4-ctdb


Changeset truncated at 500 lines:

diff --git a/README.v3-4-ctdb b/README.v3-4-ctdb
new file mode 100644
index 000..5d8dc28
--- /dev/null
+++ b/README.v3-4-ctdb
@@ -0,0 +1,12 @@
+This git branch contains a version of Samba that is based on
+the 3.4 releases and contains several enhancements for the
+production use of Samba in a clustered environment with CTDB,
+especially with a focus on the support of some features of
+the GPFS file system, and a few patches that have not been
+accepted upstream yet.
+
+This branch is regularly _rebased_ on top of the upstream
+branch v3-4-test which collects the reviewed bugfix patches
+for the next 3.4.X release.
+
+Michael


-- 
SAMBA-CTDB repository


svn commit: samba-web r1307 - in trunk: . devel history security

2009-06-23 Thread kseeger
Author: kseeger
Date: 2009-06-23 12:37:48 + (Tue, 23 Jun 2009)
New Revision: 1307

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-webrev=1307

Log:
Announce Samba 3.0.35. 3.2.13 and 3.3.6
Karolin
Added:
   trunk/history/samba-3.0.35.html
   trunk/history/samba-3.2.13.html
   trunk/history/samba-3.3.6.html
   trunk/security/CVE-2009-1886.html
   trunk/security/CVE-2009-1888.html
Modified:
   trunk/devel/index.html
   trunk/header_columns.html
   trunk/history/header_history.html
   trunk/history/security.html
   trunk/index.html


Changeset:
Sorry, the patch is too large (552 lines) to include; please use WebSVN to see 
it!
WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-webrev=1307


svn commit: samba-web r1308 - in trunk/history: .

2009-06-23 Thread kseeger
Author: kseeger
Date: 2009-06-23 12:59:14 + (Tue, 23 Jun 2009)
New Revision: 1308

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=revroot=samba-webrev=1308

Log:
Fx Typo.
Karolin
Modified:
   trunk/history/samba-3.2.13.html


Changeset:
Modified: trunk/history/samba-3.2.13.html
===
--- trunk/history/samba-3.2.13.html 2009-06-23 12:37:48 UTC (rev 1307)
+++ trunk/history/samba-3.2.13.html 2009-06-23 12:59:14 UTC (rev 1308)
@@ -12,7 +12,6 @@
 
 p
 pre
-/pre
==
Release Notes for Samba 3.2.13
   June 23, 2009
@@ -44,5 +43,6 @@
 o   Jeremy Allison j...@samba.org
 * Fix for CVE-2009-1886.
 * Fix for CVE-2009-1888.
+/pre
 /body
 /html



[SCM] Samba Shared Repository - annotated tag release-3-0-35 created - release-3-0-35

2009-06-23 Thread Karolin Seeger
The annotated tag, release-3-0-35 has been created
at  74df95679caf4c996b19af292c0b2ae6a26e0c6f (tag)
   tagging  857b6fb063b9968134cc664430ff5d33a992da4a (commit)
  replaces  release-3-0-34
 tagged by  Karolin Seeger
on  Tue Jun 23 11:37:34 2009 +0200

- Log -
tag release-3-0-35
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iD8DBQBKQKKEbzORW2Vot+oRAtZGAJ9GhB+yru2IsMB37YSdtrLFAOyhUACglB2F
mXU7UygAK33ke3vf5BlItVE=
=Iuyk
-END PGP SIGNATURE-

Jeremy Allison (1):
  Fix bug #6488.

Karolin Seeger (2):
  WHATSNEW: Update changes since 3.0.34.
  VERSION: Raise version number to 3.0.35.

---


-- 
Samba Shared Repository


[SCM] Samba Shared Repository - annotated tag release-3-2-13 created - release-3-2-13

2009-06-23 Thread Karolin Seeger
The annotated tag, release-3-2-13 has been created
at  1750671f1d94534a521ffcf95c4817834156b1b6 (tag)
   tagging  fcb091407ba003db807964f27a2b7cecc70896c7 (commit)
  replaces  release-3-2-12
 tagged by  Karolin Seeger
on  Tue Jun 23 11:38:36 2009 +0200

- Log -
tag release-3-2-13
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iD8DBQBKQKKlbzORW2Vot+oRAhcNAJ4u/aw33V7XhtT/vU4RcUC+A8vZUgCfWx+c
OcmzA+MkyE5aWFQ9pikhQZQ=
=z7y8
-END PGP SIGNATURE-

Jeremy Allison (1):
  Bug 6488: acl_group_override() call in posix acls references an 
uninitialized variable. (cherry picked from commit 
f92195e3a1baaddda47a5d496f9488c8445b41ad)

Karolin Seeger (3):
  VERSION: Raise version number up to 3.2.13.
  WHATSNEW: Update changes since 3.2.12.
  WHATSNEW: Update changes.

Volker Lendecke (1):
  Fix bug 6478

---


-- 
Samba Shared Repository


[SCM] Samba Shared Repository - annotated tag release-3-3-6 created - release-3-3-6

2009-06-23 Thread Karolin Seeger
The annotated tag, release-3-3-6 has been created
at  5344886ed96fcc1eb8c9f0e7ac0f5a05544ee21a (tag)
   tagging  b09440c77b93ff6088c2fd474d6b24c081054812 (commit)
  replaces  release-3-3-5
 tagged by  Karolin Seeger
on  Tue Jun 23 11:38:55 2009 +0200

- Log -
tag release-3-3-6
-BEGIN PGP SIGNATURE-
Version: GnuPG v2.0.9 (GNU/Linux)

iD8DBQBKQKK1bzORW2Vot+oRAuv2AJkBoQ11vxX5OmNyk1BGSfW6ytvpmACeLiv3
NWv+82U6PiWCEX0pu7Jc3uI=
=Sve8
-END PGP SIGNATURE-

Jeremy Allison (1):
  Bug 6488: acl_group_override() call in posix acls references an 
uninitialized variable.

Karolin Seeger (2):
  WHATSNEW: Update changes since 3.3.5.
  VERSION: Raise version number up to 3.3.6.

---


-- 
Samba Shared Repository


[SCM] Samba Shared Repository - branch v3-0-stable updated - release-3-0-35

2009-06-23 Thread Karolin Seeger
The branch, v3-0-stable has been updated
   via  857b6fb063b9968134cc664430ff5d33a992da4a (commit)
   via  21d184a8b1b335ff9e8e0515fd70f4a16c00be5a (commit)
   via  689b313404971bb884566710b1468b9bd4091caa (commit)
  from  9398128966537cc1977ea59ef54fbfd66bf8d0e5 (commit)

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


- Log -
commit 857b6fb063b9968134cc664430ff5d33a992da4a
Author: Karolin Seeger ksee...@samba.org
Date:   Mon Jun 22 22:35:07 2009 +0200

VERSION: Raise version number to 3.0.35.

Karolin

commit 21d184a8b1b335ff9e8e0515fd70f4a16c00be5a
Author: Karolin Seeger ksee...@samba.org
Date:   Mon Jun 22 22:34:42 2009 +0200

WHATSNEW: Update changes since 3.0.34.

Karolin

commit 689b313404971bb884566710b1468b9bd4091caa
Author: Jeremy Allison j...@samba.org
Date:   Mon Jun 22 22:29:49 2009 +0200

Fix bug #6488.

---

Summary of changes:
 WHATSNEW.txt |   53 -
 source/VERSION   |2 +-
 source/smbd/posix_acls.c |2 +
 3 files changed, 54 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index fa0ae84..01905e2 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,4 +1,53 @@
==
+   Release Notes for Samba 3.0.35
+ June, 23 2009
+   ==
+
+
+This is a security release in order to address CVE-2009-1888.
+
+   o CVE-2009-1888:
+ In Samba 3.0.31 to 3.3.5 (inclusive), an uninitialized read of a
+ data value can potentially affect access control when dos filemode
+ is set to yes.
+
+
+##
+Changes
+###
+
+Changes since 3.0.34
+
+
+
+o   Jeremy Allison j...@samba.org
+* Fix for CVE-2009-1888.
+
+
+##
+Reporting bugs  Development Discussion
+###
+
+Please discuss this release on the samba-technical mailing list or by
+joining the #samba-technical IRC channel on irc.freenode.net.
+
+If you do report problems then please try to send high quality
+feedback. If you don't provide vital information to help us track down
+the problem then you will probably be ignored.  All bug reports should
+be filed under the Samba 3.0 product in the project's Bugzilla
+database (https://bugzilla.samba.org/).
+
+
+==
+== Our Code, Our Bugs, Our Responsibility.
+== The Samba Team
+==
+
+
+Release notes for older releases follow:
+-
+
+   ==
Release Notes for Samba 3.0.34
  January, 20 2009
==
@@ -177,8 +226,8 @@ database (https://bugzilla.samba.org/).
 ==
 
 
-Release notes for older releases follow:
-  --
+
+
==
Release Notes for Samba 3.0.33
  November, 27 2008
diff --git a/source/VERSION b/source/VERSION
index 419c703..4351b58 100644
--- a/source/VERSION
+++ b/source/VERSION
@@ -25,7 +25,7 @@
 
 SAMBA_VERSION_MAJOR=3
 SAMBA_VERSION_MINOR=0
-SAMBA_VERSION_RELEASE=34
+SAMBA_VERSION_RELEASE=35
 
 
 # Bug fix releases use a letter for the patch revision #
diff --git a/source/smbd/posix_acls.c b/source/smbd/posix_acls.c
index 33cba6a..4886467 100644
--- a/source/smbd/posix_acls.c
+++ b/source/smbd/posix_acls.c
@@ -2296,6 +2296,8 @@ static BOOL acl_group_override(connection_struct *conn, 
gid_t prim_gid, const ch
 {
SMB_STRUCT_STAT sbuf;
 
+   ZERO_STRUCT(sbuf);
+
if ((errno != EPERM)  (errno != EACCES)) {
return False;
}


-- 
Samba Shared Repository


[SCM] Samba Shared Repository - branch v3-2-stable updated - release-3-2-13

2009-06-23 Thread Karolin Seeger
The branch, v3-2-stable has been updated
   via  fcb091407ba003db807964f27a2b7cecc70896c7 (commit)
   via  c5a0590a2efb9c0e8565e822dfc7cea92af0bece (commit)
   via  d85b881d66841a5dac66a98a94f251f58d66d1c4 (commit)
   via  0239c6555dbf515935fed7b958cfcce24810f07f (commit)
   via  91ea0d3fa11fc209dc653dd09dfab6244fb80f0d (commit)
  from  a3d27deaa6c20d5764a511384d75ee481c92e13d (commit)

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


- Log -
commit fcb091407ba003db807964f27a2b7cecc70896c7
Author: Jeremy Allison j...@samba.org
Date:   Fri Jun 19 11:00:41 2009 +0200

Bug 6488: acl_group_override() call in posix acls references an 
uninitialized variable. (cherry picked from commit 
f92195e3a1baaddda47a5d496f9488c8445b41ad)

commit c5a0590a2efb9c0e8565e822dfc7cea92af0bece
Author: Karolin Seeger ksee...@samba.org
Date:   Mon Jun 22 23:04:29 2009 +0200

WHATSNEW: Update changes.

Karolin

commit d85b881d66841a5dac66a98a94f251f58d66d1c4
Author: Karolin Seeger ksee...@samba.org
Date:   Fri Jun 19 09:20:04 2009 +0200

WHATSNEW: Update changes since 3.2.12.

Karolin

commit 0239c6555dbf515935fed7b958cfcce24810f07f
Author: Karolin Seeger ksee...@samba.org
Date:   Thu Jun 18 10:28:13 2009 +0200

VERSION: Raise version number up to 3.2.13.

Karolin

commit 91ea0d3fa11fc209dc653dd09dfab6244fb80f0d
Author: Volker Lendecke v...@samba.org
Date:   Tue Jun 16 12:23:31 2009 +0200

Fix bug 6478

This is the part of checkin cfee2025 that is relevant to this bug.

---

Summary of changes:
 WHATSNEW.txt | 1694 +-
 source/VERSION   |2 +-
 source/client/client.c   |   40 +-
 source/smbd/posix_acls.c |   22 +-
 4 files changed, 1723 insertions(+), 35 deletions(-)


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 2e98fdf..8b34c13 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,4 +1,60 @@
==
+   Release Notes for Samba 3.2.13
+  June 23, 2009
+   ==
+
+
+This is a security release in order to address CVE-2009-1886 and CVE-2009-1888.
+
+   o CVE-2009-1886:
+ In Samba 3.2.0 to 3.2.12 (inclusive), the smbclient commands dealing
+ with file names treat user input as a format string to asprintf.
+ With a maliciously crafted file name smbclient can be made
+ to execute code triggered by the server.
+
+   o CVE-2009-1888:
+ In Samba 3.0.31 to 3.3.5 (inclusive), an uninitialized read of a data
+ value can potentially affect access control when dos filemode
+ is set to yes.
+
+
+##
+Changes
+###
+
+Changes since 3.2.12
+
+
+
+o   Jeremy Allison j...@samba.org
+* Fix for CVE-2009-1886.
+* Fix for CVE-2009-1888.
+
+
+##
+Reporting bugs  Development Discussion
+###
+
+Please discuss this release on the samba-technical mailing list or by
+joining the #samba-technical IRC channel on irc.freenode.net.
+
+If you do report problems then please try to send high quality
+feedback. If you don't provide vital information to help us track down
+the problem then you will probably be ignored.  All bug reports should
+be filed under the Samba 3.2 product in the project's Bugzilla
+database (https://bugzilla.samba.org/).
+
+
+==
+== Our Code, Our Bugs, Our Responsibility.
+== The Samba Team
+==
+
+
+Release notes for older releases follow:
+
+
+   ==
Release Notes for Samba 3.2.12
   June 16, 2009
==
@@ -99,8 +155,1642 @@ database (https://bugzilla.samba.org/).
 ==
 
 
-Release notes for older releases follow:
-
+--
+
+   ==
+   Release Notes for Samba 3.2.11
+  April 17, 2009
+   ==
+
+
+This is a maintenance release of the Samba 3.2 series.
+
+Major enhancements in 3.2.11 include:
+
+o Fix domain logins for WinXP clients pre SP3 (bug #6263).
+o Fix samr_OpenDomain access checks (bug #6089).
+o Fix smbd crash for close_on_completion.
+
+

[SCM] Samba Shared Repository - branch v3-3-stable updated - release-3-3-6

2009-06-23 Thread Karolin Seeger
The branch, v3-3-stable has been updated
   via  b09440c77b93ff6088c2fd474d6b24c081054812 (commit)
   via  a71fdf8189154cd8949016be725c8319671ba587 (commit)
   via  c4e515314fa82739936380d11550fc531d624596 (commit)
  from  aa97504f0358dcc23de7a65f39a1c4d24f0709b7 (commit)

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


- Log -
commit b09440c77b93ff6088c2fd474d6b24c081054812
Author: Karolin Seeger ksee...@samba.org
Date:   Tue Jun 23 11:35:13 2009 +0200

VERSION: Raise version number up to 3.3.6.

Karolin

commit a71fdf8189154cd8949016be725c8319671ba587
Author: Karolin Seeger ksee...@samba.org
Date:   Tue Jun 23 11:33:44 2009 +0200

WHATSNEW: Update changes since 3.3.5.

Karolin

commit c4e515314fa82739936380d11550fc531d624596
Author: Jeremy Allison j...@samba.org
Date:   Fri Jun 19 11:00:41 2009 +0200

Bug 6488: acl_group_override() call in posix acls references an 
uninitialized variable.
(cherry picked from commit f92195e3a1baaddda47a5d496f9488c8445b41ad)

---

Summary of changes:
 WHATSNEW.txt |   54 -
 source/VERSION   |2 +-
 source/smbd/posix_acls.c |   22 --
 3 files changed, 63 insertions(+), 15 deletions(-)


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 70fdb8e..58bb038 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,4 +1,55 @@
=
+   Release Notes for Samba 3.3.6
+ June, 23  2009
+   =
+
+
+This is a security release in order to address CVE-2009-1888.
+
+   o CVE-2009-1888:
+ In Samba 3.0.31 to 3.3.5 (inclusive), an uninitialized read of a
+ data value can potentially affect access control when dos filemode
+ is set to yes.
+
+
+##
+Changes
+###
+
+
+Changes since 3.3.5:
+
+
+
+o   Jeremy Allison j...@samba.org
+* BUG 6488: Fix for CVE-2009-1888.
+
+
+##
+Reporting bugs  Development Discussion
+###
+
+Please discuss this release on the samba-technical mailing list or by
+joining the #samba-technical IRC channel on irc.freenode.net.
+
+If you do report problems then please try to send high quality
+feedback. If you don't provide vital information to help us track down
+the problem then you will probably be ignored.  All bug reports should
+be filed under the Samba 3.3 product in the project's Bugzilla
+database (https://bugzilla.samba.org/).
+
+
+==
+== Our Code, Our Bugs, Our Responsibility.
+== The Samba Team
+==
+
+
+Release notes for older releases follow:
+
+
+
+   =
Release Notes for Samba 3.3.5
  June, 16  2009
=
@@ -117,8 +168,7 @@ database (https://bugzilla.samba.org/).
 ==
 
 
-Release notes for older releases follow:
-
+--
 
 
=
diff --git a/source/VERSION b/source/VERSION
index 8eb5331..7c5eaab 100644
--- a/source/VERSION
+++ b/source/VERSION
@@ -25,7 +25,7 @@
 
 SAMBA_VERSION_MAJOR=3
 SAMBA_VERSION_MINOR=3
-SAMBA_VERSION_RELEASE=5
+SAMBA_VERSION_RELEASE=6
 
 
 # Bug fix releases use a letter for the patch revision #
diff --git a/source/smbd/posix_acls.c b/source/smbd/posix_acls.c
index 93bc44b..1afd48e 100644
--- a/source/smbd/posix_acls.c
+++ b/source/smbd/posix_acls.c
@@ -2384,24 +2384,22 @@ static bool current_user_in_group(gid_t gid)
 /
 
 static bool acl_group_override(connection_struct *conn,
-   gid_t prim_gid,
+   SMB_STRUCT_STAT *psbuf,
const char *fname)
 {
-   SMB_STRUCT_STAT sbuf;
-
if ((errno != EPERM)  (errno != EACCES)) {
return false;
}
 
/* file primary group == user primary or supplementary group */
if (lp_acl_group_control(SNUM(conn)) 
-   current_user_in_group(prim_gid)) {
+   current_user_in_group(psbuf-st_gid)) {
 

[SCM] SAMBA-CTDB repository - branch v3-4-ctdb updated - 061dd90fc54daeaed758b47e3aa413a8362c9a08

2009-06-23 Thread Michael Adam
The branch, v3-4-ctdb has been updated
   via  061dd90fc54daeaed758b47e3aa413a8362c9a08 (commit)
  from  e780063d072342cc5c57a7adc6c8ea2cd8084775 (commit)

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


- Log -
commit 061dd90fc54daeaed758b47e3aa413a8362c9a08
Author: Volker Lendecke v...@samba.org
Date:   Thu May 14 15:34:42 2009 +0200

Introduce struct stat_ex as a replacement for SMB_STRUCT_STAT

This patch introduces

struct stat_ex {
dev_t   st_ex_dev;
ino_t   st_ex_ino;
mode_t  st_ex_mode;
nlink_t st_ex_nlink;
uid_t   st_ex_uid;
gid_t   st_ex_gid;
dev_t   st_ex_rdev;
off_t   st_ex_size;
struct timespec st_ex_atime;
struct timespec st_ex_mtime;
struct timespec st_ex_ctime;
struct timespec st_ex_btime; /* birthtime */
blksize_t   st_ex_blksize;
blkcnt_tst_ex_blocks;
};
typedef struct stat_ex SMB_STRUCT_STAT;

It is really large because due to the friendly libc headers playing macro
tricks with fields like st_ino, so I renamed them to st_ex_xxx.

Why this change? To support birthtime, we already have quite a few #ifdef's 
at
places where it does not really belong. With a stat struct that we control, 
we
can consolidate the nanosecond timestamps and the birthtime deep in the VFS
stat calls.

At this moment it is triggered by a request to support the birthtime field 
for
GPFS. GPFS does not extend the system level struct stat, but instead has a
separate call that gets us the additional information beyond posix. Without
being able to do that within the VFS stat calls, that support would have to 
be
scattered around the main smbd code.

It will very likely break all the onefs modules, but I think the changes 
will
be reasonably easy to do.

---

Summary of changes:
 source3/client/client.c |   42 ---
 source3/client/clitar.c |5 +-
 source3/include/includes.h  |   33 -
 source3/include/proto.h |   11 +--
 source3/include/smb_macros.h|6 +-
 source3/lib/debug.c |2 +-
 source3/lib/system.c|  225 ++--
 source3/lib/time.c  |  245 ---
 source3/lib/util.c  |   10 +-
 source3/libsmb/clifile.c|   32 +++---
 source3/libsmb/clirap.c |6 +-
 source3/libsmb/libsmb_stat.c|   12 +-
 source3/modules/nfs4_acls.c |   11 +-
 source3/modules/vfs_acl_tdb.c   |4 +-
 source3/modules/vfs_acl_xattr.c |4 +-
 source3/modules/vfs_afsacl.c|6 +-
 source3/modules/vfs_commit.c|2 +-
 source3/modules/vfs_default.c   |   44 +++---
 source3/modules/vfs_fake_perms.c|   20 ++--
 source3/modules/vfs_fileid.c|4 +-
 source3/modules/vfs_gpfs.c  |4 +-
 source3/modules/vfs_hpuxacl.c   |2 +-
 source3/modules/vfs_netatalk.c  |   12 +-
 source3/modules/vfs_recycle.c   |8 +-
 source3/modules/vfs_shadow_copy2.c  |2 +-
 source3/modules/vfs_streams_depot.c |   10 +-
 source3/modules/vfs_streams_xattr.c |   54 
 source3/modules/vfs_tsmsm.c |   15 ++-
 source3/param/loadparm.c|   64 +-
 source3/passdb/pdb_smbpasswd.c  |2 +-
 source3/printing/nt_printing.c  |4 +-
 source3/printing/printfsp.c |2 +-
 source3/printing/printing.c |2 +-
 source3/registry/regfio.c   |4 +-
 source3/smbd/close.c|2 +-
 source3/smbd/dir.c  |   12 +-
 source3/smbd/dosmode.c  |   42 +++---
 source3/smbd/file_access.c  |   16 +-
 source3/smbd/fileio.c   |2 +-
 source3/smbd/filename.c |2 +-
 source3/smbd/msdfs.c|2 +-
 source3/smbd/nttrans.c  |   28 ++--
 source3/smbd/open.c |   56 
 source3/smbd/posix_acls.c   |   52 
 source3/smbd/reply.c|   70 ++-
 source3/smbd/service.c  |4 +-
 source3/smbd/trans2.c   |  104 
 source3/smbd/vfs.c  |   28 ++--
 source3/torture/cmd_vfs.c   |  180 ++
 source3/utils/net_conf.c|2 +-
 source3/utils/net_usershare.c   |   14 +-
 source3/utils/testparm.c|6 +-
 source3/web/cgi.c   |8 +-
 53 files changed, 771 insertions(+), 768 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/client/client.c 

[SCM] SAMBA-CTDB repository - branch v3-4-ctdb updated - c8a03b0043794e57d80caf460d570bb3e3c040bf

2009-06-23 Thread Michael Adam
The branch, v3-4-ctdb has been updated
   via  c8a03b0043794e57d80caf460d570bb3e3c040bf (commit)
   via  9b572412f709a0d755e8846ad6f1610387814c16 (commit)
   via  6a0d05e342ad7a5bc4346db24a32185ed7c135b3 (commit)
   via  7a3881bd915979b347b19871cd0f0bd771bb530b (commit)
   via  29c589359b49c1465d5fb062d550c8422d2df3d1 (commit)
  from  061dd90fc54daeaed758b47e3aa413a8362c9a08 (commit)

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


- Log -
commit c8a03b0043794e57d80caf460d570bb3e3c040bf
Author: Michael Adam ob...@samba.org
Date:   Tue Jun 23 16:41:38 2009 +0200

adapt VERSION to be 3.4.0rc1-ctdb-1

following the versioning scheme of the v3-2-ctdb branch

Michael

commit 9b572412f709a0d755e8846ad6f1610387814c16
Author: Michael Adam ob...@samba.org
Date:   Wed Jan 21 09:49:12 2009 +0100

packaging(RHEL-CTDB): makerpms.sh: build winbind-32bit libs in the 64bit 
build

Michael
(cherry picked from commit a9a506b6640986548e2ae8540b7ae93960d6ece5)

commit 6a0d05e342ad7a5bc4346db24a32185ed7c135b3
Author: Michael Adam ob...@samba.org
Date:   Tue Jan 20 19:47:28 2009 +0100

packaging(RHEL-CTDB): Build winbind-32bit package in the 64bit build

Michael
(cherry picked from commit f5cd88a25f360e6609dc5abe24247fab78af6854)

commit 7a3881bd915979b347b19871cd0f0bd771bb530b
Author: Michael Adam ob...@samba.org
Date:   Wed Jan 21 11:03:34 2009 +0100

packaging(RHEL-CTDB): extend makespec.sh to extract VENDOR_PATCH from 
version.h

Michael
(cherry picked from commit fc122aa276bce379b492e5bdf52ab3e03bc3737f)

commit 29c589359b49c1465d5fb062d550c8422d2df3d1
Author: Michael Adam ob...@samba.org
Date:   Wed Jan 21 10:24:31 2009 +0100

packaging(RHEL-CTDB): The former release number has basically moved into 
VERSION

Michael

---

Summary of changes:
 packaging/RHEL-CTDB/makerpms.sh |   17 +++---
 packaging/RHEL-CTDB/makespec.sh |4 +
 packaging/RHEL-CTDB/samba.spec.tmpl |  105 ---
 source3/VERSION |6 +-
 4 files changed, 113 insertions(+), 19 deletions(-)


Changeset truncated at 500 lines:

diff --git a/packaging/RHEL-CTDB/makerpms.sh b/packaging/RHEL-CTDB/makerpms.sh
index 50fa96c..8da9078 100755
--- a/packaging/RHEL-CTDB/makerpms.sh
+++ b/packaging/RHEL-CTDB/makerpms.sh
@@ -88,19 +88,20 @@ cp -p ${SPECFILE} ${RPMSPECDIR}
 popd
 
 ##
-## Build
+## some symlink fixes for building 32bit compat libs
 ##
-echo $(basename $0): Getting Ready to build release package
-pushd ${RPMSPECDIR}
-${RPM} -ba $EXTRA_OPTIONS $SPECFILE
-if [ x$? = x0 ]  [ `arch` = x86_64 ]; then
-echo Building 32 bit winbind libs
-# hi ho, a hacking we will go ...
+if [ `arch` = x86_64 ]; then
 ln -sf /lib/libcom_err.so.2 /lib/libcom_err.so
 ln -sf /lib/libuuid.so.1 /lib/libuuid.so
-${RPM} -ba --rebuild --target=i386 $SPECFILE
 fi
 
+##
+## Build
+##
+echo $(basename $0): Getting Ready to build release package
+
+pushd ${RPMSPECDIR}
+${RPM} -ba $EXTRA_OPTIONS $SPECFILE
 popd
 
 echo $(basename $0): Done.
diff --git a/packaging/RHEL-CTDB/makespec.sh b/packaging/RHEL-CTDB/makespec.sh
index ae58db0..62f0969 100755
--- a/packaging/RHEL-CTDB/makespec.sh
+++ b/packaging/RHEL-CTDB/makespec.sh
@@ -26,6 +26,10 @@ vendor_version=`grep SAMBA_VERSION_VENDOR_SUFFIX 
${VERSION_H} | awk '{print $3}'
 if test x${vendor_version}  != x ; then
VERSION=${VERSION}-${vendor_version}
 fi
+vendor_patch=`grep SAMBA_VERSION_VENDOR_PATCH ${VERSION_H} | awk '{print $3}'`
+if test x${vendor_patch} != x ; then
+   VERSION=${VERSION}-${vendor_patch}
+fi
 VERSION=`echo ${VERSION} | sed 's/-/_/g'`
 VERSION=`echo ${VERSION} | sed 's/\//g'`
 echo VERSION: ${VERSION}
diff --git a/packaging/RHEL-CTDB/samba.spec.tmpl 
b/packaging/RHEL-CTDB/samba.spec.tmpl
index c8f31f3..744cfe4 100644
--- a/packaging/RHEL-CTDB/samba.spec.tmpl
+++ b/packaging/RHEL-CTDB/samba.spec.tmpl
@@ -6,7 +6,7 @@ Vendor: Samba Team
 Packager: Samba Team sa...@samba.org
 Name: samba
 Version:  PVERSION
-Release:  ctdb.1
+Release:  1
 Epoch:0
 License: GNU GPL version 3
 Group: System Environment/Daemons
@@ -93,7 +93,7 @@ The samba-swat package includes the new SWAT (Samba Web 
Administration
 Tool), for remotely managing Samba's smb.conf file using your favorite
 Web browser.
 
-%ifarch i386 i486 i586 i686 ppc s390
+%ifarch x86_64 ppc64
 %package winbind-32bit
 Summary:Samba winbind compatibility package for 32bit apps on 64bit 
archs
 Group:  Applications/System
@@ -144,6 +144,80 @@ export CC
 ## always run autogen.sh
 ./autogen.sh
 
+
+##
+## build the files for the winbind-32bit compat package
+## and copy them to a safe location
+##
+%ifarch x86_64 ppc64
+
+# a directory to store the 32bit compatibility modules for later install

[SCM] SAMBA-CTDB repository - branch v3-4-ctdb updated - 10090001ddf672c02d1c7d8221dc3e9ad3795e42

2009-06-23 Thread Michael Adam
The branch, v3-4-ctdb has been updated
   via  10090001ddf672c02d1c7d8221dc3e9ad3795e42 (commit)
   via  543bfdcff9759903c4ba476c51f8e7088012894f (commit)
   via  ff01e8b473599f886e5f1a57bfd569aba9b627f9 (commit)
  from  c8a03b0043794e57d80caf460d570bb3e3c040bf (commit)

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


- Log -
commit 10090001ddf672c02d1c7d8221dc3e9ad3795e42
Author: Michael Adam ob...@samba.org
Date:   Tue Jun 23 23:09:09 2009 +0200

packaging(RHEL-CTDB):makerpms.sh: replace source/ by source3/

Michael

commit 543bfdcff9759903c4ba476c51f8e7088012894f
Author: Michael Adam ob...@samba.org
Date:   Tue Jun 23 23:06:40 2009 +0200

packaging(RHEL-CTDB):makespec.sh: fix detection of version

Michael

commit ff01e8b473599f886e5f1a57bfd569aba9b627f9
Author: Michael Adam ob...@samba.org
Date:   Tue Jun 23 22:41:51 2009 +0200

packaging(RHEL-CTDB): makeversion.sh: v3-4-test uses source3 instead of 
source

Michael

---

Summary of changes:
 packaging/RHEL-CTDB/makespec.sh |8 
 packaging/RHEL-CTDB/samba.spec.tmpl |   14 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)


Changeset truncated at 500 lines:

diff --git a/packaging/RHEL-CTDB/makespec.sh b/packaging/RHEL-CTDB/makespec.sh
index 62f0969..e47f449 100755
--- a/packaging/RHEL-CTDB/makespec.sh
+++ b/packaging/RHEL-CTDB/makespec.sh
@@ -6,7 +6,7 @@
 
 DIRNAME=$(dirname $0)
 TOPDIR=${DIRNAME}/../..
-SRCDIR=${TOPDIR}/source
+SRCDIR=${TOPDIR}/source3
 VERSION_H=${SRCDIR}/include/version.h
 SPECFILE=${DIRNAME}/samba.spec
 
@@ -21,12 +21,12 @@ if [ ! -f ${VERSION_H} ] ; then
exit 1
 fi
 
-VERSION=`grep SAMBA_VERSION_OFFICIAL_STRING ${VERSION_H} | awk '{print $3}'`
-vendor_version=`grep SAMBA_VERSION_VENDOR_SUFFIX ${VERSION_H} | awk '{print 
$3}'`
+VERSION=`grep ^#define SAMBA_VERSION_OFFICIAL_STRING  ${VERSION_H} | awk 
'{print $3}'`
+vendor_version=`grep ^#define SAMBA_VERSION_VENDOR_SUFFIX  ${VERSION_H} | 
awk '{print $3}'`
 if test x${vendor_version}  != x ; then
VERSION=${VERSION}-${vendor_version}
 fi
-vendor_patch=`grep SAMBA_VERSION_VENDOR_PATCH ${VERSION_H} | awk '{print $3}'`
+vendor_patch=`grep ^#define SAMBA_VERSION_VENDOR_PATCH  ${VERSION_H} | awk 
'{print $3}'`
 if test x${vendor_patch} != x ; then
VERSION=${VERSION}-${vendor_patch}
 fi
diff --git a/packaging/RHEL-CTDB/samba.spec.tmpl 
b/packaging/RHEL-CTDB/samba.spec.tmpl
index 744cfe4..9fa4b68 100644
--- a/packaging/RHEL-CTDB/samba.spec.tmpl
+++ b/packaging/RHEL-CTDB/samba.spec.tmpl
@@ -129,7 +129,7 @@ utilized by SWAT as well as the HTML and PDF version of 
Using Samba,
 
 /bin/cp setup/filter-requires-samba.sh %{SOURCE998}
 
-cd source
+cd source3
 # RPM_OPT_FLAGS=$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64
 
 ## check for ccache
@@ -296,20 +296,20 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d
 mkdir -p $RPM_BUILD_ROOT/var/lib/samba/winbindd_privileged
 mkdir -p $RPM_BUILD_ROOT/var/{log,run/winbindd,spool}/samba
 
-cd source
+cd source3
 make DESTDIR=$RPM_BUILD_ROOT \
 install
 cd ..
 
 # NSS winbind support
-install -m 755 source/nsswitch/libnss_winbind.so 
$RPM_BUILD_ROOT/%{_libarch}/libnss_winbind.so.2
+install -m 755 source3/nsswitch/libnss_winbind.so 
$RPM_BUILD_ROOT/%{_libarch}/libnss_winbind.so.2
 ( cd $RPM_BUILD_ROOT/%{_libarch};
   ln -sf libnss_winbind.so.2  libnss_winbind.so )
 #
 # do not install libnss_wins.so in order to reduce dependencies
 # (we do not need it for the samba-ctdb scenario)
 #
-#install -m 755 source/nsswitch/libnss_wins.so 
$RPM_BUILD_ROOT/%{_libarch}/libnss_wins.so
+#install -m 755 source3/nsswitch/libnss_wins.so 
$RPM_BUILD_ROOT/%{_libarch}/libnss_wins.so
 # ( cd $RPM_BUILD_ROOT/%{_libarch}; ln -sf libnss_wins.so  libnss_wins.so.2 )
 
 
@@ -342,9 +342,9 @@ install -m644 setup/samba.pamd 
$RPM_BUILD_ROOT%{_sysconfdir}/pam.d/samba
 install -m755 setup/smbprint $RPM_BUILD_ROOT%{_bindir}
 install -m644 setup/smbusers $RPM_BUILD_ROOT%{_sysconfdir}/samba/smbusers
 install -m644 setup/smb.conf $RPM_BUILD_ROOT%{_sysconfdir}/samba/smb.conf
-install -m755 source/bin/mount.cifs $RPM_BUILD_ROOT/sbin/mount.cifs
-install -m755 source/bin/umount.cifs $RPM_BUILD_ROOT/sbin/umount.cifs
-install -m755 source/script/mksmbpasswd.sh $RPM_BUILD_ROOT%{_bindir}
+install -m755 source3/bin/mount.cifs $RPM_BUILD_ROOT/sbin/mount.cifs
+install -m755 source3/bin/umount.cifs $RPM_BUILD_ROOT/sbin/umount.cifs
+install -m755 source3/script/mksmbpasswd.sh $RPM_BUILD_ROOT%{_bindir}
 
 /bin/rm $RPM_BUILD_ROOT%{_sbindir}/*mount.cifs
 


-- 
SAMBA-CTDB repository


[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-46-g05459cf

2009-06-23 Thread Günther Deschner
The branch, master has been updated
   via  05459cf833aebc8402ef9b58580aa05e0b5f653f (commit)
   via  118ac25784dba37e135ed427ab347107bf8fc8e9 (commit)
  from  a6ab195d72ab5b986f278662f1fbbb5d983effec (commit)

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


- Log -
commit 05459cf833aebc8402ef9b58580aa05e0b5f653f
Author: Günther Deschner g...@samba.org
Date:   Tue Jun 23 20:27:05 2009 +0200

s3-printing: eliminate another non sec_initial_uid using security check.

Guenther

commit 118ac25784dba37e135ed427ab347107bf8fc8e9
Author: Günther Deschner g...@samba.org
Date:   Tue Jun 23 20:26:27 2009 +0200

s3-spoolss: restructure _spoolss_EndDocPrinter().

Guenther

---

Summary of changes:
 source3/printing/nt_printing.c  |2 +-
 source3/rpc_server/srv_spoolss_nt.c |   62 ++-
 2 files changed, 33 insertions(+), 31 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index f496ae5..3e206be 100644
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -2532,7 +2532,7 @@ uint32 del_a_printer(const char *sharename)
 
close_all_print_db();
 
-   if (geteuid() == 0) {
+   if (geteuid() == sec_initial_uid()) {
if (asprintf(printdb_path, %s%s.tdb,
cache_path(printing/),
sharename)  0) {
diff --git a/source3/rpc_server/srv_spoolss_nt.c 
b/source3/rpc_server/srv_spoolss_nt.c
index f710994..899fed2 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -1995,31 +1995,6 @@ static bool convert_printer_driver_info(const struct 
spoolss_AddDriverInfoCtr *r
return true;
 }
 
-/
- * _spoolss_enddocprinter_internal.
- /
-
-static WERROR _spoolss_enddocprinter_internal(pipes_struct *p,
- struct policy_handle *handle)
-{
-   Printer_entry *Printer = find_printer_index_by_hnd(p, handle);
-   int snum;
-
-   if (!Printer) {
-   DEBUG(2,(_spoolss_enddocprinter_internal: Invalid handle 
(%s:%u:%u)\n, OUR_HANDLE(handle)));
-   return WERR_BADFID;
-   }
-
-   if (!get_printer_snum(p, handle, snum, NULL))
-   return WERR_BADFID;
-
-   Printer-document_started = false;
-   print_job_end(snum, Printer-jobid,NORMAL_CLOSE);
-   /* error codes unhandled so far ... */
-
-   return WERR_OK;
-}
-
 /
  _spoolss_ClosePrinter
 /
@@ -2029,8 +2004,13 @@ WERROR _spoolss_ClosePrinter(pipes_struct *p,
 {
Printer_entry *Printer = find_printer_index_by_hnd(p, r-in.handle);
 
-   if (Printer  Printer-document_started)
-   _spoolss_enddocprinter_internal(p, r-in.handle);  /* 
print job was not closed */
+   if (Printer  Printer-document_started) {
+   struct spoolss_EndDocPrinter e;
+
+   e.in.handle = r-in.handle;
+
+   _spoolss_EndDocPrinter(p, e);
+   }
 
if (!close_printer_handle(p, r-in.handle))
return WERR_BADFID;
@@ -2055,8 +2035,13 @@ WERROR _spoolss_DeletePrinter(pipes_struct *p,
Printer_entry *Printer = find_printer_index_by_hnd(p, r-in.handle);
WERROR result;
 
-   if (Printer  Printer-document_started)
-   _spoolss_enddocprinter_internal(p, r-in.handle);  /* print job 
was not closed */
+   if (Printer  Printer-document_started) {
+   struct spoolss_EndDocPrinter e;
+
+   e.in.handle = r-in.handle;
+
+   _spoolss_EndDocPrinter(p, e);
+   }
 
result = delete_printer_handle(p, r-in.handle);
 
@@ -5659,7 +5644,24 @@ WERROR _spoolss_StartDocPrinter(pipes_struct *p,
 WERROR _spoolss_EndDocPrinter(pipes_struct *p,
  struct spoolss_EndDocPrinter *r)
 {
-   return _spoolss_enddocprinter_internal(p, r-in.handle);
+   Printer_entry *Printer = find_printer_index_by_hnd(p, r-in.handle);
+   int snum;
+
+   if (!Printer) {
+   DEBUG(2,(_spoolss_EndDocPrinter: Invalid handle (%s:%u:%u)\n,
+   OUR_HANDLE(r-in.handle)));
+   return WERR_BADFID;
+   }
+
+   if (!get_printer_snum(p, r-in.handle, snum, NULL)) {
+   return WERR_BADFID;
+   }
+
+   Printer-document_started = false;
+   print_job_end(snum, Printer-jobid, NORMAL_CLOSE);
+   /* error codes unhandled so far ... */
+
+   return WERR_OK;
 }
 
 

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-47-g46167c1

2009-06-23 Thread Günther Deschner
The branch, master has been updated
   via  46167c1d1b2ee4d77338214494decd9326b7ab93 (commit)
  from  05459cf833aebc8402ef9b58580aa05e0b5f653f (commit)

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


- Log -
commit 46167c1d1b2ee4d77338214494decd9326b7ab93
Author: Günther Deschner g...@samba.org
Date:   Wed Jun 24 00:27:33 2009 +0200

s4-smbtorture: more paranoid checks while testing group membership in 
RPC-SAMR.

Guenther

---

Summary of changes:
 source4/torture/rpc/samr.c |   28 +++-
 1 files changed, 27 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c
index bd88c3b..e3d1245 100644
--- a/source4/torture/rpc/samr.c
+++ b/source4/torture/rpc/samr.c
@@ -5909,6 +5909,8 @@ static bool test_AddGroupMember(struct dcerpc_pipe *p, 
struct torture_context *t
struct samr_RidTypeArray *rids = NULL;
struct samr_SetMemberAttributesOfGroup s;
uint32_t rid;
+   bool found_member = false;
+   int i;
 
status = test_LookupName(p, tctx, domain_handle, TEST_ACCOUNT_NAME, 
rid);
torture_assert_ntstatus_ok(tctx, status, test_AddGroupMember looking 
up name  TEST_ACCOUNT_NAME);
@@ -5917,7 +5919,7 @@ static bool test_AddGroupMember(struct dcerpc_pipe *p, 
struct torture_context *t
r.in.rid = rid;
r.in.flags = 0; /* ??? */
 
-   torture_comment(tctx, Testing AddGroupMember and DeleteGroupMember\n);
+   torture_comment(tctx, Testing AddGroupMember, QueryGroupMember and 
DeleteGroupMember\n);
 
d.in.group_handle = group_handle;
d.in.rid = rid;
@@ -5951,10 +5953,34 @@ static bool test_AddGroupMember(struct dcerpc_pipe *p, 
struct torture_context *t
 
status = dcerpc_samr_QueryGroupMember(p, tctx, q);
torture_assert_ntstatus_ok(tctx, status, QueryGroupMember);
+   torture_assert(tctx, rids, QueryGroupMember did not fill in rids 
structure);
+
+   for (i=0; i  rids-count; i++) {
+   if (rids-rids[i] == rid) {
+   found_member = true;
+   }
+   }
+
+   torture_assert(tctx, found_member, QueryGroupMember did not list newly 
added member);
 
status = dcerpc_samr_DeleteGroupMember(p, tctx, d);
torture_assert_ntstatus_ok(tctx, status, DeleteGroupMember);
 
+   rids = NULL;
+   found_member = false;
+
+   status = dcerpc_samr_QueryGroupMember(p, tctx, q);
+   torture_assert_ntstatus_ok(tctx, status, QueryGroupMember);
+   torture_assert(tctx, rids, QueryGroupMember did not fill in rids 
structure);
+
+   for (i=0; i  rids-count; i++) {
+   if (rids-rids[i] == rid) {
+   found_member = true;
+   }
+   }
+
+   torture_assert(tctx, !found_member, QueryGroupMember does still list 
removed member);
+
status = dcerpc_samr_AddGroupMember(p, tctx, r);
torture_assert_ntstatus_ok(tctx, status, AddGroupMember);
 


-- 
Samba Shared Repository


Build status as of Wed Jun 24 00:00:02 2009

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

--- /home/build/master/cache/broken_results.txt.old 2009-06-23 
00:00:28.0 +
+++ /home/build/master/cache/broken_results.txt 2009-06-24 00:00:33.0 
+
@@ -1,22 +1,22 @@
-Build status as of Tue Jun 23 00:00:02 2009
+Build status as of Wed Jun 24 00:00:02 2009
 
 Build counts:
 Tree Total  Broken Panic 
 build_farm   0  0  0 
-ccache   31 5  0 
+ccache   25 3  0 
 distcc   0  0  0 
-ldb  32 32 0 
-libreplace   31 11 0 
+ldb  25 25 0 
+libreplace   25 9  0 
 lorikeet 0  0  0 
-pidl 23 2  0 
-ppp  14 0  0 
-rsync32 9  0 
+pidl 19 2  0 
+ppp  11 0  0 
+rsync25 8  0 
 samba-docs   0  0  0 
 samba-web0  0  0 
-samba_3_current 29 21 0 
-samba_3_master 29 26 3 
-samba_3_next 30 28 0 
-samba_4_0_test 29 24 1 
-talloc   32 32 0 
-tdb  30 25 0 
+samba_3_current 21 15 0 
+samba_3_master 24 21 2 
+samba_3_next 23 21 0 
+samba_4_0_test 24 22 2 
+talloc   25 25 0 
+tdb  23 21 0