Re: [Samba] Failed to retrieve password from secrets.tdb with anonymous bind

2008-09-10 Thread Dr. Alberto Benati
Unfortunately I don't have a password to administer this external ldap but
only query / bind anonymously

if I enable a local (127.0.0.1) openldap with administration (rootdn and
rootpw) everything works well.
Samba seems to work that must administer LDAP unlike ProFtpd that retrieve
data and stop

Alberto



 Try run:
 
 root# smbpasswd -w ldap_password
 
 and restart the samba
 
 Reggars,
 
 Iarly Selbir
 
 2008/9/9 Dr. Alberto Benati [EMAIL PROTECTED]
 
  Samba 3.2.1 on linux OpenFiler 2.3
 
  I have an external LDAP server with anonymous bind and pam
  ProFtpd linked to LDAP server works well without error
 
 
  But samba does not work, in smbd.log I have:
  [2008/09/09 22:01:54,  0] passdb/secrets.c:fetch_ldap_pw(888)
   fetch_ldap_pw: neither ldap secret retrieved!
  [2008/09/09 22:01:54,  0] lib/smbldap.c:smbldap_connect_system(952)
   ldap_connect_system: Failed to retrieve password from secrets.tdb
  [2008/09/09 22:01:54,  1] lib/smbldap.c:another_ldap_try(1178)
   Connection to LDAP server failed for the 1 try!
  .
 
 
  Part of smb.conf:
  ldap ssl = no
  ldap suffix = ou=People,dc=unizz,dc=it
  encrypt passwords = yes
  security = user
  passdb backend = ldapsam:ldap://ldap.unizz.it
  ldap user suffix = ou=People
  pam password change = no
 
 
  I tried to add password in secrets.tdb, but:
  [EMAIL PROTECTED] samba]# smbpasswd -w 
  ERROR: 'ldap admin dn' not defined! Please check your smb.conf
 
  I then added in smb.conf a fake:
  ldap admin dn = ou=People,dc=unizz,dc=it
 
  [EMAIL PROTECTED] samba]# tdbdump /etc/samba/secrets.tdb
  {
  key(19) = SECRETS/SID/BACKUP2
  data(68) = \01\04\00\00\00\00\00\05\15\00\00\00A,\EB\C1\E5\5C/(\E7\DDl
 
 
\A7\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00
  }
  {
  key(45) = SECRETS/LDAP_BIND_PW/ou=People,dc=unizz,dc=it
  data(1) = \00
 
 
  now without the row I have always same prev error
  and with the row ldap admin dn = ou=People,dc=unizz,dc=it I have now:
  [2008/09/09 22:15:13,  0] lib/smbldap.c:smbldap_connect_system(992)
   failed to bind to server ldap://ldap.unizz.it with
  dn=ou=People,dc=unizz,dc=it Error: Server is unwilling to perform
unwilling to allow anonymous bind with non-empty DN
  [2008/09/09 22:15:13,  1] lib/smbldap.c:another_ldap_try(1178)
   Connection to LDAP server failed for the 1 try!
  ..
 
  rightly, but I can not go out from this situation.
  Any suggestion?
 
  Thank you
  Alby
  --
  To unsubscribe from this list go to the following URL and read the
  instructions:  https://lists.samba.org/mailman/listinfo/samba
 
--- End of Original Message ---

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


Re: [Samba] Failed to retrieve password from secrets.tdb with anonymous bind

2008-09-10 Thread Richard Foltyn
Why don't you just *create* a dedicated samba DN in LDAP which Samba
can use? This is a much more secure setup than granting read or even
write access to passwords to unauthenticated external connections.

The official smbldap-tools HOWTO even suggests how to do this:

1) Create an LDAP entry which might look like this:

dn : cn=samba , ou=DSA, dc=IDEALX, dc=ORG
objectclass : organizationalRole
objectClass : top
objectClass : simpleSecurityObject
userPassword : sambasecretpwd
cn : samba

2) Set the password:
ldappasswd -x -h localhost -D cn=Manager,dc=IDEALX,dc=ORG -s sambasecretpwd \
-W cn=samba,ou=DSA,dc=IDEALX,dc=ORG

3) Set you ldap admin dn in smb.conf

4) Set the samba password with smbpasswd

Done.

(See the HOWTO for details:
http://www.iallanis.info/smbldap-tools/docs/samba-ldap-howto/ )
-- 
To unsubscribe from this list go to the following URL and read the
instructions:  https://lists.samba.org/mailman/listinfo/samba


Re: [Samba] parallel administration tool for PCs?

2008-09-10 Thread malte . mueller

- Nachricht von [EMAIL PROTECTED] -
 Datum: Tue, 09 Sep 2008 15:01:08 -0700
   Von: David Mathog [EMAIL PROTECTED]
Antwort an: David Mathog [EMAIL PROTECTED]
   Betreff: [Samba] parallel administration tool for PCs?
An: samba@lists.samba.org



This is a bit off topic, but I'm looking for a convenient way to manage
N identical Windows PCs, using as much as possible 1 command to do the
same thing on all of them.  The capabilities I'm looking for, preferably
in a single tool are, given a designated master machine and N clones of
that master:

1.  Compare all (or to a specified depth) files below some directory on
the workstations, displaying differences.  For instance, compare the
directory tree below C:\Program Files.

2  After determining which subset of the differences from (1) need to be
pushed, designate those files and put, whereupon all such files are
copied from the master to the N remote machines.

3. Select a .bat file in the synchronized directory tree, invoke run,
whereupon it runs inside a DOS shell on all remote machines.  The output
from that run is saved and diffed, so that anything that went wrong on
one of the machines may be spotted.

4  Run a program on the master (using Windows GUI), and it runs
on all the other machines at once, applying the same key strokes and
mouse events to all of them at once.  For instance, do an install on the
master and everything happens the same way on the other N machines.
If something different happens along the way, the option to address that
machine specifically would be provided.  This one is sort of the holy
grail for Windows administration, I'm not entirely sure that the Windows
GUI even provides a place to hack in between the mouse and keyboard to
achieve this.

I already have a collection of tools for doing bits and pieces of this,
but nothing that covers all of these bases:


From Samba there is smbclient, which if buried in a script can be used

for the file transfers, so long as port 445/tcp is open on each
workstation.  That isn't too bad a security hole since it can be
restricted through the firewall to only talk to one controlling machine.
It is relatively easy to make it talk to N machines by addressing them
sequentially within a script, although it also requires one more machine
running Linux to perform all the smbclient operations.  Tar can do
the directory traversals, but there seems not to be any way to generate
checksums on the remote machines, so for a directory comparision one
would have to move all the relevant data over the net back to the
central machine.  Not very efficient if N is large and the disk space
being traversed is also large.

UltraVNC lets me do any console operation remotely, but only one machine
at a time.  If there was some way to run UltraVNC in parallel it would
almost do what (4) requires, but currently all one can do is switch from
display to display, and then repeat the same commands on each.

Disk cloning (ghost and the like).  Massive overkill when just a few
files need to be tweaked.  Plus on Windows if the partition being copied
includes C:\Windows (and it always does for me) the whole sysprep etc.
dance must be carried out.

md5deep generates a tree'd md5sum report, which could be used for the
file comparisons in (1), but it just runs on one machine at a time.

Boot all machines under linux.  This lets me use ssh to run scripts,
and since NTFS can be mounted read/write these days, access to the
XP directories is possible from linux.  That makes the file
synchronization relatively straightforward, but at the cost of having
to run a completely different OS, and the loss of the ability to run
programs within Windows.

Thanks,

David Mathog
[EMAIL PROTECTED]
Manager, Sequence Analysis Facility, Biology Division, Caltech
--
To unsubscribe from this list go to the following URL and read the
instructions:  https://lists.samba.org/mailman/listinfo/samba



- Ende der Nachricht von [EMAIL PROTECTED] -

I use the autoexnt service for such purposes. Autoexnt runs with  
admin-privileges at startup, before anyone logges in. Users can log in  
though. It is available at least for win2k and winXP, but I don't know  
about Vista.
I have written a small webservice (a servlet in my case, I am a bit  
biased towards java) that builds (it just concatenates some text  
files) a batch file for the client depending on it's IP. The client  
fetches that batch file using wget and executes it. I use it to bring  
client-PC back into the domain after imaging but sometimes I also copy  
just some files. The server side logic proved to be usefull because  
win2k sometimes seemed not to be able to resolve it's own name  
correctly after the imaging process.

You might want to watch for security issues.

Hope this helpes
Malte Müller

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


Re: [Samba] Failed to retrieve password from secrets.tdb with anonymous bind

2008-09-10 Thread Volker Lendecke
On Wed, Sep 10, 2008 at 08:41:03AM +0200, Dr. Alberto Benati wrote:
 Unfortunately I don't have a password to administer this external ldap but
 only query / bind anonymously
 
 if I enable a local (127.0.0.1) openldap with administration (rootdn and
 rootpw) everything works well.
 Samba seems to work that must administer LDAP unlike ProFtpd that retrieve
 data and stop

You are aware that due to the NTLM challenge-response system
Samba must store plaintext equivalents of the passwords in
LDAP? You definitely can't give them out anonymously. If you
do that, you could as well just use no user database at all,
everyone is allowed everything.

Volker


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

Re: [Samba] Failed to retrieve password from secrets.tdb with anonymous bind

2008-09-10 Thread Dr. Alberto Benati
I see to clarify the context.

Everything is inside an intranet 10.X.X.X of my University and
OpenFiler (Samba / Proftpd) server must act as file server for many users
(about 100) against about 1000 total.

Authentication (with user password) is on University LDAP server.

If I create a local LDAP I must then provide a synchronization (account /
password) with University LDAP server that I can not manage/access/retrieve (I
have an anonymous bind only).

Subsequently testing (for security) I use tls for dialogue with University LDAP.

My problem that I can not do work Samba on LDAP authentication without
administration 

Alberto


-- Original Message ---
From: Richard Foltyn [EMAIL PROTECTED]
To: samba@lists.samba.org
Sent: Wed, 10 Sep 2008 08:41:19 +0200
Subject: Re: [Samba] Failed to retrieve password from secrets.tdb with
anonymous bind

 Why don't you just *create* a dedicated samba DN in LDAP which Samba
 can use? This is a much more secure setup than granting read or even
 write access to passwords to unauthenticated external connections.
 
 The official smbldap-tools HOWTO even suggests how to do this:
 
 1) Create an LDAP entry which might look like this:
 
 dn : cn=samba , ou=DSA, dc=IDEALX, dc=ORG
 objectclass : organizationalRole
 objectClass : top
 objectClass : simpleSecurityObject
 userPassword : sambasecretpwd
 cn : samba
 
 2) Set the password:
 ldappasswd -x -h localhost -D cn=Manager,dc=IDEALX,dc=ORG -s 
 sambasecretpwd \ -W cn=samba,ou=DSA,dc=IDEALX,dc=ORG
 
 3) Set you ldap admin dn in smb.conf
 
 4) Set the samba password with smbpasswd
 
 Done.
 
 (See the HOWTO for details:
 http://www.iallanis.info/smbldap-tools/docs/samba-ldap-howto/ )
 -- 
 To unsubscribe from this list go to the following URL and read the
 instructions:  https://lists.samba.org/mailman/listinfo/samba
--- End of Original Message ---

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


Re: [Samba] Failed to retrieve password from secrets.tdb with anonymous bind

2008-09-10 Thread Volker Lendecke
On Wed, Sep 10, 2008 at 09:34:37AM +0200, Dr. Alberto Benati wrote:
 I see to clarify the context.
 
 Everything is inside an intranet 10.X.X.X of my University and
 OpenFiler (Samba / Proftpd) server must act as file server for many users
 (about 100) against about 1000 total.
 
 Authentication (with user password) is on University LDAP server.
 
 If I create a local LDAP I must then provide a synchronization (account /
 password) with University LDAP server that I can not manage/access/retrieve (I
 have an anonymous bind only).

If you can't really mess with your part of the LDAP tree,
putting sambaSamAccout objects there is probably not the
thing that you want to do.

Volker


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

Re: [Samba] XP cannot read files after upgrade to Debian Samba 3.2.3

2008-09-10 Thread Veselin Kantsev
Hello Jeremy,

Yes, browsing the folder with smbclient shows the filename as 1FQJ7Y~Z




-- 
Regards,

Veselin 

Campbell-Lange Workshop
www.campbell-lange.net
0207 6311 555
3 Tottenham Street London W1T 2AF
Registered in England No. 04551928


On Tue, Sep 09, 2008 at 08:38:14PM -0700, Jeremy Allison wrote:
 On Tue, Sep 09, 2008 at 11:08:20PM +0100, Veselin Kantsev wrote:
  Thank you much Jeremy,
  
  Do you know of some temporary workaround that I can use for the time being?
 
 I'd be interested to see if you see the filename containing
 a ':' as a mangled (8.3) name when connecting using smbclient
 please ?
 
 Jeremy.
-- 
To unsubscribe from this list go to the following URL and read the
instructions:  https://lists.samba.org/mailman/listinfo/samba


Re: [Samba] XP cannot read files after upgrade to Debian Samba 3.2.3

2008-09-10 Thread Veselin Kantsev
Thank you much David, your temporary solution worked fine.
I had to disable encrypted passwords though, otherwise
NT_STATUS_LOGON_FAILURE


Thanks again.

Hopefully Jeremy will come up with the fix soon.

-- 
Regards,
Veselin 

Campbell-Lange Workshop
www.campbell-lange.net
0207 6311 555
3 Tottenham Street London W1T 2AF
Registered in England No. 04551928


On Tue, Sep 09, 2008 at 10:15:51PM -0500, David C. Rankin wrote:
 Veselin Kantsev wrote:
 Thank you much Jeremy,

 Do you know of some temporary workaround that I can use for the time being?

 Regards,

 Veselin,

   The simplest way would be to download a copy of the 3.0.24 that you 
 know 
 will work and install that on the 3.2.3 machine. You don't need to remove 
 3.2.3, you can simply install 2.0.24 in the default location of 
 /usr/local/samba. You are probably safe with 3.0.31. Just download the 
 tarball at:

 http://us3.samba.org/samba/ftp/samba-3.0.31.tar.gz

   If you need 3.0.24:

 http://us1.samba.org/samba/ftp/old-versions/samba-3.0.24.tar.gz

   Then simply:

 (1) tar -xzf samba-3.0.24.tar.gz  # untar the source
 (2) cd samba-3.0.24/src   # change to the src directory
 (3) ./configure   # default install in 
 /usr/local/samba
 ** install any missing packages (gcc, etc..)
 (4) make
 (5) make install

 ** now figure out where your smb.conf and smbpasswd files are stored and 
 where you want you log files. (Usually /etc/samba/ and /var/log) Assumed 
 in step (7)

 ** make sure you stop 3.2.3 (smbd and nmbd), change to the 
 /usr/local/samba/bin directory then start your new version of each:

 (6) cd /usr/local/samba/bin   # new executable location

 (7)(a) ./nmbd --daemon --configfile=/etc/samba/smb.conf 
 --log-basename=log.nmb.test

 (7)(b) ./smbd --daemon --configfile=/etc/samba/smb.conf --log-basename  
 log.smb.test --smb-passwd-file=/etc/samba/smbpasswd 
 --private-dir=/etc/samba

   If disaster strikes and everything goes bad, not to worry, simply issue 
 the command

 (8) make revert   # Restores original 3.2.3 
 binaries
   #+if they were overwritten


   That's it. Takes about 20 minutes total. Your new self-compiled samba 
 will run just fine until Jeremy is done looking at the problem. It is 
 always good to have this work-around in your hip-pocket just in case a 
 'new feature' is introduced in the latest release ;-)

 -- 
 David C. Rankin, J.D., P.E.
 Rankin Law Firm, PLLC
 510 Ochiltree Street
 Nacogdoches, Texas 75961
 Telephone: (936) 715-9333
 Facsimile: (936) 715-9339
 www.rankinlawfirm.com
 -- 
 To unsubscribe from this list go to the following URL and read the
 instructions:  https://lists.samba.org/mailman/listinfo/samba
