[Samba] a new world | smb2

2011-08-10 Thread Martin Hochreiter

Hi Samba list!

I was very excited that SMB2 is finally working with samba 3.6.0 - great 
job!!


I just know that SMB2 has a smaller command set compared to SMB1 and 
this, beside

many other rebuilds of the code makes it faster

As I am completely new to the file transfer protocol world, I want to 
ask a few basic things:


 - is Samba backward compatible ... xp can't use SMB2 as far as I read, 
but the shares

   are still working...
 - how  do I see that a windows client is using SMB2 and not SMB1
 - Do I need XFS or ext4 for better performance in combination with 
SMB2 or

   is this irrelevant
 - Is SMB2 more secure than SMB1?

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


Re: [Samba] a new world | smb2

2011-08-10 Thread Volker Lendecke
On Wed, Aug 10, 2011 at 08:03:13AM +0200, Martin Hochreiter wrote:
 Hi Samba list!
 
 I was very excited that SMB2 is finally working with samba 3.6.0 -
 great job!!
 
 I just know that SMB2 has a smaller command set compared to SMB1 and
 this, beside
 many other rebuilds of the code makes it faster
 
 As I am completely new to the file transfer protocol world, I want
 to ask a few basic things:
 
  - is Samba backward compatible ... xp can't use SMB2 as far as I
 read, but the shares
are still working...

SMB2 is an option that client and server negotiate at
connection setup. XP just does not negotiate it.

  - how  do I see that a windows client is using SMB2 and not SMB1

At this moment you need to look at network traces using
wireshark.

  - Do I need XFS or ext4 for better performance in combination with
 SMB2 or
is this irrelevant

It should be irrelevant. Semantically both protocols are
very similar, it might just be that clients show different
behaviour that is better being served by XFS or ext4.

  - Is SMB2 more secure than SMB1?

No.

Volker

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


Re: [Samba] Need to correct samba4 how to ?

2011-08-10 Thread Michael Wood
On 3 August 2011 11:56, Konstantin Pobudzey 5836...@gmail.com wrote:
 Hello All

 I noticed same minor imperfection on Samba4 How To page.

 Installation on CentOS6.

 I did as below :


 For RedHat 6.x:

 $ yum install gtkhtml setroubleshoot-server setroubleshoot-plugins
 policycoreutils-python libsemange-python setools-libs-python setools-libs
 popt-devel
   libpcap-devel sqlite-devel libidn-devel libxml2-devel libacl-devel
 libsepol-devel libattr-devel keyutils-lib-devel zlib-devel cyrus-sasl-devel

 And configure script failed.

 #
 ./configure.developer

  : Could not find the python development headers
 /root/download/samba-4.0.0alpha16/wscript:70: error: the configuration
 failed (see '/root/download/samba-4.0.0alpha16/bin/config.log')

 #

 So installed extra packages for Fedora .
 ( Not sure if I need all of them or just python-devel )

 yum install libacl-devel libblkid-devel gnutls-devel readline-devel
 python-devel gdb pkgconfig

 And it was success for configuration script after.

Thanks, I've updated the HOWTO.

-- 
Michael Wood esiot...@gmail.com
-- 
To unsubscribe from this list go to the following URL and read the
instructions:  https://lists.samba.org/mailman/options/samba


Re: [Samba] Samba4 on CentOS6 make quicktest failed

2011-08-10 Thread Michael Wood
Hi

On 3 August 2011 15:30, Konstantin Pobudzey 5836...@gmail.com wrote:

 Hello all
 I followed samba4 how to
 ( CentOS6 minimum install )

 #working fro me
 ./configure.developer
  make

 #failed for me

 [root@dcmsc samba-4.0.0alpha16]# make quicktest
 WAF_MAKE=1 ./buildtools/bin/waf test --quick
 'test' finished successfully (0.000s)
 Waf: Entering directory `/root/download/samba-4.0.0alpha16/bin'
 [ 111/3389] Generating VERSION
 Waf: Leaving directory `/root/download/samba-4.0.0alpha16/bin'
 'build' finished successfully (5.131s)
 test: running (/usr/bin/perl
 /root/download/samba-4.0.0alpha16/selftest/selftest.pl --target=samba
 --prefix=./st --srcdir=/root/download/samba-4.0.0alpha16 --exclude=./st/skip
 --testlist=/usr/bin/python
 /root/download/samba-4.0.0alpha16/source3/selftest/tests.py|
 --testlist=/usr/bin/python
 /root/download/samba-4.0.0alpha16/source4/selftest/tests.py|
 --binary-mapping=nmblookup3:nmblookup3,smbclient3:smbclient3,smbtorture4:smbtorture,ntlm_auth3:ntlm_auth3
 --exclude=./st/slow --quick --include=./st/quick --socket-wrapper  touch
 ./st/st_done) | /usr/bin/python -u
 /root/download/samba-4.0.0alpha16/selftest/filter-subunit
 --expected-failures=./st/knownfail | tee ./st/subunit | /usr/bin/python -u
 /root/download/samba-4.0.0alpha16/selftest/format-subunit --prefix=./st
 --immediate
 You don't have Time::Hires installed !
 SOCKET_WRAPPER_DIR=/root/download/samba-4.0.0alpha16/st/w
 [2011/08/03 16:17:44,  0] ../lib/util/debug.c:572(reopen_logs_internal)
  Unable to open new log file '/usr/local/samba/var/log.smbd': No such file
 or directory
 Can't locate Test/More.pm in @INC (@INC contains: /usr/local/lib64/perl5
 /usr/local/share/perl5 /usr/lib64/perl5/vendor_perl
 /usr/share/perl5/vendor_perl /usr/lib64/perl5 /usr/share/perl5 .) at -e line
 1.
 Can't locate Test/More.pm in @INC (@INC contains: /usr/local/lib64/perl5
 /usr/local/share/perl5 /usr/lib64/perl5/vendor_perl
 /usr/share/perl5/vendor_perl /usr/lib64/perl5 /usr/share/perl5 .) at -e line
 1.
 Unknown parameter encountered: announce as
 Ignoring unknown parameter announce as
 Version 4.0.0alpha16
 OPTIONS --configfile=$SMB_CONF_PATH --maximum-runtime=$SELFTEST_MAXTIME
 --target=samba4 --basedir=$SELFTEST_TMPDIR --option=torture:progress=no
 --format=subunit --option=torture:quick=yes
 WARNING: allowing empty subunit output from ldb.base
 skipping pidl.cutil (Test::More not available)
 skipping pidl.dump (Test::More not available)
 skipping pidl.header (Test::More not available)
 skipping pidl.ndr (Test::More not available)
 skipping pidl.ndr_align (Test::More not available)
 skipping pidl.ndr_alloc (Test::More not available)
 skipping pidl.ndr_array (Test::More not available)
 skipping pidl.ndr_compat (Test::More not available)
 skipping pidl.ndr_deprecations (Test::More not available)
 skipping pidl.ndr_fullptr (Test::More not available)
 skipping pidl.ndr_refptr (Test::More not available)
 skipping pidl.ndr_represent (Test::More not available)
 skipping pidl.ndr_simple (Test::More not available)
 skipping pidl.ndr_string (Test::More not available)
 skipping pidl.ndr_tagtype (Test::More not available)
 skipping pidl.parse_idl (Test::More not available)
 skipping pidl.samba-ndr (Test::More not available)
 skipping pidl.samba3-cli (Test::More not available)
 skipping pidl.samba3-srv (Test::More not available)
 skipping pidl.tdr (Test::More not available)
 skipping pidl.test_util (Test::More not available)
 skipping pidl.typelist (Test::More not available)
 skipping pidl.util (Test::More not available)
 skipping pidl.wireshark-conf (Test::More not available)
 skipping pidl.wireshark-ndr (Test::More not available)
 WARNING: allowing empty subunit output from
 samba4.urgent_replication.python(dc)
 WARNING: allowing empty subunit output from samba4.blackbox.samba3dump
 WARNING: allowing empty subunit output from samba4.blackbox.upgrade
 PROVISIONING S3DC...CREATE TEST ENVIRONMENT IN './st/s3dc'...DONE
 STARTING NMBD...DONE
 STARTING WINBINDD...DONE
 STARTING SMBD...DONE
 delaying for nbt name registration
 querying __SAMBA__ on 127.0.0.2
 127.0.0.2 __SAMBA__00
 127.0.0.2 __SAMBA__00
 querying __SAMBA__ on 127.255.255.255
 127.0.0.2 __SAMBA__00
 querying LOCALS3DC2 on 127.0.0.2
 127.0.0.2 LOCALS3DC200
 127.0.0.2 LOCALS3DC200
 wait for smbd
 Domain=[SAMBA-TEST] OS=[Unix] Server=[Samba 4.0.0alpha16]

        Sharename       Type      Comment
        -             ---
        tmp             Disk
        tmpguest        Disk
        guestonly       Disk
        forceuser       Disk
        forcegroup      Disk
        ro-tmp          Disk
        msdfs-share     Disk
        hideunread      Disk
        tmpcase         Disk
        hideunwrite     Disk
        print1          Printer
        print2          Printer
        print3          Printer
        lp              Printer
        print$          Disk
        IPC$            IPC       IPC Service (Samba 4.0.0alpha16)

        Server               

Re: [Samba] samba4 asn1_compile issue

2011-08-10 Thread Michael Wood
Hi

On 5 August 2011 10:06, Sedat Cakir cakir_se...@yahoo.com wrote:
 Hi,

 I am trying to do cross compile Samba4. Build system generating two binary 
 asn1_compile and compile_et to generate .c files which will then build for 
 our platform.
 But it can not execute both binary files.

While Samba4 is still in alpha, the samba-technical list is a better
place to ask questions like this.  I have copied my reply there.

 [ 198/3298] Compiling ASN1 source4/heimdal/lib/asn1/kx509.asn1
 /bin/sh: 
 ../build_dir/target-ubicom32-unknown-linux-gnu/samba-4.0.0alpha16/bin/asn1_compile:
  cannot execute binary file

It looks like waf should be compiling a version of asn1_compile for
the build host instead of for the host you ultimately want to run
Samba on.