-- 
To unsubscribe from this list go to the following URL and read the
instructions:  https://lists.samba.org/mailman/listinfo/samba


Re: [Samba] parallel administration tool for PCs?

2008-09-10 Thread Hari Sekhon

David Mathog wrote:

This is a bit off topic, but I'm looking for a convenient way to manage
N identical Windows PCs, using as much as possible 1 command to do the
same thing on all of them.  The capabilities I'm looking for, preferably
in a single tool are, given a designated master machine and N clones of
that master:
  
This sounds like it would be better done architecturally with Active 
Directory + group policies/SMS etc ... or you could just scrape around 
and sort-of get something working by hobbling together the kinds of 
technologies you previously mentioned... kind of. Can't vouch for it though.


Fyi I recommend vbs/wsh for the gui keystrokes by the way... I have 
personally find that a very useful little language.


-h

--
Hari Sekhon

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


Re: [Samba] Samba 3.0.28a onwards allow trusted domains has no effect?

2008-09-10 Thread Hari Sekhon

simo wrote:

On Tue, 2008-09-09 at 15:52 +0100, Hari Sekhon wrote:
  

Hi,

   I've noticed a discrepancy between Samba Version 3.0.28a and Version 
3.0.24 in relation to Winbind rid idmap and trusted domains behaviour.


I have an environment with 2 domains linked via a trust, an Active 
Directory domain and an NT4 domain. On 3.0.24 the rid backend seems to 
work fine, but on 3.0.28a it shows OTHERDOMAIN\domain admins instead of 
the primary domain's domain admins in uid/name mapping on files.


Below is a relevant snippet of the identical samba configuration on both 
machines:


allow trusted domains = no
idmap backend = rid
idmap config PRIMARYDOMAIN:range = 1-1
idmap config OTHERDOMAIN:range = 2-2
idmap gid = 1-3
idmap uid = 1-3



Hari, this is not, as is, a valid configuration for either versions, is
this the full configuration used ?

  
Testparm confirms that allow trusted domains is set to No, so it seems 
that 3.0.28a does not respect the fact that trusted domains are not 
supposed to be allowed at all? This seems to break the way the rid 
backend works of course as there is a rid clash with the other domain.



Allow trusted domains = no controls only authentication/access to the
service not id resolution.

  

This output from wbinfo --group-info shows the name clash:

domain admins:x:10512
OTHERDOMAIN\domain admins:x:10512

Can anyone offer any advice on what to do about this?
I am running 3.0.24 on Debian Etch and 3.0.28a on Gentoo, for which 
those are the latest stable versions packaged for the systems. I have 
tried 3.0.32 and the problem seems to occur there too. Is this a bug 
that has crept in after 3.0.24?



If that is the configuration you use, it seem more like a configuration
error.

Simo.
  
It's not the entire configuration obviously I have left out lots of 
implicit options like security = ads etc, but I have been playing with 
using the rid idmap backend for unified id mapping across systems as 
mentioned in the samba official documentation (as it means I don't have 
to change my pre-R2 2003 Active Directory)


Testparm does not show any config error, the options are valid and 
appear in the global section of the dump of service configurations as 
accepted.


This works absolutely as expected on 3.0.24 so far but on 3.0.28a and 
3.0.32 it seems a touch broken because of the cross domain collision id 
collision.


-h

--
Hari Sekhon

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


Re: [Samba] Samba VFS recyclebin hide

2008-09-10 Thread mourik jan c heupink
Why not just set repository = /some/path/that/isnt/shared/recycle 
(note the absolute path), same effect, no messing with symlinks.

I didn't, because I didn't know this was possible. :-)

Anyway, I have /recycle/ in my veto files, so nobody can follow that 
symlink.


But thanks for the tip!

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


[Samba] samba - fetch NT ACLS permissions

2008-09-10 Thread Pavol Eisenberg

Hello

I am using samba as member of NT Domain.  I 've copied the folder inside 
linux  and create new share in samba. The problem is that I need to 
fetch permission for that folder from NT Domain controller (otherwise I 
will have to set up permission again), is there any way how to copy 
folder with NT permission from one place to another ?  (maybe smbcacls ? )


Many thanks for your help

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


[Samba] UIDGID no same at two server...

2008-09-10 Thread Renato
Hello world 

I realized that my samba_Server1 did not even UID  GID that the other
samba_Server1 .. 

In summary: the share from the windows works very well.  samba 1 and 2. 

When i run wbinfo-u (samba 1 and 2.) i'have : 

GUEST 
ADMINITRATOR 
.. 

but not 
[DOMAIN] GUEST 
[DOMAIN] ADMINITRATOR 
.. 
(strange...)
 

When I run on samba_Server1: getent passwd 

guest: *: 604:608: Guest: / home/MIMOSA/guest: / bin / bash 
administrator: *: 603:608: Administrator: / home/MIMOSA/administrator: / bin
/ bash 

when I made the samba_Server2 : getent passwd 

guest: *: 600:600: Guest: / home/MIMOSA/guest: / bin / bash 
administrator: *: 601:600: Administrator: / home/MIMOSA/administrator: / bin
/ bash 


I'would like to have the same UID  GID on my two linux...  How i do ??? 
 
I regenerate a new winbindd base :  /var/lib/samba/winbindd_idmap.tdb (but
no change... )
 
Thank you for answer... Sorry for my english writing
-- 
To unsubscribe from this list go to the following URL and read the
instructions:  https://lists.samba.org/mailman/listinfo/samba


Re: [Samba] Samba 3.0.28a onwards allow trusted domains has no effect?

2008-09-10 Thread simo
On Wed, 2008-09-10 at 11:50 +0100, Hari Sekhon wrote:
 simo wrote:
  On Tue, 2008-09-09 at 15:52 +0100, Hari Sekhon wrote:

  Hi,
 
 I've noticed a discrepancy between Samba Version 3.0.28a and Version 
  3.0.24 in relation to Winbind rid idmap and trusted domains behaviour.
 
  I have an environment with 2 domains linked via a trust, an Active 
  Directory domain and an NT4 domain. On 3.0.24 the rid backend seems to 
  work fine, but on 3.0.28a it shows OTHERDOMAIN\domain admins instead of 
  the primary domain's domain admins in uid/name mapping on files.
 
  Below is a relevant snippet of the identical samba configuration on both 
  machines:
 
  allow trusted domains = no
  idmap backend = rid
  idmap config PRIMARYDOMAIN:range = 1-1
  idmap config OTHERDOMAIN:range = 2-2
  idmap gid = 1-3
  idmap uid = 1-3
  
 
  Hari, this is not, as is, a valid configuration for either versions, is
  this the full configuration used ?
 

  Testparm confirms that allow trusted domains is set to No, so it seems 
  that 3.0.28a does not respect the fact that trusted domains are not 
  supposed to be allowed at all? This seems to break the way the rid 
  backend works of course as there is a rid clash with the other domain.
  
 
  Allow trusted domains = no controls only authentication/access to the
  service not id resolution.
 

  This output from wbinfo --group-info shows the name clash:
 
  domain admins:x:10512
  OTHERDOMAIN\domain admins:x:10512
 
  Can anyone offer any advice on what to do about this?
  I am running 3.0.24 on Debian Etch and 3.0.28a on Gentoo, for which 
  those are the latest stable versions packaged for the systems. I have 
  tried 3.0.32 and the problem seems to occur there too. Is this a bug 
  that has crept in after 3.0.24?
  
 
  If that is the configuration you use, it seem more like a configuration
  error.
 
  Simo.

 It's not the entire configuration obviously I have left out lots of 
 implicit options like security = ads etc, but I have been playing with 
 using the rid idmap backend for unified id mapping across systems as 
 mentioned in the samba official documentation (as it means I don't have 
 to change my pre-R2 2003 Active Directory)
 
 Testparm does not show any config error, the options are valid and 
 appear in the global section of the dump of service configurations as 
 accepted.
 
 This works absolutely as expected on 3.0.24 so far but on 3.0.28a and 
 3.0.32 it seems a touch broken because of the cross domain collision id 
 collision.

I guess a look at the idmap_rid manpage would help then.

To have it working as expected on 3.0.25+ you should add the following
parameter:

idmap domains = PRIMARYDOMAIN OTHERDOMAIN
idmap config PRIMARYDOMAIN:backend = rid
idmap config PRIMARYDOMAIN:default = yes
idmap config OTHERDOMAIN:backend = rid

and remove the:

idmap backend = rid


and optionally (to avoid a 1000 ids hole at the start of each range):
idmap config PRIMARYDOMAIN:base_rid = 1000
idmap config OTHERDOMAIN:base_rid = 1000


see the idmap_rid(8) manpage.


Also note that your configuration will probably be ok when we release
samba 3.3.0, as we modified slightly the code to avoid the 'idmap
domains' parameters and to make back 'idmap backend' the main backend
used. But until then your current configuration is not correct for
3.0.25+ and the 'idmap config' directives are ignored w/o the idmap
domains one

Simo.

-- 
Simo Sorce
Samba Team GPL Compliance Officer [EMAIL PROTECTED]
Senior Software Engineer at Red Hat Inc. [EMAIL PROTECTED]

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


Re: [Samba] Samba 3.0.28a onwards allow trusted domains has no effect?

2008-09-10 Thread Hari Sekhon

simo wrote:

I guess a look at the idmap_rid manpage would help then.
  
Ironically I read the entire samba documentation (skipping only the 
printing sections) and all the man pages too, but perhaps in overdid it 
and missed something...


The thing which surprised me is that everything worked, if testparm had 
raised any error or warning, if a service failed to accept the config, I 
would have googled and re-read the docs


What really threw me was that this worked fine in 3.0.24 and not in 
3.0.28a onwards.



To have it working as expected on 3.0.25+ you should add the following
parameter:

idmap domains = PRIMARYDOMAIN OTHERDOMAIN
idmap config PRIMARYDOMAIN:backend = rid
idmap config PRIMARYDOMAIN:default = yes
idmap config OTHERDOMAIN:backend = rid

and remove the:

idmap backend = rid


and optionally (to avoid a 1000 ids hole at the start of each range):
idmap config PRIMARYDOMAIN:base_rid = 1000
idmap config OTHERDOMAIN:base_rid = 1000


see the idmap_rid(8) manpage.
  
I've done all this and it seems to have fixed it on the newer samba 
boxes I have.



Also note that your configuration will probably be ok when we release
samba 3.3.0, as we modified slightly the code to avoid the 'idmap
domains' parameters and to make back 'idmap backend' the main backend
used. But until then your current configuration is not correct for
3.0.25+ and the 'idmap config' directives are ignored w/o the idmap
domains one
  

Thanks

-h

--
Hari Sekhon

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


[Samba] samba and ssl certificates?

2008-09-10 Thread Mike Eggleston
Morning,

I am working on enabling the ssl portion of several of my services (https,
imaps, ftps, etc). I am using a free certification authorithy (CA) for
my certificates. I need to get this CA's root certificate installed in
my several windows workstations. All these workstations are part of my
samba PDC domain.

Is there a way I can use samba, or maybe the logon.bat file, to install
this root certificate on my workstations?

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


Re: [Samba] Samba 3.0.28a onwards allow trusted domains has no effect?

2008-09-10 Thread Volker Lendecke
On Wed, Sep 10, 2008 at 12:44:43PM +, simo wrote:
 and optionally (to avoid a 1000 ids hole at the start of each range):
 idmap config PRIMARYDOMAIN:base_rid = 1000
 idmap config OTHERDOMAIN:base_rid = 1000

I'd stronly recomment not to use base_rid=1000, because in
many configurations Domain Users is the default primary
group ID of users. As the well-known RID of domain users
is 513, this prevents all these users from logging in, as
winbind will not be able to map the primary group's RID
anymore.

Volker


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

[Samba] Samba + NFS + APACHE + PHP5 + Symfony

2008-09-10 Thread Fabio da Silva Junior
Hello All, I'm new here so I expect to learn a lot using this mail list.
 
Let's directly to my problem.
 
I have here 2 servers, one running Apache + php5 + Symfony, and other server 
with Samba and nfs.
 
The web-server mount the data from the samba-server by nfs. there are 
developers that create and edit the data on the samba-server, but the Apache 
and Symfony create and edit data too, and i'm having serious troubles with 
permission.
 
The developers access de data by samba, with a single user. the web-server, 
when mount the data, have permissoin to write, but when he writes, the owner of 
the file is different from the owner in the samba server.
 
In other words, when the apache user write some data, the samba user cannot 
edit this data and vice-versa.
 
It's a little hard to explain, so i tried to make as easy as possible to show 
the problem.
 
I apreciate some help to solve this problem. 
 
Thanks for your atention
 
Att.
 
 
Fábio da Silva Júnior - [EMAIL PROTECTED]
Laboratório de Computação Aplicada - G10
Laboratório de Redes
UNIVALI - Universidade do Vale do Itajaí
--
To unsubscribe from this list go to the following URL and read the
instructions:  https://lists.samba.org/mailman/listinfo/samba


Re: [Samba] Inexistant file displayed by samba

2008-09-10 Thread François Legal
I took some time to check the files in that share, and I finally found a
thumbs.db:encryptable file.
I guess this is a thumbnail cache file generated by Windows clients, but
what is this :encryptable part in the file name ?

After google through, it appears that this would be an alternate data
stream. Do I need this if I serve files only for non-macos clients ?
Can I disable this feature then ?

Thanks.

François

On Fri, 05 Sep 2008 07:50:55 +0800, Michael Heydon [EMAIL PROTECTED]
wrote:
 Oops, I should probably cc the list :(
 
 
 You should look on your Samba server to see if there are funny looking
 three letter files named con or com or such.
   
 It's not necessarily three letters, anything with a : or \ in it's
 name will do the same thing.
 
 *Michael Heydon - IT Administrator *
 [EMAIL PROTECTED] mailto:[EMAIL PROTECTED]

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


Re: [Samba] Samba 3.0.28a onwards allow trusted domains has no effect?

2008-09-10 Thread simo
On Wed, 2008-09-10 at 16:35 +0200, Volker Lendecke wrote:
 On Wed, Sep 10, 2008 at 12:44:43PM +, simo wrote:
  and optionally (to avoid a 1000 ids hole at the start of each range):
  idmap config PRIMARYDOMAIN:base_rid = 1000
  idmap config OTHERDOMAIN:base_rid = 1000
 
 I'd stronly recomment not to use base_rid=1000, because in
 many configurations Domain Users is the default primary
 group ID of users. As the well-known RID of domain users
 is 513, this prevents all these users from logging in, as
 winbind will not be able to map the primary group's RID
 anymore.

Ahh, right! That's why it is not the default :-)

Simo.

-- 
Simo Sorce
Samba Team GPL Compliance Officer [EMAIL PROTECTED]
Senior Software Engineer at Red Hat Inc. [EMAIL PROTECTED]

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


Re: [Samba] Samba 3.0.28a onwards allow trusted domains has no effect?

2008-09-10 Thread Hari Sekhon

Volker Lendecke wrote:

On Wed, Sep 10, 2008 at 12:44:43PM +, simo wrote:
  

and optionally (to avoid a 1000 ids hole at the start of each range):
idmap config PRIMARYDOMAIN:base_rid = 1000
idmap config OTHERDOMAIN:base_rid = 1000



I'd stronly recomment not to use base_rid=1000, because in
many configurations Domain Users is the default primary
group ID of users. As the well-known RID of domain users
is 513, this prevents all these users from logging in, as
winbind will not be able to map the primary group's RID
anymore.

Volker
  
Thanks for the pointer, I didn't use that setting as I think it's nicer 
to have a very clear mapping like your uid is your sid plus ten 
thousand. Simple to keep in mind.


-h

--
Hari Sekhon

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


Re: [Samba] Samba 3.0.28a onwards allow trusted domains has no effect?

2008-09-10 Thread simo
On Wed, 2008-09-10 at 16:35 +0200, Volker Lendecke wrote:
 On Wed, Sep 10, 2008 at 12:44:43PM +, simo wrote:
  and optionally (to avoid a 1000 ids hole at the start of each range):
  idmap config PRIMARYDOMAIN:base_rid = 1000
  idmap config OTHERDOMAIN:base_rid = 1000
 
 I'd stronly recomment not to use base_rid=1000, because in
 many configurations Domain Users is the default primary
 group ID of users. As the well-known RID of domain users
 is 513, this prevents all these users from logging in, as
 winbind will not be able to map the primary group's RID
 anymore.

Of course base_rid=500 might work instead (just to save 500 ids that
would be otherwise wasted).

Simo.

-- 
Simo Sorce
Samba Team GPL Compliance Officer [EMAIL PROTECTED]
Senior Software Engineer at Red Hat Inc. [EMAIL PROTECTED]

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


Re: [Samba] Samba + NFS + APACHE + PHP5 + Symfony

2008-09-10 Thread François Legal
I think this is not so much samba related. Can't you just manage to make
the webserver user a member of a group, which samba users accessing the
files would also be member of ? Then you could only set the setgid bit on
directories, and that would do the trick.

On Wed, 10 Sep 2008 11:32:34 -0300, Fabio da Silva Junior
[EMAIL PROTECTED] wrote:
 Hello All, I'm new here so I expect to learn a lot using this mail list.
  
 Let's directly to my problem.
  
 I have here 2 servers, one running Apache + php5 + Symfony, and other
 server with Samba and nfs.
  
 The web-server mount the data from the samba-server by nfs. there are
 developers that create and edit the data on the samba-server, but the
 Apache and Symfony create and edit data too, and i'm having serious
 troubles with permission.
  
 The developers access de data by samba, with a single user. the
 web-server, when mount the data, have permissoin to write, but when he
 writes, the owner of the file is different from the owner in the samba
 server.
  
 In other words, when the apache user write some data, the samba user
 cannot edit this data and vice-versa.
  
 It's a little hard to explain, so i tried to make as easy as possible to
 show the problem.
  
 I apreciate some help to solve this problem. 
  
 Thanks for your atention
  
 Att.
  
  
 Fábio da Silva Júnior - [EMAIL PROTECTED]
 Laboratório de Computação Aplicada - G10
 Laboratório de Redes
 UNIVALI - Universidade do Vale do Itajaí


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


Re: [Samba] XP cannot read files after upgrade to Debian Samba 3.2.3

2008-09-10 Thread Jeremy Allison
On Wed, Sep 10, 2008 at 10:03:35AM +0100, Veselin Kantsev wrote:
 Hello Jeremy,
 
 Yes, browsing the folder with smbclient shows the filename as 1FQJ7Y~Z

Ok, then this should work with Windows too. So long as the
filename is not being seen as a alternate data stream and
is being correctly mangled, then it should be accessible
via that mangled name to a Windows client.

I need debug level 10 logs of your problem occurring, and
a bug logged at samba.org bugzilla will help track it.

Thanks,

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


Re: [Samba] Missing files and folders on Vista

2008-09-10 Thread Leonardo Boselli
I remember when XP arrived for the first time in my department from sono
external users users of home edition of XP were not able to see
all'directories in a win2000 server above a certain number. users of
xp-pro had no problem.
after first SP all was ok and it still is (file server is still a win2k ).
 


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


[Samba] samaba winwind

2008-09-10 Thread vishesh

dear all
i am running samba 3.0.28 on two server and using winbind to get active 
directory users and group. the problem i facing is attach the uid 
assigned for same user is diffrent on samba servers.


i am using default for
idmap uid  and idmap gid

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


[Samba] Re: samaba winwind

2008-09-10 Thread Andreas Ladanyi

vishesh schrieb:

dear all
i am running samba 3.0.28 on two server and using winbind to get active 
directory users and group. the problem i facing is attach the uid 
assigned for same user is diffrent on samba servers.


The uid saved in the Active Directory is different from the winbind 
Linux side ?


Could you give an example, please ?

Did you get a result with wbinfo -u, wbinfo -g ? Is this result ok ?

Could you post your winbind config ?

Which Windows server version do you use ?

bye,
Andy



i am using default for
idmap uid  and idmap gid

Thanks


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


Re: [Samba] Samba + NFS + APACHE + PHP5 + Symfony

2008-09-10 Thread pedro noticioso
add to file

/etc/smb.conf

on the share in question

[the-share]

these directives:

force user = apache-user
force group = apache-user
create mask = 0775


so, samba users files writes, just make sure you are matching the user and 
group to what apache can read :)


and still a safer bet is to force EVERYONE to access the filesystem with samba 
no matter if they have direct access to the server bacuse it will maintain 
consistency




--- On Wed, 9/10/08, François Legal [EMAIL PROTECTED] wrote:

 From: François Legal [EMAIL PROTECTED]
 Subject: Re: [Samba] Samba + NFS + APACHE + PHP5 + Symfony
 To: samba@lists.samba.org
 Date: Wednesday, September 10, 2008, 8:31 AM
 I think this is not so much samba related. Can't you
 just manage to make
 the webserver user a member of a group, which samba users
 accessing the
 files would also be member of ? Then you could only set the
 setgid bit on
 directories, and that would do the trick.
 
 On Wed, 10 Sep 2008 11:32:34 -0300, Fabio da Silva
 Junior
 [EMAIL PROTECTED] wrote:
  Hello All, I'm new here so I expect to learn a lot
 using this mail list.
   
  Let's directly to my problem.
   
  I have here 2 servers, one running Apache + php5 +
 Symfony, and other
  server with Samba and nfs.
   
  The web-server mount the data from the samba-server by
 nfs. there are
  developers that create and edit the data on the
 samba-server, but the
  Apache and Symfony create and edit data too, and
 i'm having serious
  troubles with permission.
   
  The developers access de data by samba, with a single
 user. the
  web-server, when mount the data, have permissoin to
 write, but when he
  writes, the owner of the file is different from the
 owner in the samba
  server.
   
  In other words, when the apache user write some data,
 the samba user
  cannot edit this data and vice-versa.
   
  It's a little hard to explain, so i tried to make
 as easy as possible to
  show the problem.
   
  I apreciate some help to solve this problem. 
   
  Thanks for your atention
   
  Att.
   
   
  Fábio da Silva Júnior - [EMAIL PROTECTED]
  Laboratório de Computação Aplicada - G10
  Laboratório de Redes
  UNIVALI - Universidade do Vale do Itajaí
 
 
 -- 
 To unsubscribe from this list go to the following URL and
 read the
 instructions: 
 https://lists.samba.org/mailman/listinfo/samba



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


[Samba] NT_STATUS_MEDIA_WRITE_PROTECTED

2008-09-10 Thread Chris Muller
Greetings, I am having trouble writing to my Samba share
//ent1/data.  When I connect via smbclient from another machine, I
can navigate and read files, but I can't create a directory or replace
any files; smbclient prints the message:

  NT_STATUS_MEDIA_WRITE_PROTECTED making remote directory \test

Incidentally, it *used* to work fine until I upgraded my Ubuntu
Desktop to 8.0.4LTS.

My other server, running Ubuntu 8.0.4 Server Edition, hosts a Samba
server known as //prod1/private.  I *am* able to write to that
share.

So I tried copying that smb.conf over to my ent1 box, changing only
the share name.  Unfortunately, same problem.

Each machine has the same exact userid (chris) and password.  Same UID
and GID on each (1000).

Connecting from a Windows client (christ60p), also with the same
userId and password, has the same problem, but at least smbstatus on
the Samba server shows that it knows it is connected RDONLY.  WHY?!

==
Samba version 3.0.28a
PID Username  Group Machine
---
17049   chris chris prod1(192.168.0.3)
17358   chris chris christ60p(192.168.0.2)

Service  pid machine   Connected at
---
data 17049   prod1 Wed Sep 10 18:02:52 2008
data 17358   christ60p Wed Sep 10 18:27:16 2008

Locked files:
Pid  UidDenyMode   Access  R/WOplock
SharePath   Name   Time
--
173581000   DENY_NONE  0x11RDONLY NONE
/data   .   Wed Sep 10 18:27:17 2008
173581000   DENY_NONE  0x11RDONLY NONE
/data   music   Wed Sep 10 18:27:27 2008



File permissions do not seem to be the issue, I loosened the entire
shared directory tree on ent1 to 777.  On prod1 they are 700 and
access works!

Also, smbcacls on each machine (ent1 and prod1) both show the
exact same output:

(Run from ent1)

smbcacls //prod1/private / -U chris
Password:
REVISION:1
OWNER:PROD1\chris
GROUP:Unix Group\chris
ACL:PROD1\chris:ALLOWED/0/FULL
ACL:Unix Group\chris:ALLOWED/0/
ACL:\Everyone:ALLOWED/0/

(Run from prod1)

smbcacls //ent1/data / -U chris
Password:
REVISION:1
OWNER:ENT1\chris
GROUP:Unix Group\chris
ACL:PROD1\chris:ALLOWED/0/FULL
ACL:Unix Group\chris:ALLOWED/0/
ACL:\Everyone:ALLOWED/0/

===

Next I tried cranking up syslog = 3 and on each server and comparing
what I saw in the log files for clues.  I can, of course, see the
connect to service private initially as user chris (uid=1000,
gid=1000) message.  BUT, interestingly, on the prod1 which is
*working* I have what appear to be error messages like:

  auth/auth_util.c:create_builtin_administrators(792)
create_builtin_administrators: Failed to create Administrators

and a similar message user about Failed to create Users.

Yeow, I don't know whether this failure is opening up the prod1
system for write access.  (!)

===

I also made sure the binaries /usr/sbin/smbd were owned by root and
they are.  HOWEVER, even though each machine is supposed to be running
Samba 3.0.28a, their sizes and timestamps are different!

Sooo, I shutdown samba on ent1, copied the binary from prod1.
Unfortunately, same result.

==

I've spent five days trying to get this working.  I have no hair left
to pull.  PLEASE, can anyone give me a hint?

Regards,
  Chris Muller

PS - My output from my testparm:

[global]
workgroup = MULLER
server string = %h (Samba, Ubuntu)
map to guest = Bad User
syslog = 3
syslog only = Yes
debug uid = Yes
socket options = TCP_NODELAY SO_RCVBUF=16384 SO_SNDBUF=16384
dns proxy = No
panic action = /usr/share/samba/panic-action %d
invalid users = root
hosts allow = 192.168.0., 192.168.1.

[printers]
comment = All Printers
path = /var/spool/samba
create mask = 0700
printable = Yes
browseable = No

[print$]
comment = Printer Drivers
path = /var/lib/samba/printers

[data]
comment = private Data
path = /data
read only = No
create mask = 0750
directory mask = 0750
guest ok = Yes
-- 
To unsubscribe from this list go to the following URL and read the
instructions:  https://lists.samba.org/mailman/listinfo/samba


Re: [Samba] samba and ssl certificates?

2008-09-10 Thread Michael Heydon

Mike Eggleston wrote:

Is there a way I can use samba, or maybe the logon.bat file, to install
this root certificate on my workstations?
  
This has been on my TODO list for a while. MS have a program called 
certutil which should do the trick. I haven't progressed past 
downloading a copy so I can't tell you how to use it, but there should 
be plenty of docs around.


*Michael Heydon - IT Administrator *
[EMAIL PROTECTED] mailto:[EMAIL PROTECTED]

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


Re: [Samba] Samba 3.2.3 as a PDC will not load profiles with Vista

2008-09-10 Thread Jim Shanks
 Hi, I'm having a Samba 3.2.3 that is running has a PDC and it is working
 quite well with XP. When I try to login with Vista it can not load the
 profiles so I'm getting a message saying that I'm using a temporary
 profile and it will be lost on next reboot. My home drive is map, I have
 access to my profile. So I really don't understand why can't I put my
 profile in the server and load it after a reboot. I add my smb.conf, if
 you see any errors please tell me.

 Thanks

 J-E


This is just a guess and may be wrong, but do you already have a Windows
XP profile stored on the server for the user trying to login with Vista?

The reason for the question is I do know from past experience that
different version of Windows do not have compatible profiles.  Because of
that I use:

logon path = \\%L\profiles\%U\%a

in the global section so that the profiles for different versions of
Windows are stored in different directories.  The %a expands to the
client's version of Windows.

Also the profile share really should contain profile acls = Yes

Such as:

[profiles]
comment = Personal Profile Folder
path = /home/profiles
read only = No
profile acls = Yes
browseable = No


 my smb.conf:

 [global]
   workgroup = MARIANO
   interfaces = eth0
   logon script = %G.bat
   logon path = \\luismariano\profiles\%U
   logon drive = H:
   logon home =
   domain logons = Yes
   os level = 100
   preferred master = Auto
   domain master = Yes
   wins support = Yes
   ldap ssl = no

 [netlogon]
   path = /usr/local/samba/netlogon
   write list = Admin
   read only = No

 [profiles]
   path = /usr/local/samba/profiles
   read only = No
   create mask = 0644

 [homes]
   valid users = %S
   read only = No

 [Public]
   path = /home/public
   valid users = @admin
   read only = No
   available = No



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


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

2008-09-10 Thread Karolin Seeger
The branch, v3-2-test has been updated
   via  eec57823cd6503339f8a54fed7dce0d4d41ab9a5 (commit)
   via  165691927cdaaafc057de667294dff7a7bc8a991 (commit)
  from  903868a474d4875807a131dffe74b5090c0dbcea (commit)

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


- Log -
commit eec57823cd6503339f8a54fed7dce0d4d41ab9a5
Author: Karolin Seeger [EMAIL PROTECTED]
Date:   Wed Sep 10 11:15:02 2008 +0200

WHATSNEW: Update changes since 3.2.3.

Karolin

commit 165691927cdaaafc057de667294dff7a7bc8a991
Author: Michael Adam [EMAIL PROTECTED]
Date:   Fri Aug 29 16:48:37 2008 +0200

packaging(RHEL): remove libmsrpc stuff which is no more...

Michael
(cherry picked from commit 3eaa33e9df6d58ef93f13a840b38a063649fffbc)

---

Summary of changes:
 WHATSNEW.txt   |1 +
 packaging/RHEL/samba.spec.tmpl |   10 --
 2 files changed, 1 insertions(+), 10 deletions(-)


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 7af5981..ce223c9 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -22,6 +22,7 @@ Changes since 3.2.3
 
 o   Michael Adam [EMAIL PROTECTED]
 * BUG 5590: Fix binary stripping on older OS.
+* BUG 5492: Fix RHEL SPEC file by removing libmsrpc stuff.
 * Fix linking of cifs.upcall when nscd_flush_cache() is found.
 
 
diff --git a/packaging/RHEL/samba.spec.tmpl b/packaging/RHEL/samba.spec.tmpl
index d71e5b0..c4d4fd6 100644
--- a/packaging/RHEL/samba.spec.tmpl
+++ b/packaging/RHEL/samba.spec.tmpl
@@ -226,14 +226,6 @@ install -m 755 source/bin/libsmbclient.a 
$RPM_BUILD_ROOT%{_libdir}/libsmbclient.
 install -m 644 source/include/libsmbclient.h $RPM_BUILD_ROOT%{_includedir}
 ln -s %{_libdir}/libsmbclient.so $RPM_BUILD_ROOT%{_libdir}/libsmbclient.so.0
 
-# make install puts libmsrpc.so in the wrong place on x86_64
-rm -f $RPM_BUILD_ROOT/usr/lib*/samba/libmsrpc.so 
$RPM_BUILD_ROOT/usr/lib*/samba/libmsrpc.a || true
-install -m 755 source/bin/libmsrpc.so $RPM_BUILD_ROOT%{_libdir}/libmsrpc.so
-install -m 755 source/bin/libmsrpc.a $RPM_BUILD_ROOT%{_libdir}/libmsrpc.a
-install -m 644 source/include/libmsrpc.h $RPM_BUILD_ROOT%{_includedir}
-rm -f $RPM_BUILD_ROOT%{_libdir}/samba/libmsrpc.*
-ln -s /%{_libdir}/libmsrpc.so $RPM_BUILD_ROOT%{_libdir}/libmsrpc.so.0
-
 # make install puts libsmbsharemodes.so in the wrong place on x86_64
 rm -f $RPM_BUILD_ROOT/usr/lib*/samba/libsmbsharemodes.so 
$RPM_BUILD_ROOT/usr/lib*/samba/libsmbsharemodes.a || true
 install -m 755 source/bin/libsmbsharemodes.so 
$RPM_BUILD_ROOT%{_libdir}/libsmbsharemodes.so
@@ -477,8 +469,6 @@ fi
 
 %{_includedir}/libsmbclient.h
 %{_libdir}/libsmbclient.*
-%{_includedir}/libmsrpc.h
-%{_libdir}/libmsrpc.*
 %{_includedir}/smb_share_modes.h
 %{_libdir}/libsmbsharemodes.*
 


-- 
Samba Shared Repository


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

2008-09-10 Thread Karolin Seeger
The branch, v3-2-stable has been updated
   via  47a9726c47eca22f4389794536827e5824f2ae90 (commit)
   via  ef3484f7beb0a87ae5f226da652d137d32f073ca (commit)
  from  25f85bdc7a23697757905fa5f44baeaab23bcbfb (commit)

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


- Log -
commit 47a9726c47eca22f4389794536827e5824f2ae90
Author: Karolin Seeger [EMAIL PROTECTED]
Date:   Wed Sep 10 11:15:02 2008 +0200

WHATSNEW: Update changes since 3.2.3.

Karolin
(cherry picked from commit eec57823cd6503339f8a54fed7dce0d4d41ab9a5)

commit ef3484f7beb0a87ae5f226da652d137d32f073ca
Author: Michael Adam [EMAIL PROTECTED]
Date:   Fri Aug 29 16:48:37 2008 +0200

packaging(RHEL): remove libmsrpc stuff which is no more...

Michael
(cherry picked from commit 3eaa33e9df6d58ef93f13a840b38a063649fffbc)
(cherry picked from commit 165691927cdaaafc057de667294dff7a7bc8a991)

---

Summary of changes:
 WHATSNEW.txt   |1 +
 packaging/RHEL/samba.spec.tmpl |   10 --
 2 files changed, 1 insertions(+), 10 deletions(-)


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 7af5981..ce223c9 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -22,6 +22,7 @@ Changes since 3.2.3
 
 o   Michael Adam [EMAIL PROTECTED]
 * BUG 5590: Fix binary stripping on older OS.
+* BUG 5492: Fix RHEL SPEC file by removing libmsrpc stuff.
 * Fix linking of cifs.upcall when nscd_flush_cache() is found.
 
 
diff --git a/packaging/RHEL/samba.spec.tmpl b/packaging/RHEL/samba.spec.tmpl
index d71e5b0..c4d4fd6 100644
--- a/packaging/RHEL/samba.spec.tmpl
+++ b/packaging/RHEL/samba.spec.tmpl
@@ -226,14 +226,6 @@ install -m 755 source/bin/libsmbclient.a 
$RPM_BUILD_ROOT%{_libdir}/libsmbclient.
 install -m 644 source/include/libsmbclient.h $RPM_BUILD_ROOT%{_includedir}
 ln -s %{_libdir}/libsmbclient.so $RPM_BUILD_ROOT%{_libdir}/libsmbclient.so.0
 
-# make install puts libmsrpc.so in the wrong place on x86_64
-rm -f $RPM_BUILD_ROOT/usr/lib*/samba/libmsrpc.so 
$RPM_BUILD_ROOT/usr/lib*/samba/libmsrpc.a || true
-install -m 755 source/bin/libmsrpc.so $RPM_BUILD_ROOT%{_libdir}/libmsrpc.so
-install -m 755 source/bin/libmsrpc.a $RPM_BUILD_ROOT%{_libdir}/libmsrpc.a
-install -m 644 source/include/libmsrpc.h $RPM_BUILD_ROOT%{_includedir}
-rm -f $RPM_BUILD_ROOT%{_libdir}/samba/libmsrpc.*
-ln -s /%{_libdir}/libmsrpc.so $RPM_BUILD_ROOT%{_libdir}/libmsrpc.so.0
-
 # make install puts libsmbsharemodes.so in the wrong place on x86_64
 rm -f $RPM_BUILD_ROOT/usr/lib*/samba/libsmbsharemodes.so 
$RPM_BUILD_ROOT/usr/lib*/samba/libsmbsharemodes.a || true
 install -m 755 source/bin/libsmbsharemodes.so 
$RPM_BUILD_ROOT%{_libdir}/libsmbsharemodes.so
@@ -477,8 +469,6 @@ fi
 
 %{_includedir}/libsmbclient.h
 %{_libdir}/libsmbclient.*
-%{_includedir}/libmsrpc.h
-%{_libdir}/libmsrpc.*
 %{_includedir}/smb_share_modes.h
 %{_libdir}/libsmbsharemodes.*
 


-- 
Samba Shared Repository


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

2008-09-10 Thread Karolin Seeger
The branch, v3-3-test has been updated
   via  913880a7dbfe7710f4a146b1160db1db7e529cba (commit)
   via  a688dfae8025f0f2e5a75c8b26d896f0090ddf4b (commit)
  from  298420071b188190ea0e6756c88b1c589312cfbc (commit)

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


- Log -
commit 913880a7dbfe7710f4a146b1160db1db7e529cba
Author: Karolin Seeger [EMAIL PROTECTED]
Date:   Wed Sep 10 11:20:40 2008 +0200

WHATSNEW: Update changes since 3.3.0pre1.

Karolin

commit a688dfae8025f0f2e5a75c8b26d896f0090ddf4b
Author: Michael Adam [EMAIL PROTECTED]
Date:   Fri Aug 29 16:48:37 2008 +0200

packaging(RHEL): remove libmsrpc stuff which is no more...

Michael
(cherry picked from commit 3eaa33e9df6d58ef93f13a840b38a063649fffbc)

---

Summary of changes:
 WHATSNEW.txt   |1 +
 packaging/RHEL/samba.spec.tmpl |   10 --
 2 files changed, 1 insertions(+), 10 deletions(-)


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index d8347fe..a12592c 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -140,6 +140,7 @@ Commit Highlights:
 --
 
 o   Michael Adam [EMAIL PROTECTED]
+* BUG 5492: Fix RHEL SPEC file by removing libmsrpc stuff.
 * BUG 5609: Remove configure option --with-libdir and add
   --with-modulesdir.
 * Extend net rpc vampire keytab to support differential replication
diff --git a/packaging/RHEL/samba.spec.tmpl b/packaging/RHEL/samba.spec.tmpl
index d71e5b0..c4d4fd6 100644
--- a/packaging/RHEL/samba.spec.tmpl
+++ b/packaging/RHEL/samba.spec.tmpl
@@ -226,14 +226,6 @@ install -m 755 source/bin/libsmbclient.a 
$RPM_BUILD_ROOT%{_libdir}/libsmbclient.
 install -m 644 source/include/libsmbclient.h $RPM_BUILD_ROOT%{_includedir}
 ln -s %{_libdir}/libsmbclient.so $RPM_BUILD_ROOT%{_libdir}/libsmbclient.so.0
 
-# make install puts libmsrpc.so in the wrong place on x86_64
-rm -f $RPM_BUILD_ROOT/usr/lib*/samba/libmsrpc.so 
$RPM_BUILD_ROOT/usr/lib*/samba/libmsrpc.a || true
-install -m 755 source/bin/libmsrpc.so $RPM_BUILD_ROOT%{_libdir}/libmsrpc.so
-install -m 755 source/bin/libmsrpc.a $RPM_BUILD_ROOT%{_libdir}/libmsrpc.a
-install -m 644 source/include/libmsrpc.h $RPM_BUILD_ROOT%{_includedir}
-rm -f $RPM_BUILD_ROOT%{_libdir}/samba/libmsrpc.*
-ln -s /%{_libdir}/libmsrpc.so $RPM_BUILD_ROOT%{_libdir}/libmsrpc.so.0
-
 # make install puts libsmbsharemodes.so in the wrong place on x86_64
 rm -f $RPM_BUILD_ROOT/usr/lib*/samba/libsmbsharemodes.so 
$RPM_BUILD_ROOT/usr/lib*/samba/libsmbsharemodes.a || true
 install -m 755 source/bin/libsmbsharemodes.so 
$RPM_BUILD_ROOT%{_libdir}/libsmbsharemodes.so
@@ -477,8 +469,6 @@ fi
 
 %{_includedir}/libsmbclient.h
 %{_libdir}/libsmbclient.*
-%{_includedir}/libmsrpc.h
-%{_libdir}/libmsrpc.*
 %{_includedir}/smb_share_modes.h
 %{_libdir}/libsmbsharemodes.*
 


-- 
Samba Shared Repository


[SCM] Samba Shared Repository - branch v3-3-stable updated - release-3-3-0pre1-130-gd802c78

2008-09-10 Thread Karolin Seeger
The branch, v3-3-stable has been updated
   via  d802c787beb4ff4e3a185c5297010f47ba9df5da (commit)
  from  13aa85725386da7e45f286ec1d4ac46fa9dfaf55 (commit)

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


- Log -
commit d802c787beb4ff4e3a185c5297010f47ba9df5da
Author: Michael Adam [EMAIL PROTECTED]
Date:   Fri Aug 29 16:48:37 2008 +0200

packaging(RHEL): remove libmsrpc stuff which is no more...

Michael
(cherry picked from commit 3eaa33e9df6d58ef93f13a840b38a063649fffbc)
(cherry picked from commit a688dfae8025f0f2e5a75c8b26d896f0090ddf4b)

---

Summary of changes:
 packaging/RHEL/samba.spec.tmpl |   10 --
 1 files changed, 0 insertions(+), 10 deletions(-)


Changeset truncated at 500 lines:

diff --git a/packaging/RHEL/samba.spec.tmpl b/packaging/RHEL/samba.spec.tmpl
index d71e5b0..c4d4fd6 100644
--- a/packaging/RHEL/samba.spec.tmpl
+++ b/packaging/RHEL/samba.spec.tmpl
@@ -226,14 +226,6 @@ install -m 755 source/bin/libsmbclient.a 
$RPM_BUILD_ROOT%{_libdir}/libsmbclient.
 install -m 644 source/include/libsmbclient.h $RPM_BUILD_ROOT%{_includedir}
 ln -s %{_libdir}/libsmbclient.so $RPM_BUILD_ROOT%{_libdir}/libsmbclient.so.0
 
-# make install puts libmsrpc.so in the wrong place on x86_64
-rm -f $RPM_BUILD_ROOT/usr/lib*/samba/libmsrpc.so 
$RPM_BUILD_ROOT/usr/lib*/samba/libmsrpc.a || true
-install -m 755 source/bin/libmsrpc.so $RPM_BUILD_ROOT%{_libdir}/libmsrpc.so
-install -m 755 source/bin/libmsrpc.a $RPM_BUILD_ROOT%{_libdir}/libmsrpc.a
-install -m 644 source/include/libmsrpc.h $RPM_BUILD_ROOT%{_includedir}
-rm -f $RPM_BUILD_ROOT%{_libdir}/samba/libmsrpc.*
-ln -s /%{_libdir}/libmsrpc.so $RPM_BUILD_ROOT%{_libdir}/libmsrpc.so.0
-
 # make install puts libsmbsharemodes.so in the wrong place on x86_64
 rm -f $RPM_BUILD_ROOT/usr/lib*/samba/libsmbsharemodes.so 