Perhaps you should try the latest version from Git to see if the
problem has been fixed since alpha16.  If it's still a problem I think
someone will have to tell waf how to handle asn1_compile properly.

 Waf: Leaving directory 
 `../build_dir/target-ubicom32-unknown-linux-gnu/samba-4.0.0alpha16/bin'
 Build failed:  - task failed (err #126):
     {task: HEIMDAL_KX509_ASN1_ASN1 kx509.asn1 - 
 asn1_kx509_asn1.x,kx509_asn1.hx,kx509_asn1-priv.hx}
 When we replaced binary files with files generated at PC, it can
    execute them and generate .c files, then continue to compile.
 Do you have any idea why we can not generate binaries correctly? Can anybody 
 kindly help us to?

-- 
Michael Wood esiot...@gmail.com
-- 
To unsubscribe from this list go to the following URL and read the
instructions:  https://lists.samba.org/mailman/options/samba


Re: [Samba] Domain trust between Samba 3.5.9 and Windows 2008 Active Directory crashes lsass.exe which makes AD Domain Controller reboot

2011-08-10 Thread Tim Wright
Thanks for saving me some time going down a rabbit hole.

Still at a loss, get this packet:

226 1970-01-01 00:01:51.853391  192.168.153.156 192.168.56.152 SMB 
Session Setup AndX Request, NTLMSSP_AUTH, User: CTGDOMAIN\testuser01

Then a load of other traffic between Samba PDC and AD DC which all seems 
ok (SMB. DCERPC and RPC_NETLOGON packets)  then 12 seconds later get the 
response to packet 226 above and then the DC has rebooted:

274 1970-01-01 00:02:03.425244  192.168.56.152  192.168.153.156 
SMB Session Setup AndX Response, Error: STATUS_INTERNAL_ERROR

Enabled netlogon max logging ( nltest /dbflag:0x2080 ) and see the 
following in the netlogon.log:

08/10 12:16:41 [LOGON] SamLogon: Network logon of CTGDOMAIN\root from 
CTGSOL10 Entered
08/10 12:16:41 [SESSION] CTGDOMAIN: NlSessionSetup: Try Session setup
08/10 12:16:41 [SESSION] CTGDOMAIN: NlSetStatusClientSession: Set 
connection status to 0
08/10 12:16:41 [SESSION] CTGDOMAIN: NlSetStatusClientSession: Set 
connection status to 0
08/10 12:16:41 [SESSION] CTGDOMAIN: NlSessionSetup: negotiated 400201ff 
flags rather than 603fbfff
08/10 12:16:41 [SESSION] CTGDOMAIN: NlSessionSetup: Session setup 
Succeeded

Then nothing till the server reboots (also enabled SAM logging but nothing 
in sam.log)

A session using the NT4 domain trust shows the following in netlogon.log:

08/09 14:44:36 [LOGON] SamLogon: Network logon of LIVENT4DOMAIN\testuser01 
from GORDIAN-FCB4FE1 Entered
08/09 14:44:36 [SESSION] LIVENT4DOMAIN: NlSessionSetup: Try Session setup
08/09 14:44:37 [CRITICAL] NlSessionSetup: Fall back to Authenticate2
08/09 14:44:37 [SESSION] LIVENT4DOMAIN: NlSetStatusClientSession: Set 
connection status to 0
08/09 14:44:37 [SESSION] LIVENT4DOMAIN: NlSetStatusClientSession: Set 
connection status to 0
08/09 14:44:37 [SESSION] LIVENT4DOMAIN: NlSessionSetup: negotiated 
41ff flags rather than 603fbfff
08/09 14:44:37 [SESSION] LIVENT4DOMAIN: NlSessionSetup: Session setup 
Succeeded
08/09 14:44:37 [LOGON] SamLogon: Network logon of LIVENT4DOMAIN\testuser01 
from GORDIAN-FCB4FE1 Returns 0x0
08/09 14:45:04 [LOGON] SamLogon: Network logon of LIVENT4DOMAIN\testuser01 
from GORDIAN-FCB4FE1 Entered
08/09 14:45:04 [LOGON] SamLogon: Network logon of LIVENT4DOMAIN\testuser01 
from GORDIAN-FCB4FE1 Returns 0x0

Naively, I'm guessing I want to configure Samba so that the session setup 
is the same as the NT4 i.e. Fall back to Authenticate2 but I honestly do 
not really know what any of this means and not finding much when searching 
the web. The NT4 PDC is SP6 and so I'm assuming it's using NTLMv2 which 
should be the same as  Samba (have tried with ntlm auth = Yes and No is 
smb.conf but doesn't seem to make any diff to behaviour).

tim



From:   Volker Lendecke volker.lende...@sernet.de
To: Tim Wright ti...@gordian.co.uk
Cc: samba@lists.samba.org
Date:   05/08/2011 12:22
Subject:Re: [Samba] Domain trust between Samba 3.5.9 and Windows 
2008 Active Directory crashes lsass.exe which makes AD Domain Controller 
reboot



On Fri, Aug 05, 2011 at 11:47:57AM +0100, Tim Wright wrote:
 Have some more information on this - looking at a packet capture of 
 traffic between the AD DC and the Samba PDC, the last packet it sends is 
a 
 Session Setup AndX Request, NTLMSSP_AUTH message but the NTLM SSP bit 
of 
 the packet has User and Domain set to NULL. Turned up the debug level on 

 the samba side and see the following in the logs (sorry have include 
 preamble to final message in case it's of any use in diagnosing the 
 problem):

This is definitely not your problem. Just a standard
anonymous session setup. The problem must be MUCH later in
the sniff.

Volker

-- 
SerNet GmbH, Bahnhofsallee 1b, 37081 Göttingen
phone: +49-551-37-0, fax: +49-551-37-9
AG Göttingen, HRB 2816, GF: Dr. Johannes Loxen


 
 
 
 

For further information on Gordian Knot Limited (Gordian) and/or Theta 
Corporation (Theta) please visit our website at http://www.gordian.co.uk or 
call +44 20 7290 9901. 

The contents of this email and any attachments are confidential and may also be 
privileged.  If you are not the intended recipient of this e-mail you may not 
copy, forward, disclose or otherwise use any part of it or any attachment in 
any way or in any form whatsoever.  If you have received this message in error, 
please notify the sender immediately by telephone or return e-mail and delete 
it and any attachment(s) from your system. 

Gordian is a company registered in England with company number 2853833 at the 
following address Lansdowne House, Berkeley Square, London, W1J 6AB, England. 

In accordance with the FSA's Rules Theta is Gordian's 

Re: [Samba] windows 7 cannot connect

2011-08-10 Thread Robert Adkins II

No, you do not need to turn off all of that on Windows 7. I have had no
issues with connecting 7 different Windows 7 Professional workstations into
my network. Most of the systems here are running Windows XP Professional and
are joined to the domain.

The only issue that I have had is joining the Windows 7 systems into the
domain. I understand that it might be possible, but I haven't had the time
to really dig into that.

There might be some authentication elements within smb.conf to adjust to
allow the Windows 7 systems to authenticate users on the network, but I may
have made those adjustments quite some time ago in order to allow Windows
95, 98, NT 4.0 and Windows 2000 to all join the domain in their various
ways.

All you need is to have the Windows 7 machines in the workgroup of the
Domain or the workgroup, then create individual user accounts on the Windows
7 machines that mirror the account user IDs and passwords on the Samba
server.

Regards,
Robert Adkins II
 

 -Original Message-
 From: samba-boun...@lists.samba.org 
 [mailto:samba-boun...@lists.samba.org] On Behalf Of Gregory Carter
 Sent: Tuesday, August 09, 2011 2:51 PM
 To: samba@lists.samba.org
 Subject: Re: [Samba] windows 7 cannot connect
 
 On 08/09/2011 01:42 PM, Marc Fromm wrote:
  I just set up my first windows 7 desktop.
 My condolences.
 
When I try to map a drive to the red hat linux samba 
 share it complains that the server cannot perform the 
 requested operation. Windows XP machines work with no problem.
 First, I would remove all security contexts from the Windows 7 
 workstation.  Turn the firewall off.   Turn off your virus 
 software/security software.
 
 Try again.
  The linux samba information:
  [root@finaid45 samba]$ rpm -qa | grep smb
  pam_smb-1.1.7-7.2.1
  libsmbclient-3.0.33-3.29.el5_6.2
  gnome-vfs2-smb-2.16.2-8.el5
 
  [root@finaid45 samba]$ rpm -qa | grep samba
  samba-client-3.0.33-3.29.el5_6.2
  samba-common-3.0.33-3.29.el5_6.2
  samba-3.0.33-3.29.el5_6.2
  system-config-samba-1.2.41-5.el5
 
 
 
 --
 To unsubscribe from this list go to the following URL and read the
 instructions:  https://lists.samba.org/mailman/options/samba
 

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


Re: [Samba] Samba4 on CentOS6 make quicktest failed

2011-08-10 Thread John Doe
From: Michael Wood esiot...@gmail.com

 I don't know what package Test::More is in.  It there a search engine
 for RHEL/CentOS packages like http://packages.debian.org?

Google Test:More centos and first answer is 
  http://pkgs.org/package/perl%28Test::More%29
Then you find it seems to be in perl-Test-Simple.
  # rpm -qpl perl-Test-Simple-0.92-115.el6.x86_64.rpm 
  ...
  /usr/share/man/man3/Test::More.3pm.gz
  ...
  /usr/share/perl5/Test/More.pm
  ...

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


[Samba] help with sharing files between windows 7 and linux

2011-08-10 Thread alex wallis

Hi list.
I am not very experienced with samba, so would really appreciate some help.

I am trying to share files between my windows 7 host OS and a linux 
guest OS being run by vmware workstation as a virtual machine.

the linux machine I believe is a version of ubuntu lucid.

I was able to share files with no problem between xp and this machine, 
but just can't get it to work with 7.
I am mounting as the super user, I always become root with sudo su 
before trying to mount.

Whenever I try I get the error message permission denied error 13.
I have already tried disabling my firewall and antivirus, antispyware 
technology etc. This hasn't helped.
I have tried to mount using the host name of my computer, and its IP 
address, again no luck.
I can't get smbfs to mount my share either, I know that it has been 
deprecated in favour of samba, but a lot of forums on line seem to 
suggest its more reliable than samba.

thanks so much for any help,
Alex.

The mount command I am putting in is
sudo mount -t cifs //alex/code /mnt/rockbox/code -o 
guest,rw,iocharset=utf8,noserverino,gid=1000,uid=1000,nounix,file_mode=0777,dir_mode=0777

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


[Samba] Administrator cannot connect to samba on 2008 R2 ADS members

2011-08-10 Thread Bruce Richardson
I have an odd situation where Samba 3.x domain members in an Active
Directory 2008 R2 domain cannot authenticate the Administrator.  All
other users work, but if I try to connect to the samba services as the
domain Administrator, authentication fails.  The Windows domain
controllers are happy to accept connections from the Administrator (e.g.
using smbclient) but the Linux (Centos 5.5 and 5.6) domain members are
not (I have encountered this problem with both Samba 3.3.8 and 3.5.4).

Direct kerberos authentication using the Administrator account works
just fine, as does ldap authentication (I am using ldap rather than
winbind in nsswitch.conf and I can ssh into the Linux domain members
just fine as the Administrator).  

I can attach detailed logs if wanted, but am not sure which detail is
relevant.  Here's the smb.conf:

#=== Global Settings =

[global]

workgroup = HQ
realm = HQ.CORP.COM
server string = 
# --- Domain Members Options 

security = ADS
passdb backend = tdbsam

# - Winbind Options --

client ldap sasl wrapping = seal
idmap backend = tdb
idmap uid = 1-1
idmap gid = 1-1
idmap config HQ : backend = ad
idmap config HQ : range = 1-1
winbind nss info = rfc2307

-- 
Bruce

Hierophant: someone who remembers, when you are on the way down,
everything you did to them on the way up.
-- 
To unsubscribe from this list go to the following URL and read the
instructions:  https://lists.samba.org/mailman/options/samba


Re: [Samba] windows 7 cannot connect

2011-08-10 Thread Anders Norrbring

Robert Adkins II skrev 2011-08-10 14:28:


No, you do not need to turn off all of that on Windows 7. I have had no
issues with connecting 7 different Windows 7 Professional workstations into
my network. Most of the systems here are running Windows XP Professional and
are joined to the domain.

The only issue that I have had is joining the Windows 7 systems into the
domain. I understand that it might be possible, but I haven't had the time
to really dig into that.

There might be some authentication elements within smb.conf to adjust to
allow the Windows 7 systems to authenticate users on the network, but I may
have made those adjustments quite some time ago in order to allow Windows
95, 98, NT 4.0 and Windows 2000 to all join the domain in their various
ways.

All you need is to have the Windows 7 machines in the workgroup of the
Domain or the workgroup, then create individual user accounts on the Windows
7 machines that mirror the account user IDs and passwords on the Samba
server.

Regards,
Robert Adkins II



Robert, it's easy to join a samba domain, here's how..
http://wiki.samba.org/index.php/Windows7

Anders





-Original Message-
From: samba-boun...@lists.samba.org
[mailto:samba-boun...@lists.samba.org] On Behalf Of Gregory Carter
Sent: Tuesday, August 09, 2011 2:51 PM
To: samba@lists.samba.org
Subject: Re: [Samba] windows 7 cannot connect

On 08/09/2011 01:42 PM, Marc Fromm wrote:

I just set up my first windows 7 desktop.

My condolences.


   When I try to map a drive to the red hat linux samba

share it complains that the server cannot perform the
requested operation. Windows XP machines work with no problem.
First, I would remove all security contexts from the Windows 7
workstation.  Turn the firewall off.   Turn off your virus
software/security software.

Try again.

The linux samba information:
[root@finaid45 samba]$ rpm -qa | grep smb
pam_smb-1.1.7-7.2.1
libsmbclient-3.0.33-3.29.el5_6.2
gnome-vfs2-smb-2.16.2-8.el5

[root@finaid45 samba]$ rpm -qa | grep samba
samba-client-3.0.33-3.29.el5_6.2
samba-common-3.0.33-3.29.el5_6.2
samba-3.0.33-3.29.el5_6.2
system-config-samba-1.2.41-5.el5




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





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


[Samba] 3.6.0 cross-compile error (reg_format.c)

2011-08-10 Thread Martin Herrman
Compiling ../librpc/ndr/ndr_preg.c
Compiling librpc/gen_ndr/ndr_drsuapi_c.c
Compiling librpc/gen_ndr/ndr_initshutdown_c.c
Dear samba-users,

Any help with the following compile error (cross-compilation to
MIPSEL) is greatly appreciated:

Compiling librpc/gen_ndr/ndr_dssetup_c.c
Compiling librpc/gen_ndr/ndr_svcctl_c.c
Compiling librpc/gen_ndr/ndr_wkssvc_c.c
Compiling registry/reg_parse.c
Compiling registry/reg_format.c
In file included from registry/reg_parse_internal.h:32,
 from registry/reg_format.c:29:
include/includes.h:382: error: expected specifier-qualifier-list
before 'blksize_t'
The following command failed:
/opt/Sourcery_G++_Lite/bin/mips-linux-gnu-gcc -O2 -I../lib/zlib -EL
-O2 -I. -I/home/martin/EM7075/work/samba-3.6.0/source3
-I/home/martin/EM7075/work/samba-3.6.0/source3/../lib/popt
-I/home/martin/EM7075/work/samba-3.6.0/source3/../lib/iniparser/src
-Iinclude -I./include  -I. -I. -I./../lib/replace -I./../lib/tevent
-I./librpc -I./.. -I./../lib/talloc -I../lib/tdb/include
-DHAVE_CONFIG_H  -Iinclude -I./include -I. -I. -I./../lib/replace
-I./../lib/tevent -I./librpc -I./.. -I./../lib/popt
-I/home/martin/EM7075/work/samba-3.6.0/source3/lib -I..
-D_SAMBA_BUILD_=3 -D_SAMBA_BUILD_=3 -fPIC -c registry/reg_format.c -o
registry/reg_format.o
make: *** [registry/reg_format.o] Error 1
Using CFLAGS = -I../lib/zlib -EL -O2 -I.
-I/home/martin/EM7075/work/samba-3.6.0/source3
-I/home/martin/EM7075/work/samba-3.6.0/source3/../lib/popt
-I/home/martin/EM7075/work/samba-3.6.0/source3/../lib/iniparser/src
-Iinclude -I./include  -I. -I. -I./../lib/replace -I./../lib/tevent
-I./librpc -I./.. -I./../lib/talloc -I../lib/tdb/include
-DHAVE_CONFIG_H  -Iinclude -I./include -I. -I. -I./../lib/replace
-I./../lib/tevent -I./librpc -I./.. -I./../lib/popt
-I/home/martin/EM7075/work/samba-3.6.0/source3/lib -I..
-D_SAMBA_BUILD_=3 -D_SAMBA_BUILD_=3
  PICFLAG= -fPIC
  LIBS   = -lresolv -lresolv -lnsl -ldl -lrt
  LDFLAGS= -EL -s
-L/opt/Sourcery_G++_Lite/lib/gcc/mips-linux-gnu/4.3.3/el -L./bin
  DYNEXP = -Wl,--export-dynamic
  LDSHFLAGS  = -fPIC -shared -Wl,-Bsymbolic  -EL -s
-L/opt/Sourcery_G++_Lite/lib/gcc/mips-linux-gnu/4.3.3/el -L./bin -lc
-Wl,-z,defs
  SHLIBEXT   = so
  SONAMEFLAG = -Wl,-soname=
Compiling registry/reg_format.c
In file included from registry/reg_parse_internal.h:32,
 from registry/reg_format.c:29:
include/includes.h:382: error: expected specifier-qualifier-list
before 'blksize_t'
The following command failed:
/opt/Sourcery_G++_Lite/bin/mips-linux-gnu-gcc -O2 -I../lib/zlib -EL
-O2 -I. -I/home/martin/EM7075/work/samba-3.6.0/source3
-I/home/martin/EM7075/work/samba-3.6.0/source3/../lib/popt
-I/home/martin/EM7075/work/samba-3.6.0/source3/../lib/iniparser/src
-Iinclude -I./include  -I. -I. -I./../lib/replace -I./../lib/tevent
-I./librpc -I./.. -I./../lib/talloc -I../lib/tdb/include
-DHAVE_CONFIG_H  -Iinclude -I./include -I. -I. -I./../lib/replace
-I./../lib/tevent -I./librpc -I./.. -I./../lib/popt
-I/home/martin/EM7075/work/samba-3.6.0/source3/lib -I..
-D_SAMBA_BUILD_=3 -D_SAMBA_BUILD_=3 -fPIC -c registry/reg_format.c -o
registry/reg_format.o
make: *** [registry/reg_format.o] Error 1

Thanks in advance,

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


[Samba] Change the IP/name of the domain member server

2011-08-10 Thread Piotr Legiecki

Hi

I have two servers: old production and new to change the old one.

What is the right way to change to brand new server (with new Samba) in 
a way transparent to end users?


Both (old and new one) servers are domain member servers. What I want to 
achieve is to: leave the old servers name and IP but assign them to new 
server.


I have done almost everything, so the new server has the data, the ACLs 
are transfered and are ok, but when I shut down the old server, change 
the hostname of the new one to old one, changed the SID of the new 
server to the old server (using net getlocalsid/net setlocalsid xxx) 
and... booom. When I try to access the shares on the new server (from 
windows) it asks for user name/password just like  the new server is not 
a member of the domain.


So is it possible to achieve what I want?

I'm not sure if other way, by using net ads leave (on new server) and 
then join with changed name (of the old server) would work. I'm afraid 
of loosing the connection to domain controler and all windows 
workstations would not be able to access the new server after joining. 
what is wors, also the old one could (?) have problems then. Looks like 
the trick with the changed SID is not working well.


I hope someone would help me with this. Playing with windows is 
dangerous, some actions are not possible to undo.


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


[Samba] Off reply: Need to correct samba4 how to ?

2011-08-10 Thread Bob Cavey
Hi,

  I noticed this thread in the digest mailing.

Actually the HOWTO is correct ( I know lots of folks would just love the ole
yum/apt-get huge-list-of-packages and please build it for me too method )
as it states above the distro specific instructions that python-devel is a
required package. I see someone added the extra packages to the RedHat 6.X
section.

I just moved up the Python development into a *Required* libraries so folks
actually check that python-devel is in fact installed before getting all
excited to run ./configure.  :-P

--- past from wiki ---
Step 2: Compile Samba4

Required development libraries:
Python development libraries (python-dev in Debian/Ubuntu) required to
compile

Recommended optional development libraries:
acl and xattr development libraries (libattr1-dev package in Debian/Ubuntu)
blkid development libraries (libblkid-dev package in Debian/Ubuntu)
gnutls (libgnutls-dev package in Debian/Ubuntu)
readline (libreadline5-dev package in Debian/Ubuntu)
-- end past from wiki --

Subject: [Samba] Need to correct samba4 how to ?
Hello All

I noticed same minor imperfection on Samba4 How To page.

Installation on CentOS6.


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


Re: [Samba] windows 7 cannot connect

2011-08-10 Thread Marc Fromm
My googling seems to point at upgrading samba to 3.4. Currently installed on my 
RHEL 5.2 32 bit server is as listed below for smb and samba.

If I was running RHEL 64 bit I would be supported by red hat and updating the 
OS to the latest 5.x would provide this for me. For some reason red hat feels 
they do not need to support their 32 bit users, which my server is running, and 
updating the OS does not update certain packages like samba and php. Even 
though I have paid support with red hat they will not provide support to update 
the needed packages.

Thus, is there a detailed set of procedures on how to manually upgrade samba on 
a RHEL 5.2 server? I do not want to try this by trial and error and cripple the 
server.

Thanks

-Original Message-
From: John Drescher [mailto:dresche...@gmail.com] 
Sent: Tuesday, August 09, 2011 12:00 PM
To: Marc Fromm; samba
Subject: Re: [Samba] windows 7 cannot connect

On Tue, Aug 9, 2011 at 2:42 PM, Marc Fromm marc.fr...@wwu.edu wrote:
 I just set up my first windows 7 desktop. When I try to map a drive to the 
 red hat linux samba share it complains that the server cannot perform the 
 requested operation. Windows XP machines work with no problem.

 The linux samba information:
 [root@finaid45 samba]$ rpm -qa | grep smb
 pam_smb-1.1.7-7.2.1
 libsmbclient-3.0.33-3.29.el5_6.2
 gnome-vfs2-smb-2.16.2-8.el5

 [root@finaid45 samba]$ rpm -qa | grep samba
 samba-client-3.0.33-3.29.el5_6.2
 samba-common-3.0.33-3.29.el5_6.2
 samba-3.0.33-3.29.el5_6.2
 system-config-samba-1.2.41-5.el5


Is the samba machine a pdc?

John

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


Re: [Samba] windows 7 cannot connect

2011-08-10 Thread Christ Schlacta
The best bet is to not go with *hat in the first place.  however, as 
you've already failed that, your second best bet is to modify the source 
RPM from upstream, or from one of the other RPM distros (like fedora, or 
CENTos)(both of which are as bad as *hat) and build it on your machine.


On 8/10/2011 13:13, Marc Fromm wrote:

My googling seems to point at upgrading samba to 3.4. Currently installed on my 
RHEL 5.2 32 bit server is as listed below for smb and samba.

If I was running RHEL 64 bit I would be supported by red hat and updating the 
OS to the latest 5.x would provide this for me. For some reason red hat feels 
they do not need to support their 32 bit users, which my server is running, and 
updating the OS does not update certain packages like samba and php. Even 
though I have paid support with red hat they will not provide support to update 
the needed packages.

Thus, is there a detailed set of procedures on how to manually upgrade samba on 
a RHEL 5.2 server? I do not want to try this by trial and error and cripple the 
server.

Thanks

-Original Message-
From: John Drescher [mailto:dresche...@gmail.com]
Sent: Tuesday, August 09, 2011 12:00 PM
To: Marc Fromm; samba
Subject: Re: [Samba] windows 7 cannot connect

On Tue, Aug 9, 2011 at 2:42 PM, Marc Frommmarc.fr...@wwu.edu  wrote:

I just set up my first windows 7 desktop. When I try to map a drive to the red hat linux 
samba share it complains that the server cannot perform the requested 
operation. Windows XP machines work with no problem.

The linux samba information:
[root@finaid45 samba]$ rpm -qa | grep smb
pam_smb-1.1.7-7.2.1
libsmbclient-3.0.33-3.29.el5_6.2
gnome-vfs2-smb-2.16.2-8.el5

[root@finaid45 samba]$ rpm -qa | grep samba
samba-client-3.0.33-3.29.el5_6.2
samba-common-3.0.33-3.29.el5_6.2
samba-3.0.33-3.29.el5_6.2
system-config-samba-1.2.41-5.el5


Is the samba machine a pdc?

John



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


[Samba] Samba read problem

2011-08-10 Thread Chris Robison
I'm running Ubuntu server 11.04 and a recent update came down for Samba this
is causing some issues and I'm unable to figure it. We can connect to
shares, see file listings, and write files to samba just fine. The problem
comes when trying to copy and file down, especially a larger one (~90 MB).
It seems to try to start copying, but seems to sit forever on the Window
Calculating... cycle. If anyone can render assistance, that would be
great.

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


Re: [Samba] windows 7 cannot connect

2011-08-10 Thread Anil Wakhare
Hi,
For windows 7 there is a script file on internet please find it on
internet,i hope that you will find it.i have connect the windows7 to Samba
on RHEL  5 successfully.

On Thu, Aug 11, 2011 at 1:45 AM, Christ Schlacta li...@aarcane.org wrote:

 The best bet is to not go with *hat in the first place.  however, as you've
 already failed that, your second best bet is to modify the source RPM from
 upstream, or from one of the other RPM distros (like fedora, or CENTos)(both
 of which are as bad as *hat) and build it on your machine.


 On 8/10/2011 13:13, Marc Fromm wrote:

 My googling seems to point at upgrading samba to 3.4. Currently installed
 on my RHEL 5.2 32 bit server is as listed below for smb and samba.

 If I was running RHEL 64 bit I would be supported by red hat and updating
 the OS to the latest 5.x would provide this for me. For some reason red hat
 feels they do not need to support their 32 bit users, which my server is
 running, and updating the OS does not update certain packages like samba and
 php. Even though I have paid support with red hat they will not provide
 support to update the needed packages.

 Thus, is there a detailed set of procedures on how to manually upgrade
 samba on a RHEL 5.2 server? I do not want to try this by trial and error and
 cripple the server.

 Thanks

 -Original Message-
 From: John Drescher [mailto:dresche...@gmail.com]
 Sent: Tuesday, August 09, 2011 12:00 PM
 To: Marc Fromm; samba
 Subject: Re: [Samba] windows 7 cannot connect

 On Tue, Aug 9, 2011 at 2:42 PM, Marc Frommmarc.fr...@wwu.edu  wrote:

 I just set up my first windows 7 desktop. When I try to map a drive to
 the red hat linux samba share it complains that the server cannot perform
 the requested operation. Windows XP machines work with no problem.

 The linux samba information:
 [root@finaid45 samba]$ rpm -qa | grep smb
 pam_smb-1.1.7-7.2.1
 libsmbclient-3.0.33-3.29.el5_**6.2
 gnome-vfs2-smb-2.16.2-8.el5

 [root@finaid45 samba]$ rpm -qa | grep samba
 samba-client-3.0.33-3.29.el5_**6.2
 samba-common-3.0.33-3.29.el5_**6.2
 samba-3.0.33-3.29.el5_6.2
 system-config-samba-1.2.41-5.**el5

  Is the samba machine a pdc?

 John


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




-- 

---

Thanks  Regards.
Anil S Wakhare.
Pune 411027,Maharashtra,India
Ph:-9763328839
-- 
To unsubscribe from this list go to the following URL and read the
instructions:  https://lists.samba.org/mailman/options/samba


Re: [Samba] windows 7 cannot connect

2011-08-10 Thread Chris Weiss
On Wed, Aug 10, 2011 at 3:13 PM, Marc Fromm marc.fr...@wwu.edu wrote:
 My googling seems to point at upgrading samba to 3.4. Currently installed on 
 my RHEL 5.2 32 bit server is as listed below for smb and samba.

 If I was running RHEL 64 bit I would be supported by red hat and updating the 
 OS to the latest 5.x would provide this for me. For some reason red hat feels 
 they do not need to support their 32 bit users, which my server is running, 
 and updating the OS does not update certain packages like samba and php. Even 
 though I have paid support with red hat they will not provide support to 
 update the needed packages.

 Thus, is there a detailed set of procedures on how to manually upgrade samba 
 on a RHEL 5.2 server? I do not want to try this by trial and error and 
 cripple the server.


I think RH 5 has a samba 3.x package, or was that only Centos?  I
don't recall what version it was intro'd
-- 
To unsubscribe from this list go to the following URL and read the
instructions:  https://lists.samba.org/mailman/options/samba


Re: [Samba] windows 7 cannot connect

2011-08-10 Thread Jason Pyeron

 -Original Message-
 From: Chris Weiss
 Sent: Wednesday, August 10, 2011 17:17
 To: Marc Fromm
 Subject: Re: [Samba] windows 7 cannot connect
 
 On Wed, Aug 10, 2011 at 3:13 PM, Marc Fromm 
 marc.fr...@wwu.edu wrote:
  My googling seems to point at upgrading samba to 3.4. 
 Currently installed on my RHEL 5.2 32 bit server is as listed 
 below for smb and samba.
 
  If I was running RHEL 64 bit I would be supported by red 
 hat and updating the OS to the latest 5.x would provide this 
 for me. For some reason red hat feels they do not need to 
 support their 32 bit users, which my server is running, and 
 updating the OS does not update certain packages like samba 
 and php. Even though I have paid support with red hat they 
 will not provide support to update the needed packages.
 
  Thus, is there a detailed set of procedures on how to 
 manually upgrade samba on a RHEL 5.2 server? I do not want to 
 try this by trial and error and cripple the server.
 
 
 I think RH 5 has a samba 3.x package, or was that only 
 Centos?  I don't recall what version it was intro'd


RHEL=Centos

They have 3.0.33-3.29.el5_6.2 on x86_64

http://ftp.redhat.com/pub/redhat/linux/enterprise/5Server/en/os/SRPMS/samba-3.0.
33-3.29.el5_6.2.src.rpm

-Jason

--
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-   -
- Jason Pyeron  PD Inc. http://www.pdinc.us -
- Principal Consultant  10 West 24th Street #100-
- +1 (443) 269-1555 x333Baltimore, Maryland 21218   -
-   -
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
This message is copyright PD Inc, subject to license 20080407P00.

 

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


Re: [Samba] windows 7 cannot connect

2011-08-10 Thread Chris Weiss
On Wed, Aug 10, 2011 at 4:28 PM, Jason Pyeron jpye...@pdinc.us wrote:

 -Original Message-
 From: Chris Weiss
 Sent: Wednesday, August 10, 2011 17:17
 To: Marc Fromm
 Subject: Re: [Samba] windows 7 cannot connect

 I think RH 5 has a samba 3.x package, or was that only
 Centos?  I don't recall what version it was intro'd


 RHEL=Centos

 They have 3.0.33-3.29.el5_6.2 on x86_64

 http://ftp.redhat.com/pub/redhat/linux/enterprise/5Server/en/os/SRPMS/samba-3.0.
 33-3.29.el5_6.2.src.rpm


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


Re: [Samba] windows 7 cannot connect

2011-08-10 Thread Philipoff, Andrew
 -Original Message-
 From: Chris Weiss
 Sent: Wednesday, August 10, 2011 17:17
 To: Marc Fromm
 Subject: Re: [Samba] windows 7 cannot connect

 I think RH 5 has a samba 3.x package, or was that only Centos?  I 
 don't recall what version it was intro'd


 RHEL=Centos

 They have 3.0.33-3.29.el5_6.2 on x86_64

 http://ftp.redhat.com/pub/redhat/linux/enterprise/5Server/en/os/SRPMS/samba-3.0.
 33-3.29.el5_6.2.src.rpm


 yum search samba3x

I migrated our RHEL 5 servers from the Red Hat supplied Samba 3.0.33 packages 
to their samba3x packages. Before installing any of the samba3x packages I had 
to un-install all Samba 3.0.33 packages except for libsmbclient-3.0.33. We 
operate in an mixed 2003-2008 AD environment with Windows XP/Vista/7 and Mac OS 
X clients. I installed the following packages:

samba3x-3.5.4
samba3x-client-3.5.4
samba3x-common-3.5.4
samba3x-doc-3.5.4
samba3x-winbind-3.5.4. 

Andrew Philipoff
Infrastructure Coordinator
UCSF Department of Medicine - IT Services

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


Re: [Samba] windows 7 cannot connect

2011-08-10 Thread Marc Fromm
The server currently has 3.0.33 on it, but it needs at least 3.4 to work with 
windows 7 computers. Red hat will not be upgrading samba beyond 3.0.33 for 
their 32bit RH5 users. Thus I am stuck and cannot use yum and the red hat repos 
to do the upgrade. 

On site directed me to this page to download the rpms, but I am not experienced 
enough with manually updating a package.
http://ftp.sernet.de/pub/samba/ . I downloaded all the files listed under the 
3.6/rhel/5/i386 directory.

Thus I was hoping to find to step by step on how to do the upgrade.

-Original Message-
From: Chris Weiss [mailto:cwe...@gmail.com] 
Sent: Wednesday, August 10, 2011 2:17 PM
To: Marc Fromm
Cc: John Drescher; samba@lists.samba.org
Subject: Re: [Samba] windows 7 cannot connect

On Wed, Aug 10, 2011 at 3:13 PM, Marc Fromm marc.fr...@wwu.edu wrote:
 My googling seems to point at upgrading samba to 3.4. Currently installed on 
 my RHEL 5.2 32 bit server is as listed below for smb and samba.

 If I was running RHEL 64 bit I would be supported by red hat and updating the 
 OS to the latest 5.x would provide this for me. For some reason red hat feels 
 they do not need to support their 32 bit users, which my server is running, 
 and updating the OS does not update certain packages like samba and php. Even 
 though I have paid support with red hat they will not provide support to 
 update the needed packages.

 Thus, is there a detailed set of procedures on how to manually upgrade samba 
 on a RHEL 5.2 server? I do not want to try this by trial and error and 
 cripple the server.


I think RH 5 has a samba 3.x package, or was that only Centos?  I don't recall 
what version it was intro'd

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


[Samba] difference between '%u' and '%U'?

2011-08-10 Thread Linda Walsh

I realized in looking at my smb.conf, I'm not using these in
a consistent manner, and  well I just don't understand what the
differences are between them.

Sure I can read the smb.conf page:
 %U
   session username (the username that the client wanted, not
   necessarily the same as the one they got).
vs.
 %u
   username of the current service, if any.
---
So if I use %U, what name might I get 'instead'?

For example, MS, seems to save my profile under 'user.V2'...even
though my smb config has:

logon path = \\%D\%U\profile
logon home = \\%D\%U
logon drive = i:



But my 'home' is always set to  /home/Domain/User,
but my profile (under W7), is stored under /home/Domain/User.V2...

So when my home dir is mounted, I don't see the 'appdir' of *my*
profile, but the appdir of an XP login (which has caused more than
a little bit of confusion over the years)

Now, I 'hack' around this by mounting 'i:' manually,
and setting it to '/home/Domain/User.V2'(which still feels
like a 'hack', but at least my homedir contains my profile and
not my XP profile!


So how are %u and %U supposed to be different?   Should one evaluate
to 'User.V2'?

Thanks for any 'enlightenment!'



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


[SCM] Samba Shared Repository - annotated tag tevent-0.9.14 created

2011-08-10 Thread Stefan Metzmacher
The annotated tag, tevent-0.9.14 has been created
at  06dbb56029a10ff8b69160d18e7c4bdd42a58be1 (tag)
   tagging  fd3382906a86aa7077aac535fee39cc5b441d682 (commit)
  replaces  tevent-0.9.13
 tagged by  Stefan Metzmacher
on  Wed Aug 10 08:39:21 2011 +0200

- Log -
tevent: tag release tevent-0.9.14
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)

iQEcBAABAgAGBQJOQieZAAoJEEeTkWETCEAldPQIAJxV4ejg9ZUYEsp/Jqymca7G
fCF1rHZDMblCky+ASPO2jDdrHb8hMau4+S+GEHlPYfXcm3nkWLeYAT/l/lpXXauK
Vzn13LoUfYz+jAK8qz34DC6oC5qtTBKMXtnG915YviZ8UcZzja/So4ut2bJdT1hb
FfHvKVUfyumgFZ5uRcbf6GHLsGXPv1pA8QBSp1mKtux3QKmkNovrLgFKlQIkLgUJ
ELQ+znulUaxPLfph2lO9v2LSOeYfXZsl43Zm2o2OETcBKTnnJGUxWDMaMJbHsVLo
xJPLrdAdttLbAGwTG6oogDQmsuZtLpGVuxnoC4lwe/C1o0pOw5HOe5rGyYAEPCo=
=SpfI
-END PGP SIGNATURE-

Alban Browaeys (1):
  Fix bug #8341 - libsmbclient segfault when feed the root of a mounted 
share via an uri

Amitay Isaacs (41):
  samba-tool: Reimplement GPO functions in python
  ldb: Expose ldb_handler_fold() funcion
  ldb-samba: Allow --show-binary flag on defaultSecurityDescriptor
  s4auth: Remove duplicate assignment of structure variable
  s4auth: Fix the object names for PyCredentials and 
PyCredentialCacheContainer
  s4auth: Fix the object name for Py_Security
  samba-tool: Added python version of samba-tool
  samba-tool: Replace C version of samba-tool with python version
  samba-tool: Display Usage line and list commands alphabetically
  samba-tool: Raise exception on errors and report using base class
  samba-tool: Display usage for main commands and list them alphabetically
  samba-tool: Catch exceptions at top-level and exit with correct return 
value
  s4-param: Fix object names for python objects PyLoadparm and 
PyLoadparmContext
  samba-tool: For samba-tool-c, help lists commands implemented only in C
  s4-libcli: Added python interface for file I/O using SMB
  samba-tool: Python routine to find writable/ldap-capable DC
  s4-libnet: py_net - Remove parsing for credentials argument
  s4-libnet: py_net Add change_password() python command
  samba-tool: Add user password command to change user's own password
  test-blackbox: Rearrange the arguments in required order for samba-tool 
time
  test-blackbox: Remove 'domain\' from username for samba-tool user 
setpassword
  test-blackbox: Rearrange arguments for samba-tool user setpassword command
  test-blackbox: use python version of change password command
  tests-blackbox: Revert the test to use user-level change password command
  s4-libcli: Initialize stack structure variables to zero.
  samba-tool: Change samba-tool gpo semantics (use gpo name instead of dn)
  samba-tool: Added gpo fetch command implementation using python smb 
module.
  s4-libcli: Added python SMB methods for mkdir(), rmdir(), chkpath()
  s4-policy: Expose gp_ads_to_dir_access_mask() function
  s4-policy: Add python wrapper for ads_to_dir_access_mask() function
  samba-tool: Addd functions to print GPO flags and GPlink options
  samba-tool: Rename copy_directory_recurse to 
copy_directory_remote_to_local
  s4-policy: Use the correct local directory for stat.
  s4-libcli: Replace smb_composite_connect() with smb_full_connection()
  s4-libcli: Check if short_name is not null, before converting to python 
string
  s4-libcli: get_acl and set_acl require raw_open to set security descriptor
  samba-tool: Add functions to create directories and copy files over SMB 
share
  samba-tool: Add implementation of gpo create command
  samba-tool: Remove C version of samba-tool
  samba-tool: Rename samba-tool command gpo2 -- gpo
  s4-libcli: Fix the fd leak. Close open file descriptor before return.

Andreas Schneider (81):
  s3-waf: Don't link LIBNTLMSSP twice.
  s3-auth: Fix account check over ncalrpc.
  s3-epmapper: Fix adding tcpip endpoints.
  s3-smbd: Create ev_ctx and msg_ctx and use it.
  s3-smbd: Pass ev_ctx to smbd_parent_loop().
  s3-smbd: Pass ev_ctx and msg_ctx to open_sockets_smbd().
  s3-smbd: Pass ev_ctx and msg_ctx to smbd_accept_connection().
  s3-smbd: Pass ev_ctx to smbd_setup_sig_chld_handler().
  s3-smbd: Pass msg_ctx to smbd_accept_connection.
  s3-smbd: Pass ev_ctx to remove_child_pid().
  s3-smbd: Pass event and messaging context to smbd_parent_housekeeping().
  s3-librpc: Pass messaging context to dcerpc register functions.
  s3-rpc_server: Pass event and messaging context to accept function.
  s3-rpc_server: Fixed segfaults in rpc daemons.
  s3-rpc_server: Add my copyright.
  s3-rpc_server: Fix messaging context in the pipes struct.
  s3-rpc_server: Free the np dir.
  s3-rpc_server: Duplicate the pipe name.
  s3-rpc_server: We need to copy the session_info for external 

[SCM] Samba Shared Repository - branch master updated

2011-08-10 Thread Stefan Metzmacher
The branch, master has been updated
   via  0a9c30f Revert s3:test_async_echo: unsure the desired smb message 
sequence
   via  b97aab0 tsocket: make use of tevent_queue_add_optimize_empty() to 
optimize for the empty queue case
  from  4a5e9cf s4:subtree_rename LDB module - fix the move/rename 
constraints

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


- Log -
commit 0a9c30f5096523f98aa2b8b1b4cbd3f0649a9eb9
Author: Stefan Metzmacher me...@samba.org
Date:   Thu Jul 28 11:39:32 2011 +0200

Revert s3:test_async_echo: unsure the desired smb message sequence

This reverts commit 34faeb8bba86fff57466c06682b7dcbffc48a52a.

This is not needed anymore.

metze

Autobuild-User: Stefan Metzmacher me...@samba.org
Autobuild-Date: Wed Aug 10 09:54:24 CEST 2011 on sn-devel-104

commit b97aab0223746870429255acac5607062781a266
Author: Stefan Metzmacher me...@samba.org
Date:   Thu Jul 28 10:37:51 2011 +0200

tsocket: make use of tevent_queue_add_optimize_empty() to optimize for the 
empty queue case

metze

---

Summary of changes:
 lib/tsocket/tsocket_helpers.c |   85 +
 source3/torture/test_async_echo.c |   10 
 2 files changed, 48 insertions(+), 47 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/tsocket/tsocket_helpers.c b/lib/tsocket/tsocket_helpers.c
index db6b614..1b92b9f 100644
--- a/lib/tsocket/tsocket_helpers.c
+++ b/lib/tsocket/tsocket_helpers.c
@@ -52,7 +52,7 @@ struct tevent_req *tdgram_sendto_queue_send(TALLOC_CTX 
*mem_ctx,
 {
struct tevent_req *req;
struct tdgram_sendto_queue_state *state;
-   bool ok;
+   struct tevent_queue_entry *e;
 
req = tevent_req_create(mem_ctx, state,
struct tdgram_sendto_queue_state);
@@ -67,21 +67,24 @@ struct tevent_req *tdgram_sendto_queue_send(TALLOC_CTX 
*mem_ctx,
state-caller.dst   = dst;
state-ret  = -1;
 
-   ok = tevent_queue_add(queue,
- ev,
- req,
- tdgram_sendto_queue_trigger,
- NULL);
-   if (!ok) {
-   tevent_req_oom(req);
-   goto post;
+   /*
+* we use tevent_queue_add_optimize_empty() with allow_direct
+* in order to optimize for the empty queue case.
+*/
+   e = tevent_queue_add_optimize_empty(
+   queue,
+   ev,
+   req,
+   tdgram_sendto_queue_trigger,
+   NULL);
+   if (tevent_req_nomem(e, req)) {
+   return tevent_req_post(req, ev);
+   }
+   if (!tevent_req_is_in_progress(req)) {
+   return tevent_req_post(req, ev);
}
 
return req;
-
- post:
-   tevent_req_post(req, ev);
-   return req;
 }
 
 static void tdgram_sendto_queue_trigger(struct tevent_req *req,
@@ -326,7 +329,7 @@ struct tevent_req *tstream_readv_pdu_queue_send(TALLOC_CTX 
*mem_ctx,
 {
struct tevent_req *req;
struct tstream_readv_pdu_queue_state *state;
-   bool ok;
+   struct tevent_queue_entry *e;
 
req = tevent_req_create(mem_ctx, state,
struct tstream_readv_pdu_queue_state);
@@ -340,20 +343,24 @@ struct tevent_req 
*tstream_readv_pdu_queue_send(TALLOC_CTX *mem_ctx,
state-caller.next_vector_private   = next_vector_private;
state-ret  = -1;
 
-   ok = tevent_queue_add(queue,
- ev,
- req,
- tstream_readv_pdu_queue_trigger,
- NULL);
-   if (!ok) {
-   tevent_req_oom(req);
-   goto post;
+   /*
+* we use tevent_queue_add_optimize_empty() with allow_direct
+* in order to optimize for the empty queue case.
+*/
+   e = tevent_queue_add_optimize_empty(
+   queue,
+   ev,
+   req,
+   tstream_readv_pdu_queue_trigger,
+   NULL);
+   if (tevent_req_nomem(e, req)) {
+   return tevent_req_post(req, ev);
+   }
+   if (!tevent_req_is_in_progress(req)) {
+   return tevent_req_post(req, ev);
}
 
return req;
-
- post:
-   return tevent_req_post(req, ev);
 }
 
 static void tstream_readv_pdu_queue_trigger(struct tevent_req *req,
@@ -433,7 +440,7 @@ struct tevent_req *tstream_writev_queue_send(TALLOC_CTX 
*mem_ctx,
 {
struct tevent_req *req;
struct tstream_writev_queue_state *state;
-   bool 

[SCM] Samba Website Repository - branch master updated

2011-08-10 Thread Lars Müller
The branch, master has been updated
   via  fc77cd9 Make use of global_menu instead of hack_samba_menu
  from  cb9c66b Add some common include virtual and list libs

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


- Log -
commit fc77cd95588ef3ee93d3890d0e8d9fbece922b52
Author: Lars Müller l...@samba.org
Date:   Wed Aug 10 10:38:26 2011 +0200

Make use of global_menu instead of hack_samba_menu

---

Summary of changes:
 news/releases/3.6.0.html |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/news/releases/3.6.0.html b/news/releases/3.6.0.html
index d504675..7995c28 100644
--- a/news/releases/3.6.0.html
+++ b/news/releases/3.6.0.html
@@ -1,6 +1,6 @@
 !--#include virtual=/samba/header.html --
   titleSamba - opening windows to a wider world/title
-!--#include virtual=/samba/hack_samba_menu.html --
+!--#include virtual=/samba/global_menu.html --
 
 
 h2a name=3.6.0Samba Team Releases Version 3.6/a/h2


-- 
Samba Website Repository


[SCM] Samba Website Repository - branch master updated

2011-08-10 Thread Lars Müller
The branch, master has been updated
   via  c816367 Move tar ball text block to the right location
  from  fc77cd9 Make use of global_menu instead of hack_samba_menu

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


- Log -
commit c8163679472a1a8aa2835b7bb918b5f9f429444e
Author: Lars Müller l...@samba.org
Date:   Wed Aug 10 11:10:16 2011 +0200

Move tar ball text block to the right location

---

Summary of changes:
 news/releases/3.6.0.html |   12 ++--
 1 files changed, 6 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/news/releases/3.6.0.html b/news/releases/3.6.0.html
index 7995c28..b71b1a8 100644
--- a/news/releases/3.6.0.html
+++ b/news/releases/3.6.0.html
@@ -152,6 +152,12 @@ enabled and meets all mandates for modern network 
interoperability./p
 pSamba 3.6 source code is available now from the
 a href=http://www.samba.org;Samba Web site/a./p
 
+pThe uncompressed tarballs and patch files have been signed
+using GnuPG (ID 6568B7EA).  The source code can be
+a href=http://ftp.samba.org/pub/samba/stable/samba-3.6.0.tar.gz;downloaded 
now/a.  See the
+a href=/samba/history/samba-3.6.0.htmlrelease notes/a
+for more information./p
+
 h3About the Samba Team/h3
 
 pThe Samba Team is a worldwide group of computer professionals working
@@ -163,12 +169,6 @@ the largest companies in the software Industry and even 
helped
 Microsoft produce the protocol documentation that fully specifies the
 SMB/CIFS protocol./p
 
-pThe uncompressed tarballs and patch files have been signed
-using GnuPG (ID 6568B7EA).  The source code can be
-a href=http://ftp.samba.org/pub/samba/stable/samba-3.6.0.tar.gz;downloaded 
now/a.  See the
-a href=/samba/history/samba-3.6.0.htmlrelease notes/a
-for more information./p
-
 div align=centerSamba - iOpening Windows to a Wider World/i/div
 
 !--#include virtual=/samba/footer.html --


-- 
Samba Website Repository


[SCM] Samba Website Repository - branch master updated

2011-08-10 Thread Lars Müller
The branch, master has been updated
   via  730dc84 Add missing p.  Thx to Dave ddiss!
  from  c816367 Move tar ball text block to the right location

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


- Log -
commit 730dc8433a539e3ed4d093a90c2935fbccf16338
Author: Lars Müller l...@samba.org
Date:   Wed Aug 10 12:02:08 2011 +0200

Add missing p.  Thx to Dave ddiss!

---

Summary of changes:
 news/releases/3.6.0.html |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/news/releases/3.6.0.html b/news/releases/3.6.0.html
index b71b1a8..eed2727 100644
--- a/news/releases/3.6.0.html
+++ b/news/releases/3.6.0.html
@@ -73,7 +73,7 @@ suite, created by the Samba Team to test Samba itself and now 
used by
 most of the companies writing SMB2/SMB/CIFS file server software to
 test their own products./p
 
-In addition, Samba is one of eleven open source projects that leading
+pIn addition, Samba is one of eleven open source projects that leading
 software integrity vendor Coverity has certified as secure and has
 reached Coverity Integrity Rung 2 certification./p
 


-- 
Samba Website Repository


[SCM] Samba Shared Repository - branch master updated

2011-08-10 Thread Stefan Metzmacher
The branch, master has been updated
   via  8158042 s3:libsmb: make cli_session_setup_spnego() static
   via  33a6a4e s3:winbindd_cm: use cli_session_setup() instead of 
cli_session_setup_spnego()
   via  d7cdd96 s3:libsmb: pass remote_realm to cli_session_setup_spnego() 
in cli_session_setup()
   via  c6a3ded s3:libsmb: store the remote_realm on the cli_state
   via  a726567 s3:smb_macros.h: simplify _smb_setlen() and 
_smb_setlen_large()
   via  b65ea9f s3:include: smb.h base old smb header offsets on new defines
   via  6da226a s3:include: smb.h merge some stuff from source4
  from  0a9c30f Revert s3:test_async_echo: unsure the desired smb message 
sequence

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


- Log -
commit 81580429ec1ab872aa06f541d696f087621b05e6
Author: Stefan Metzmacher me...@samba.org
Date:   Tue Aug 9 22:24:14 2011 +0200

s3:libsmb: make cli_session_setup_spnego() static

metze

Autobuild-User: Stefan Metzmacher me...@samba.org
Autobuild-Date: Wed Aug 10 12:31:55 CEST 2011 on sn-devel-104

commit 33a6a4ea854edb6cc667ba78babab0b930755b91
Author: Stefan Metzmacher me...@samba.org
Date:   Tue Aug 9 22:21:41 2011 +0200

s3:winbindd_cm: use cli_session_setup() instead of 
cli_session_setup_spnego()

metze

commit d7cdd9651e4e849f19d791fd587f74ad76d370c8
Author: Stefan Metzmacher me...@samba.org
Date:   Tue Aug 9 22:17:56 2011 +0200

s3:libsmb: pass remote_realm to cli_session_setup_spnego() in 
cli_session_setup()

metze

commit c6a3dedd99b57345af1b51bad560709319ec8caa
Author: Stefan Metzmacher me...@samba.org
Date:   Tue Aug 9 22:15:23 2011 +0200

s3:libsmb: store the remote_realm on the cli_state

metze

commit a7265675d5cd41f05a0ebaba43ad36a389419db2
Author: Stefan Metzmacher me...@samba.org
Date:   Thu Jul 28 11:27:10 2011 +0200

s3:smb_macros.h: simplify _smb_setlen() and _smb_setlen_large()

This also takes care of the correct casting.

metze

commit b65ea9faa8e775da9be976482cf1931456500355
Author: Stefan Metzmacher me...@samba.org
Date:   Tue Jul 12 09:40:56 2011 +0200

s3:include: smb.h base old smb header offsets on new defines

metze

commit 6da226a5e54354d72e66ffdc303086edc7db0f9b
Author: Stefan Metzmacher me...@samba.org
Date:   Tue Jul 12 09:37:53 2011 +0200

s3:include: smb.h merge some stuff from source4

metze

---

Summary of changes:
 source3/include/client.h   |1 +
 source3/include/smb.h  |   99 +++-
 source3/include/smb_macros.h   |   10 ++--
 source3/libsmb/cliconnect.c|   12 +++--
 source3/libsmb/clientgen.c |   13 +
 source3/libsmb/proto.h |6 +--
 source3/winbindd/winbindd_cm.c |   37 --
 7 files changed, 116 insertions(+), 62 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/client.h b/source3/include/client.h
index a4d4321..f44e52f 100644
--- a/source3/include/client.h
+++ b/source3/include/client.h
@@ -124,6 +124,7 @@ struct cli_state {
struct sockaddr_storage local_ss;
struct sockaddr_storage remote_ss;
const char *remote_name;
+   const char *remote_realm;
struct tevent_req *read_smb_req;
struct tevent_queue *outgoing;
struct tevent_req **pending;
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 88521d4..207fc9e 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -692,39 +692,71 @@ struct connections_data {
uint32 unused_compatitibility_field;
 };
 
+#define SMB_MAGIC 0x424D53FF /* 0xFF 'S' 'M' 'B' */
+
+/* the basic packet size, assuming no words or bytes. Does not include the NBT 
header */
+#define MIN_SMB_SIZE 35
+
+/* when using NBT encapsulation every packet has a 4 byte header */
+#define NBT_HDR_SIZE 4
+
+/* offsets into message header for common items - NOTE: These have
+   changed from being offsets from the base of the NBT packet to the base of 
the SMB packet.
+   this has reduced all these values by 4
+*/
+#define HDR_COM 4
+#define HDR_RCLS 5
+#define HDR_REH 6
+#define HDR_ERR 7
+#define HDR_FLG 9
+#define HDR_FLG2 10
+#define HDR_PIDHIGH 12
+#define HDR_SS_FIELD 14
+#define HDR_TID 24
+#define HDR_PID 26
+#define HDR_UID 28
+#define HDR_MID 30
+#define HDR_WCT 32
+#define HDR_VWV 33
+
 /* offsets into message for common items */
-#define smb_com 8
-#define smb_rcls 9
-#define smb_reh 10
-#define smb_err 11
-#define smb_flg 13
-#define smb_flg2 14
-#define smb_pidhigh 16
-#define smb_ss_field 18
-#define smb_tid 28
-#define smb_pid 30
-#define smb_uid 32
-#define smb_mid 34
-#define smb_wct 36
-#define smb_vwv 37
-#define smb_vwv0 37
-#define smb_vwv1 39
-#define smb_vwv2 41
-#define smb_vwv3 43
-#define smb_vwv4 45

[SCM] Samba Shared Repository - branch master updated

2011-08-10 Thread Michael Adam
The branch, master has been updated
   via  8338fe4 s3:idmap_tdb2: fix bug 8368 : correctly initialize idmap 
config * : script with NULL
  from  8158042 s3:libsmb: make cli_session_setup_spnego() static

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


- Log -
commit 8338fe4bfbc935e3cff059383dd07d419f58c696
Author: Michael Adam ob...@samba.org
Date:   Wed Aug 10 13:41:14 2011 +0200

s3:idmap_tdb2: fix bug 8368 : correctly initialize idmap config * : 
script with NULL

this fixes the fallback to the deprecated spelling idmap:script

Autobuild-User: Michael Adam ob...@samba.org
Autobuild-Date: Wed Aug 10 14:59:32 CEST 2011 on sn-devel-104

---

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


Changeset truncated at 500 lines:

diff --git a/source3/winbindd/idmap_tdb2.c b/source3/winbindd/idmap_tdb2.c
index d245e44..07b91e5 100644
--- a/source3/winbindd/idmap_tdb2.c
+++ b/source3/winbindd/idmap_tdb2.c
@@ -290,7 +290,7 @@ static NTSTATUS idmap_tdb2_db_init(struct idmap_domain *dom)
ret = NT_STATUS_NO_MEMORY;
goto failed;
}
-   ctx-script = lp_parm_const_string(-1, config_option, script, NULL);
+   ctx-script = lp_parm_const_string(-1, config_option, script, NULL);
talloc_free(config_option);
 
idmap_script = lp_parm_const_string(-1, idmap, script, NULL);


-- 
Samba Shared Repository


[SCM] Samba Shared Repository - branch master updated

2011-08-10 Thread Jelmer Vernooij
The branch, master has been updated
   via  4b94926 pytalloc: Regenerate ABI file.
   via  f8ec7f6 pytalloc: Use consistent prefix for functions, add ABI file.
  from  8338fe4 s3:idmap_tdb2: fix bug 8368 : correctly initialize idmap 
config * : script with NULL

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


- Log -
commit 4b94926ac33bb4534497a3fa2ed8978d767918df
Author: Jelmer Vernooij jel...@samba.org
Date:   Wed Aug 10 15:20:59 2011 +0200

pytalloc: Regenerate ABI file.

Autobuild-User: Jelmer Vernooij jel...@samba.org
Autobuild-Date: Wed Aug 10 16:51:11 CEST 2011 on sn-devel-104

commit f8ec7f6cb19c4cc27398bdc0482b531e601d4291
Author: Jelmer Vernooij jel...@samba.org
Date:   Wed Aug 10 15:15:18 2011 +0200

pytalloc: Use consistent prefix for functions, add ABI file.

---

Summary of changes:
 lib/talloc/ABI/pytalloc-util-2.0.6.sigs  |6 +++
 lib/talloc/pytalloc.c|   42 +-
 lib/talloc/pytalloc.h|   36 
 lib/talloc/pytalloc_util.c   |   22 +-
 lib/talloc/wscript   |3 +
 libcli/security/pysecurity.c |8 ++--
 pidl/lib/Parse/Pidl/Samba4/Python.pm |   36 
 source4/auth/credentials/pycredentials.c |   60 +-
 source4/auth/credentials/pycredentials.h |2 +-
 source4/auth/gensec/pygensec.c   |   40 +-
 source4/auth/pyauth.c|8 ++--
 source4/auth/pyauth.h|2 +-
 source4/lib/registry/pyregistry.c|   30 +++---
 source4/libcli/pysmb.c   |   28 ++--
 source4/libnet/py_net.c  |9 ++--
 source4/librpc/ndr/py_auth.c |7 ++-
 source4/librpc/ndr/py_misc.c |   17 
 source4/librpc/ndr/py_security.c |   67 +++---
 source4/librpc/ndr/py_xattr.c|2 +-
 source4/librpc/rpc/pyrpc_util.c  |2 +-
 source4/param/provision.c|2 +-
 source4/param/pyparam.c  |   38 
 source4/param/pyparam_util.c |2 +-
 23 files changed, 240 insertions(+), 229 deletions(-)
 create mode 100644 lib/talloc/ABI/pytalloc-util-2.0.6.sigs


Changeset truncated at 500 lines:

diff --git a/lib/talloc/ABI/pytalloc-util-2.0.6.sigs 
b/lib/talloc/ABI/pytalloc-util-2.0.6.sigs
new file mode 100644
index 000..961c1a8
--- /dev/null
+++ b/lib/talloc/ABI/pytalloc-util-2.0.6.sigs
@@ -0,0 +1,6 @@
+pytalloc_CObject_FromTallocPtr: PyObject *(void *)
+pytalloc_Check: int (PyObject *)
+pytalloc_GetObjectType: PyTypeObject *(void)
+pytalloc_reference_ex: PyObject *(PyTypeObject *, TALLOC_CTX *, void *)
+pytalloc_steal: PyObject *(PyTypeObject *, void *)
+pytalloc_steal_ex: PyObject *(PyTypeObject *, TALLOC_CTX *, void *)
diff --git a/lib/talloc/pytalloc.c b/lib/talloc/pytalloc.c
index 614b81f..62c6808 100644
--- a/lib/talloc/pytalloc.c
+++ b/lib/talloc/pytalloc.c
@@ -1,7 +1,7 @@
 /* 
Unix SMB/CIFS implementation.
Python Talloc Module
-   Copyright (C) Jelmer Vernooij jel...@samba.org 2010
+   Copyright (C) Jelmer Vernooij jel...@samba.org 2010-2011
 
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@
 void inittalloc(void);
 
 /* print a talloc tree report for a talloc python object */
-static PyObject *py_talloc_report_full(PyObject *self, PyObject *args)
+static PyObject *pytalloc_report_full(PyObject *self, PyObject *args)
 {
PyObject *py_obj = Py_None;
PyTypeObject *type;
@@ -36,20 +36,20 @@ static PyObject *py_talloc_report_full(PyObject *self, 
PyObject *args)
talloc_report_full(NULL, stdout);
} else {
type = (PyTypeObject*)PyObject_Type(py_obj);
-   talloc_report_full(py_talloc_get_mem_ctx(py_obj), stdout);
+   talloc_report_full(pytalloc_get_mem_ctx(py_obj), stdout);
}
return Py_None;
 }
 
 /* enable null tracking */
-static PyObject *py_talloc_enable_null_tracking(PyObject *self)
+static PyObject *pytalloc_enable_null_tracking(PyObject *self)
 {
talloc_enable_null_tracking();
return Py_None;
 }
 
 /* return the number of talloc blocks */
-static PyObject *py_talloc_total_blocks(PyObject *self, PyObject *args)
+static PyObject *pytalloc_total_blocks(PyObject *self, PyObject *args)
 {
PyObject *py_obj = Py_None;
PyTypeObject *type;
@@ -63,15 +63,15 @@ static PyObject *py_talloc_total_blocks(PyObject *self, 
PyObject *args)
 
type = (PyTypeObject*)PyObject_Type(py_obj);
 
-   return 
PyLong_FromLong(talloc_total_blocks(py_talloc_get_mem_ctx(py_obj)));
+   return 

[SCM] Samba Shared Repository - branch master updated

2011-08-10 Thread Volker Lendecke
The branch, master has been updated
   via  e0dc3aa s3: Remove an unnecessary include
  from  4b94926 pytalloc: Regenerate ABI file.

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


- Log -
commit e0dc3aa5b61a779b51d101e79aefd6b8026e
Author: Volker Lendecke v...@samba.org
Date:   Wed Aug 10 15:52:28 2011 +0200

s3: Remove an unnecessary include

Autobuild-User: Volker Lendecke vlen...@samba.org
Autobuild-Date: Wed Aug 10 18:10:39 CEST 2011 on sn-devel-104

---

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


Changeset truncated at 500 lines:

diff --git a/source3/lib/ctdb_packet.c b/source3/lib/ctdb_packet.c
index 17c70ff..49ade4e 100644
--- a/source3/lib/ctdb_packet.c
+++ b/source3/lib/ctdb_packet.c
@@ -20,7 +20,6 @@
 #include includes.h
 #include ../lib/util/select.h
 #include system/filesys.h
-#include system/select.h
 #include ctdb_packet.h
 
 struct ctdb_packet_context {


-- 
Samba Shared Repository


[SCM] Samba Shared Repository - branch master updated

2011-08-10 Thread Andreas Schneider
The branch, master has been updated
   via  d53e3ec selftest: Always test the spoolss deamon.
   via  9eafbeb s3-spoolss: Fix prototypes warnings.
   via  c3cfa6b s3-printing: Do not try to force reload.
   via  54aaa5a s3-spoolss: do not call pcap_cache_reload() directly
   via  dd4ff4b s3-printing: Add child handler to bq process
   via  befc539 s3-spoolss: Fix printers related messaging
   via  7a07162 s3-prefork: Fix use of child id.
   via  f00681f s3-printing: make sure to block SIGHUP ...
   via  6f682be s3-spoolss: Use a global variable for the pool
   via  b2f682a s3-printing: Allow bq process to have own logfile
   via  339c106 s3-spoolssd: Use the child_id to open log files
   via  fa893e8 s3-prefork: Pass the child a child_id
   via  0de0928 s3-printing: Force pcap reload when all ready
   via  227551a s3-prefork: Return tsocket_address for client and server
   via  2b33b43 s3-prefork: Pass messaging context around too
   via  1155280 s3-prefork: Set up a SIGCHLD handler by default
   via  d36a8dc s3:spoolssd Start spoolssd from printing_subsystem_init
   via  9ce6416 s3-printing: Rework how the background process is started
   via  0a910c9 s3-prefork: Provide a cleanup function
   via  e0aa6ee s3-prefork: Inline Doxygen Documentation
   via  b58d446 s3-prefork: better timing out semantics
   via  f6ae58f s3-prefork: add support for multiple listning file 
descriptors
   via  afde4d8 s3-spoolssd: propagate SIGHUP to children
   via  3339c9b s3-prefork: provide way to send a signal to all children
   via  de08cd9 s3-spoolssd: expand children pool when necessary
   via  567ca03 s3-prefork: provide means to expand the pool size
   via  afc4dda s3-spoolssd: Use parametric option for prefork parameters
   via  595cce8 s3-spoolss: make listening asynchronous
   via  1dd93f4 s3-spoolssd: Use the prefork framework in spoolssd
   via  a1394fc s3-rpc_server: add termination function
   via  d67fc9c s3-rpc: Expose some internal functions
   via  2056d06 s3-prefork: add way to manage number of clients per child
   via  b9354f7 s3-prefork: add asynchronous functions
   via  4fef4fe s3-prefork: implement prefork framework
   via  88b901b s3-printing: No need to register to smbd's children list
   via  74f3e52 tevent: cleanup nesting counter when doing a full reinit.
   via  09ad4d4 lib-util: Make create_unlink_tmp argument optional
   via  05455b4 lib-util: Make useful function a common utility.
   via  185cd4c libutil: use AI_ADDRCONFIG only when AI_NUMERIC is not 
defined
  from  e0dc3aa s3: Remove an unnecessary include

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


- Log -
commit d53e3ecf085d432cb514c05fa55c137e4d9a8715
Author: Andreas Schneider a...@samba.org
Date:   Wed Aug 10 18:05:07 2011 +0200

selftest: Always test the spoolss deamon.

Autobuild-User: Andreas Schneider a...@cryptomilk.org
Autobuild-Date: Wed Aug 10 19:29:14 CEST 2011 on sn-devel-104

commit 9eafbebf9c96f1f4c9a48239e025a1729cf697d8
Author: Andreas Schneider a...@samba.org
Date:   Wed Aug 10 12:48:30 2011 +0200

s3-spoolss: Fix prototypes warnings.

Signed-off-by: Andreas Schneider a...@samba.org

commit c3cfa6be4769be15de4278a72b1c73c763edb21f
Author: Simo Sorce i...@samba.org
Date:   Wed Aug 10 09:27:24 2011 -0400

s3-printing: Do not try to force reload.

Be more correct in load printers at startup.
If async process have already started we do not need to force a reload, but 
we
just need to load the printers. If other process have not finished 
initializing
it makes no sense to try to force them as they are masking SIGHUP unitl 
init is
done anyway.

Signed-off-by: Andreas Schneider a...@samba.org

commit 54aaa5a58c91df4054c3cbaa238c6a83bbfb2eb7
Author: Simo Sorce i...@samba.org
Date:   Wed Aug 10 09:20:24 2011 -0400

s3-spoolss: do not call pcap_cache_reload() directly

The background queue process is repsonsible for that.
Just reload printers if necessary or wait for a message from bq to do that.

Signed-off-by: Andreas Schneider a...@samba.org

commit dd4ff4bfdd3338bc5102fdcdcfea75dc9cf0be8a
Author: Simo Sorce i...@samba.org
Date:   Wed Aug 10 08:59:44 2011 -0400

s3-printing: Add child handler to bq process

The cups backend forks a child to do asynchronous work.
We need a sigchld handler in bq to properly wait for the chilod to finish 
and
reap it, otherwise it hangs the forever as a zombie process.

Signed-off-by: Andreas Schneider a...@samba.org

commit befc53927363b6619ef306da56c4a5d15dfa8ed2
Author: Simo Sorce i...@samba.org
Date:   Tue Aug 9 16:46:21 2011 -0400

s3-spoolss: Fix printers related messaging

Children were not properly receiving messages to reload 

[SCM] Samba Shared Repository - branch master updated

2011-08-10 Thread Volker Lendecke
The branch, master has been updated
   via  f7b820c Adapt tally_histogram to Samba coding conventions
   via  fed9775 Adapt get_max_bucket to Samba coding conventions
   via  35550ba Adapt tally_approx_median to Samba coding conventions
   via  eac2f44 Adapt bucket_range to Samba coding conventions
   via  06a4159 Adapt tally_mean to Samba coding conventions
   via  f589af1 Adapt divls64 to Samba coding conventions
   via  b32f086 Avoid some // style comments in divls64
   via  ee91004 Adapt divlu64 to Samba coding conventions
   via  26795b3 Avoid some // style comments in divlu64
   via  73414d0 Adapt fls64 to Samba coding conventions
   via  3f67063 Adapt tally_num to Samba coding conventions
   via  9c32c86 Adapt tally_add to Samba coding conventions
   via  1fa4236 Adapt renormalize to Samba coding conventions
   via  4a3913f Adapt shift_overflows to Samba coding conventions
   via  a2d1d0b Adapt bucket_min to Samba coding conventions
   via  68d0843 Adapt bucket_of to Samba coding conventions
   via  c6ae297 Adapt tally_new to Samba coding conventions
   via  066d36a Slightly simplify tally_new
   via  cb5c6f4 Fix a c++ warning
   via  54282e9 Fix a c++ warning
   via  38fb4df s3: Adapt msg_idmap.c to Samba coding conventions
   via  223fbc9 s3: Fix some nonempty blank lines
   via  63435f9 s3: Fix some typos -- Simo, please check
  from  d53e3ec selftest: Always test the spoolss deamon.

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


- Log -
commit f7b820c3590ac78dd0dea67ac882f53ae6f550d9
Author: Volker Lendecke v...@samba.org
Date:   Wed Aug 10 19:53:53 2011 +0200

Adapt tally_histogram to Samba coding conventions

Autobuild-User: Volker Lendecke vlen...@samba.org
Autobuild-Date: Wed Aug 10 21:12:59 CEST 2011 on sn-devel-104

commit fed977514019e130322fb21ad5726ee997965898
Author: Volker Lendecke v...@samba.org
Date:   Wed Aug 10 19:52:58 2011 +0200

Adapt get_max_bucket to Samba coding conventions

commit 35550ba641d251a2dc3762b08eda92d0f7ce6bed
Author: Volker Lendecke v...@samba.org
Date:   Wed Aug 10 19:52:40 2011 +0200

Adapt tally_approx_median to Samba coding conventions

commit eac2f44cde39d16b827b7e2d360f7a7fb1d940e5
Author: Volker Lendecke v...@samba.org
Date:   Wed Aug 10 19:52:15 2011 +0200

Adapt bucket_range to Samba coding conventions

commit 06a41594554a1a6881dcbf9d051a822f8f955b56
Author: Volker Lendecke v...@samba.org
Date:   Wed Aug 10 19:51:56 2011 +0200

Adapt tally_mean to Samba coding conventions

commit f589af19821e12aba6145492fd4ded58f07131b8
Author: Volker Lendecke v...@samba.org
Date:   Wed Aug 10 19:51:26 2011 +0200

Adapt divls64 to Samba coding conventions

commit b32f086d643eb39c3806e30b19a028e6a59f0054
Author: Volker Lendecke v...@samba.org
Date:   Wed Aug 10 19:50:52 2011 +0200

Avoid some // style comments in divls64

commit ee91004f4bddcda873f8ccde1db16609a66a493b
Author: Volker Lendecke v...@samba.org
Date:   Wed Aug 10 19:49:55 2011 +0200

Adapt divlu64 to Samba coding conventions

commit 26795b3dd1a90c61424cd8f1761f98bc60b3ddc4
Author: Volker Lendecke v...@samba.org
Date:   Wed Aug 10 19:49:23 2011 +0200

Avoid some // style comments in divlu64

commit 73414d0ee7bbe371b0f9b275b44ce5854a10b9f2
Author: Volker Lendecke v...@samba.org
Date:   Wed Aug 10 19:46:52 2011 +0200

Adapt fls64 to Samba coding conventions

commit 3f67063dfab1a7add95da5157206ccebb2f75df8
Author: Volker Lendecke v...@samba.org
Date:   Wed Aug 10 19:46:37 2011 +0200

Adapt tally_num to Samba coding conventions

commit 9c32c86783bf6a3e126e6e83f51ccdf0ecdd132d
Author: Volker Lendecke v...@samba.org
Date:   Wed Aug 10 19:46:24 2011 +0200

Adapt tally_add to Samba coding conventions

commit 1fa4236c40a727d7ae648e12d14d1f0f9fcf79b5
Author: Volker Lendecke v...@samba.org
Date:   Wed Aug 10 19:46:00 2011 +0200

Adapt renormalize to Samba coding conventions

commit 4a3913fbb9399685785efa430765e0b5836ded60
Author: Volker Lendecke v...@samba.org
Date:   Wed Aug 10 19:45:40 2011 +0200

Adapt shift_overflows to Samba coding conventions

commit a2d1d0b51485f2d383d1d69fa3bd6b79b9e8d5aa
Author: Volker Lendecke v...@samba.org
Date:   Wed Aug 10 19:45:24 2011 +0200

Adapt bucket_min to Samba coding conventions

commit 68d0843437b05dc8a36091e4a307bfd912cbc09f
Author: Volker Lendecke v...@samba.org
Date:   Wed Aug 10 19:45:14 2011 +0200

Adapt bucket_of to Samba coding conventions

commit c6ae297d613fc22b92c34d26c61ec1715058b484
Author: Volker Lendecke v...@samba.org
Date:   Wed Aug 10 19:44:45 2011 +0200

Adapt tally_new to Samba coding conventions

commit 066d36a1a635e1115f62c452c49a9830d484c03b
Author: Volker Lendecke v...@samba.org
Date:   Wed Aug 10 19:44:10 2011 +0200

Slightly simplify tally_new

commit cb5c6f441f394f91bedf641aa76841bdb833e440
Author: 

[SCM] CTDB repository - branch 1.2 updated - ctdb-1.9.1-462-g39d8a4c

2011-08-10 Thread Ronnie Sahlberg
The branch, 1.2 has been updated
   via  39d8a4c0f174d7dbd706c785ca604f614a81fb91 (commit)
   via  716305a7b1614229de5518b3fbafaf8c81006130 (commit)
  from  0e0c4f20610f085da78d7e0b7224b8c437dceaa0 (commit)

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


- Log -
commit 39d8a4c0f174d7dbd706c785ca604f614a81fb91
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date:   Thu Aug 11 07:14:57 2011 +1000

increase the persistent timeout to make people happier

commit 716305a7b1614229de5518b3fbafaf8c81006130
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date:   Thu Aug 11 07:13:28 2011 +1000

check the shares if they are available before we decide to try to restart 
nfs

CQ S1027529

---

Summary of changes:
 config/events.d/60.nfs |   14 +++---
 config/events.d/91.lvs |4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)


Changeset truncated at 500 lines:

diff --git a/config/events.d/60.nfs b/config/events.d/60.nfs
index 0cea531..ea05b1b 100755
--- a/config/events.d/60.nfs
+++ b/config/events.d/60.nfs
@@ -47,6 +47,13 @@ case $1 in
;;
 
   monitor)
+   # and that its directories are available
+   [ $CTDB_NFS_SKIP_SHARE_CHECK = yes ] || {
+   exportfs | grep -v '^#' | grep '^/' |
+   sed -e 's/[[:space:]]\+[^[:space:]]*$//' |
+   ctdb_check_directories
+   } || exit $?
+
if ctdb_service_needs_reconfigure ; then
ctdb_service_reconfigure
exit 0
@@ -105,13 +112,6 @@ case $1 in
fi
}
 
-   # and that its directories are available
-   [ $CTDB_NFS_SKIP_SHARE_CHECK = yes ] || {
-   exportfs | grep -v '^#' | grep '^/' |
-   sed -e 's/[[:space:]]\+[^[:space:]]*$//' |
-   ctdb_check_directories
-   } || exit $?
-
# check that lockd responds to rpc requests
if ctdb_check_rpc LOCKD 100021 1 /dev/null ; then
(service_name=lockd; ctdb_counter_init)
diff --git a/config/events.d/91.lvs b/config/events.d/91.lvs
index ff95811..19cb445 100755
--- a/config/events.d/91.lvs
+++ b/config/events.d/91.lvs
@@ -59,8 +59,8 @@ case $1 in
ip addr del $CTDB_LVS_PUBLIC_IP/32 dev lo /dev/null 2/dev/null
ip addr add $CTDB_LVS_PUBLIC_IP/32 dev lo /dev/null 2/dev/null
 
-   ipvsadm -A -t $CTDB_LVS_PUBLIC_IP:0 -p  -s lc
-   ipvsadm -A -u $CTDB_LVS_PUBLIC_IP:0 -p  -s lc
+   ipvsadm -A -t $CTDB_LVS_PUBLIC_IP:0 -p 99 -s lc
+   ipvsadm -A -u $CTDB_LVS_PUBLIC_IP:0 -p 99 -s lc
 
# add all nodes (except ourselves) to the lvs config
ctdb lvs | egrep -v ^$PNN: | sed -e s/.*:// | while read IP; do


-- 
CTDB repository


[SCM] CTDB repository - branch master updated - ctdb-1.10-333-g68ea19c

2011-08-10 Thread Ronnie Sahlberg
The branch, master has been updated
   via  68ea19cb02017e93769df7f6312d5e0bef55e605 (commit)
   via  b6c6a4588ccf6ef78fabfd76d228f56b4eb65165 (commit)
  from  6c287861e780ba985e7ae7a61c1ee462b925e09e (commit)

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


- Log -
commit 68ea19cb02017e93769df7f6312d5e0bef55e605
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date:   Thu Aug 11 07:14:57 2011 +1000

increase the persistent timeout to make people happier

commit b6c6a4588ccf6ef78fabfd76d228f56b4eb65165
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date:   Thu Aug 11 07:13:28 2011 +1000

check the shares if they are available before we decide to try to restart 
nfs

CQ S1027529

---

Summary of changes:
 config/events.d/60.nfs |   14 +++---
 config/events.d/91.lvs |4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)


Changeset truncated at 500 lines:

diff --git a/config/events.d/60.nfs b/config/events.d/60.nfs
index 6736a9c..c0207ee 100755
--- a/config/events.d/60.nfs
+++ b/config/events.d/60.nfs
@@ -47,6 +47,13 @@ case $1 in
;;
 
   monitor)
+   # and that its directories are available
+   [ $CTDB_NFS_SKIP_SHARE_CHECK = yes ] || {
+   exportfs | grep -v '^#' | grep '^/' |
+   sed -e 's/[[:space:]]\+[^[:space:]]*$//' |
+   ctdb_check_directories
+   } || exit $?
+
if ctdb_service_needs_reconfigure ; then
ctdb_service_reconfigure
exit 0
@@ -105,13 +112,6 @@ case $1 in
fi
}
 
-   # and that its directories are available
-   [ $CTDB_NFS_SKIP_SHARE_CHECK = yes ] || {
-   exportfs | grep -v '^#' | grep '^/' |
-   sed -e 's/[[:space:]]\+[^[:space:]]*$//' |
-   ctdb_check_directories
-   } || exit $?
-
# check that lockd responds to rpc requests
if ctdb_check_rpc LOCKD 100021 1 /dev/null ; then
(service_name=lockd; ctdb_counter_init)
diff --git a/config/events.d/91.lvs b/config/events.d/91.lvs
index ff95811..19cb445 100755
--- a/config/events.d/91.lvs
+++ b/config/events.d/91.lvs
@@ -59,8 +59,8 @@ case $1 in
ip addr del $CTDB_LVS_PUBLIC_IP/32 dev lo /dev/null 2/dev/null
ip addr add $CTDB_LVS_PUBLIC_IP/32 dev lo /dev/null 2/dev/null
 
-   ipvsadm -A -t $CTDB_LVS_PUBLIC_IP:0 -p  -s lc
-   ipvsadm -A -u $CTDB_LVS_PUBLIC_IP:0 -p  -s lc
+   ipvsadm -A -t $CTDB_LVS_PUBLIC_IP:0 -p 99 -s lc
+   ipvsadm -A -u $CTDB_LVS_PUBLIC_IP:0 -p 99 -s lc
 
# add all nodes (except ourselves) to the lvs config
ctdb lvs | egrep -v ^$PNN: | sed -e s/.*:// | while read IP; do


-- 
CTDB repository


[SCM] CTDB repository - branch 1.2 updated - ctdb-1.9.1-463-gb3f9373

2011-08-10 Thread Ronnie Sahlberg
The branch, 1.2 has been updated
   via  b3f9373b601bad9a31bde7798231c3a58827cd54 (commit)
  from  39d8a4c0f174d7dbd706c785ca604f614a81fb91 (commit)

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


- Log -
commit b3f9373b601bad9a31bde7798231c3a58827cd54
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date:   Thu Aug 11 09:11:38 2011 +1000

make the persistent even longer for lvs to make people even happier

---

Summary of changes:
 config/events.d/91.lvs |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/config/events.d/91.lvs b/config/events.d/91.lvs
index 19cb445..0355ae9 100755
--- a/config/events.d/91.lvs
+++ b/config/events.d/91.lvs
@@ -59,8 +59,8 @@ case $1 in
ip addr del $CTDB_LVS_PUBLIC_IP/32 dev lo /dev/null 2/dev/null
ip addr add $CTDB_LVS_PUBLIC_IP/32 dev lo /dev/null 2/dev/null
 
-   ipvsadm -A -t $CTDB_LVS_PUBLIC_IP:0 -p 99 -s lc
-   ipvsadm -A -u $CTDB_LVS_PUBLIC_IP:0 -p 99 -s lc
+   ipvsadm -A -t $CTDB_LVS_PUBLIC_IP:0 -p 9 -s lc
+   ipvsadm -A -u $CTDB_LVS_PUBLIC_IP:0 -p 9 -s lc
 
# add all nodes (except ourselves) to the lvs config
ctdb lvs | egrep -v ^$PNN: | sed -e s/.*:// | while read IP; do


-- 
CTDB repository


[SCM] CTDB repository - branch master updated - ctdb-1.10-334-g8158077

2011-08-10 Thread Ronnie Sahlberg
The branch, master has been updated
   via  8158077624eb763ba40c6a7b4b7faf3867b205d7 (commit)
  from  68ea19cb02017e93769df7f6312d5e0bef55e605 (commit)

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


- Log -
commit 8158077624eb763ba40c6a7b4b7faf3867b205d7
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date:   Thu Aug 11 09:11:38 2011 +1000

make the persistent even longer for lvs to make people even happier

---

Summary of changes:
 config/events.d/91.lvs |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/config/events.d/91.lvs b/config/events.d/91.lvs
index 19cb445..0355ae9 100755
--- a/config/events.d/91.lvs
+++ b/config/events.d/91.lvs
@@ -59,8 +59,8 @@ case $1 in
ip addr del $CTDB_LVS_PUBLIC_IP/32 dev lo /dev/null 2/dev/null
ip addr add $CTDB_LVS_PUBLIC_IP/32 dev lo /dev/null 2/dev/null
 
-   ipvsadm -A -t $CTDB_LVS_PUBLIC_IP:0 -p 99 -s lc
-   ipvsadm -A -u $CTDB_LVS_PUBLIC_IP:0 -p 99 -s lc
+   ipvsadm -A -t $CTDB_LVS_PUBLIC_IP:0 -p 9 -s lc
+   ipvsadm -A -u $CTDB_LVS_PUBLIC_IP:0 -p 9 -s lc
 
# add all nodes (except ourselves) to the lvs config
ctdb lvs | egrep -v ^$PNN: | sed -e s/.*:// | while read IP; do


-- 
CTDB repository


[SCM] CTDB repository - branch 1.2 updated - ctdb-1.9.1-465-gb8bc053

2011-08-10 Thread Ronnie Sahlberg
The branch, 1.2 has been updated
   via  b8bc053f9b5ef3d33f3967d2a3c2e9319a8fea28 (commit)
   via  b65efc69317756fe60479c0df58c874da3fde6db (commit)
  from  b3f9373b601bad9a31bde7798231c3a58827cd54 (commit)

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


- Log -
commit b8bc053f9b5ef3d33f3967d2a3c2e9319a8fea28
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date:   Thu Aug 11 10:09:52 2011 +1000

document the new check for file system use

commit b65efc69317756fe60479c0df58c874da3fde6db
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date:   Thu Aug 11 10:00:53 2011 +1000

Add new eventscript 40.fs_use that can be used to monitor file system use 
and flag a node unhealthy when they become full

---

Summary of changes:
 Makefile.in|1 +
 config/ctdb.sysconfig  |9 +++
 config/events.d/40.fs_use  |   53 
 packaging/RPM/ctdb.spec.in |1 +
 4 files changed, 64 insertions(+), 0 deletions(-)
 create mode 100644 config/events.d/40.fs_use


Changeset truncated at 500 lines:

diff --git a/Makefile.in b/Makefile.in
index 5fa9e98..3a4e7d9 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -257,6 +257,7 @@ install: all
${INSTALLCMD} -m 644 config/events.d/20.multipathd 
$(DESTDIR)$(etcdir)/ctdb/events.d
${INSTALLCMD} -m 644 config/events.d/31.clamd 
$(DESTDIR)$(etcdir)/ctdb/events.d
${INSTALLCMD} -m 755 config/events.d/40.vsftpd 
$(DESTDIR)$(etcdir)/ctdb/events.d
+   ${INSTALLCMD} -m 644 config/events.d/40.fs_use 
$(DESTDIR)$(etcdir)/ctdb/events.d
${INSTALLCMD} -m 755 config/events.d/41.httpd 
$(DESTDIR)$(etcdir)/ctdb/events.d
${INSTALLCMD} -m 755 config/events.d/50.samba 
$(DESTDIR)$(etcdir)/ctdb/events.d
${INSTALLCMD} -m 755 config/events.d/60.nfs 
$(DESTDIR)$(etcdir)/ctdb/events.d
diff --git a/config/ctdb.sysconfig b/config/ctdb.sysconfig
index b0ee474..1f2edc4 100644
--- a/config/ctdb.sysconfig
+++ b/config/ctdb.sysconfig
@@ -290,6 +290,15 @@ CTDB_DEBUGLEVEL=ERR
 # newly manage or no longer manage them?
 CTDB_SERVICE_AUTOSTARTSTOP=yes
 
+# Monitor filesystem useage.
+# when set, and the 40.fs_use eventscript is enabled, this variable
+# allows to monitor the filesystem use and flag a node as unhealthy when
+# the filesystem becomes too full.
+# This is useful for example when /var grows too big.
+# Example: monitor both / and /var and make the node unhealthy when eitehr go
+# above 90%
+# CTDB_CHECK_FS_USE=/:90 /var:90
+
 # 
 #
 # set any default tuning options for ctdb
diff --git a/config/events.d/40.fs_use b/config/events.d/40.fs_use
new file mode 100644
index 000..14d33fa
--- /dev/null
+++ b/config/events.d/40.fs_use
@@ -0,0 +1,53 @@
+#!/bin/sh
+# ctdb event script for checking local file system utilization
+
+. $CTDB_BASE/functions
+loadconfig
+
+case $1 in 
+monitor)
+# check each specified fs to be checked
+# config format is fs_mount:fs_threshold
+for fs in $CTDB_CHECK_FS_USE
+do
+# parse fs_mount and fs_threshold
+fs_config=(`echo $fs | tr ':' '\n'`)
+fs_mount=${fs_config[0])}
+fs_threshold=${fs_config[1])}
+
+# check if given fs_mount is existing directory
+if [ ! -d $fs_mount ]; then
+echo $0: Directory $fs_mount does not exist
+exit 1
+fi
+
+# check if given fs_threshold is number
+if ! [[ $fs_threshold =~ ^[0-9]+$ ]] ; then
+echo $0: Threshold $fs_threshold is invalid number
+exit 1
+fi
+
+# get utilization of given fs from df
+fs_usage=`df -k $fs_mount | grep % | awk {'print $5'} | sed 
's/%//g' | tail -n 1`
+
+# check if fs_usage is number
+if ! [[ $fs_usage =~ ^[0-9]+$ ]] ; then
+echo $0: FS utilization $fs_usage is invalid number
+exit 1
+fi
+
+# check if fs_usage is higher than or equal to fs_threshold
+if [[ $fs_usage -ge $fs_threshold ]] ; then
+echo ERROR: Utilization of $fs_mount ($fs_usage%) is higher 
than threshold ($fs_threshold%)
+exit 1
+fi
+done
+
+   ;;
+
+*)
+   ctdb_standard_event_handler $@
+   ;;
+esac
+
+exit 0
diff --git a/packaging/RPM/ctdb.spec.in b/packaging/RPM/ctdb.spec.in
index 543f342..f397c67 100644
--- a/packaging/RPM/ctdb.spec.in
+++ b/packaging/RPM/ctdb.spec.in
@@ -102,6 +102,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/ctdb/events.d/11.routing
 %{_sysconfdir}/ctdb/events.d/20.multipathd
 %{_sysconfdir}/ctdb/events.d/31.clamd
+%{_sysconfdir}/ctdb/events.d/40.fs_use
 %{_sysconfdir}/ctdb/events.d/40.vsftpd
 %{_sysconfdir}/ctdb/events.d/41.httpd
 %{_sysconfdir}/ctdb/events.d/50.samba


-- 

[SCM] CTDB repository - branch master updated - ctdb-1.10-336-g9f10c5d

2011-08-10 Thread Ronnie Sahlberg
The branch, master has been updated
   via  9f10c5d48a08ffb3417f880c801aed2aa2dc1355 (commit)
   via  2fd1babf8135ad5d53f3b25ba823d840ebc66460 (commit)
  from  8158077624eb763ba40c6a7b4b7faf3867b205d7 (commit)

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


- Log -
commit 9f10c5d48a08ffb3417f880c801aed2aa2dc1355
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date:   Thu Aug 11 10:07:50 2011 +1000

Add documentation for the new filesystem use monitoring

commit 2fd1babf8135ad5d53f3b25ba823d840ebc66460
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date:   Thu Aug 11 10:00:53 2011 +1000

Add new eventscript 40.fs_use that can be used to monitor file system use 
and flag a node unhealthy when they become full

---

Summary of changes:
 Makefile.in|1 +
 config/ctdb.sysconfig  |9 +++
 config/events.d/40.fs_use  |   53 
 packaging/RPM/ctdb.spec.in |1 +
 4 files changed, 64 insertions(+), 0 deletions(-)
 create mode 100644 config/events.d/40.fs_use


Changeset truncated at 500 lines:

diff --git a/Makefile.in b/Makefile.in
index d53d3db..0cce22e 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -258,6 +258,7 @@ install: all
${INSTALLCMD} -m 644 config/events.d/20.multipathd 
$(DESTDIR)$(etcdir)/ctdb/events.d
${INSTALLCMD} -m 644 config/events.d/31.clamd 
$(DESTDIR)$(etcdir)/ctdb/events.d
${INSTALLCMD} -m 755 config/events.d/40.vsftpd 
$(DESTDIR)$(etcdir)/ctdb/events.d
+   ${INSTALLCMD} -m 644 config/events.d/40.fs_use 
$(DESTDIR)$(etcdir)/ctdb/events.d
${INSTALLCMD} -m 755 config/events.d/41.httpd 
$(DESTDIR)$(etcdir)/ctdb/events.d
${INSTALLCMD} -m 755 config/events.d/50.samba 
$(DESTDIR)$(etcdir)/ctdb/events.d
${INSTALLCMD} -m 755 config/events.d/60.nfs 
$(DESTDIR)$(etcdir)/ctdb/events.d
diff --git a/config/ctdb.sysconfig b/config/ctdb.sysconfig
index 011593d..5115094 100644
--- a/config/ctdb.sysconfig
+++ b/config/ctdb.sysconfig
@@ -286,6 +286,15 @@ CTDB_DEBUGLEVEL=ERR
 # This parameter controls how many entries we allow for this in memory log
 # CTDB_LOG_RINGBUF_SIZE=50
 
+# Monitor filesystem useage.
+# when set, and the 40.fs_use eventscript is enabled, this variable
+# allows to monitor the filesystem use and flag a node as unhealthy when
+# the filesystem becomes too full.
+# This is useful for example when /var grows too big.
+# Example: monitor both / and /var and make the node unhealthy when eitehr go
+# above 90%
+# CTDB_CHECK_FS_USE=/:90 /var:90
+
 # 
 #
 # set any default tuning options for ctdb
diff --git a/config/events.d/40.fs_use b/config/events.d/40.fs_use
new file mode 100644
index 000..14d33fa
--- /dev/null
+++ b/config/events.d/40.fs_use
@@ -0,0 +1,53 @@
+#!/bin/sh
+# ctdb event script for checking local file system utilization
+
+. $CTDB_BASE/functions
+loadconfig
+
+case $1 in 
+monitor)
+# check each specified fs to be checked
+# config format is fs_mount:fs_threshold
+for fs in $CTDB_CHECK_FS_USE
+do
+# parse fs_mount and fs_threshold
+fs_config=(`echo $fs | tr ':' '\n'`)
+fs_mount=${fs_config[0])}
+fs_threshold=${fs_config[1])}
+
+# check if given fs_mount is existing directory
+if [ ! -d $fs_mount ]; then
+echo $0: Directory $fs_mount does not exist
+exit 1
+fi
+
+# check if given fs_threshold is number
+if ! [[ $fs_threshold =~ ^[0-9]+$ ]] ; then
+echo $0: Threshold $fs_threshold is invalid number
+exit 1
+fi
+
+# get utilization of given fs from df
+fs_usage=`df -k $fs_mount | grep % | awk {'print $5'} | sed 
's/%//g' | tail -n 1`
+
+# check if fs_usage is number
+if ! [[ $fs_usage =~ ^[0-9]+$ ]] ; then
+echo $0: FS utilization $fs_usage is invalid number
+exit 1
+fi
+
+# check if fs_usage is higher than or equal to fs_threshold
+if [[ $fs_usage -ge $fs_threshold ]] ; then
+echo ERROR: Utilization of $fs_mount ($fs_usage%) is higher 
than threshold ($fs_threshold%)
+exit 1
+fi
+done
+
+   ;;
+
+*)
+   ctdb_standard_event_handler $@
+   ;;
+esac
+
+exit 0
diff --git a/packaging/RPM/ctdb.spec.in b/packaging/RPM/ctdb.spec.in
index c006b51..f618e76 100644
--- a/packaging/RPM/ctdb.spec.in
+++ b/packaging/RPM/ctdb.spec.in
@@ -102,6 +102,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/ctdb/events.d/11.routing
 %{_sysconfdir}/ctdb/events.d/20.multipathd
 %{_sysconfdir}/ctdb/events.d/31.clamd
+%{_sysconfdir}/ctdb/events.d/40.fs_use
 %{_sysconfdir}/ctdb/events.d/40.vsftpd
 

[SCM] CTDB repository - branch master updated - ctdb-1.10-337-g8de5513

2011-08-10 Thread Ronnie Sahlberg
The branch, master has been updated
   via  8de5513b3ad89711da845c7588d35b32e2f2acb6 (commit)
  from  9f10c5d48a08ffb3417f880c801aed2aa2dc1355 (commit)

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


- Log -
commit 8de5513b3ad89711da845c7588d35b32e2f2acb6
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date:   Thu Aug 11 11:45:59 2011 +1000

When starting and stopping ctdb through the init-script, make sure we first 
clear all public ips bvefore we start the daemon, in case they are still 
hanging around since a previous kill -9   and also make sure we drop them after 
we have stopped the deamon when shutting down

CQ S1027550

---

Summary of changes:
 config/ctdb.init |   18 ++
 1 files changed, 18 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/config/ctdb.init b/config/ctdb.init
index 9e32bac..c65ad1a 100755
--- a/config/ctdb.init
+++ b/config/ctdb.init
@@ -215,6 +215,16 @@ wait_until_ready () {
 
 ctdbd=${CTDBD:-/usr/sbin/ctdbd}
 
+drop_all_public_ips() {
+[ -z $CTDB_PUBLIC_ADDRESSES ]  {
+   return
+}
+
+cat $CTDB_PUBLIC_ADDRESSES | while read IP IFACE REST; do
+   ip addr del $IP dev $IFACE /dev/null 2/dev/null
+done
+}
+
 start() {
 echo -n $Starting ctdbd service: 
 
@@ -225,6 +235,10 @@ start() {
 
 build_ctdb_options
 
+# make sure we drop any ips that might still be held if previous
+# instance of ctdb got killed with -9 or similar
+drop_all_public_ips
+
 check_persistent_databases || return $?
 
 if [ $CTDB_SUPPRESS_COREFILE = yes ]; then
@@ -305,6 +319,9 @@ stop() {
pkill -9 -f $CTDB_BASE/events.d/
}
 done
+# make sure all ips are dropped, pfkill -9 might leave them hanging around
+drop_all_public_ips
+
 case $init_style in
suse)
# re-set the return code to the recorded RETVAL in order
@@ -318,6 +335,7 @@ stop() {
echo 
;;
 esac
+
 return $RETVAL
 }
 


-- 
CTDB repository


[SCM] CTDB repository - branch 1.2 updated - ctdb-1.9.1-466-g0267ff4

2011-08-10 Thread Ronnie Sahlberg
The branch, 1.2 has been updated
   via  0267ff4e017243aeef11adcb737eeccb475578a8 (commit)
  from  b8bc053f9b5ef3d33f3967d2a3c2e9319a8fea28 (commit)

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


- Log -
commit 0267ff4e017243aeef11adcb737eeccb475578a8
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date:   Thu Aug 11 11:45:59 2011 +1000

When starting and stopping ctdb through the init-script, make sure we first 
clear all public ips bvefore we start the daemon, in case they are still 
hanging around since a previous kill -9   and also make sure we drop them after 
we have stopped the deamon when shutting down

CQ S1027550

---

Summary of changes:
 config/ctdb.init |   18 ++
 1 files changed, 18 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/config/ctdb.init b/config/ctdb.init
index 1dc051c..d6493bd 100755
--- a/config/ctdb.init
+++ b/config/ctdb.init
@@ -219,6 +219,16 @@ wait_until_ready () {
 
 ctdbd=${CTDBD:-/usr/sbin/ctdbd}
 
+drop_all_public_ips() {
+[ -z $CTDB_PUBLIC_ADDRESSES ]  {
+   return
+}
+
+cat $CTDB_PUBLIC_ADDRESSES | while read IP IFACE REST; do
+   ip addr del $IP dev $IFACE /dev/null 2/dev/null
+done
+}
+
 start() {
 echo -n $Starting ctdbd service: 
 
@@ -229,6 +239,10 @@ start() {
 
 build_ctdb_options
 
+# make sure we drop any ips that might still be held if previous
+# instance of ctdb got killed with -9 or similar
+drop_all_public_ips
+
 check_persistent_databases || return $?
 
 if [ $CTDB_SUPPRESS_COREFILE = yes ]; then
@@ -309,6 +323,9 @@ stop() {
pkill -9 -f $CTDB_BASE/events.d/
}
 done
+# make sure all ips are dropped, pfkill -9 might leave them hanging around
+drop_all_public_ips
+
 case $init_style in
suse)
# re-set the return code to the recorded RETVAL in order
@@ -322,6 +339,7 @@ stop() {
echo 
;;
 esac
+
 return $RETVAL
 }
 


-- 
CTDB repository


[SCM] CTDB repository - branch master updated - ctdb-1.10-365-g2086482

2011-08-10 Thread Ronnie Sahlberg
The branch, master has been updated
   via  20864822372b6d574c545287002a429b273c4bcc (commit)
   via  c45a89418ba733ff91d48340d72bdb6d2ef80051 (commit)
   via  642292d7ba7a95567964b4160c7ee31a4f8985d1 (commit)
   via  21dfcbbdccd906fcd6ab7bba81418ce565bf63aa (commit)
   via  defaec99df8c279d8e315d5010f9146e013afda2 (commit)
   via  de13350c17261032a7468c2cf4d2cf4a8d66a840 (commit)
   via  f928c201b6d0e1cd3e5568ae65186e3cee7c4988 (commit)
   via  01776b9f29af9ad5c8534649ece1bd100e450434 (commit)
   via  5b01b7233515669e995e037205796e265643b176 (commit)
   via  881af7c1417962b9b3ade6565b3e8eb9f9df7a97 (commit)
   via  a9ab1937239761dc32b143c9d225447bc6f090b4 (commit)
   via  f57d1722b6aa082f3f826171acc57d7d796ea95c (commit)
   via  6da7095192fb172a06b434cfb02f4bfa6221b343 (commit)
   via  05a8fcfbac3da2b5843b31e0fe258255cc761190 (commit)
   via  beabf506a5eb68fc50fdbf8772c1d2bb0f7951e3 (commit)
   via  0f003f05e28037eefdce3a686fcb52cd2289af9d (commit)
   via  7c070b0bc86b3b9a91a9dc263b72c0567934535c (commit)
   via  cc4c5c19af7efe01c48f73bb5ec5e607ed79db4c (commit)
   via  da3aedd1a472b430b75989d3c157efedd382e327 (commit)
   via  51c45b1c4751af41e5f9fd252763e0025f8cce3a (commit)
   via  15d4111d0761d82f57d5d4f0b1227812d14e4d7c (commit)
   via  8675744cbd90b5a5095ed6fff7b36ae82004a457 (commit)
   via  86e4aefed9fd1028660c98e3ea758c2b75ffc1d8 (commit)
   via  b14f18649f42aab80ce0336c15ab6159f241c9af (commit)
   via  758f4667c60089e09a0439c1eb74f5e426ca5e2e (commit)
   via  538902fbc1e74134a03987b36b3733ad641f8971 (commit)
   via  d8f0f8948abd340088720718fef7dc858661ba23 (commit)
   via  257a2e350280c0b76ed2fac588cad167381fda52 (commit)
  from  8de5513b3ad89711da845c7588d35b32e2f2acb6 (commit)

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


- Log -
commit 20864822372b6d574c545287002a429b273c4bcc
Merge: 8de5513b3ad89711da845c7588d35b32e2f2acb6 
c45a89418ba733ff91d48340d72bdb6d2ef80051
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date:   Thu Aug 11 14:01:02 2011 +1000

Merge remote branch 'martins/eventscript_infrastructure'

commit c45a89418ba733ff91d48340d72bdb6d2ef80051
Author: Martin Schwenke mar...@meltin.net
Date:   Mon May 23 16:00:05 2011 +1000

Eventscripts: in 60.nfs move statd-notify code to service_reconfigure().

This means that it now occurs on every reconfigure event.  As a result
the ipreallocated event is removed.

Signed-off-by: Martin Schwenke mar...@meltin.net

commit 642292d7ba7a95567964b4160c7ee31a4f8985d1
Author: Martin Schwenke mar...@meltin.net
Date:   Thu Aug 11 13:55:02 2011 +1000

Eventscripts - 60.nfs should define service_reconfigure().

Not $service_reconfigure.

Signed-off-by: Martin Schwenke mar...@meltin.net

commit 21dfcbbdccd906fcd6ab7bba81418ce565bf63aa
Author: Martin Schwenke mar...@meltin.net
Date:   Fri Jan 14 09:31:56 2011 +1100

Evenscripts: improvements to ctdb_service_check_reconfigure().

* Make this function applicable to ipreallocated event too.

* Monitor event should not always succeed just because we reconfigure.

  If the service was unhealthy before the reconfigure and we end the
  reconfigure with exit 0 then we can cause the node's health status
  to flip-flop.

  To avoid this we return the status of the service from the previous
  monitor event.

Signed-off-by: Martin Schwenke mar...@meltin.net

commit defaec99df8c279d8e315d5010f9146e013afda2
Author: Martin Schwenke mar...@meltin.net
Date:   Fri May 27 14:37:37 2011 +1000

Eventscripts: 50.samba - only start/stop nmbd if $CTDB_SERVICE_NMB set.

Signed-off-by: Martin Schwenke mar...@meltin.net

commit de13350c17261032a7468c2cf4d2cf4a8d66a840
Author: Martin Schwenke mar...@meltin.net
Date:   Mon May 23 15:37:09 2011 +1000

Eventscripts: 50.samba needs null service_reconfigure() function.

Samba doesn't need to do anything for configuration changes.  It will
notice configuration changes and reload automatically.

Signed-off-by: Martin Schwenke mar...@meltin.net

commit f928c201b6d0e1cd3e5568ae65186e3cee7c4988
Author: Martin Schwenke mar...@meltin.net
Date:   Fri Jan 14 09:42:18 2011 +1100

Eventscripts: 40.vsftpd service_stop() no longer /dev/null's output.

Signed-off-by: Martin Schwenke mar...@meltin.net

commit 01776b9f29af9ad5c8534649ece1bd100e450434
Author: Martin Schwenke mar...@meltin.net
Date:   Fri Jan 14 09:43:01 2011 +1100

Eventscripts: improvements to 41.httpd.

* Reduce the failure counts so that restart attempts happen sooner.

* Use service_start() and service_stop() for the restart.
  ctdb_service_start() resets the failure count, which isn't very
  useful in this context.

Signed-off-by: Martin Schwenke 

[SCM] CTDB repository - branch master updated - ctdb-1.10-367-g84ac667

2011-08-10 Thread Ronnie Sahlberg
The branch, master has been updated
   via  84ac667af408816e5508719b9fdb7c5e25408640 (commit)
   via  a6e61867c7a58d5a77cd8641d8df0b105cddff77 (commit)
  from  20864822372b6d574c545287002a429b273c4bcc (commit)

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


- Log -
commit 84ac667af408816e5508719b9fdb7c5e25408640
Merge: 20864822372b6d574c545287002a429b273c4bcc 
a6e61867c7a58d5a77cd8641d8df0b105cddff77
Author: Ronnie Sahlberg ronniesahlb...@gmail.com
Date:   Thu Aug 11 14:15:22 2011 +1000

Merge remote branch 'martins/eventscript.10.interface'

commit a6e61867c7a58d5a77cd8641d8df0b105cddff77
Author: Martin Schwenke mar...@meltin.net
Date:   Wed Aug 10 16:06:26 2011 +1000

Eventscripts - fix 10.interface bash incompatibility.

In dash, this fails gracefully with nothing to stderr:

  t=$(cat /does_not_exist) 2/dev/null

In bash the error from cat is still printed due to different order of
evaluation.

This works everywhere:

  t=$(cat /does_not_exist 2/dev/null)

Signed-off-by: Martin Schwenke mar...@meltin.net

---

Summary of changes:
 config/events.d/10.interface |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/config/events.d/10.interface b/config/events.d/10.interface
index b912ab3..baf3171 100755
--- a/config/events.d/10.interface
+++ b/config/events.d/10.interface
@@ -44,7 +44,7 @@ monitor_interfaces()
# When we use VLANs for bond interfaces, there will only
# be an entry in /proc for the underlying real interface
REALIFACE=`echo $IFACE |sed -e 's/\..*$//'`
-   bi=$(get_proc net/bonding/$REALIFACE) 2/dev/null  {
+   bi=$(get_proc net/bonding/$REALIFACE 2/dev/null)  {
echo $bi | grep -q 'Currently Active Slave: None'  {
echo ERROR: No active slaves for bond device 
$REALIFACE
fail=1


-- 
CTDB repository