$RPM_BUILD_ROOT/usr/lib*/samba/libsmbsharemodes.a || true
 install -m 755 source/bin/libsmbsharemodes.so 
$RPM_BUILD_ROOT%{_libdir}/libsmbsharemodes.so
@@ -477,8 +469,6 @@ fi
 
 %{_includedir}/libsmbclient.h
 %{_libdir}/libsmbclient.*
-%{_includedir}/libmsrpc.h
-%{_libdir}/libmsrpc.*
 %{_includedir}/smb_share_modes.h
 %{_libdir}/libsmbsharemodes.*
 


-- 
Samba Shared Repository


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

2008-09-10 Thread Karolin Seeger
The branch, v3-3-test has been updated
   via  58792ba5ca73a9086c7f59505523d1c871f27c81 (commit)
   via  4e44f8a960fd0045905416e6a812c3f4163e565c (commit)
   via  81ee5988eac33b2bdade3bd46c201b690f6ca3e2 (commit)
   via  b4c58d49902d62f25aa0c9289d1857aa2636c028 (commit)
   via  730fbb255a8cd2adb2939ac275a2f4272771ee0f (commit)
   via  364e1c50b28799ee6a5debe3ab30f64730515421 (commit)
   via  8eb83a2c94fbc6f014480d22b422f6bfe008b8f7 (commit)
   via  e03183e11be968740223a42a4080a53320f318ec (commit)
   via  f8b8774a33fdf5f390dbebd2b56411b689f8cb8d (commit)
   via  6a68739e618b2815158f2e577a920c018e5a4093 (commit)
   via  18f8be31f697b807ab34d5d08a028e09e9d9f09c (commit)
   via  88cc5106c32443197a7b3e53554529420321d47f (commit)
   via  0de6722276277550de08a9fd225baae91f2aeaf1 (commit)
   via  45948bd82b1810d9b796471e39c5a445a8e087d2 (commit)
  from  913880a7dbfe7710f4a146b1160db1db7e529cba (commit)

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


- Log -
commit 58792ba5ca73a9086c7f59505523d1c871f27c81
Author: Karolin Seeger [EMAIL PROTECTED]
Date:   Wed Sep 10 11:46:53 2008 +0200

WHATSNEW: Update changes since 3.3.0pre1.

Karolin

commit 4e44f8a960fd0045905416e6a812c3f4163e565c
Author: Michael Adam [EMAIL PROTECTED]
Date:   Mon Sep 8 17:38:55 2008 +0200

packaging(RHEL): use ccache if available

Michael
(cherry picked from commit e8abbfabde3da0844ffb4e2507084c139a70d503)

commit 81ee5988eac33b2bdade3bd46c201b690f6ca3e2
Author: Michael Adam [EMAIL PROTECTED]
Date:   Mon Sep 8 15:52:27 2008 +0200

packaging(RHEL): add ldbtools binaries and man pages to common package

Michael
(cherry picked from commit 206985dfda5a9f62df975629046b00a88ec666f5)

commit b4c58d49902d62f25aa0c9289d1857aa2636c028
Author: Michael Adam [EMAIL PROTECTED]
Date:   Mon Sep 8 15:51:57 2008 +0200

packaging(RHEL): add cifs.upcall binary and manpage to client package

Michael
(cherry picked from commit f1b80bcb58b8aa5c586835dc201ce674b3417835)

commit 730fbb255a8cd2adb2939ac275a2f4272771ee0f
Author: Michael Adam [EMAIL PROTECTED]
Date:   Mon Sep 8 15:51:33 2008 +0200

packaging(RHEL): fix installation of pam modules.

Michael
(cherry picked from commit 0f045f18ebaa752b9d906afc64fd5badb3bf352c)

commit 364e1c50b28799ee6a5debe3ab30f64730515421
Author: Michael Adam [EMAIL PROTECTED]
Date:   Mon Sep 8 14:46:31 2008 +0200

packaging(RHEL): remove leftovers of smbmount from SPEC file.

Michael
(cherry picked from commit 041875c64daba3d185b1954eb0eb9a21b2f41ee1)

commit 8eb83a2c94fbc6f014480d22b422f6bfe008b8f7
Author: Michael Adam [EMAIL PROTECTED]
Date:   Fri Aug 29 17:45:45 2008 +0200

packaging(RHEL): add new libs (talloc, tdb, ...) to the common package

Michael
(cherry picked from commit f23183bbec55faf2d6496e04e73f8dd415a08d1c)

commit e03183e11be968740223a42a4080a53320f318ec
Author: Michael Adam [EMAIL PROTECTED]
Date:   Fri Aug 29 16:57:16 2008 +0200

packaging(RHEL): remove workaround code for libsmclient/sharemodes 
installation

With 3.3.0, this is not needed any more
(libdir/modulesdir separation and corrected library creation).

Michael
(cherry picked from commit 5348e28f6674cab643b42c1265c24983d9a9189d)

commit f8b8774a33fdf5f390dbebd2b56411b689f8cb8d
Author: Michael Adam [EMAIL PROTECTED]
Date:   Fri Aug 29 16:55:55 2008 +0200

packaging(RHEL): fix libdir installation by using _libarch/_libarchdir

Michael
(cherry picked from commit 829f83c27ad03e4d2a7b5dc0b0459823fa4f3804)

commit 6a68739e618b2815158f2e577a920c018e5a4093
Author: Michael Adam [EMAIL PROTECTED]
Date:   Fri Aug 29 16:44:06 2008 +0200

packaging(RHEL): remove duplicate installation of pam_smbpass.so

Michael
(cherry picked from commit cdc24fbb195b1a5460c05fcd20d7ba81ad69ef22)

commit 18f8be31f697b807ab34d5d08a028e09e9d9f09c
Author: Michael Adam [EMAIL PROTECTED]
Date:   Fri Aug 29 16:41:30 2008 +0200

packaging(RHEL): remove smbmount related stuff from spec file

Michael
(cherry picked from commit 4420cf6199e3c718a3dea84fe814d6ad6e83c2d8)

commit 88cc5106c32443197a7b3e53554529420321d47f
Author: Michael Adam [EMAIL PROTECTED]
Date:   Fri Aug 29 16:40:04 2008 +0200

packaging(RHEL): don't make proto for samba 3.3

Michael
(cherry picked from commit 75c28699496d843e21eefef564c72023b24975a1)

commit 0de6722276277550de08a9fd225baae91f2aeaf1
Author: Michael Adam [EMAIL PROTECTED]
Date:   Fri Aug 29 16:38:31 2008 +0200

packaging(RHEL): use --libdir and --with-modulesdir instead of --with-libdir

Michael
(cherry picked from commit dc6625637fb9de7d64d4416a1eb43f214590d393)

commit 45948bd82b1810d9b796471e39c5a445a8e087d2
Author: Michael Adam [EMAIL PROTECTED]
Date:   Fri Aug 29 15:45:18 2008 +0200

packaging(RHEL): fix 

[SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-4089-g84ed752

2008-09-10 Thread Volker Lendecke
The branch, v3-devel has been updated
   via  84ed752d9f17b2279bd60f534ce7c02b267a40b2 (commit)
  from  5721205bff539ed5f8592a86168679ec5a9c368e (commit)

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


- Log -
commit 84ed752d9f17b2279bd60f534ce7c02b267a40b2
Author: Volker Lendecke [EMAIL PROTECTED]
Date:   Wed Sep 10 11:51:02 2008 +0200

Fix some bogus compiler warnings

---

Summary of changes:
 source/libsmb/clitrans.c |   15 ++-
 1 files changed, 10 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/libsmb/clitrans.c b/source/libsmb/clitrans.c
index 5b84e68..c929f0b 100644
--- a/source/libsmb/clitrans.c
+++ b/source/libsmb/clitrans.c
@@ -1119,11 +1119,16 @@ static void cli_trans_recv_helper(struct async_req *req)
req-private_data, struct cli_request);
struct cli_trans_state *state = talloc_get_type_abort(
cli_req-recv_helper.priv, struct cli_trans_state);
-   uint8_t num_setup;
-   uint16_t *setup;
-   uint32_t total_param, num_param, param_disp;
-   uint32_t total_data, num_data, data_disp;
-   uint8_t *param, *data;
+   uint8_t num_setup   = 0;
+   uint16_t *setup = NULL;
+   uint32_t total_param= 0;
+   uint32_t num_param  = 0;
+   uint32_t param_disp = 0;
+   uint32_t total_data = 0;
+   uint32_t num_data   = 0;
+   uint32_t data_disp  = 0;
+   uint8_t *param  = NULL;
+   uint8_t *data   = NULL;
bool sent_all;
NTSTATUS status;
 


-- 
Samba Shared Repository


[SCM] Samba Shared Repository - branch v3-3-stable updated - release-3-3-0pre1-144-gdc4b7a4

2008-09-10 Thread Karolin Seeger
The branch, v3-3-stable has been updated
   via  dc4b7a43192543d90ede3817fbfaccea61d8f5c8 (commit)
   via  93fb563fc8ae9ea036f255ddd0121162ac0fde75 (commit)
   via  6dcc1c52216115f26823feac95b88ff568a94cae (commit)
   via  da8fa524cd8fdc64d317ca215558f434c34d9a3e (commit)
   via  0325da50d0c9074990c815d826442dae9893eb78 (commit)
   via  af408ea49ebecd10b08eb635388715dec7956000 (commit)
   via  92c485d375bbc1d80d019443ed7cc73c8ed7d0a6 (commit)
   via  847420d29c2db305efc818a1747a0e7d44f478fa (commit)
   via  ba760a186ecec232cc85311a8e1de2eeaa60789b (commit)
   via  ddfedbeb4907ed3ab1a10f483020acae13badae2 (commit)
   via  cff70da9d0fa41533973e249cf3d456b2bfc9b1b (commit)
   via  86035a22e27098bd301c180f2ef451b90a7aac86 (commit)
   via  d587fe03721e20606badd438eb596e0d69eb96b7 (commit)
   via  af21cfce1b93ea4fee0a4830f62d993495d7f4de (commit)
  from  d802c787beb4ff4e3a185c5297010f47ba9df5da (commit)

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


- Log -
commit dc4b7a43192543d90ede3817fbfaccea61d8f5c8
Author: Karolin Seeger [EMAIL PROTECTED]
Date:   Wed Sep 10 11:46:53 2008 +0200

WHATSNEW: Update changes since 3.3.0pre1.

Karolin

commit 93fb563fc8ae9ea036f255ddd0121162ac0fde75
Author: Michael Adam [EMAIL PROTECTED]
Date:   Mon Sep 8 17:38:55 2008 +0200

packaging(RHEL): use ccache if available

Michael
(cherry picked from commit e8abbfabde3da0844ffb4e2507084c139a70d503)
(cherry picked from commit 4e44f8a960fd0045905416e6a812c3f4163e565c)

commit 6dcc1c52216115f26823feac95b88ff568a94cae
Author: Michael Adam [EMAIL PROTECTED]
Date:   Mon Sep 8 15:52:27 2008 +0200

packaging(RHEL): add ldbtools binaries and man pages to common package

Michael
(cherry picked from commit 206985dfda5a9f62df975629046b00a88ec666f5)
(cherry picked from commit 81ee5988eac33b2bdade3bd46c201b690f6ca3e2)

commit da8fa524cd8fdc64d317ca215558f434c34d9a3e
Author: Michael Adam [EMAIL PROTECTED]
Date:   Mon Sep 8 15:51:57 2008 +0200

packaging(RHEL): add cifs.upcall binary and manpage to client package

Michael
(cherry picked from commit f1b80bcb58b8aa5c586835dc201ce674b3417835)
(cherry picked from commit b4c58d49902d62f25aa0c9289d1857aa2636c028)

commit 0325da50d0c9074990c815d826442dae9893eb78
Author: Michael Adam [EMAIL PROTECTED]
Date:   Mon Sep 8 15:51:33 2008 +0200

packaging(RHEL): fix installation of pam modules.

Michael
(cherry picked from commit 0f045f18ebaa752b9d906afc64fd5badb3bf352c)
(cherry picked from commit 730fbb255a8cd2adb2939ac275a2f4272771ee0f)

commit af408ea49ebecd10b08eb635388715dec7956000
Author: Michael Adam [EMAIL PROTECTED]
Date:   Mon Sep 8 14:46:31 2008 +0200

packaging(RHEL): remove leftovers of smbmount from SPEC file.

Michael
(cherry picked from commit 041875c64daba3d185b1954eb0eb9a21b2f41ee1)
(cherry picked from commit 364e1c50b28799ee6a5debe3ab30f64730515421)

commit 92c485d375bbc1d80d019443ed7cc73c8ed7d0a6
Author: Michael Adam [EMAIL PROTECTED]
Date:   Fri Aug 29 17:45:45 2008 +0200

packaging(RHEL): add new libs (talloc, tdb, ...) to the common package

Michael
(cherry picked from commit f23183bbec55faf2d6496e04e73f8dd415a08d1c)
(cherry picked from commit 8eb83a2c94fbc6f014480d22b422f6bfe008b8f7)

commit 847420d29c2db305efc818a1747a0e7d44f478fa
Author: Michael Adam [EMAIL PROTECTED]
Date:   Fri Aug 29 16:57:16 2008 +0200

packaging(RHEL): remove workaround code for libsmclient/sharemodes 
installation

With 3.3.0, this is not needed any more
(libdir/modulesdir separation and corrected library creation).

Michael
(cherry picked from commit 5348e28f6674cab643b42c1265c24983d9a9189d)
(cherry picked from commit e03183e11be968740223a42a4080a53320f318ec)

commit ba760a186ecec232cc85311a8e1de2eeaa60789b
Author: Michael Adam [EMAIL PROTECTED]
Date:   Fri Aug 29 16:55:55 2008 +0200

packaging(RHEL): fix libdir installation by using _libarch/_libarchdir

Michael
(cherry picked from commit 829f83c27ad03e4d2a7b5dc0b0459823fa4f3804)
(cherry picked from commit f8b8774a33fdf5f390dbebd2b56411b689f8cb8d)

commit ddfedbeb4907ed3ab1a10f483020acae13badae2
Author: Michael Adam [EMAIL PROTECTED]
Date:   Fri Aug 29 16:44:06 2008 +0200

packaging(RHEL): remove duplicate installation of pam_smbpass.so

Michael
(cherry picked from commit cdc24fbb195b1a5460c05fcd20d7ba81ad69ef22)
(cherry picked from commit 6a68739e618b2815158f2e577a920c018e5a4093)

commit cff70da9d0fa41533973e249cf3d456b2bfc9b1b
Author: Michael Adam [EMAIL PROTECTED]
Date:   Fri Aug 29 16:41:30 2008 +0200

packaging(RHEL): remove smbmount related stuff from spec file

Michael
(cherry picked from commit 4420cf6199e3c718a3dea84fe814d6ad6e83c2d8)
(cherry picked from commit 

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

2008-09-10 Thread Karolin Seeger
The branch, v3-2-test has been updated
   via  5359d8ae840dba48bb6f2163085d22b80108db2c (commit)
   via  998b699f27630d3ea6d781da4f09c1cfd3e24511 (commit)
   via  80d5e3621cac803c007e38e437d07f7dab2379aa (commit)
   via  17351dc1ea2be1d2478d6ae00d63ec8967539ab0 (commit)
   via  84810cd8a66503acb447e7c3bd439b76c735366b (commit)
   via  fdaef16604064cbd0be75838f9d6359a3d7a8e1b (commit)
   via  e243a6a724fc820fa01aa3e16f18212ed6729415 (commit)
  from  eec57823cd6503339f8a54fed7dce0d4d41ab9a5 (commit)

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


- Log -
commit 5359d8ae840dba48bb6f2163085d22b80108db2c
Author: Michael Adam [EMAIL PROTECTED]
Date:   Fri Aug 29 16:44:06 2008 +0200

packaging(RHEL): remove duplicate installation of pam_smbpass.so

Michael
(cherry picked from commit cdc24fbb195b1a5460c05fcd20d7ba81ad69ef22)

commit 998b699f27630d3ea6d781da4f09c1cfd3e24511
Author: Michael Adam [EMAIL PROTECTED]
Date:   Mon Sep 8 17:38:55 2008 +0200

packaging(RHEL): use ccache if available

Michael
(cherry picked from commit e8abbfabde3da0844ffb4e2507084c139a70d503)

commit 80d5e3621cac803c007e38e437d07f7dab2379aa
Author: Michael Adam [EMAIL PROTECTED]
Date:   Mon Sep 8 15:52:27 2008 +0200

packaging(RHEL): add ldbtools binaries and man pages to common package

Michael
(cherry picked from commit 206985dfda5a9f62df975629046b00a88ec666f5)

commit 17351dc1ea2be1d2478d6ae00d63ec8967539ab0
Author: Michael Adam [EMAIL PROTECTED]
Date:   Mon Sep 8 14:46:31 2008 +0200

packaging(RHEL): remove leftovers of smbmount from SPEC file.

Michael
(cherry picked from commit 041875c64daba3d185b1954eb0eb9a21b2f41ee1)

commit 84810cd8a66503acb447e7c3bd439b76c735366b
Author: Michael Adam [EMAIL PROTECTED]
Date:   Fri Aug 29 17:45:45 2008 +0200

packaging(RHEL): add new libs (talloc, tdb, ...) to the common package

Michael
(cherry picked from commit f23183bbec55faf2d6496e04e73f8dd415a08d1c)

commit fdaef16604064cbd0be75838f9d6359a3d7a8e1b
Author: Michael Adam [EMAIL PROTECTED]
Date:   Fri Aug 29 16:41:30 2008 +0200

packaging(RHEL): remove smbmount related stuff from spec file

Michael
(cherry picked from commit 4420cf6199e3c718a3dea84fe814d6ad6e83c2d8)

commit e243a6a724fc820fa01aa3e16f18212ed6729415
Author: Michael Adam [EMAIL PROTECTED]
Date:   Fri Aug 29 15:45:18 2008 +0200

packaging(RHEL): fix version of GPL (2 -- 3)

Michael
(cherry picked from commit c015e8e0cf4131f21305451943df13b81f51ea6a)

---

Summary of changes:
 packaging/RHEL/samba.spec.tmpl |   54 ++-
 1 files changed, 30 insertions(+), 24 deletions(-)


Changeset truncated at 500 lines:

diff --git a/packaging/RHEL/samba.spec.tmpl b/packaging/RHEL/samba.spec.tmpl
index c4d4fd6..8c34a4a 100644
--- a/packaging/RHEL/samba.spec.tmpl
+++ b/packaging/RHEL/samba.spec.tmpl
@@ -8,7 +8,7 @@ Name: samba
 Version:  PVERSION
 Release:  PRELEASEPRPMREV
 Epoch:0
-License: GNU GPL version 2
+License: GNU GPL version 3
 Group: System Environment/Daemons
 URL: http://www.samba.org/
 
@@ -113,17 +113,17 @@ cd source
 # RPM_OPT_FLAGS=$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64
 
 ## check for ccache
-# ccache -h 21  /dev/null
-#if [ $? -eq 0 ]; then
-#  CC=ccache gcc
-#else
+ ccache -h 21  /dev/null
+if [ $? -eq 0 ]; then
+   CC=ccache gcc
+else
CC=gcc
-#fi 
+fi 
 
 ## always run autogen.sh
 ./autogen.sh
 
-CFLAGS=$RPM_OPT_FLAGS $EXTRA -D_GNU_SOURCE ./configure \
+CC=$CC CFLAGS=$RPM_OPT_FLAGS $EXTRA -D_GNU_SOURCE ./configure \
--prefix=%{_prefix} \
--localstatedir=/var \
 --with-configdir=%{_sysconfdir}/samba \
@@ -147,7 +147,6 @@ CFLAGS=$RPM_OPT_FLAGS $EXTRA -D_GNU_SOURCE ./configure \
--with-pam \
--with-quotas \
--with-shared-modules=idmap_rid,idmap_ad \
-   --with-smbmount \
--with-syslog \
--with-utmp \
--with-dnsupdate
@@ -208,9 +207,6 @@ make DESTDIR=$RPM_BUILD_ROOT \
 install
 cd ..
 
-# pam_smbpass
-cp source/bin/pam_smbpass.so $RPM_BUILD_ROOT/%{_lib}/security/pam_smbpass.so
-
 # NSS  PAM winbind support
 install -m 755 source/bin/pam_winbind.so 
$RPM_BUILD_ROOT/%{_lib}/security/pam_winbind.so
 install -m 755 source/nsswitch/libnss_winbind.so 
$RPM_BUILD_ROOT/%{_lib}/libnss_winbind.so
@@ -240,11 +236,6 @@ install -m755 source/bin/pam_smbpass.so 
$RPM_BUILD_ROOT/%{_lib}/security/pam_smb
 ## cleanup
 /bin/rm -rf $RPM_BUILD_ROOT/usr/lib*/samba/security
 
-# we need a symlink for mount to recognise the smb and smbfs filesystem types
-ln -sf %{_prefix}/bin/smbmount $RPM_BUILD_ROOT/sbin/mount.smbfs
-ln -sf %{_prefix}/bin/smbmount $RPM_BUILD_ROOT/sbin/mount.smb
-/bin/rm -f $RPM_BUILD_ROOT/mount.smbfs
-
 # Install the miscellany
 echo 127.0.0.1 

[SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-4090-g50af6d6

2008-09-10 Thread Kai Blin
The branch, v3-devel has been updated
   via  50af6d609dcbbdadb9af44ede980d9c85ac834e3 (commit)
  from  84ed752d9f17b2279bd60f534ce7c02b267a40b2 (commit)

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


- Log -
commit 50af6d609dcbbdadb9af44ede980d9c85ac834e3
Author: Kai Blin [EMAIL PROTECTED]
Date:   Wed Sep 10 12:05:18 2008 +0200

net: share_type is defined in net_rap.c, net_rpc.c needs to use that.

This fixes a crash in net rpc share that Günther Deschner found.

---

Summary of changes:
 source/utils/net.h |1 -
 source/utils/net_rpc.c |4 +++-
 2 files changed, 3 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/utils/net.h b/source/utils/net.h
index e7f9ce0..5dc2b11 100644
--- a/source/utils/net.h
+++ b/source/utils/net.h
@@ -68,7 +68,6 @@ struct net_context {
 
bool display_usage;
void *private_data;
-   const char *share_type[];
 };
 
 #define NET_TRANSPORT_LOCAL 0x01
diff --git a/source/utils/net_rpc.c b/source/utils/net_rpc.c
index 9047290..7ebd749 100644
--- a/source/utils/net_rpc.c
+++ b/source/utils/net_rpc.c
@@ -26,6 +26,8 @@
 static int net_mode_share;
 static bool sync_files(struct copy_clistate *cp_clistate, const char *mask);
 
+extern const char *share_type[];
+
 /**
  * @file net_rpc.c
  *
@@ -2874,7 +2876,7 @@ static void display_share_info_1(struct net_context *c,
if (c-opt_long_list_entries) {
d_printf(%-12s %-8.8s %-50s\n,
 r-name,
-c-share_type[r-type  
~(STYPE_TEMPORARY|STYPE_HIDDEN)],
+share_type[r-type  ~(STYPE_TEMPORARY|STYPE_HIDDEN)],
 r-comment);
} else {
d_printf(%s\n, r-name);


-- 
Samba Shared Repository


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

2008-09-10 Thread Karolin Seeger
The branch, v3-2-test has been updated
   via  df138f23b920757076917553fa4bbbe413918cf7 (commit)
  from  5359d8ae840dba48bb6f2163085d22b80108db2c (commit)

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


- Log -
commit df138f23b920757076917553fa4bbbe413918cf7
Author: Karolin Seeger [EMAIL PROTECTED]
Date:   Wed Sep 10 12:11:05 2008 +0200

WHATSNEW: Update changes since 3.2.3.

Karolin

---

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


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index ce223c9..c1eb68f 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -23,6 +23,7 @@ Changes since 3.2.3
 o   Michael Adam [EMAIL PROTECTED]
 * BUG 5590: Fix binary stripping on older OS.
 * BUG 5492: Fix RHEL SPEC file by removing libmsrpc stuff.
+* BUG 5507: Fix several issues in the RHEL SPEC file.
 * Fix linking of cifs.upcall when nscd_flush_cache() is found.
 
 


-- 
Samba Shared Repository


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

2008-09-10 Thread Kai Blin
The branch, v3-3-test has been updated
   via  89a2558d7ac2d3f596534e4add98eb0e9302d940 (commit)
  from  58792ba5ca73a9086c7f59505523d1c871f27c81 (commit)

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


- Log -
commit 89a2558d7ac2d3f596534e4add98eb0e9302d940
Author: Kai Blin [EMAIL PROTECTED]
Date:   Wed Sep 10 12:05:18 2008 +0200

net: share_type is defined in net_rap.c, net_rpc.c needs to use that.

This fixes a crash in net rpc share that Günther Deschner found.

---

Summary of changes:
 source/utils/net.h |1 -
 source/utils/net_rpc.c |4 +++-
 2 files changed, 3 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/utils/net.h b/source/utils/net.h
index e7f9ce0..5dc2b11 100644
--- a/source/utils/net.h
+++ b/source/utils/net.h
@@ -68,7 +68,6 @@ struct net_context {
 
bool display_usage;
void *private_data;
-   const char *share_type[];
 };
 
 #define NET_TRANSPORT_LOCAL 0x01
diff --git a/source/utils/net_rpc.c b/source/utils/net_rpc.c
index 6db5bc7..a17c610 100644
--- a/source/utils/net_rpc.c
+++ b/source/utils/net_rpc.c
@@ -26,6 +26,8 @@
 static int net_mode_share;
 static bool sync_files(struct copy_clistate *cp_clistate, const char *mask);
 
+extern const char *share_type[];
+
 /**
  * @file net_rpc.c
  *
@@ -2925,7 +2927,7 @@ static void display_share_info_1(struct net_context *c,
if (c-opt_long_list_entries) {
d_printf(%-12s %-8.8s %-50s\n,
 r-name,
-c-share_type[r-type  
~(STYPE_TEMPORARY|STYPE_HIDDEN)],
+share_type[r-type  ~(STYPE_TEMPORARY|STYPE_HIDDEN)],
 r-comment);
} else {
d_printf(%s\n, r-name);


-- 
Samba Shared Repository


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

2008-09-10 Thread Karolin Seeger
The branch, v3-2-stable has been updated
   via  627832e5f7ed6c82c227a55a9fdcc5bff25242ff (commit)
   via  31491407ba7e645a07a619664c1c751671b28b30 (commit)
   via  90a50d9c2a442c492682050e00d6619a4717f6f8 (commit)
   via  5e1994c92ef4f6a068c8465d176de20d3c10e0e6 (commit)
   via  c58733fc96ccaadb7ad95c1bbc97ac75f57cf46a (commit)
   via  33aeca1b59cda1f02a04e721f8ad1e6c6595d199 (commit)
   via  f41775617814ccc30131f69ea4538109e9b354dd (commit)
   via  515be63fb624e82618993fe4478df93259020408 (commit)
  from  47a9726c47eca22f4389794536827e5824f2ae90 (commit)

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


- Log -
commit 627832e5f7ed6c82c227a55a9fdcc5bff25242ff
Author: Karolin Seeger [EMAIL PROTECTED]
Date:   Wed Sep 10 12:11:05 2008 +0200

WHATSNEW: Update changes since 3.2.3.

Karolin
(cherry picked from commit df138f23b920757076917553fa4bbbe413918cf7)

commit 31491407ba7e645a07a619664c1c751671b28b30
Author: Michael Adam [EMAIL PROTECTED]
Date:   Fri Aug 29 16:44:06 2008 +0200

packaging(RHEL): remove duplicate installation of pam_smbpass.so

Michael
(cherry picked from commit cdc24fbb195b1a5460c05fcd20d7ba81ad69ef22)
(cherry picked from commit 5359d8ae840dba48bb6f2163085d22b80108db2c)

commit 90a50d9c2a442c492682050e00d6619a4717f6f8
Author: Michael Adam [EMAIL PROTECTED]
Date:   Mon Sep 8 17:38:55 2008 +0200

packaging(RHEL): use ccache if available

Michael
(cherry picked from commit e8abbfabde3da0844ffb4e2507084c139a70d503)
(cherry picked from commit 998b699f27630d3ea6d781da4f09c1cfd3e24511)

commit 5e1994c92ef4f6a068c8465d176de20d3c10e0e6
Author: Michael Adam [EMAIL PROTECTED]
Date:   Mon Sep 8 15:52:27 2008 +0200

packaging(RHEL): add ldbtools binaries and man pages to common package

Michael
(cherry picked from commit 206985dfda5a9f62df975629046b00a88ec666f5)
(cherry picked from commit 80d5e3621cac803c007e38e437d07f7dab2379aa)

commit c58733fc96ccaadb7ad95c1bbc97ac75f57cf46a
Author: Michael Adam [EMAIL PROTECTED]
Date:   Mon Sep 8 14:46:31 2008 +0200

packaging(RHEL): remove leftovers of smbmount from SPEC file.

Michael
(cherry picked from commit 041875c64daba3d185b1954eb0eb9a21b2f41ee1)
(cherry picked from commit 17351dc1ea2be1d2478d6ae00d63ec8967539ab0)

commit 33aeca1b59cda1f02a04e721f8ad1e6c6595d199
Author: Michael Adam [EMAIL PROTECTED]
Date:   Fri Aug 29 17:45:45 2008 +0200

packaging(RHEL): add new libs (talloc, tdb, ...) to the common package

Michael
(cherry picked from commit f23183bbec55faf2d6496e04e73f8dd415a08d1c)
(cherry picked from commit 84810cd8a66503acb447e7c3bd439b76c735366b)

commit f41775617814ccc30131f69ea4538109e9b354dd
Author: Michael Adam [EMAIL PROTECTED]
Date:   Fri Aug 29 16:41:30 2008 +0200

packaging(RHEL): remove smbmount related stuff from spec file

Michael
(cherry picked from commit 4420cf6199e3c718a3dea84fe814d6ad6e83c2d8)
(cherry picked from commit fdaef16604064cbd0be75838f9d6359a3d7a8e1b)

commit 515be63fb624e82618993fe4478df93259020408
Author: Michael Adam [EMAIL PROTECTED]
Date:   Fri Aug 29 15:45:18 2008 +0200

packaging(RHEL): fix version of GPL (2 -- 3)

Michael
(cherry picked from commit c015e8e0cf4131f21305451943df13b81f51ea6a)
(cherry picked from commit e243a6a724fc820fa01aa3e16f18212ed6729415)

---

Summary of changes:
 WHATSNEW.txt   |1 +
 packaging/RHEL/samba.spec.tmpl |   54 ++-
 2 files changed, 31 insertions(+), 24 deletions(-)


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index ce223c9..c1eb68f 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -23,6 +23,7 @@ Changes since 3.2.3
 o   Michael Adam [EMAIL PROTECTED]
 * BUG 5590: Fix binary stripping on older OS.
 * BUG 5492: Fix RHEL SPEC file by removing libmsrpc stuff.
+* BUG 5507: Fix several issues in the RHEL SPEC file.
 * Fix linking of cifs.upcall when nscd_flush_cache() is found.
 
 
diff --git a/packaging/RHEL/samba.spec.tmpl b/packaging/RHEL/samba.spec.tmpl
index c4d4fd6..8c34a4a 100644
--- a/packaging/RHEL/samba.spec.tmpl
+++ b/packaging/RHEL/samba.spec.tmpl
@@ -8,7 +8,7 @@ Name: samba
 Version:  PVERSION
 Release:  PRELEASEPRPMREV
 Epoch:0
-License: GNU GPL version 2
+License: GNU GPL version 3
 Group: System Environment/Daemons
 URL: http://www.samba.org/
 
@@ -113,17 +113,17 @@ cd source
 # RPM_OPT_FLAGS=$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64
 
 ## check for ccache
-# ccache -h 21  /dev/null
-#if [ $? -eq 0 ]; then
-#  CC=ccache gcc
-#else
+ ccache -h 21  /dev/null
+if [ $? -eq 0 ]; then
+   CC=ccache gcc
+else
CC=gcc
-#fi 
+fi 
 
 ## always run autogen.sh
 ./autogen.sh
 
-CFLAGS=$RPM_OPT_FLAGS $EXTRA -D_GNU_SOURCE 

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

2008-09-10 Thread Jeremy Allison
The branch, v3-2-test has been updated
   via  738729cad0b88a2f453d61d38e1088003afd0a9e (commit)
  from  df138f23b920757076917553fa4bbbe413918cf7 (commit)

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


- Log -
commit 738729cad0b88a2f453d61d38e1088003afd0a9e
Author: Jeremy Allison [EMAIL PROTECTED]
Date:   Wed Sep 10 10:16:42 2008 -0700

Fix blocker bug 5745 kerberos authentication with (lib)smbclient is broken.
Jeremy.

---

Summary of changes:
 source/libsmb/clikrb5.c |   21 +
 1 files changed, 13 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/libsmb/clikrb5.c b/source/libsmb/clikrb5.c
index a7ca24f..66dd5f6 100644
--- a/source/libsmb/clikrb5.c
+++ b/source/libsmb/clikrb5.c
@@ -743,16 +743,21 @@ static krb5_error_code ads_krb5_mk_req(krb5_context 
context,
ccache,
in_data );
if (retval) {
-   DEBUG( 1, (ads_krb5_get_fwd_ticket failed (%s)\n, 
error_message( retval ) ) );
-   goto cleanup_creds;
-   }
+   DEBUG( 3, (ads_krb5_get_fwd_ticket failed (%s)\n, 
error_message( retval ) ) );
 
-   if (retval) {
-   DEBUG( 1, (krb5_auth_con_set_req_cksumtype failed 
(%s)\n,
-   error_message( retval ) ) );
-   goto cleanup_creds;
-   }
+   /*
+* This is not fatal. Delete the *auth_context and 
continue
+* with krb5_mk_req_extended to get a non-forwardable 
ticket.
+*/
 
+   if (in_data.data) {
+   free( in_data.data );
+   in_data.data = NULL;
+   in_data.length = 0;
+   }
+   krb5_auth_con_free(context, *auth_context);
+   *auth_context = NULL;
+   }
}
 #endif
 


-- 
Samba Shared Repository


[SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-4091-ga59bd0e

2008-09-10 Thread Jeremy Allison
The branch, v3-devel has been updated
   via  a59bd0e4854117a8646f4d388a0f7285362d5ba2 (commit)
  from  50af6d609dcbbdadb9af44ede980d9c85ac834e3 (commit)

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


- Log -
commit a59bd0e4854117a8646f4d388a0f7285362d5ba2
Author: Jeremy Allison [EMAIL PROTECTED]
Date:   Wed Sep 10 10:18:02 2008 -0700

Fix blocker bug 5745 kerberos authentication with (lib)smbclient is broken.
Jeremy.

---

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


Changeset truncated at 500 lines:

diff --git a/source/libsmb/clikrb5.c b/source/libsmb/clikrb5.c
index f940081..b8afb57 100644
--- a/source/libsmb/clikrb5.c
+++ b/source/libsmb/clikrb5.c
@@ -749,9 +749,21 @@ static krb5_error_code ads_krb5_mk_req(krb5_context 
context,
ccache,
in_data );
if (retval) {
-   DEBUG( 1, (ads_krb5_get_fwd_ticket failed (%s)\n,
+   DEBUG( 3, (ads_krb5_get_fwd_ticket failed (%s)\n,
   error_message( retval ) ) );
-   goto cleanup_creds;
+
+   /*
+* This is not fatal. Delete the *auth_context and 
continue
+* with krb5_mk_req_extended to get a non-forwardable 
ticket.
+*/
+
+   if (in_data.data) {
+   free( in_data.data );
+   in_data.data = NULL;
+   in_data.length = 0;
+   }
+   krb5_auth_con_free(context, *auth_context);
+   *auth_context = NULL;
}
}
 #endif


-- 
Samba Shared Repository


[SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-4092-g295bfb6

2008-09-10 Thread Michael Adam
The branch, v3-devel has been updated
   via  295bfb6af8153e91ae881e2437cc707d5736bc97 (commit)
  from  a59bd0e4854117a8646f4d388a0f7285362d5ba2 (commit)

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


- Log -
commit 295bfb6af8153e91ae881e2437cc707d5736bc97
Author: Michael Adam [EMAIL PROTECTED]
Date:   Wed Sep 10 23:22:49 2008 +0200

packaging(RHEL): fix direction of link (.so) of nss libs.

libnss_winbindd.so - libnss_winbindd.so.2
libnss_wins.so - libnss_wins.so.2

Michael

---

Summary of changes:
 packaging/RHEL/samba.spec.tmpl |8 
 1 files changed, 4 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/packaging/RHEL/samba.spec.tmpl b/packaging/RHEL/samba.spec.tmpl
index 20567bb..92030fc 100644
--- a/packaging/RHEL/samba.spec.tmpl
+++ b/packaging/RHEL/samba.spec.tmpl
@@ -217,11 +217,11 @@ make DESTDIR=$RPM_BUILD_ROOT \
 cd ..
 
 # NSS winbind support
-install -m 755 source/nsswitch/libnss_winbind.so 
$RPM_BUILD_ROOT/%{_libarch}/libnss_winbind.so
-install -m 755 source/nsswitch/libnss_wins.so 
$RPM_BUILD_ROOT/%{_libarch}/libnss_wins.so
+install -m 755 source/nsswitch/libnss_winbind.so 
$RPM_BUILD_ROOT/%{_libarch}/libnss_winbind.so.2
+install -m 755 source/nsswitch/libnss_wins.so 
$RPM_BUILD_ROOT/%{_libarch}/libnss_wins.so.2
 ( cd $RPM_BUILD_ROOT/%{_libarch};
-  ln -sf libnss_winbind.so  libnss_winbind.so.2;
-  ln -sf libnss_wins.so  libnss_wins.so.2 )
+  ln -sf libnss_winbind.so.2  libnss_winbind.so;
+  ln -sf libnss_wins.so.2  libnss_wins.so )
 
 ## cleanup
 /bin/rm -rf $RPM_BUILD_ROOT/usr/lib*/samba/security


-- 
Samba Shared Repository


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

2008-09-10 Thread Jeremy Allison
The branch, v3-3-test has been updated
   via  9a70a1305732fb22d85d57cb381fa35e3ba31c54 (commit)
  from  55d43c04b47855e40b9ceeec2bc6f0deb3bf39d0 (commit)

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


- Log -
commit 9a70a1305732fb22d85d57cb381fa35e3ba31c54
Author: Jeremy Allison [EMAIL PROTECTED]
Date:   Wed Sep 10 14:53:39 2008 -0700

When requesting UNIX info levels on findfirst/findnext, don't play games 
with write time,
just return what the underlying filesystem says. Trying not to confuse UNIX 
apps any more than necessary.
Jeremy.

---

Summary of changes:
 source/smbd/trans2.c |6 +-
 1 files changed, 5 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/smbd/trans2.c b/source/smbd/trans2.c
index 3c17533..2e2da5c 100644
--- a/source/smbd/trans2.c
+++ b/source/smbd/trans2.c
@@ -1945,6 +1945,8 @@ close_if_end = %d requires_resume_key = %d level = 0x%x, 
max_data_bytes = %d\n,
break;
case SMB_FIND_FILE_UNIX:
case SMB_FIND_FILE_UNIX_INFO2:
+   /* Always use filesystem for UNIX mtime query. */
+   ask_sharemode = false;
if (!lp_unix_extensions()) {
reply_nterror(req, NT_STATUS_INVALID_LEVEL);
return;
@@ -2302,6 +2304,8 @@ resume_key = %d resume name = %s continue=%d level = 
%d\n,
break;
case SMB_FIND_FILE_UNIX:
case SMB_FIND_FILE_UNIX_INFO2:
+   /* Always use filesystem for UNIX mtime query. */
+   ask_sharemode = false;
if (!lp_unix_extensions()) {
reply_nterror(req, NT_STATUS_INVALID_LEVEL);
return;
@@ -4148,7 +4152,7 @@ total_data=%u (should be %u)\n, (unsigned 
int)total_data, (unsigned int)IVAL(pd
}
}
 
-   if (!null_timespec(write_time_ts)) {
+   if (!null_timespec(write_time_ts)  !INFO_LEVEL_IS_UNIX(info_level)) {
mtime_ts = write_time_ts;
}
 


-- 
Samba Shared Repository


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

2008-09-10 Thread Jeremy Allison
The branch, v3-2-test has been updated
   via  4e06c71a12654d78c9a94fb023e372920bf7618b (commit)
  from  738729cad0b88a2f453d61d38e1088003afd0a9e (commit)

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


- Log -
commit 4e06c71a12654d78c9a94fb023e372920bf7618b
Author: Jeremy Allison [EMAIL PROTECTED]
Date:   Wed Sep 10 14:52:34 2008 -0700

When requesting UNIX info levels on findfirst/findnext, don't play games 
with write time,
just return what the underlying filesystem says. Trying not to confuse UNIX 
apps any more than necessary.
Jeremy.

---

Summary of changes:
 source/smbd/trans2.c |6 +-
 1 files changed, 5 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/smbd/trans2.c b/source/smbd/trans2.c
index 7753fad..13105dc 100644
--- a/source/smbd/trans2.c
+++ b/source/smbd/trans2.c
@@ -1938,6 +1938,8 @@ close_if_end = %d requires_resume_key = %d level = 0x%x, 
max_data_bytes = %d\n,
break;
case SMB_FIND_FILE_UNIX:
case SMB_FIND_FILE_UNIX_INFO2:
+   /* Always use filesystem for UNIX mtime query. */
+   ask_sharemode = false;
if (!lp_unix_extensions()) {
reply_nterror(req, NT_STATUS_INVALID_LEVEL);
return;
@@ -2295,6 +2297,8 @@ resume_key = %d resume name = %s continue=%d level = 
%d\n,
break;
case SMB_FIND_FILE_UNIX:
case SMB_FIND_FILE_UNIX_INFO2:
+   /* Always use filesystem for UNIX mtime query. */
+   ask_sharemode = false;
if (!lp_unix_extensions()) {
reply_nterror(req, NT_STATUS_INVALID_LEVEL);
return;
@@ -4132,7 +4136,7 @@ total_data=%u (should be %u)\n, (unsigned 
int)total_data, (unsigned int)IVAL(pd
}
}
 
-   if (!null_timespec(write_time_ts)) {
+   if (!null_timespec(write_time_ts)  !INFO_LEVEL_IS_UNIX(info_level)) {
mtime_ts = write_time_ts;
}
 


-- 
Samba Shared Repository


[SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-4094-ga03b0dd

2008-09-10 Thread Jeremy Allison
The branch, v3-devel has been updated
   via  a03b0dde01e4cebe07a65af3943d178dbdeda276 (commit)
   via  b81a4dd003957a611ea190979d828b75d07a1f80 (commit)
  from  295bfb6af8153e91ae881e2437cc707d5736bc97 (commit)

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


- Log -
commit a03b0dde01e4cebe07a65af3943d178dbdeda276
Merge: b81a4dd003957a611ea190979d828b75d07a1f80 
295bfb6af8153e91ae881e2437cc707d5736bc97
Author: Jeremy Allison [EMAIL PROTECTED]
Date:   Wed Sep 10 14:57:52 2008 -0700

Merge branch 'v3-devel' of ssh://[EMAIL PROTECTED]/data/git/samba into 
v3-devel

commit b81a4dd003957a611ea190979d828b75d07a1f80
Author: Jeremy Allison [EMAIL PROTECTED]
Date:   Wed Sep 10 14:54:25 2008 -0700

When requesting UNIX info levels on findfirst/findnext, don't play games 
with write time,
just return what the underlying filesystem says. Trying not to confuse UNIX 
apps any more than necessary.
Jeremy.

---

Summary of changes:
 source/smbd/trans2.c |6 +-
 1 files changed, 5 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/smbd/trans2.c b/source/smbd/trans2.c
index 3c17533..2e2da5c 100644
--- a/source/smbd/trans2.c
+++ b/source/smbd/trans2.c
@@ -1945,6 +1945,8 @@ close_if_end = %d requires_resume_key = %d level = 0x%x, 
max_data_bytes = %d\n,
break;
case SMB_FIND_FILE_UNIX:
case SMB_FIND_FILE_UNIX_INFO2:
+   /* Always use filesystem for UNIX mtime query. */
+   ask_sharemode = false;
if (!lp_unix_extensions()) {
reply_nterror(req, NT_STATUS_INVALID_LEVEL);
return;
@@ -2302,6 +2304,8 @@ resume_key = %d resume name = %s continue=%d level = 
%d\n,
break;
case SMB_FIND_FILE_UNIX:
case SMB_FIND_FILE_UNIX_INFO2:
+   /* Always use filesystem for UNIX mtime query. */
+   ask_sharemode = false;
if (!lp_unix_extensions()) {
reply_nterror(req, NT_STATUS_INVALID_LEVEL);
return;
@@ -4148,7 +4152,7 @@ total_data=%u (should be %u)\n, (unsigned 
int)total_data, (unsigned int)IVAL(pd
}
}
 
-   if (!null_timespec(write_time_ts)) {
+   if (!null_timespec(write_time_ts)  !INFO_LEVEL_IS_UNIX(info_level)) {
mtime_ts = write_time_ts;
}
 


-- 
Samba Shared Repository


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

2008-09-10 Thread Jeremy Allison
The branch, v3-2-test has been updated
   via  c22bf57329f16a45eb0954b72f8083270f6535e7 (commit)
  from  4e06c71a12654d78c9a94fb023e372920bf7618b (commit)

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


- Log -
commit c22bf57329f16a45eb0954b72f8083270f6535e7
Author: Jeremy Allison [EMAIL PROTECTED]
Date:   Wed Sep 10 16:21:25 2008 -0700

Fix bug #5052 - not work cancel inheritance on share. We were
using the parent security descriptor type and flags instead
of using the passed in SD.
Jeremy.

---

Summary of changes:
 source/smbd/posix_acls.c |   13 ++---
 1 files changed, 10 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/smbd/posix_acls.c b/source/smbd/posix_acls.c
index 86934f9..d798fa8 100644
--- a/source/smbd/posix_acls.c
+++ b/source/smbd/posix_acls.c
@@ -3400,10 +3400,17 @@ static NTSTATUS append_parent_acl(files_struct *fsp,
parent_name));
}
 
-   parent_sd-dacl-aces = new_ace;
-   parent_sd-dacl-num_aces = i;
+   /* This sucks. psd should be const and we should
+* be doing a deep-copy here. We're getting away
+* with is as we know parent_sd is talloced off
+* talloc_tos() as well as psd. JRA. */
 
-   *pp_new_sd = parent_sd;
+   psd-dacl-aces = new_ace;
+   psd-dacl-num_aces = i;
+   psd-type = ~(SE_DESC_DACL_AUTO_INHERITED|
+ SE_DESC_DACL_AUTO_INHERIT_REQ);
+
+   *pp_new_sd = psd;
return status;
 }
 


-- 
Samba Shared Repository


[SCM] Samba Shared Repository - branch v3-devel updated - release-3-2-0pre2-4095-g0d824d7

2008-09-10 Thread Jeremy Allison
The branch, v3-devel has been updated
   via  0d824d7188518aaa7b4e890885e6bc42e94397c5 (commit)
  from  a03b0dde01e4cebe07a65af3943d178dbdeda276 (commit)

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


- Log -
commit 0d824d7188518aaa7b4e890885e6bc42e94397c5
Author: Jeremy Allison [EMAIL PROTECTED]
Date:   Wed Sep 10 16:22:51 2008 -0700

Fix bug #5052 - not work cancel inheritance on share. We were
using the parent security descriptor type and flags instead
of using the passed in SD.
Jeremy.

---

Summary of changes:
 source/smbd/posix_acls.c |   13 ++---
 1 files changed, 10 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/smbd/posix_acls.c b/source/smbd/posix_acls.c
index 427cfc9..7479aea 100644
--- a/source/smbd/posix_acls.c
+++ b/source/smbd/posix_acls.c
@@ -3398,10 +3398,17 @@ static NTSTATUS append_parent_acl(files_struct *fsp,
parent_name));
}
 
-   parent_sd-dacl-aces = new_ace;
-   parent_sd-dacl-num_aces = i;
+   /* This sucks. psd should be const and we should
+* be doing a deep-copy here. We're getting away
+* with is as we know parent_sd is talloced off
+* talloc_tos() as well as psd. JRA. */
 
-   *pp_new_sd = parent_sd;
+   psd-dacl-aces = new_ace;
+   psd-dacl-num_aces = i;
+   psd-type = ~(SE_DESC_DACL_AUTO_INHERITED|
+ SE_DESC_DACL_AUTO_INHERIT_REQ);
+
+   *pp_new_sd = psd;
return status;
 }
 


-- 
Samba Shared Repository


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

2008-09-10 Thread Jeremy Allison
The branch, v3-3-test has been updated
   via  7ef92e36e4293e6ee30beaba2d63ccf2cbd443d0 (commit)
  from  9a70a1305732fb22d85d57cb381fa35e3ba31c54 (commit)

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


- Log -
commit 7ef92e36e4293e6ee30beaba2d63ccf2cbd443d0
Author: Jeremy Allison [EMAIL PROTECTED]
Date:   Wed Sep 10 16:23:31 2008 -0700

Fix bug #5052 - not work cancel inheritance on share. We were
using the parent security descriptor type and flags instead
of using the passed in SD.
Jeremy.

---

Summary of changes:
 source/smbd/posix_acls.c |   13 ++---
 1 files changed, 10 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/smbd/posix_acls.c b/source/smbd/posix_acls.c
index 427cfc9..7479aea 100644
--- a/source/smbd/posix_acls.c
+++ b/source/smbd/posix_acls.c
@@ -3398,10 +3398,17 @@ static NTSTATUS append_parent_acl(files_struct *fsp,
parent_name));
}
 
-   parent_sd-dacl-aces = new_ace;
-   parent_sd-dacl-num_aces = i;
+   /* This sucks. psd should be const and we should
+* be doing a deep-copy here. We're getting away
+* with is as we know parent_sd is talloced off
+* talloc_tos() as well as psd. JRA. */
 
-   *pp_new_sd = parent_sd;
+   psd-dacl-aces = new_ace;
+   psd-dacl-num_aces = i;
+   psd-type = ~(SE_DESC_DACL_AUTO_INHERITED|
+ SE_DESC_DACL_AUTO_INHERIT_REQ);
+
+   *pp_new_sd = psd;
return status;
 }
 


-- 
Samba Shared Repository


Build status as of Thu Sep 11 00:00:02 2008

2008-09-10 Thread build
URL: http://build.samba.org/

--- /home/build/master/cache/broken_results.txt.old 2008-09-10 
00:00:33.0 +
+++ /home/build/master/cache/broken_results.txt 2008-09-11 00:00:35.0 
+
@@ -1,21 +1,21 @@
-Build status as of Wed Sep 10 00:00:03 2008
+Build status as of Thu Sep 11 00:00:02 2008
 
 Build counts:
 Tree Total  Broken Panic 
 build_farm   0  0  0 
-ccache   35 11 0 
+ccache   35 10 0 
 ctdb 0  0  0 
 distcc   1  0  0 
 ldb  35 34 0 
-libreplace   32 13 0 
+libreplace   34 13 0 
 lorikeet-heimdal 31 21 0 
 pidl 21 11 0 
 ppp  15 0  0 
-rsync35 12 0 
+rsync35 13 0 
 samba-docs   0  0  0 
 samba-gtk7  7  0 
-samba_3_X_devel 30 18 0 
-samba_3_X_test 30 15 0 
+samba_3_X_devel 30 16 0 
+samba_3_X_test 31 17 0 
 samba_4_0_test 33 30 1 
 smb-build33 7  0 
 talloc   35 6  0 


[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha5-500-g2d41035

2008-09-10 Thread Andrew Bartlett
The branch, v4-0-test has been updated
   via  2d4103518ab8a7286e65347b8b9b0ccb660e69f6 (commit)
  from  7cd0977a28e9973ff71e9e0146fef6e6771a72b5 (commit)

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


- Log -
commit 2d4103518ab8a7286e65347b8b9b0ccb660e69f6
Author: Andrew Bartlett [EMAIL PROTECTED]
Date:   Thu Sep 11 11:49:24 2008 +1000

Fix failures in the winbind struct-based test.

Don't try to pass the 'privileged' socket directory around for expected 
value testing - it is just too hard...

A better test (once we unify the winbind protocol with Samba3) would
be a operation to see if you are on the priv pipe, and that will give
acutal end-to-end testing.

Andrew Bartlett

---

Summary of changes:
 source/nsswitch/winbind_struct_protocol.h |1 -
 source/selftest/samba4_tests.sh   |1 -
 source/selftest/target/Samba4.pm  |2 --
 source/torture/winbind/struct_based.c |   11 ---
 4 files changed, 0 insertions(+), 15 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/nsswitch/winbind_struct_protocol.h 
b/source/nsswitch/winbind_struct_protocol.h
index 33797e2..fba4523 100644
--- a/source/nsswitch/winbind_struct_protocol.h
+++ b/source/nsswitch/winbind_struct_protocol.h
@@ -34,7 +34,6 @@
  */
 #define WINBINDD_SOCKET_DIR_ENVVAR WINBINDD_SOCKET_DIR
 
-#define WINBINDD_PRIV_SOCKET_SUBDIR winbindd_privileged /* name of 
subdirectory of lp_lockdir() to hold the 'privileged' pipe */
 #define WINBINDD_DOMAIN_ENV  WINBINDD_DOMAIN /* Environment variables */
 #define WINBINDD_DONT_ENV_NO_WINBINDD
 #define WINBINDD_LOCATOR_KDC_ADDRESS WINBINDD_LOCATOR_KDC_ADDRESS
diff --git a/source/selftest/samba4_tests.sh b/source/selftest/samba4_tests.sh
index 82c57de..6f6ffbb 100755
--- a/source/selftest/samba4_tests.sh
+++ b/source/selftest/samba4_tests.sh
@@ -308,7 +308,6 @@ done
 WB_OPTS=--option=\torture:strict mode=no\
 WB_OPTS=${WB_OPTS} --option=\torture:timelimit=1\
 WB_OPTS=${WB_OPTS} --option=\torture:winbindd separator=/\
-WB_OPTS=${WB_OPTS} --option=\torture:winbindd private pipe 
dir=\$WINBINDD_PRIV_PIPE_DIR\
 WB_OPTS=${WB_OPTS} --option=\torture:winbindd netbios name=\$SERVER\
 WB_OPTS=${WB_OPTS} --option=\torture:winbindd netbios domain=\$DOMAIN\
 
diff --git a/source/selftest/target/Samba4.pm b/source/selftest/target/Samba4.pm
index 896b013..8835f69 100644
--- a/source/selftest/target/Samba4.pm
+++ b/source/selftest/target/Samba4.pm
@@ -523,7 +523,6 @@ sub provision($$)
my $winbindd_socket_dir = $prefix_abs/winbindd_socket;
my $winbindd_privileged_socket_dir = 
$prefix_abs/winbindd_privileged_socket;
my $ntp_signd_socket_dir = $prefix_abs/ntp_signd_socket;
-   my $winbindd_priv_pipe_dir = $privatedir/smbd.tmp/winbind_pipe;
my $nsswrap_passwd = $etcdir/passwd;
my $nsswrap_group = $etcdir/group;
 
@@ -739,7 +738,6 @@ nogroup:x:65534:nobody
PASSWORD = $password,
LDAPDIR = $ldapdir,
WINBINDD_SOCKET_DIR = $winbindd_socket_dir,
-   WINBINDD_PRIV_PIPE_DIR = $winbindd_priv_pipe_dir,
NCALRPCDIR = $ncalrpcdir,
LOCKDIR = $lockdir,
CONFIGURATION = $configuration,
diff --git a/source/torture/winbind/struct_based.c 
b/source/torture/winbind/struct_based.c
index 31c5b8c..c27ab24 100644
--- a/source/torture/winbind/struct_based.c
+++ b/source/torture/winbind/struct_based.c
@@ -140,8 +140,6 @@ static bool torture_winbind_struct_info(struct 
torture_context *torture)
 static bool torture_winbind_struct_priv_pipe_dir(struct torture_context 
*torture)
 {
struct winbindd_response rep;
-   const char *default_dir;
-   const char *expected_dir;
const char *got_dir;
 
ZERO_STRUCT(rep);
@@ -154,15 +152,6 @@ static bool torture_winbind_struct_priv_pipe_dir(struct 
torture_context *torture
 
torture_assert(torture, got_dir, NULL WINBINDD_PRIV_PIPE_DIR\n);
 
-   default_dir = lock_path(torture, torture-lp_ctx, 
-   WINBINDD_PRIV_SOCKET_SUBDIR);
-   expected_dir = torture_setting_string(torture,
- winbindd private pipe dir,
- default_dir);
-
-   torture_assert_str_equal(torture, got_dir, expected_dir,
-WINBINDD_PRIV_PIPE_DIR doesn't match);
-
SAFE_FREE(rep.extra_data.data);
return true;
 }


-- 
Samba Shared Repository


[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha5-501-g02d6645

2008-09-10 Thread Andrew Bartlett
The branch, v4-0-test has been updated
   via  02d6645efc84179efd652dd29ab32f62ae310147 (commit)
  from  2d4103518ab8a7286e65347b8b9b0ccb660e69f6 (commit)

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


- Log -
commit 02d6645efc84179efd652dd29ab32f62ae310147
Author: Andrew Bartlett [EMAIL PROTECTED]
Date:   Thu Sep 11 12:36:58 2008 +1000

Make cn=aggregate output less pretty, by more like Win2008.

I'm not sure if this fixes bug #5713, as this is not consistantly
reproducably on my equipment.

Andrew Bartlett

---

Summary of changes:
 source/dsdb/schema/schema_description.c |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/dsdb/schema/schema_description.c 
b/source/dsdb/schema/schema_description.c
index a40de37..6884c52 100644
--- a/source/dsdb/schema/schema_description.c
+++ b/source/dsdb/schema/schema_description.c
@@ -221,7 +221,7 @@ char *schema_class_description(TALLOC_CTX *mem_ctx,

if (must) {
schema_entry = talloc_asprintf_append(schema_entry, 
- MUST ( );
+ MUST (%s, target == 
TARGET_AD_SCHEMA_SUBENTRY ?  :  );
IF_NULL_FAIL_RET(schema_entry);

APPEND_ATTRS(must);
@@ -233,7 +233,7 @@ char *schema_class_description(TALLOC_CTX *mem_ctx,

if (may) {
schema_entry = talloc_asprintf_append(schema_entry, 
- MAY ( );
+ MAY (%s, target == 
TARGET_AD_SCHEMA_SUBENTRY ?  :  );
IF_NULL_FAIL_RET(schema_entry);

APPEND_ATTRS(may);


-- 
Samba Shared Repository