[Samba] File disappear when saving it with windows seven

2010-11-15 Thread Brenda Scywith
Hello, 

I have a Debian server up to date with the backport version of samba :
3.5.5. My kernel is a 2.6.26-2-amd64 (64 bits). Everything is working
fine with xp station. But with seven, when I modify a file and save
sometimes the file disappear or when application report an error and the
file is left in old state (not saved). I try remove all kind of lock
with the following configuration directive : 

veto oplock files = /*/
oplocks = no
level2 oplocks = False
blocking locks = no
strict locking = no
locking = no
share modes = no

but my files still disappear !

Do you have an idea ?

Regards,
Brenda


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


[Samba] The least possible Samba client version able to work with Samba 3.5.6 server

2010-11-15 Thread Konstantin Boyandin

Hello,

We have to work with a number of old OS; the problem is to find out what 
minimal Samba version is required to make a client work with a server 
running Samba 3.5.6.


In my experiments I had to use at least Samba 3.3.*, but if there are 
use cases for much earlier versions, I'd be glad to know of them.


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


Re: [Samba] SAMBA accessible with hostname only on local subnet

2010-11-15 Thread *...@ppu
Dear Aaron,

Sorry for the delay in repying.Please find the output of route command.
default gateway was set properly and its is pinging.

Destination Gateway Genmask Flags Metric RefUse
Iface
172.27.0.0  *   255.255.240.0   U 0  00 eth0
169.254.0.0 *   255.255.0.0 U 0  00 eth0
default 172.27.0.1  0.0.0.0 UG0  00 eth0


From: Aaron E. ssures...@gmail.com
To: samba@lists.samba.org
Date: Thu, 11 Nov 2010 08:15:54 -0500
Subject: Re: [Samba] SAMBA accessible with hostname only on local subnet
I would verify the routing table on the server. This sounds like the default
gateway isn't set or the server doesn't know how to reach the other
networks.

try # route
and examine the table.

On 11/11/2010 06:17 AM, *...@ppu wrote:

hi all,

i have integrated SAMBA with active directory and everthing is working .
however  SAMBA server is accessible with hostname only on local
subnet. it is not opening in other subnets and opening with ipaddress.
it keeps on asking for password and saying access denied while using
net view \\testsamba file://testsamba/ corp.raju.ad.
command
any one faced the same problem ?? please help me out.


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


Re: [Samba] Samba for z/OS 1.10

2010-11-15 Thread Volker Lendecke
On Mon, Nov 15, 2010 at 10:45:56AM +0100, martin.h...@helvetia.ch wrote:
 thanks for your feedback.
 Yes sure we have a C/C++ compiler which also supports some posix 
 standards...
 
 I'm just not a c programmer if there would be any need for correcting the 
 source code?!?
 but for the build process on the mainframe, this would be no problem, as 
 lond it is
 compilable...
 I am in contact with samba.org to get technical assistance there also,
 I let you know, what I will get...

Well, I'm sending mail from my SerNet address, but I'd
consider myself to also participate in samba.org activities
every now and then. I haven't seen any requests in other
channels. Who in samba.org are you talking to?

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


Re: [Samba] File disappear when saving it with windows seven

2010-11-15 Thread Hachi

Hi,

what do you mean with disappear?
Removed or hidden?

Is any information in the log-files, at the time, you see the files 
disappearing?


Am 15.11.2010 09:37, schrieb Brenda Scywith:

Hello,

I have a Debian server up to date with the backport version of samba :
3.5.5. My kernel is a 2.6.26-2-amd64 (64 bits). Everything is working
fine with xp station. But with seven, when I modify a file and save
sometimes the file disappear or when application report an error and the
file is left in old state (not saved). I try remove all kind of lock
with the following configuration directive :

veto oplock files = /*/
oplocks = no
level2 oplocks = False
blocking locks = no
strict locking = no
locking = no
share modes = no

but my files still disappear !

Do you have an idea ?

Regards,
Brenda





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


Re: [Samba] SAMBA accessible with hostname only on local subnet

2010-11-15 Thread Aaron E.

Other items to check are,
1. can you ping by hostname
2. can you ping by ip
a. if you cannot by hostname then you have a DNS issue,

3. What type of firewall is between? Check the configuration..
4. Check the firewall configuration on your samba server. (fedora has 
most items blocked by default (including samba)(ubuntu I dont' even has 
firewall enabled.)


What OS's are involved..



On 11/15/2010 05:02 AM, *...@ppu wrote:

Dear Aaron,

Sorry for the delay in repying.Please find the output of route command.
default gateway was set properly and its is pinging.

Destination Gateway Genmask Flags Metric RefUse
Iface
172.27.0.0  *   255.255.240.0   U 0  00 eth0
169.254.0.0 *   255.255.0.0 U 0  00 eth0
default 172.27.0.1  0.0.0.0 UG0  00 eth0


From: Aaron E.ssures...@gmail.com
To: samba@lists.samba.org
Date: Thu, 11 Nov 2010 08:15:54 -0500
Subject: Re: [Samba] SAMBA accessible with hostname only on local subnet
I would verify the routing table on the server. This sounds like the default
gateway isn't set or the server doesn't know how to reach the other
networks.

try # route
and examine the table.

On 11/11/2010 06:17 AM, *...@ppu wrote:

hi all,

i have integrated SAMBA with active directory and everthing is working .
however  SAMBA server is accessible with hostname only on local
subnet. it is not opening in other subnets and opening with ipaddress.
it keeps on asking for password and saying access denied while using
net view \\testsambafile://testsamba/  corp.raju.ad.
command
any one faced the same problem ?? please help me out.


Regards
Appaji.p


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


Re: [Samba] winbind - wbinfo problem

2010-11-15 Thread Vivekanandan Nataraj
Hi John,

Thanks for your reply.

# net ads testjoin

[2010/11/15 06:40:27,  0] libads/sasl.c:819(ads_sasl_spnego_bind)
  kinit succeeded but ads_sasl_spnego_krb5_bind failed: Invalid credentials
[2010/11/15 06:40:29,  0] libads/sasl.c:819(ads_sasl_spnego_bind)
  kinit succeeded but ads_sasl_spnego_krb5_bind failed: Invalid credentials
Join to domain is not valid: Invalid credentials

but,

# net rpc testjoin
Join to 'SQUID' is OK

# net ads info -U Administrator

Enter Administrator's password:
LDAP server: 172.16.1.33
LDAP server name: EIS.squid.biz
Realm: SQUID.BIZ
Bind Path: dc=SQUID,dc=BIZ
LDAP port: 389
Server time: Mon, 15 Nov 2010 06:45:33 IST
KDC server: 172.16.1.33
Server time offset: 43

# net rpc info -U Administrator

Enter Administrator's password:
Domain Name: SQUID
Domain SID: S-1-5-21-419217316-27721265-2755569738
Sequence number: 548
Num users: 29
Num domain groups: 10
Num local groups: 39

# wbinfo -a 'vivek%vivek'

plaintext password authentication succeeded
challenge/response password authentication succeeded

# wbinfo -K 'vivek%vivek'
plaintext kerberos password authentication for [vivek%vivek] failed
(requesting cctype: FILE)
Could not authenticate user [vivek%vivek] with Kerberos (ccache: FILE)

 # kinit vivek
Password for vi...@squid.biz:
#

Anything need to be modify on the Windows side ??..next step i will remove
the system from the domain and try everything...

Thanks in advance.

Regards,
VIvek


On Mon, Nov 15, 2010 at 8:25 AM, John Stile j...@stilen.com wrote:

 Invalid credentials points to a problem, thought I'm guessing, with
 the domain membership.

 I'm really not sure what it means.

 Does 'ads testjoin' show anything?

 Would it be too much trouble to remove the system from the domain and
 add it back, assuming that was the the problem?

 1. remove the machine from the domain (on the AD server),
 2. stop smbd, nmbd, and winbindd.
 3. find and remove  *.tdb  files.
 4. Check 'date' vs. 'net date'
 5. net ads join -U 'SQUID.BIZ+username'%'passwd'
 6. check 'net ads testjoin'
 7. check 'net ads info'
 8. start daemon: 'winbindd -d 3 -i'
 9.  wbinfo -a 'SQUID.BIZ+username'%'password'
 10. wbinfo -K 'SQUID.BIZ+username'%'password'
 11. kinit username

 On Mon, 2010-11-15 at 00:32 +0530, Vivekanandan Nataraj wrote:
  Hi John,
 
 
  Thanks for your reply.
 
 
  This is the result :-
 
 
  #wbinfo -u
 
 
  Connected to LDAP server EIS.squid.biz
  ads_sasl_spnego_bind: got OID=1.2.840.48018.1.2.2
  ads_sasl_spnego_bind: got OID=1.2.840.113554.1.2.2
  ads_sasl_spnego_bind: got OID=1.2.840.113554.1.2.2.3
  ads_sasl_spnego_bind: got OID=1.3.6.1.4.1.311.2.2.10
  ads_sasl_spnego_bind: got server principal name = e...@squid.biz
  ads_cleanup_expired_creds: Ticket in ccache[MEMORY:winbind_ccache]
  expiration Sun, 14 Nov 2010 22:22:14 IST
  ads_cleanup_expired_creds: Ticket in ccache[MEMORY:winbind_ccache]
  expiration Sun, 14 Nov 2010 22:22:26 IST
  kinit succeeded but ads_sasl_spnego_krb5_bind failed: Invalid
  credentials
  ads_connect for domain SQUID failed: Invalid credentials
  final write to client failed: Broken pipe
 
 
 
 
  #wbinfo -g
 
 
  Connected to LDAP server EIS.squid.biz
  ads_sasl_spnego_bind: got OID=1.2.840.48018.1.2.2
  ads_sasl_spnego_bind: got OID=1.2.840.113554.1.2.2
  ads_sasl_spnego_bind: got OID=1.2.840.113554.1.2.2.3
  ads_sasl_spnego_bind: got OID=1.3.6.1.4.1.311.2.2.10
  ads_sasl_spnego_bind: got server principal name = e...@squid.biz
  ads_cleanup_expired_creds: Ticket in ccache[MEMORY:winbind_ccache]
  expiration Sun, 14 Nov 2010 22:27:10 IST
  ads_cleanup_expired_creds: Ticket in ccache[MEMORY:winbind_ccache]
  expiration Sun, 14 Nov 2010 22:27:12 IST
  kinit succeeded but ads_sasl_spnego_krb5_bind failed: Invalid
  credentials
  ads_connect for domain SQUID failed: Invalid credentials
  final write to client failed: Broken pipe
 
 
  any problem with krb configuration ???
 
 
  Regards,
  Vivek
 
 
 
 
  On Sun, Nov 14, 2010 at 11:59 PM, John Stile j...@stilen.com wrote:
  You could try to run winbindd manually (winbindd -d 3 -i), and
  from
  another console run 'wbinfo -u', and see if any errors present
  them
  selves in the console where you ran winbindd.  First make sure
  no other
  winbind daemon is running, by testing, as root, with:  lsof -i
  tcp -nP |
  grep winbind
 
 
  On Sun, 2010-11-14 at 23:41 +0530, Vivekanandan Nataraj wrote:
   Hi John,
  
  
   Thanks for your reply.
  
  
   I have modified the nsswitch.conf file and smb.conf as per
  your
   suggestions.
  
  
   Still wbinfo does not list the users... I have rebooted the
  server
   after modification.
  
  
   and  #rm -rf /var/lib/samba/* and restart the services and
  joined the
   domain again. but no luck..
  
  
   

Re: [Samba] File disappear when saving it with windows seven

2010-11-15 Thread Brenda Scywith
Le lundi 15 novembre 2010 à 12:28 +0100, Hachi a écrit :
 Hi,
 
 what do you mean with disappear?
 Removed or hidden?

The file is removed. Sometimes the file is left in the previous state.
For example, if I try to remove 5 second at the end of a wav file and
save the file. I have an error while saving the file and the file still
have the last 5 second. With the same action, sometimes, the file is
removed. 

 Is any information in the log-files, at the time, you see the files 
 disappearing?

I have too many log messages with :

log level = 9

Maybe I can try with another log level ?

Brenda.
 
 Am 15.11.2010 09:37, schrieb Brenda Scywith:
  Hello,
 
  I have a Debian server up to date with the backport version of samba :
  3.5.5. My kernel is a 2.6.26-2-amd64 (64 bits). Everything is working
  fine with xp station. But with seven, when I modify a file and save
  sometimes the file disappear or when application report an error and the
  file is left in old state (not saved). I try remove all kind of lock
  with the following configuration directive :
 
  veto oplock files = /*/
  oplocks = no
  level2 oplocks = False
  blocking locks = no
  strict locking = no
  locking = no
  share modes = no
 
  but my files still disappear !
 
  Do you have an idea ?
 
  Regards,
  Brenda
 
 
 
 

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

Re: [Samba] Samba domain member (re)creates sambaDomainName record in LDAP on PDC

2010-11-15 Thread Gaiseric Vandal

I see that happen as well-  although my entries are just

sambaDomainName=MEMBERNAME

not

sambaDomainName=MEMBERNAME,dc=example,dc=com


Otherwise, this seems to be normal.


On 11/13/2010 01:52 AM, Konstantin Boyandin wrote:

Hello,

I have followed the steps mentioned in

http://www.samba.org/samba/docs/man/Samba-Guide/unixclients.html#sdcsdmldap 



and used the proposed smb.conf template (replacing only the actual 
redentials/LDAP names) to join a Linux workstation as a domain member. 
Everything went OK, but I noticed that a record like


sambaDomainName=MEMBERNAME,dc=example,dc=com

where MEMBERNAME is the netbios name of a domain member keeps being 
created in PDC LDAP DB, even if I delete it.


Is it the expected behavior?

Thanks.


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


Re: [Samba] Samba domain member (re)creates sambaDomainName record in LDAP on PDC

2010-11-15 Thread Anil Wakhare
Hi,
I have made a samba server,I want to write a script to add a 70 user in
samba server at a time can u help me?

On Mon, Nov 15, 2010 at 10:09 PM, Gaiseric Vandal gaiseric.van...@gmail.com
 wrote:

 I see that happen as well-  although my entries are just

sambaDomainName=MEMBERNAME

 not

sambaDomainName=MEMBERNAME,dc=example,dc=com


 Otherwise, this seems to be normal.


 On 11/13/2010 01:52 AM, Konstantin Boyandin wrote:

 Hello,

 I have followed the steps mentioned in


 http://www.samba.org/samba/docs/man/Samba-Guide/unixclients.html#sdcsdmldap

 and used the proposed smb.conf template (replacing only the actual
 redentials/LDAP names) to join a Linux workstation as a domain member.
 Everything went OK, but I noticed that a record like

 sambaDomainName=MEMBERNAME,dc=example,dc=com

 where MEMBERNAME is the netbios name of a domain member keeps being
 created in PDC LDAP DB, even if I delete it.

 Is it the expected behavior?

 Thanks.


 --
 To unsubscribe from this list go to the following URL and read the
 instructions:  https://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] how to map shared folders when start user profile in XP

2010-11-15 Thread Gaiseric Vandal
Are you using a login script?  That should take care of mapping shared 
folders to drive letters.


You can't use login scripts to setup printers.   If the printers are 
properly shared from a Windows server or Samba server users should be 
able to easily locate them in My Network Places.



On 11/12/2010 06:33 AM, marcos gonzalez wrote:

Hi guys

I have configured samba 3.3.2 in a domain with Xp clients and I would like
to config inside clients the shared folders how units when users starts, and
the printers too. Im looking for this and the information is very confused,
and I dont know which the fast option for users. Suggestions?

Thanks
   


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


Re: [Samba] how to map shared folders when start user profile in XP

2010-11-15 Thread Anil Wakhare
hi,
Thank you for giving relpy,I have made the samba successfully,it access to
all the user,i want only script to add multiple user with password to samba
server.

On Mon, Nov 15, 2010 at 10:25 PM, Gaiseric Vandal gaiseric.van...@gmail.com
 wrote:

 Are you using a login script?  That should take care of mapping shared
 folders to drive letters.

 You can't use login scripts to setup printers.   If the printers are
 properly shared from a Windows server or Samba server users should be able
 to easily locate them in My Network Places.


 On 11/12/2010 06:33 AM, marcos gonzalez wrote:

 Hi guys

 I have configured samba 3.3.2 in a domain with Xp clients and I would like
 to config inside clients the shared folders how units when users starts,
 and
 the printers too. Im looking for this and the information is very
 confused,
 and I dont know which the fast option for users. Suggestions?

 Thanks



 --
 To unsubscribe from this list go to the following URL and read the
 instructions:  https://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] how to map shared folders when start user profile in XP

2010-11-15 Thread Gaiseric Vandal

You should be able to use a bash or bourne shell script e.g.

for i in `cat userlist.txt`
do
adduser $i ..
smbpasswd -a $i
done


With adduser just set the local unix account /bin/false as the shell.

On 11/15/2010 12:05 PM, Anil Wakhare wrote:

hi,
Thank you for giving relpy,I have made the samba successfully,it 
access to all the user,i want only script to add multiple user with 
password to samba server.


On Mon, Nov 15, 2010 at 10:25 PM, Gaiseric Vandal 
gaiseric.van...@gmail.com mailto:gaiseric.van...@gmail.com wrote:


Are you using a login script?  That should take care of mapping
shared folders to drive letters.

You can't use login scripts to setup printers.   If the printers
are properly shared from a Windows server or Samba server users
should be able to easily locate them in My Network Places.


On 11/12/2010 06:33 AM, marcos gonzalez wrote:

Hi guys

I have configured samba 3.3.2 in a domain with Xp clients and
I would like
to config inside clients the shared folders how units when
users starts, and
the printers too. Im looking for this and the information is
very confused,
and I dont know which the fast option for users. Suggestions?

Thanks


-- 
To unsubscribe from this list go to the following URL and read the

instructions: https://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


[Samba] inherit permissions option - feature or bug?

2010-11-15 Thread R.Brunsendorf
Hi,

assume two folders (directory A and B) with the sgid-bit (2770) enabled,
owned by different groups and located on the same samba-share with
inherit permissions option enabled for the share:

moving some files on a windows machine from directory A to dir B the
group-ownership of the files do not change to the group owning directory
B.

Is this feature or bug? Copying works as expected: group-ownership changes
to group owning dir b.

I've tested with samba 3.5.6

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


Re: [Samba] inherit permissions option - feature or bug?

2010-11-15 Thread Chris Weiss
move preserves, copy creates as new.  not a bug, by Windows design.

On Mon, Nov 15, 2010 at 11:28 AM, R.Brunsendorf r...@b2bytes.de wrote:
 Hi,

 assume two folders (directory A and B) with the sgid-bit (2770) enabled,
 owned by different groups and located on the same samba-share with
 inherit permissions option enabled for the share:

 moving some files on a windows machine from directory A to dir B the
 group-ownership of the files do not change to the group owning directory
 B.

 Is this feature or bug? Copying works as expected: group-ownership changes
 to group owning dir b.

 I've tested with samba 3.5.6

 Regards
 Rolf Brunsendorf
 --
 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] how to map shared folders when start user profile in XP

2010-11-15 Thread Anil Wakhare
Thank you!!

On Mon, Nov 15, 2010 at 10:50 PM, Gaiseric Vandal gaiseric.van...@gmail.com
 wrote:

  You should be able to use a bash or bourne shell script e.g.

 for i in `cat userlist.txt`
 do
 adduser $i ..
 smbpasswd -a $i
 done


 With adduser just set the local unix account /bin/false as the shell.

 On 11/15/2010 12:05 PM, Anil Wakhare wrote:

 hi,
 Thank you for giving relpy,I have made the samba successfully,it access to
 all the user,i want only script to add multiple user with password to samba
 server.

 On Mon, Nov 15, 2010 at 10:25 PM, Gaiseric Vandal 
 gaiseric.van...@gmail.com wrote:

 Are you using a login script?  That should take care of mapping shared
 folders to drive letters.

 You can't use login scripts to setup printers.   If the printers are
 properly shared from a Windows server or Samba server users should be able
 to easily locate them in My Network Places.


 On 11/12/2010 06:33 AM, marcos gonzalez wrote:

 Hi guys

 I have configured samba 3.3.2 in a domain with Xp clients and I would
 like
 to config inside clients the shared folders how units when users starts,
 and
 the printers too. Im looking for this and the information is very
 confused,
 and I dont know which the fast option for users. Suggestions?

 Thanks



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




 --

 ---

 Thanks  Regards.
 Anil S Wakhare.
 Pune 411027,Maharashtra,India
 Ph:-9763328839





-- 

---

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


[Samba] duplicate uid between over a trust

2010-11-15 Thread gregorcy
Hi,

I having a problem where different users from different domain connected via a 
trust are being assigned the same uid.
For example:

 www3 ~ #  getent passwd | grep 2933
 gregorcy:*:2933:1013:Brian Gregorcy:/home/CHE/gregorcy:/bin/bash
 USERS+mualenzu:*:2933:547:mualenzu:/home/USERS/mualenzu:/bin/bash
 
  grego...@fluent ~ $ ssh che+grego...@155.98.115.135
  Password: 
  Last login: Mon Nov 15 11:05:47 MST 2010 from fluent.che.utah.edu on ssh
  users+muale...@vwww3 ~ $ 


I am wondering if there is a way to configure samba so the users get different 
uid assigned.  This is what I have for a
smb.conf

 [global]
 workgroup   = CHE
 netbios name= vwww3
 realm   = CHE.UTAH.EDU
 server string   = CHE web server
 security= ADS
 preferred master= no
 client use spnego   = yes
 server signing  = auto
 encrypt passwords   = yes
 nt acl support  = yes
 acl map full control= yes
 wide links  = no
 password server = *
 log level   = 3
 log file= /var/log/samba/%m
 max log size= 100
 winbind offline logon= yes
 idmap backend   = tdb
 idmap uid = 500-10
 idmap gid = 500-10
 winbind separator   = +
 winbind use default domain  = yes
 winbind enum users  = yes
 winbind enum groups = yes
 winbind refresh tickets = yes
 winbind nested groups   = yes
 client ntlmv2 auth  = yes
 encrypt passwords   = yes
 template shell  = /bin/bash
 allow trusted domains   = no


Any ideas?  I have been playing with the settings idmap config DOMAIN : range = 
 but I have not had any success.

Thanks for the help,


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


Re: [Samba] duplicate uid between over a trust

2010-11-15 Thread Anil Wakhare
Hi,
The user is login on both domain?(it is created in both domain?)

On Tue, Nov 16, 2010 at 12:03 AM, gregorcy brian.grego...@utah.edu wrote:

 Hi,

 I having a problem where different users from different domain connected
 via a trust are being assigned the same uid.
 For example:

  www3 ~ #  getent passwd | grep 2933
  gregorcy:*:2933:1013:Brian Gregorcy:/home/CHE/gregorcy:/bin/bash
  USERS+mualenzu:*:2933:547:mualenzu:/home/USERS/mualenzu:/bin/bash
 
   grego...@fluent ~ $ ssh 
   che+grego...@155.98.115.135che%2bgrego...@155.98.115.135
   Password:
   Last login: Mon Nov 15 11:05:47 MST 2010 from fluent.che.utah.edu on
 ssh
   users+muale...@vwww3 ~ $


 I am wondering if there is a way to configure samba so the users get
 different uid assigned.  This is what I have for a
 smb.conf

  [global]
  workgroup   = CHE
  netbios name= vwww3
  realm   = CHE.UTAH.EDU
  server string   = CHE web server
  security= ADS
  preferred master= no
  client use spnego   = yes
  server signing  = auto
  encrypt passwords   = yes
  nt acl support  = yes
  acl map full control= yes
  wide links  = no
  password server = *
  log level   = 3
  log file= /var/log/samba/%m
  max log size= 100
  winbind offline logon= yes
  idmap backend   = tdb
  idmap uid = 500-10
  idmap gid = 500-10
  winbind separator   = +
  winbind use default domain  = yes
  winbind enum users  = yes
  winbind enum groups = yes
  winbind refresh tickets = yes
  winbind nested groups   = yes
  client ntlmv2 auth  = yes
  encrypt passwords   = yes
  template shell  = /bin/bash
  allow trusted domains   = no


 Any ideas?  I have been playing with the settings idmap config DOMAIN :
 range =  but I have not had any success.

 Thanks for the help,


 --Brian Gregorcy
 --
 To unsubscribe from this list go to the following URL and read the
 instructions:  https://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] StorNext CVFS

2010-11-15 Thread Brian McGrew
 On Sun, Nov 14, 2010 at 06:56:57AM -0800, Brian McGrew wrote:
 On 11/13/10 3:08 PM, Volker Lendecke volker.lende...@sernet.de wrote:
 
 On Sat, Nov 13, 2010 at 12:07:23PM -0800, Brian McGrew wrote:
 There is a level 10 log attached.  I stopped samba, cleared the logs,
 restarted samba, tried to connect, stopped samba and grabbed the logs.
 
 Is it possible you're trying to connect to share vol2
 where it should be called data2?
 
 No, the shares really are called data1 and data2.  When I first setup Samba
 on this machine, the shares were called vol1 and vol2 but that name was
 
 That's the point. The log file indicated that you tried to
 connect to vol2 and not data2. Please retry connecting to
 the share data2.

I'll attach a copy of my config file at the end of this message.  The list
won't let me attach a screen shot, but I'm for sure trying to map to
\\qfs\data1 or \\qfs\data2.  There is a homes share defined in my config
file and in Network Places, that share (called brian) works fine and I can
map to \\qfs\brian and read and write to it.  It's only the data1 and data2
shares that are the Quantum StorNext CVFS filesystem that are giving me
problems.

It's probably also worth pointing out that the config file I'm using is the
exact same as a config file on another Samba server that is working fine.
The only difference is the other server is sharing a GPFS filesystem and not
a CVFS filesystem.  Note the GPFS tags in the config file --- seems to make
no difference on the broken server, with or without those tags.

-brian

[global]
workgroup = 8950HIX
netbios name = QFS
server string = QFS Samba Server
password server = *
realm = 8950HIX.COM
security = ads
idmap uid = 16777216-33554431
idmap gid = 16777216-33554431
template shell = /bin/bash
template homedir = /gpfs/home/%D/%U
winbind use default domain = yes
winbind offline logon = no
idmap backend = rid
encrypt passwords = yes
log level = 3
log file = /var/log/samba/smbd.log
;clustering = yes
idmap backend = tdb2
fileid:mapping = fsname
use mmap = no
vfs objects = gpfs fileid
gpfs:sharemodes = yes
force unknown acl user = yes
nfs4: mode = special
nfs4: chown = yes
nfs4: acedup = merge

[homes]
comment = Home Directories
browseable = no
writable = yes

[data1]
comment = QFS Volume One
path = /vol1/data1
browseable = yes
writable = yes

[data2]
comment = QFS Volume One
path = /vol2/data2
browseable = yes
writable = yes

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


Re: [Samba] StorNext CVFS

2010-11-15 Thread Anil Wakhare
Hi,
can you help me?
what is IBM AIX,I want brief information about it,can any give it.

On Tue, Nov 16, 2010 at 12:51 AM, Brian McGrew br...@visionpro.com wrote:

  On Sun, Nov 14, 2010 at 06:56:57AM -0800, Brian McGrew wrote:
  On 11/13/10 3:08 PM, Volker Lendecke volker.lende...@sernet.de
 wrote:
 
  On Sat, Nov 13, 2010 at 12:07:23PM -0800, Brian McGrew wrote:
  There is a level 10 log attached.  I stopped samba, cleared the logs,
  restarted samba, tried to connect, stopped samba and grabbed the logs.
 
  Is it possible you're trying to connect to share vol2
  where it should be called data2?
 
  No, the shares really are called data1 and data2.  When I first setup
 Samba
  on this machine, the shares were called vol1 and vol2 but that name was
 
  That's the point. The log file indicated that you tried to
  connect to vol2 and not data2. Please retry connecting to
  the share data2.

 I'll attach a copy of my config file at the end of this message.  The list
 won't let me attach a screen shot, but I'm for sure trying to map to
 \\qfs\data1 or \\qfs\data2.  There is a homes share defined in my config
 file and in Network Places, that share (called brian) works fine and I can
 map to \\qfs\brian and read and write to it.  It's only the data1 and data2
 shares that are the Quantum StorNext CVFS filesystem that are giving me
 problems.

 It's probably also worth pointing out that the config file I'm using is the
 exact same as a config file on another Samba server that is working fine.
 The only difference is the other server is sharing a GPFS filesystem and
 not
 a CVFS filesystem.  Note the GPFS tags in the config file --- seems to make
 no difference on the broken server, with or without those tags.

 -brian

 [global]
workgroup = 8950HIX
netbios name = QFS
server string = QFS Samba Server
password server = *
realm = 8950HIX.COM
security = ads
idmap uid = 16777216-33554431
idmap gid = 16777216-33554431
template shell = /bin/bash
template homedir = /gpfs/home/%D/%U
winbind use default domain = yes
winbind offline logon = no
idmap backend = rid
encrypt passwords = yes
log level = 3
log file = /var/log/samba/smbd.log
;clustering = yes
idmap backend = tdb2
fileid:mapping = fsname
use mmap = no
vfs objects = gpfs fileid
gpfs:sharemodes = yes
force unknown acl user = yes
nfs4: mode = special
nfs4: chown = yes
nfs4: acedup = merge

 [homes]
comment = Home Directories
browseable = no
writable = yes

 [data1]
comment = QFS Volume One
path = /vol1/data1
browseable = yes
writable = yes

 [data2]
comment = QFS Volume One
path = /vol2/data2
browseable = yes
writable = yes

 --
 To unsubscribe from this list go to the following URL and read the
 instructions:  https://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] StorNext CVFS

2010-11-15 Thread Brian McGrew
Hello...

IBM AIX is a Unix like operating system developed by IBM that is usually run
on their big-iron boxes like the zSeries.

See this link for more info: http://en.wikipedia.org/wiki/IBM_AIX

-b


On 11/15/10 11:37 AM, Anil Wakhare aswakh...@gmail.com wrote:

 Hi,
 can you help me?
 what is IBM AIX,I want brief information about it,can any give it.
 
 On Tue, Nov 16, 2010 at 12:51 AM, Brian McGrew br...@visionpro.com wrote:
  On Sun, Nov 14, 2010 at 06:56:57AM -0800, Brian McGrew wrote:
  On 11/13/10 3:08 PM, Volker Lendecke volker.lende...@sernet.de
 wrote:
 
  On Sat, Nov 13, 2010 at 12:07:23PM -0800, Brian McGrew wrote:
  There is a level 10 log attached.  I stopped samba, cleared the
 logs,
  restarted samba, tried to connect, stopped samba and grabbed the
 logs.
 
  Is it possible you're trying to connect to share vol2
  where it should be called data2?
 
  No, the shares really are called data1 and data2.  When I first setup
 Samba
  on this machine, the shares were called vol1 and vol2 but that name was
 
  That's the point. The log file indicated that you tried to
  connect to vol2 and not data2. Please retry connecting to
  the share data2.
 
 I'll attach a copy of my config file at the end of this message.  The list
 won't let me attach a screen shot, but I'm for sure trying to map to
 \\qfs\data1 or \\qfs\data2.  There is a homes share defined in my config
 file and in Network Places, that share (called brian) works fine and I can
 map to \\qfs\brian and read and write to it.  It's only the data1 and data2
 shares that are the Quantum StorNext CVFS filesystem that are giving me
 problems.
 
 It's probably also worth pointing out that the config file I'm using is the
 exact same as a config file on another Samba server that is working fine.
 The only difference is the other server is sharing a GPFS filesystem and not
 a CVFS filesystem.  Note the GPFS tags in the config file --- seems to make
 no difference on the broken server, with or without those tags.
 
 -brian
 
 [global]
     workgroup = 8950HIX
     netbios name = QFS
     server string = QFS Samba Server
     password server = *
     realm = 8950HIX.COM http://8950HIX.COM
     security = ads
     idmap uid = 16777216-33554431
     idmap gid = 16777216-33554431
     template shell = /bin/bash
     template homedir = /gpfs/home/%D/%U
     winbind use default domain = yes
     winbind offline logon = no
     idmap backend = rid
     encrypt passwords = yes
     log level = 3
     log file = /var/log/samba/smbd.log
     ;clustering = yes
     idmap backend = tdb2
     fileid:mapping = fsname
     use mmap = no
     vfs objects = gpfs fileid
     gpfs:sharemodes = yes
     force unknown acl user = yes
     nfs4: mode = special
     nfs4: chown = yes
     nfs4: acedup = merge
 
 [homes]
     comment = Home Directories
     browseable = no
     writable = yes
 
 [data1]
     comment = QFS Volume One
     path = /vol1/data1
     browseable = yes
     writable = yes
 
 [data2]
     comment = QFS Volume One
     path = /vol2/data2
     browseable = yes
     writable = yes
 
 --
 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] StorNext CVFS

2010-11-15 Thread Anil Wakhare
Thanks

On Tue, Nov 16, 2010 at 1:09 AM, Brian McGrew br...@visionpro.com wrote:

  Hello...

 IBM AIX is a Unix like operating system developed by IBM that is usually
 run on their big-iron boxes like the zSeries.

 See this link for more info: http://en.wikipedia.org/wiki/IBM_AIX

 -b



 On 11/15/10 11:37 AM, Anil Wakhare aswakh...@gmail.com wrote:

 Hi,
 can you help me?
 what is IBM AIX,I want brief information about it,can any give it.

 On Tue, Nov 16, 2010 at 12:51 AM, Brian McGrew br...@visionpro.com
 wrote:

  On Sun, Nov 14, 2010 at 06:56:57AM -0800, Brian McGrew wrote:
  On 11/13/10 3:08 PM, Volker Lendecke volker.lende...@sernet.de
 wrote:
 
  On Sat, Nov 13, 2010 at 12:07:23PM -0800, Brian McGrew wrote:
  There is a level 10 log attached.  I stopped samba, cleared the logs,
  restarted samba, tried to connect, stopped samba and grabbed the logs.
 
  Is it possible you're trying to connect to share vol2
  where it should be called data2?
 
  No, the shares really are called data1 and data2.  When I first setup
 Samba
  on this machine, the shares were called vol1 and vol2 but that name was
 
  That's the point. The log file indicated that you tried to
  connect to vol2 and not data2. Please retry connecting to
  the share data2.

 I'll attach a copy of my config file at the end of this message.  The list
 won't let me attach a screen shot, but I'm for sure trying to map to
 \\qfs\data1 or \\qfs\data2.  There is a homes share defined in my config
 file and in Network Places, that share (called brian) works fine and I can
 map to \\qfs\brian and read and write to it.  It's only the data1 and data2
 shares that are the Quantum StorNext CVFS filesystem that are giving me
 problems.

 It's probably also worth pointing out that the config file I'm using is the
 exact same as a config file on another Samba server that is working fine.
 The only difference is the other server is sharing a GPFS filesystem and
 not
 a CVFS filesystem.  Note the GPFS tags in the config file --- seems to make
 no difference on the broken server, with or without those tags.

 -brian

 [global]
 workgroup = 8950HIX
 netbios name = QFS
 server string = QFS Samba Server
 password server = *
 realm = 8950HIX.COM http://8950HIX.COM
 security = ads
 idmap uid = 16777216-33554431
 idmap gid = 16777216-33554431
 template shell = /bin/bash
 template homedir = /gpfs/home/%D/%U
 winbind use default domain = yes
 winbind offline logon = no
 idmap backend = rid
 encrypt passwords = yes
 log level = 3
 log file = /var/log/samba/smbd.log
 ;clustering = yes
 idmap backend = tdb2
 fileid:mapping = fsname
 use mmap = no
 vfs objects = gpfs fileid
 gpfs:sharemodes = yes
 force unknown acl user = yes
 nfs4: mode = special
 nfs4: chown = yes
 nfs4: acedup = merge

 [homes]
 comment = Home Directories
 browseable = no
 writable = yes

 [data1]
 comment = QFS Volume One
 path = /vol1/data1
 browseable = yes
 writable = yes

 [data2]
 comment = QFS Volume One
 path = /vol2/data2
 browseable = yes
 writable = yes

 --
 To unsubscribe from this list go to the following URL and read the
 instructions:  https://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


[Samba] Anil Wakhare wants to chat

2010-11-15 Thread Anil Wakhare
---

Anil Wakhare wants to stay in better touch using some of Google's coolest new
products.

If you already have Gmail or Google Talk, visit:
http://mail.google.com/mail/b-c7b307dd78-149ace74d1-8_P8n8ofhRXPPRatnl-czFXMq8Q
You'll need to click this link to be able to chat with Anil Wakhare.

To get Gmail - a free email account from Google with over 2,800 megabytes of
storage - and chat with Anil Wakhare, visit:
http://mail.google.com/mail/a-c7b307dd78-149ace74d1-8_P8n8ofhRXPPRatnl-czFXMq8Q

Gmail offers:
- Instant messaging right inside Gmail
- Powerful spam protection
- Built-in search for finding your messages and a helpful way of organizing
  emails into conversations
- No pop-up ads or untargeted banners - just text ads and related information
  that are relevant to the content of your messages

All this, and its yours for free. But wait, there's more! By opening a Gmail
account, you also get access to Google Talk, Google's instant messaging
service:

http://www.google.com/talk/

Google Talk offers:
- Web-based chat that you can use anywhere, without a download
- A contact list that's synchronized with your Gmail account
- Free, high quality PC-to-PC voice calls when you download the Google Talk
  client

We're working hard to add new features and make improvements, so we might also
ask for your comments and suggestions periodically. We appreciate your help in
making our products even better!

Thanks,
The Google Team

To learn more about Gmail and Google Talk, visit:
http://mail.google.com/mail/help/about.html
http://www.google.com/talk/about.html

(If clicking the URLs in this message does not work, copy and paste them into
the address bar of your browser).
-- 
To unsubscribe from this list go to the following URL and read the
instructions:  https://lists.samba.org/mailman/options/samba


Re: [Samba] StorNext CVFS

2010-11-15 Thread Volker Lendecke
On Mon, Nov 15, 2010 at 11:21:55AM -0800, Brian McGrew wrote:
 I'll attach a copy of my config file at the end of this message.  The list
 won't let me attach a screen shot, but I'm for sure trying to map to
 \\qfs\data1 or \\qfs\data2.  There is a homes share defined in my config

Well, then the log files lie, sorry. I have deleted them,
but there definitely were connection attempts to vol2.

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


Re: [Samba] StorNext CVFS

2010-11-15 Thread Brian McGrew
On 11/15/10 12:17 PM, Volker Lendecke volker.lende...@sernet.de wrote:

 On Mon, Nov 15, 2010 at 11:21:55AM -0800, Brian McGrew wrote:
 I'll attach a copy of my config file at the end of this message.  The list
 won't let me attach a screen shot, but I'm for sure trying to map to
 \\qfs\data1 or \\qfs\data2.  There is a homes share defined in my config
 
 Well, then the log files lie, sorry. I have deleted them,
 but there definitely were connection attempts to vol2.

AH...  It just hit me why you're seeing those names in the logs:

Samba share \\qfs\data1 is really qfs:/vol1 from StorNext server.
Samba share \\qfs\data2 is really qfs:/vol2 from StorNext server.

(I was wondering where the heck the smb logs got vol1 and vol2 from).

From Windows I'm trying to connect to \\qfs\data1 and \\qfs\data2.

-brian

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


[Samba] SAMBA ON MAC

2010-11-15 Thread Larry
HI

 

Does anyone have any guide for the samba on mac os x?

 

 

I found a lot of things missed on mac

 

Thanks

 

Larry

 

 

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


Re: [Samba] StorNext CVFS

2010-11-15 Thread Volker Lendecke
On Mon, Nov 15, 2010 at 12:25:14PM -0800, Brian McGrew wrote:
 AH...  It just hit me why you're seeing those names in the logs:
 
 Samba share \\qfs\data1 is really qfs:/vol1 from StorNext server.
 Samba share \\qfs\data2 is really qfs:/vol2 from StorNext server.

No. There were tconX requests to the share name vol2. If you
re-send the logs I can copypaste the lines for you.

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


Re: [Samba] duplicate uid between over a trust

2010-11-15 Thread gregorcy


On 11/15/10 11:33, gregorcy wrote:
 Hi,
 
 I having a problem where different users from different domain connected via 
 a trust are being assigned the same uid.
 For example:
 
 www3 ~ #  getent passwd | grep 2933
 gregorcy:*:2933:1013:Brian Gregorcy:/home/CHE/gregorcy:/bin/bash
 USERS+mualenzu:*:2933:547:mualenzu:/home/USERS/mualenzu:/bin/bash

 grego...@fluent ~ $ ssh che+grego...@vwww3
 Password: 
 Last login: Mon Nov 15 11:05:47 MST 2010 from fluent.che.utah.edu on ssh
 users+muale...@vwww3 ~ $ 
 
 
 I am wondering if there is a way to configure samba so the users get 
 different uid assigned.  This is what I have for a
 smb.conf
 
 [global]
 workgroup   = CHE
 netbios name= vwww3
 realm   = CHE.UTAH.EDU
 server string   = CHE web server
 security= ADS
 preferred master= no
 client use spnego   = yes
 server signing  = auto
 encrypt passwords   = yes
 nt acl support  = yes
 acl map full control= yes
 wide links  = no
 password server = *
 log level   = 3
 log file= /var/log/samba/%m
 max log size= 100
 winbind offline logon= yes
 idmap backend   = tdb
 idmap uid = 500-10
 idmap gid = 500-10
 winbind separator   = +
 winbind use default domain  = yes
 winbind enum users  = yes
 winbind enum groups = yes
 winbind refresh tickets = yes
 winbind nested groups   = yes
 client ntlmv2 auth  = yes
 encrypt passwords   = yes
 template shell  = /bin/bash
 allow trusted domains   = no
 
 
 Any ideas?  I have been playing with the settings idmap config DOMAIN : range 
 =  but I have not had any success.
 

Found the issue, I removed this line:

 idmap backend   = rid:KPAK=500-1


Readded it and everything is working.


--Brian



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


[Samba] Win7 SLOW printing

2010-11-15 Thread Ryan Suarez

Greetings,

We use a dedicated samba-3.3.12+cups-1.3.11 on debian lenny to serve 
printing (with point and print) to windows clients.  We're getting 
complaints that some clients (win7, vista, XP) have to wait an awful 
long time from when they hit 'print' to when the job starts coming out 
of the printer.  Other clients (win7, vista, XP) print right away.


I can tail the cups log and see that as soon as it gets the job, it's 
printed immediately.  The issue is cups does not log the job until a few 
minutes/hours after the problem clients hit print.  I have a problem 
client to try and isolate the problem.  The only difference I can see 
(for now) is that samba logs this when the problem client prints:


[2010/11/15 16:23:34,  1] lib/util_sock.c:open_socket_out(1424)
  timeout connecting to 192.168.76.10:445
[2010/11/15 16:23:42,  1] lib/util_sock.c:open_socket_out(1424)
  timeout connecting to 192.168.76.10:139
[2010/11/15 16:23:42,  1] libsmb/cliconnect.c:cli_start_connection(1657)
  cli_start_connection: failed to connect to OA-C126-DGC20 
(192.168.76.10). Error NT_STATUS_ACCESS_DENIED

[2010/11/15 16:23:51,  1] lib/util_sock.c:open_socket_out(1424)
  timeout connecting to 192.168.76.10:445
[2010/11/15 16:24:00,  1] lib/util_sock.c:open_socket_out(1424)
  timeout connecting to 192.168.76.10:139
[2010/11/15 16:24:00,  1] libsmb/cliconnect.c:cli_start_connection(1657)
  cli_start_connection: failed to connect to OA-C126-DGC20 
(192.168.76.10). Error NT_STATUS_ACCESS_DENIED

[2010/11/15 16:24:09,  1] lib/util_sock.c:open_socket_out(1424)
  timeout connecting to 192.168.76.10:445
...

A client that prints right away does not get the error above.  Why is 
samba trying to initiate a connection to this client?  Could this be the 
cause of their delay?


thanks and much appreciated,
Ryan

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


Re: [Samba] Samba for z/OS 1.10

2010-11-15 Thread Jim McDonough
On Sat, Nov 13, 2010 at 6:04 PM, Volker Lendecke
volker.lende...@sernet.de wrote:
 On Wed, Nov 10, 2010 at 02:54:48PM +0100, martin.h...@helvetia.ch wrote:
 is there any samba version available for download,
 which runs on IBM MVS, i.e. IBM z/OS 1.10 ...?

 There used to be somthing that claimed to run on MVS ages
 (and I mean AGES, my rough guess would be 10 years) ago.
Yep, right around 10 years ago. IIRC it was possible to build on
OpenEdition MVS.  That was the last time I touched it.  IBM used to
have an SMB server in zOS, though, so it wasn't a real priority.  I
have no idea if that is still available.


-- 
Jim McDonough
Samba Team
SUSE labs
jmcd at samba dot org
jmcd at themcdonoughs dot org
-- 
To unsubscribe from this list go to the following URL and read the
instructions:  https://lists.samba.org/mailman/options/samba


Re: [Samba] Samba for z/OS 1.10

2010-11-15 Thread Stan Hoeppner
Jim McDonough put forth on 11/15/2010 5:13 PM:
 On Sat, Nov 13, 2010 at 6:04 PM, Volker Lendecke
 volker.lende...@sernet.de wrote:
 On Wed, Nov 10, 2010 at 02:54:48PM +0100, martin.h...@helvetia.ch wrote:
 is there any samba version available for download,
 which runs on IBM MVS, i.e. IBM z/OS 1.10 ...?

 There used to be somthing that claimed to run on MVS ages
 (and I mean AGES, my rough guess would be 10 years) ago.
 Yep, right around 10 years ago. IIRC it was possible to build on
 OpenEdition MVS.  That was the last time I touched it.  IBM used to
 have an SMB server in zOS, though, so it wasn't a real priority.  I
 have no idea if that is still available.

Forgive me for possibly being naive, but why not just run a Linux+Samba
VM on top?  Wasn't the renaming to Z series and Z/OS part of IBM's
big virtualized Linux on mainframe push?  Lemme guess, you'd have to
spend a bunch of additional $$ on software, maybe even hardware, just to
get a Linux VM up and running?  If so, that's a shame.

-- 
Stan

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


[Samba] Samba Versions

2010-11-15 Thread Gilmartin, Niall


We are using Samba Version 2.2.5 on a HP D Class Server running HP-UX 10.20. 
Anyway my question is does anybody happen to know what is the latest version of 
Samba that will operate with HP-UX 10.20, or basically any version of Samba 
work with HP-UX 10.20?

Regards

Niall


BancTec Limited.
Registered Office: Jarman House, Mathisen Way, Poyle Road, Colnbrook, Berkshire 
SL3 0HF. Incorporated in England  Wales : 1283512. VAT : GB 228 4783 38.
-- 
To unsubscribe from this list go to the following URL and read the
instructions:  https://lists.samba.org/mailman/options/samba


Re: [Samba] SAMBA ON MAC

2010-11-15 Thread Grant


On Nov 15, 2010, at 12:28 PM, Larry lar...@artonagroup.com wrote:

 HI
 
 Does anyone have any guide for the samba on mac os x?
 
 I found a lot of things missed on mac
 
 Thanks
 
 Larry

On my Mac it just works as installed with the OS, no guide needed. Point and 
click.
 What is missing on yours?
-- 
To unsubscribe from this list go to the following URL and read the
instructions:  https://lists.samba.org/mailman/options/samba


Re: [Samba] Samba Versions

2010-11-15 Thread Volker Lendecke
On Mon, Nov 15, 2010 at 06:10:46PM -0600, Gilmartin, Niall wrote:
 We are using Samba Version 2.2.5 on a HP D Class Server
 running HP-UX 10.20. Anyway my question is does anybody
 happen to know what is the latest version of Samba that
 will operate with HP-UX 10.20, or basically any version of
 Samba work with HP-UX 10.20?

It's the Samba Team's goal to make the latest version
runnable on all Posix platforms. So you might try to compile
3.5.6. If it does not work, please report back any problems.

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


Re: [Samba] how to map shared folders when start user profile in XP

2010-11-15 Thread marcos gonzalez
Hi

yes, Im interested in a login script, but Im a newbie with this and I don't
know where I can take examples. Inside samba documentacion there are no the
sufficient complex examples and in my case Im interested to made a script
for every user.

Suggestions?

Thnaks

2010/11/15 Gaiseric Vandal gaiseric.van...@gmail.com

 Are you using a login script?  That should take care of mapping shared
 folders to drive letters.

 You can't use login scripts to setup printers.   If the printers are
 properly shared from a Windows server or Samba server users should be able
 to easily locate them in My Network Places.



 On 11/12/2010 06:33 AM, marcos gonzalez wrote:

 Hi guys

 I have configured samba 3.3.2 in a domain with Xp clients and I would like
 to config inside clients the shared folders how units when users starts,
 and
 the printers too. Im looking for this and the information is very
 confused,
 and I dont know which the fast option for users. Suggestions?

 Thanks



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


[SCM] Samba Shared Repository - branch master updated

2010-11-15 Thread Andrew Bartlett
The branch, master has been updated
   via  1e29ee3 heimdal Fix handling of backwards cross-realm detection for 
Samba4
   via  6358303 s4-kdc Fix realm handling in our KDC
  from  1409c97 s4: Build ldap and samba3_smb services as shared modules.

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


- Log -
commit 1e29ee3a70151ca830f5523834d1f669fd8d0a82
Author: Andrew Bartlett abart...@samba.org
Date:   Mon Nov 15 18:43:51 2010 +1100

heimdal Fix handling of backwards cross-realm detection for Samba4

Samba4 may modify the case of the realm in a returned entry, but will no 
longer modify the case of the prinicipal components.

The easy way to keep this test passing is to consider also what we
need to do to get the krbtgt account for the PAC signing - and to use
krbtgt/this/@REALM component to fetch the real krbtgt, and to use
that resutl for realm comparion.

Andrew Bartlett

Autobuild-User: Andrew Bartlett abart...@samba.org
Autobuild-Date: Mon Nov 15 08:47:44 UTC 2010 on sn-devel-104

commit 63583037842417f117f8f3db8f576e1e83d42522
Author: Andrew Bartlett abart...@samba.org
Date:   Mon Nov 15 13:30:03 2010 +1100

s4-kdc Fix realm handling in our KDC

we should reset the realm part of the principal, but not the lowercase
realm embedded in the 'krbtgt/re...@realm'.

Andrew Bartlett

---

Summary of changes:
 source4/heimdal/kdc/krb5tgs.c |   66 +---
 source4/kdc/db-glue.c |   44 ---
 2 files changed, 54 insertions(+), 56 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/heimdal/kdc/krb5tgs.c b/source4/heimdal/kdc/krb5tgs.c
index 60fb4dc..9131e5b 100644
--- a/source4/heimdal/kdc/krb5tgs.c
+++ b/source4/heimdal/kdc/krb5tgs.c
@@ -1465,6 +1465,7 @@ tgs_build_reply(krb5_context context,
 krb5_error_code ret;
 krb5_principal cp = NULL, sp = NULL;
 krb5_principal client_principal = NULL;
+krb5_principal krbtgt_principal = NULL;
 char *spn = NULL, *cpn = NULL;
 hdb_entry_ex *server = NULL, *client = NULL, *s4u2self_impersonated_client 
= NULL;
 HDB *clientdb, *s4u2self_impersonated_clientdb;
@@ -1715,21 +1716,6 @@ server_lookup:
  * backward.
  */
 
-if (strcmp(krb5_principal_get_realm(context, server-entry.principal),
-  krb5_principal_get_comp_string(context,
- krbtgt-entry.principal,
- 1)) != 0) {
-   char *tpn;
-   ret = krb5_unparse_name(context, krbtgt-entry.principal, tpn);
-   kdc_log(context, config, 0,
-   Request with wrong krbtgt: %s,
-   (ret == 0) ? tpn : unknown);
-   if(ret == 0)
-   free(tpn);
-   ret = KRB5KRB_AP_ERR_NOT_US;
-   goto out;
-}
-
 /*
  * Validate authoriation data
  */
@@ -1742,14 +1728,58 @@ server_lookup:
goto out;
 }
 
-/* Now refetch the krbtgt, but get the current kvno (the sign check may 
have been on an old kvno) */
-ret = _kdc_db_fetch(context, config, krbtgt-entry.principal, 
HDB_F_GET_KRBTGT, NULL, NULL, krbtgt_out);
+/* Now refetch the primary krbtgt, and get the current kvno (the
+ * sign check may have been on an old kvno, and the server may
+ * have been an incoming trust) */
+ret = krb5_make_principal(context, krbtgt_principal, 
+ krb5_principal_get_comp_string(context,
+
krbtgt-entry.principal,
+1),
+ KRB5_TGS_NAME, 
+ krb5_principal_get_comp_string(context,
+
krbtgt-entry.principal,
+1), NULL);
+if(ret) {
+   kdc_log(context, config, 0,
+   Failed to generate krbtgt principal);
+   goto out;
+}
+
+ret = _kdc_db_fetch(context, config, krbtgt_principal, HDB_F_GET_KRBTGT, 
NULL, NULL, krbtgt_out);
+krb5_free_principal(context, krbtgt_principal);
 if (ret) {
+   krb5_error_code ret2;
+   char *tpn, *tpn2;
+   ret = krb5_unparse_name(context, krbtgt-entry.principal, tpn);
+   ret2 = krb5_unparse_name(context, krbtgt-entry.principal, tpn2);
kdc_log(context, config, 0,
-   Failed to find krbtgt in DB for krbtgt PAC signature);
+   Request with wrong krbtgt: %s, %s not found in our database,
+   (ret == 0) ? tpn : unknown, (ret2 == 0) ? tpn2 : 
unknown);
+   if(ret == 0)
+   free(tpn);
+   if(ret2 == 0)
+   free(tpn2);
+   ret = KRB5KRB_AP_ERR_NOT_US;
goto out;

[SCM] Samba Shared Repository - branch master updated

2010-11-15 Thread Andrew Tridgell
The branch, master has been updated
   via  88d694a waf: fixed configure again on RHEL5
   via  e409db9 s4-dns: added --fail-immediately option to samba_dnsupdate
   via  deaf7e5 s4-dns: fixed registration of multiple IPs in 
samba_dnsupdate
  from  1e29ee3 heimdal Fix handling of backwards cross-realm detection for 
Samba4

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


- Log -
commit 88d694ac8e808a22495dcdd6af181f4738c1f21c
Author: Andrew Tridgell tri...@samba.org
Date:   Mon Nov 15 21:45:42 2010 +1100

waf: fixed configure again on RHEL5

the fancier cmd_output() broke git versioning

Autobuild-User: Andrew Tridgell tri...@samba.org
Autobuild-Date: Mon Nov 15 11:33:41 UTC 2010 on sn-devel-104

commit e409db9da170ae24e3806ccf87d411b42e582945
Author: Andrew Tridgell tri...@samba.org
Date:   Mon Nov 15 19:09:14 2010 +1100

s4-dns: added --fail-immediately option to samba_dnsupdate

this is useful for manual testing

commit deaf7e5995c5120a8009dcd90e17f7e0678d1206
Author: Andrew Tridgell tri...@samba.org
Date:   Mon Nov 15 10:54:50 2010 +1100

s4-dns: fixed registration of multiple IPs in samba_dnsupdate

bitten by python object references again!

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

---

Summary of changes:
 buildtools/wafsamba/samba_version.py  |2 +-
 source4/scripting/bin/samba_dnsupdate |   16 ++--
 2 files changed, 15 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildtools/wafsamba/samba_version.py 
b/buildtools/wafsamba/samba_version.py
index 69f36eb..e6a6ccf 100644
--- a/buildtools/wafsamba/samba_version.py
+++ b/buildtools/wafsamba/samba_version.py
@@ -49,7 +49,7 @@ def git_version_summary(path, have_git):
 if not have_git:
 return (GIT-UNKNOWN, {})
 
-git = Utils.cmd_output(env={GIT_DIR: %s/.git % path}, cmd=[git, 
show, '--pretty=format:%h%n%ct%n%H%n%cd', --stat, HEAD])
+git = Utils.cmd_output('git show --pretty=format:%h%n%ct%n%H%n%cd --stat 
HEAD', silent=True)
 
 lines = git.splitlines()
 fields = {
diff --git a/source4/scripting/bin/samba_dnsupdate 
b/source4/scripting/bin/samba_dnsupdate
index 072f818..9911c6a 100755
--- a/source4/scripting/bin/samba_dnsupdate
+++ b/source4/scripting/bin/samba_dnsupdate
@@ -22,6 +22,7 @@ import os
 import fcntl
 import sys
 import tempfile
+import subprocess
 
 # ensure we get messages out immediately, so they get in the samba logs,
 # and don't get swallowed by a timeout
@@ -49,6 +50,7 @@ import dns.resolver as resolver
 
 default_ttl = 900
 am_rodc = False
+error_count = 0
 
 parser = optparse.OptionParser(samba_dnsupdate)
 sambaopts = options.SambaOptions(parser)
@@ -59,6 +61,7 @@ parser.add_option(--all-names, action=store_true)
 parser.add_option(--all-interfaces, action=store_true)
 parser.add_option(--use-file, type=string, help=Use a file, rather than 
real DNS calls)
 parser.add_option(--update-list, type=string, help=Add DNS names from the 
given file)
+parser.add_option(--fail-immediately, action='store_true', help=Exit on 
first failure)
 
 creds = None
 ccachename = None
@@ -253,7 +256,14 @@ def call_nsupdate(d):
 f.close()
 
 os.putenv(KRB5CCNAME, ccachename)
-os.system(%s %s % (nsupdate_cmd, tmpfile))
+try:
+cmd = %s %s % (nsupdate_cmd, tmpfile)
+subprocess.check_call(cmd, shell=True)
+except subprocess.CalledProcessError:
+global error_count
+if opts.fail_immediately:
+sys.exit(1)
+error_count = error_count + 1
 os.unlink(tmpfile)
 
 
@@ -360,7 +370,7 @@ for d in dns_list:
 if d.type == 'A' and d.ip == $IP:
 d.ip = IPs[0]
 for i in range(len(IPs)-1):
-d2 = d
+d2 = dnsobj(str(d))
 d2.ip = IPs[i+1]
 dns_list.append(d2)
 
@@ -392,3 +402,5 @@ for d in update_list:
 # delete the ccache if we created it
 if ccachename is not None:
 os.unlink(ccachename)
+
+sys.exit(error_count)


-- 
Samba Shared Repository


[SCM] Samba Shared Repository - branch master updated

2010-11-15 Thread Jelmer Vernooij
The branch, master has been updated
   via  c3e24bb heimdal_base: Fix include path so heim_threads.h can be 
found.
   via  f7bccc6 smb_server: Build as shared module.
   via  ee69c4f heimdal_base: Add missing dependency on replace.
   via  f91b7b5 nbtd: Build service as shared module.
  from  88d694a waf: fixed configure again on RHEL5

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


- Log -
commit c3e24bb89f8a50476ac809aaa3fee409e639b0d0
Author: Jelmer Vernooij jel...@samba.org
Date:   Mon Nov 15 12:42:14 2010 +0100

heimdal_base: Fix include path so heim_threads.h can be found.

Autobuild-User: Jelmer Vernooij jel...@samba.org
Autobuild-Date: Mon Nov 15 12:26:53 UTC 2010 on sn-devel-104

commit f7bccc6628db5434c304bcf42eaa249e87ba1f08
Author: Jelmer Vernooij jel...@samba.org
Date:   Mon Nov 15 12:41:58 2010 +0100

smb_server: Build as shared module.

commit ee69c4f4b3d2012037887c4124dd376eebb2f0af
Author: Jelmer Vernooij jel...@samba.org
Date:   Mon Nov 15 12:24:45 2010 +0100

heimdal_base: Add missing dependency on replace.

commit f91b7b5dab904613bd48f663ba768521995ed9e6
Author: Jelmer Vernooij jel...@samba.org
Date:   Mon Nov 15 12:23:46 2010 +0100

nbtd: Build service as shared module.

---

Summary of changes:
 source4/heimdal_build/wscript_build |4 ++--
 source4/nbt_server/wscript_build|3 ++-
 source4/rpc_server/wscript_build|2 +-
 source4/smb_server/wscript_build|2 +-
 source4/smbd/wscript_build  |   10 +-
 source4/torture/wscript_build   |2 +-
 6 files changed, 12 insertions(+), 11 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/heimdal_build/wscript_build 
b/source4/heimdal_build/wscript_build
index 4d8459e..0ebb339 100644
--- a/source4/heimdal_build/wscript_build
+++ b/source4/heimdal_build/wscript_build
@@ -684,8 +684,8 @@ HEIMDAL_SUBSYSTEM('HEIMDAL_HCRYPTO',
 
 HEIMDAL_SUBSYSTEM('HEIMDAL_BASE',
 'base/array.c base/bool.c base/dict.c base/heimbase.c base/string.c 
base/number.c base/null.c',
-includes='../heimdal/base',
-deps='roken'
+includes='../heimdal/base ../heimdal/include',
+deps='roken replace'
 )
 
 
diff --git a/source4/nbt_server/wscript_build b/source4/nbt_server/wscript_build
index 6fe64a4..252a9b8 100644
--- a/source4/nbt_server/wscript_build
+++ b/source4/nbt_server/wscript_build
@@ -42,6 +42,7 @@ bld.SAMBA_MODULE('service_nbtd',
source='nbt_server.c',
subsystem='service',
init_function='server_service_nbtd_init',
-   deps='NBT_SERVER process_model'
+   deps='NBT_SERVER process_model',
+   internal_module=False,
)
 
diff --git a/source4/rpc_server/wscript_build b/source4/rpc_server/wscript_build
index 97fd41c..29c1723 100644
--- a/source4/rpc_server/wscript_build
+++ b/source4/rpc_server/wscript_build
@@ -11,7 +11,7 @@ bld.SAMBA_SUBSYSTEM('DCERPC_COMMON',
autoproto='common/proto.h',
public_headers='common/common.h',
header_path='dcerpc_server',
-   deps='ldb DCERPC_SHARE'
+   deps='ldb DCERPC_SHARE samba_server_gensec'
)
 
 
diff --git a/source4/smb_server/wscript_build b/source4/smb_server/wscript_build
index a9e150e..bdf6469 100644
--- a/source4/smb_server/wscript_build
+++ b/source4/smb_server/wscript_build
@@ -6,7 +6,7 @@ bld.SAMBA_MODULE('SERVICE_SMB',
subsystem='service',
init_function='server_service_smb_init',
deps='SMB_SERVER netif shares samba-hostconfig',
-   internal_module=True
+   internal_module=False,
)
 
 
diff --git a/source4/smbd/wscript_build b/source4/smbd/wscript_build
index 3a59049..0d91d41 100644
--- a/source4/smbd/wscript_build
+++ b/source4/smbd/wscript_build
@@ -1,11 +1,11 @@
 #!/usr/bin/env python
 
 bld.SAMBA_LIBRARY('service',
-  source='service.c service_stream.c service_named_pipe.c 
service_task.c',
-  autoproto='service_proto.h',
-  deps='tevent MESSAGING samba_socket RPC_NDR_IRPC 
NDR_NAMED_PIPE_AUTH NAMED_PIPE_AUTH_TSTREAM gssapi credentials LIBTSOCKET 
LIBSAMBA_TSOCKET process_model',
-  private_library=True
-  )
+   source='service.c service_stream.c service_named_pipe.c service_task.c',
+   autoproto='service_proto.h',
+   deps='tevent MESSAGING samba_socket RPC_NDR_IRPC NDR_NAMED_PIPE_AUTH 
NAMED_PIPE_AUTH_TSTREAM gssapi credentials LIBTSOCKET LIBSAMBA_TSOCKET 
process_model',
+   private_library=True
+   )
 
 
 bld.SAMBA_SUBSYSTEM('PIDFILE',
diff --git a/source4/torture/wscript_build b/source4/torture/wscript_build
index 9b802ef..e24e9f1 100644
--- a/source4/torture/wscript_build
+++ b/source4/torture/wscript_build
@@ -44,7 +44,7 @@ bld.SAMBA_MODULE('torture_rpc',
autoproto='rpc/proto.h',
subsystem='smbtorture',
 

[SCM] Samba Shared Repository - branch master updated

2010-11-15 Thread Matthias Dieter Wallnöfer
The branch, master has been updated
   via  16e73c6 s4:objectclass LDB module - implement the objectClass 
change restrictions on Windows 2000 forest function level
  from  c3e24bb heimdal_base: Fix include path so heim_threads.h can be 
found.

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


- Log -
commit 16e73c68cb18fe428e83ee1b5ef9e17af743fae4
Author: Matthias Dieter Wallnöfer m...@samba.org
Date:   Mon Nov 15 13:00:58 2010 +0100

s4:objectclass LDB module - implement the objectClass change restrictions 
on Windows 2000 forest function level

Autobuild-User: Matthias Dieter Wallnöfer m...@samba.org
Autobuild-Date: Mon Nov 15 13:10:05 UTC 2010 on sn-devel-104

---

Summary of changes:
 source4/dsdb/samdb/ldb_modules/objectclass.c |   25 +
 1 files changed, 25 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/dsdb/samdb/ldb_modules/objectclass.c 
b/source4/dsdb/samdb/ldb_modules/objectclass.c
index e863d48..5e3226a 100644
--- a/source4/dsdb/samdb/ldb_modules/objectclass.c
+++ b/source4/dsdb/samdb/ldb_modules/objectclass.c
@@ -840,6 +840,31 @@ static int objectclass_modify(struct ldb_module *module, 
struct ldb_request *req
oc_changes = true;
}
 
+   /* MS-ADTS 3.1.1.5.3.5 - on a forest level  2003 we do allow updates
+* only on application NCs - not on the standard DCs */
+   if (oc_changes 
+   (dsdb_forest_functional_level(ldb)  DS_DOMAIN_FUNCTION_2003)) {
+   int cnt = samdb_search_count(ldb, ac,
+ldb_get_default_basedn(ldb),
+(distinguishedName=%s),
+
ldb_dn_get_linearized(req-op.mod.message-dn));
+   if (cnt == 0) {
+   cnt = samdb_search_count(ldb, ac,
+ldb_get_config_basedn(ldb),
+(distinguishedName=%s),
+
ldb_dn_get_linearized(req-op.mod.message-dn));
+   }
+   if (cnt == 0) {
+   cnt = samdb_search_count(ldb, ac,
+ldb_get_schema_basedn(ldb),
+(distinguishedName=%s),
+
ldb_dn_get_linearized(req-op.mod.message-dn));
+   }
+   if (cnt != 0) {
+   return LDB_ERR_UNWILLING_TO_PERFORM;
+   }
+   }
+
ret = ldb_build_mod_req(down_req, ldb, ac,
msg,
req-controls, ac,


-- 
Samba Shared Repository


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

2010-11-15 Thread Jelmer Vernooij
The branch, master has been updated
   via  0baa292 Use rlimit.
   via  b384226 Add build cgi script.
  from  4c30514 Implement sql-specific get_old_revs.

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


- Log -
commit 0baa292e4a249522f569ea5dcb6f3468896717a9
Author: Jelmer Vernooij jel...@samba.org
Date:   Mon Nov 15 14:20:15 2010 +0100

Use rlimit.

commit b3842262e68aea66a1929ebb4c7aab56118e7883
Author: Jelmer Vernooij jel...@samba.org
Date:   Mon Nov 15 13:25:37 2010 +0100

Add build cgi script.

---

Summary of changes:
 web/build.py = buildfarm/web/__init__.py |6 -
 web/build.cgi |   35 +
 2 files changed, 35 insertions(+), 6 deletions(-)
 rename web/build.py = buildfarm/web/__init__.py (99%)
 create mode 100644 web/build.cgi


Changeset truncated at 500 lines:

diff --git a/web/build.py b/buildfarm/web/__init__.py
similarity index 99%
rename from web/build.py
rename to buildfarm/web/__init__.py
index d4edffe..df5e608 100755
--- a/web/build.py
+++ b/buildfarm/web/__init__.py
@@ -30,8 +30,6 @@
 # e.g. only broken builds or only builds that you care about.
 
 import os
-import sys
-sys.path.insert(0, os.path.join(os.path.dirname(__file__), ..))
 
 from buildfarm import (
 data,
@@ -1067,7 +1065,3 @@ if __name__ == '__main__':
 httpd = make_server(address, int(port), standaloneApp)
 print Serving on %s:%d... % (address, int(port))
 httpd.serve_forever()
-else:
-import wsgiref.handlers
-handler = wsgiref.handlers.CGIHandler()
-handler.run(buildApp)
diff --git a/web/build.cgi b/web/build.cgi
new file mode 100644
index 000..246fca2
--- /dev/null
+++ b/web/build.cgi
@@ -0,0 +1,35 @@
+#!/usr/bin/python
+# This CGI script presents the results of the build_farm build
+
+# Copyright (C) Jelmer Vernooij jel...@samba.org 2010
+#
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 3 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program; if not, write to the Free Software
+#   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+import os
+import sys
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), ..))
+
+from buildfarm.filecache import CachingBuildFarm
+from buildfarm.web import BuildFarmApp
+import wsgiref.handlers
+import resource
+
+resource.setrlimit(resource.RLIMIT_RSS, (30, -1))
+resource.setrlimit(resource.RLIMIT_DATA, (30, -1))
+
+buildfarm = CachingBuildFarm()
+buildApp = BuildFarmApp(buildfarm)
+handler = wsgiref.handlers.CGIHandler()
+handler.run(buildApp)


-- 
build.samba.org


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

2010-11-15 Thread Jelmer Vernooij
The branch, master has been updated
   via  bfd499b Simplify standalone code.
  from  711124c Fix build.cgi mode, ulimit.

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


- Log -
commit bfd499b73bc46d33e98092bd49d2c58badd24163
Author: Jelmer Vernooij jel...@samba.org
Date:   Mon Nov 15 14:53:24 2010 +0100

Simplify standalone code.

---

Summary of changes:
 buildfarm/web/__init__.py |   32 
 1 files changed, 12 insertions(+), 20 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildfarm/web/__init__.py b/buildfarm/web/__init__.py
index 819b9bb..5f3b727 100755
--- a/buildfarm/web/__init__.py
+++ b/buildfarm/web/__init__.py
@@ -45,11 +45,9 @@ import re
 import time
 
 import wsgiref.util
-webdir = os.path.dirname(__file__)
-basedir = os.path.abspath(os.path.join(webdir, ..))
+webdir = os.path.abspath(os.path.join(os.path.dirname(__file__), .., .., 
web))
 
 
-UNPACKED_BASE = http://svn.samba.org/ftp/unpacked;
 GITWEB_BASE = http://gitweb.samba.org;
 HISTORY_HORIZON = 1000
 
@@ -917,12 +915,9 @@ class BuildFarmApp(object):
 
 def __init__(self, buildfarm):
 self.buildfarm = buildfarm
-self.db = data.BuildResultStore(basedir)
-self.hostsdb = buildfarm.hostdb
 
-self.compilers = buildfarm.compilers
 # host.properties are unicode object and the framework expect string 
object
-self.hosts = dict([(host.name.encode(utf-8), host) for host in 
self.hostsdb.hosts()])
+self.hosts = dict([(host.name.encode(utf-8), host) for host in 
self.buildfarm.hostdb.hosts()])
 
 def main_menu(self):
 main page
@@ -1037,23 +1032,20 @@ if __name__ == '__main__':
 buildfarm = CachingBuildFarm(cachedirname=opts.cachedirname)
 buildApp = BuildFarmApp(buildfarm)
 from wsgiref.simple_server import make_server
+import mimetypes
+mimetypes.init()
 
 def standaloneApp(environ, start_response):
 if environ['PATH_INFO']:
-dir = os.path.join(os.path.dirname(__file__))
-if re.match(^/[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)?, 
environ['PATH_INFO']):
-static_file = %s/%s % (dir, environ['PATH_INFO'])
+m = re.match(^/([a-zA-Z0-9_-]+)(\.[a-zA-Z0-9_-]+)?, 
environ['PATH_INFO'])
+if m:
+static_file = os.path.join(webdir, m.group(1)+m.group(2))
 if os.path.exists(static_file):
-tab = environ['PATH_INFO'].split('.')
-if len(tab)  1:
-extension = tab[-1]
-import mimetypes
-mimetypes.init()
-type = mimetypes.types_map[.%s % extension]
-start_response('200 OK', [('Content-type', type)])
-data = open(static_file, 'rb').read()
-yield data
-return
+type = mimetypes.types_map[m.group(2)]
+start_response('200 OK', [('Content-type', type)])
+data = open(static_file, 'rb').read()
+yield data
+return
 yield .join(buildApp(environ, start_response))
 try:
 (address, port) = opts.port.rsplit(:, 1)


-- 
build.samba.org


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

2010-11-15 Thread Jelmer Vernooij
The branch, master has been updated
   via  a6c0f05 Decode host names and platform name.
   via  938e2e7 Improve formatting in web output.
  from  bfd499b Simplify standalone code.

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


- Log -
commit a6c0f05eb2109e994e614cfe290be608b07dffb0
Author: Jelmer Vernooij jel...@samba.org
Date:   Mon Nov 15 15:09:14 2010 +0100

Decode host names and platform name.

commit 938e2e76589364ca8c92228a70ad710f977d075c
Author: Jelmer Vernooij jel...@samba.org
Date:   Mon Nov 15 15:03:43 2010 +0100

Improve formatting in web output.

---

Summary of changes:
 buildfarm/hostdb.py   |2 +-
 buildfarm/web/__init__.py |   32 
 2 files changed, 17 insertions(+), 17 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildfarm/hostdb.py b/buildfarm/hostdb.py
index 3d7029c..ed4e753 100644
--- a/buildfarm/hostdb.py
+++ b/buildfarm/hostdb.py
@@ -143,7 +143,7 @@ class PlainTextHostDatabase(HostDatabase):
 try:
 for l in f:
 (host, platform) = l.split(:, 1)
-ret[host] = platform.strip()
+ret[host.decode(utf-8)] = platform.strip().decode(utf-8)
 finally:
 f.close()
 return cls(ret)
diff --git a/buildfarm/web/__init__.py b/buildfarm/web/__init__.py
index 5f3b727..33165dc 100755
--- a/buildfarm/web/__init__.py
+++ b/buildfarm/web/__init__.py
@@ -922,28 +922,28 @@ class BuildFarmApp(object):
 def main_menu(self):
 main page
 
-yield form method='GET'
-yield div id='build-menu'
-yield select name='host'
+yield form method='GET'\n
+yield div id='build-menu'\n
+yield select name='host'\n
 for name, host in self.hosts.iteritems():
 yield option value='%s'%s -- %s/option\n % (name, 
host.platform.encode(utf-8), name)
-yield /select
-yield select name='tree'
+yield /select\n
+yield select name='tree'\n
 for tree, t in self.buildfarm.trees.iteritems():
 yield option value='%s'%s:%s/option\n % (tree, tree, 
t.branch)
-yield /select
-yield select name='compiler'
+yield /select\n
+yield select name='compiler'\n
 for compiler in self.buildfarm.compilers:
 yield option%s/option\n % compiler
-yield /select
-yield br/
-yield input type='submit' name='function' value='View Build'/
-yield input type='submit' name='function' value='View Host'/
-yield input type='submit' name='function' value='Recent Checkins'/
-yield input type='submit' name='function' value='Summary'/
-yield input type='submit' name='function' value='Recent Builds'/
-yield /div
-yield /form
+yield /select\n
+yield br/\n
+yield input type='submit' name='function' value='View Build'/\n
+yield input type='submit' name='function' value='View Host'/\n
+yield input type='submit' name='function' value='Recent 
Checkins'/\n
+yield input type='submit' name='function' value='Summary'/\n
+yield input type='submit' name='function' value='Recent Builds'/\n
+yield /div\n
+yield /form\n
 
 def __call__(self, environ, start_response):
 form = cgi.FieldStorage(fp=environ['wsgi.input'], environ=environ)


-- 
build.samba.org


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

2010-11-15 Thread Jeremy Allison
The branch, v3-6-test has been updated
   via  37f8565 s3-spoolss: fix spoolss GetPrinterData behaviour
  from  9262aaf Fix the unexpected.tdb database problem. Change nmbd to 
store the transaction id of packets it was requested to send via a client, and 
only store replies that match these ids. On the client side change clients to 
always attempt to ask nmbd first for name_query and node_status calls, and then 
fall back to doing socket calls if we can't talk to nmbd (either nmbd is not 
running, or we're not root and cannot open the messaging tdb's). Fix readers of 
unexpected.tdb to delete packets they've successfully read.

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


- Log -
commit 37f856500cd113ddec420ed455a8f0f75d648386
Author: David Disseldorp dd...@suse.de
Date:   Fri Nov 5 15:24:22 2010 +0100

s3-spoolss: fix spoolss GetPrinterData behaviour

Windows sends spoolss GetPrinterData requests with an offered buffer
size of zero, Model and TrayFormTable data is commonly requested in
this way.

Samba's GetPrinterData response for the above case includes the correct
error code (WERR_MORE_DATA), however the type field is set to REG_NONE.
This causes Windows (seen on XP and 2k3) to give up on the request.

If the type field is retained (not set to REG_NONE) when responding with
WERR_MORE_DATA, Windows reissues the GetPrinterData request with an
increased offered buffer size.

Signed-off-by: Günther Deschner g...@samba.org
(cherry picked from commit 1c579318ae2d2480ee4cc998443c0d1661b39846)

---

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


Changeset truncated at 500 lines:

diff --git a/source3/rpc_server/srv_spoolss_nt.c 
b/source3/rpc_server/srv_spoolss_nt.c
index d767c18..262f4a3 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -8699,7 +8699,7 @@ WERROR _spoolss_GetPrinterDataEx(struct pipes_struct *p,
}
 
  done:
-   *r-out.type= SPOOLSS_BUFFER_OK(*r-out.type, REG_NONE);
+   /* retain type when returning WERR_MORE_DATA */
r-out.data = SPOOLSS_BUFFER_OK(r-out.data, r-out.data);
 
return SPOOLSS_BUFFER_OK(WERR_OK, WERR_MORE_DATA);


-- 
Samba Shared Repository


[SCM] Samba Shared Repository - branch master updated

2010-11-15 Thread Kai Blin
The branch, master has been updated
   via  6cd9234 net: Add and fix some German translation
  from  16e73c6 s4:objectclass LDB module - implement the objectClass 
change restrictions on Windows 2000 forest function level

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


- Log -
commit 6cd92340b6b2003dbe3380819626a1f443b3456c
Author: André Hentschel n...@dawncrow.de
Date:   Sun Nov 14 23:09:03 2010 +0100

net: Add and fix some German translation

typo spotted by Michael Wood

Signed-off-by: Kai Blin k...@samba.org

Autobuild-User: Kai Blin k...@samba.org
Autobuild-Date: Mon Nov 15 21:44:39 UTC 2010 on sn-devel-104

---

Summary of changes:
 source3/locale/net/de.po |8 
 1 files changed, 4 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/locale/net/de.po b/source3/locale/net/de.po
index 36a4bb5..85b195e 100644
--- a/source3/locale/net/de.po
+++ b/source3/locale/net/de.po
@@ -3066,7 +3066,7 @@ msgstr \t-e oder --encrypt\t\t\tSMB Übertragung 
verschlüsseln  (nur UNIX erwe
 
 #: ../../utils/net_help_common.c:54
 msgid \t-k or --kerberos\t\tUse kerberos (active directory) authentication\n
-msgstr \t-k oder --kerberos\t\tKerberos benutzen (active directory) 
authentication\n
+msgstr \t-k oder --kerberos\t\tKerberos Authentifizierung benutzen (Active 
Directory)\ny
 
 #: ../../utils/net_idmap.c:26
 msgid Out of memory!\n
@@ -6161,12 +6161,12 @@ msgstr \t[%s:%s]: REG_SZ: %s\n
 #: ../../utils/net_rpc_printer.c:96
 #, c-format
 msgid \t[%s:%s]: REG_BINARY: unknown length value not displayed\n
-msgstr 
+msgstr \t[%s:%s]: REG_BINARY: unbekannte Länge, Daten werden nicht 
angezeigt\n
 
 #: ../../utils/net_rpc_printer.c:120
 #, c-format
 msgid \t%s: unknown type %d\n
-msgstr 
+msgstr \t%s: unbekannter Typ %d\n
 
 #: ../../utils/net_rpc_printer.c:254
 #, c-format
@@ -6544,7 +6544,7 @@ msgstr 
 #: ../../utils/net_rpc_registry.c:1173 ../../utils/net_rpc_registry.c:1179
 #, c-format
 msgid Closing %s...
-msgstr 
+msgstr Schließe %s...
 
 #: ../../utils/net_rpc_registry.c:1214
 msgid net rpc registry getsd path secinfo\n


-- 
Samba Shared Repository


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

2010-11-15 Thread Jelmer Vernooij
The branch, master has been updated
   via  0cb42c2 Add buildfarm.web tests.
   via  c9e91d3 Fix exception handling when both python-pysqlite2 and 
sqlite3 are installed.
  from  a6c0f05 Decode host names and platform name.

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


- Log -
commit 0cb42c2abd1c95df648dd359ef47a0ab4f1bd917
Author: Jelmer Vernooij jel...@samba.org
Date:   Mon Nov 15 16:30:50 2010 +0100

Add buildfarm.web tests.

commit c9e91d3e26de7183996455148920fb1c20163fd2
Author: Jelmer Vernooij jel...@samba.org
Date:   Mon Nov 15 16:30:36 2010 +0100

Fix exception handling when both python-pysqlite2 and sqlite3 are installed.

---

Summary of changes:
 buildfarm/sqldb.py|4 +-
 buildfarm/web/__init__.py |   71 +++--
 web/build.cgi = buildfarm/web/tests/test_util.py |   26 +++-
 3 files changed, 49 insertions(+), 52 deletions(-)
 create mode 100644 buildfarm/web/tests/__init__.py
 copy web/build.cgi = buildfarm/web/tests/test_util.py (55%)
 mode change 100755 = 100644


Changeset truncated at 500 lines:

diff --git a/buildfarm/sqldb.py b/buildfarm/sqldb.py
index 8c5330f..e0ef491 100644
--- a/buildfarm/sqldb.py
+++ b/buildfarm/sqldb.py
@@ -35,9 +35,9 @@ from buildfarm.hostdb import (
 
 import os
 try:
-import sqlite3
-except ImportError:
 from pysqlite2 import dbapi2 as sqlite3
+except ImportError:
+import sqlite3
 from storm.database import create_database
 from storm.locals import Bool, Desc, Int, Unicode, RawStr
 from storm.store import Store
diff --git a/buildfarm/web/__init__.py b/buildfarm/web/__init__.py
index 33165dc..dda4b17 100755
--- a/buildfarm/web/__init__.py
+++ b/buildfarm/web/__init__.py
@@ -682,6 +682,41 @@ class ViewRecentBuildsPage(BuildFarmPage):
 
 class ViewHostPage(BuildFarmPage):
 
+def _render_build(self, myself, build):
+try:
+(revision, revision_time) = build.revision_details()
+except data.MissingRevisionInfo:
+revision = None
+age_mtime = build.age_mtime()
+age_ctime = build.age_ctime()
+warnings = build.err_count()
+status = build_status_html(myself, build)
+if row == 0:
+if output_type == 'text':
+yield %-12s %-10s %-10s %-10s %-10s\n % (
+Tree, Compiler, Build Age, Status, Warnings)
+else:
+yield div class='host summary'
+yield a id='host' name='host'/
+yield h3%s - %s/h3 % (host, 
self.buildfarm.hostdb.host(host).platform.encode(utf-8))
+yield table class='real'
+yield 
theadtrthTarget/ththBuildbr/Revision/ththBuildbr 
/Age/ththStatusbr /config/buildbr 
/install/test/ththWarnings/th/tr/thead
+yield tbody
+
+if output_type == 'text':
+yield %-12s %-10s %-10s %-10s %-10s\n % (
+tree, compiler, util.dhm_time(age_mtime),
+util.strip_html(status), warnings)
+else:
+yield tr
+yield tdspan class='tree' + self.tree_link(myself, tree) 
+/span/ + compiler + /td
+yield td + revision_link(myself, revision, tree) + /td
+yield tddiv class='age' + self.red_age(age_mtime) + 
/div/td
+yield tddiv class='status'%s/div/td % status
+yield td%s/td % warnings
+yield /tr
+row+=1
+
 def render(self, myself, output_type, *requested_hosts):
 print the host's table of information
 
@@ -699,7 +734,6 @@ class ViewHostPage(BuildFarmPage):
 continue
 
 row = 0
-
 for compiler in self.buildfarm.compilers:
 for tree in sorted(self.buildfarm.trees.keys()):
 try:
@@ -707,39 +741,8 @@ class ViewHostPage(BuildFarmPage):
 except data.NoSuchBuildError:
 pass
 else:
-try:
-(revision, revision_time) = 
build.revision_details()
-except data.MissingRevisionInfo:
-revision = None
-age_mtime = build.age_mtime()
-age_ctime = build.age_ctime()
-warnings = build.err_count()
-status = build_status_html(myself, build)
-if row == 0:
-if output_type == 'text':
-yield %-12s %-10s %-10s %-10s %-10s\n % (
-Tree, Compiler, Build Age, 
Status, Warnings)
-else:
-yield div class='host summary'
-yield a id='host' 

[SCM] Samba Shared Repository - branch master updated

2010-11-15 Thread Andrew Tridgell
The branch, master has been updated
   via  6ff009c s4-join: not all versions of w2003 have 
msDS-SupportedEncryptionTypes
   via  10a1606 s4-devel: a script to test the Samba4 HOWTO
  from  6cd9234 net: Add and fix some German translation

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


- Log -
commit 6ff009cacca7f62fc1b67270fb2bee4f20906c70
Author: Andrew Tridgell tri...@samba.org
Date:   Tue Nov 16 07:41:54 2010 +1100

s4-join: not all versions of w2003 have msDS-SupportedEncryptionTypes

Autobuild-User: Andrew Tridgell tri...@samba.org
Autobuild-Date: Mon Nov 15 22:28:16 UTC 2010 on sn-devel-104

commit 10a1606baf69addd2d3a079ab007ebb6beffb55d
Author: Andrew Tridgell tri...@samba.org
Date:   Mon Nov 15 22:57:00 2010 +1100

s4-devel: a script to test the Samba4 HOWTO

This provides a script that allows testing of most of the steps of the
Samba4 HOWTO. The big difference between this and 'make test' is that
it test against windows, using pexpect to control windows boxes via
telnet.

The info about VMs and other parameters are in separate conf
files. I've included a sample config file that I use on my laptop.

---

Summary of changes:
 source4/scripting/devel/howto/test-howto.py |  553 +++
 source4/scripting/devel/howto/tridge.conf   |   52 +++
 source4/scripting/python/samba/join.py  |6 +-
 3 files changed, 609 insertions(+), 2 deletions(-)
 create mode 100755 source4/scripting/devel/howto/test-howto.py
 create mode 100644 source4/scripting/devel/howto/tridge.conf


Changeset truncated at 500 lines:

diff --git a/source4/scripting/devel/howto/test-howto.py 
b/source4/scripting/devel/howto/test-howto.py
new file mode 100755
index 000..f173083
--- /dev/null
+++ b/source4/scripting/devel/howto/test-howto.py
@@ -0,0 +1,553 @@
+#!/usr/bin/env python
+
+'''automated testing of the steps of the Samba4 HOWTO'''
+
+import pexpect, subprocess
+import sys, os, time
+import optparse
+
+vars = {}
+
+parser = optparse.OptionParser(samba_dnsupdate)
+parser.add_option(--conf, type='string', default='', help='config file')
+
+def load_config(fname):
+'''load the config file'''
+f = open(fname)
+for line in f:
+line = line.strip()
+if len(line) == 0 or line[0] == '#':
+continue
+colon = line.find(':')
+if colon == -1:
+raise Exception(Invalid config line '%s' % line)
+varname = line[0:colon].strip()
+value   = line[colon+1:].strip()
+vars[varname] = value
+
+def substitute(text):
+Substitute strings of the form ${NAME} in text, replacing
+with substitutions from vars.
+
+if isinstance(text, list):
+ret = text[:]
+for i in range(len(ret)):
+ret[i] = substitute(ret[i])
+return ret
+
+while True:
+var_start = text.find(${)
+if var_start == -1:
+return text
+var_end = text.find(}, var_start)
+if var_end == -1:
+return text
+var_name = text[var_start+2:var_end]
+if not var_name in vars:
+raise Exception(Unknown substitution variable ${%s} % var_name)
+text = text.replace(${%s} % var_name, vars[var_name])
+return text
+
+
+
+def putenv(key, value):
+os.putenv(key, substitute(value))
+
+def chdir(dir):
+os.chdir(substitute(dir))
+
+
+def run_cmd(cmd, dir=., show=None, output=False, checkfail=True):
+cmd = substitute(cmd)
+if isinstance(cmd, list):
+print('$ ' +  .join(cmd))
+else:
+print('$ ' + cmd)
+if output:
+return subprocess.Popen([cmd], shell=True, stdout=subprocess.PIPE, 
stderr=subprocess.STDOUT, cwd=dir).communicate()[0]
+if isinstance(cmd, list):
+shell=False
+else:
+shell=True
+if checkfail:
+return subprocess.check_call(cmd, shell=shell, cwd=dir)
+else:
+return subprocess.call(cmd, shell=shell, cwd=dir)
+
+
+def cmd_output(cmd):
+'''return output from and command'''
+cmd = substitute(cmd)
+return run_cmd(cmd, output=True)
+
+def cmd_contains(cmd, contains, nomatch=False):
+'''check that command output contains the listed strings'''
+out = cmd_output(cmd)
+print out
+for c in substitute(contains):
+if nomatch:
+if out.find(c) != -1:
+raise Exception(Expected to not see %s in %s % (c, cmd))
+else:
+if out.find(c) == -1:
+raise Exception(Expected to see %s in %s % (c, cmd))
+
+def retry_cmd(cmd, contains, retries=30, delay=2, wait_for_fail=False):
+'''retry a command a number of times'''
+while retries  0:
+try:
+cmd_contains(cmd, contains, nomatch=wait_for_fail)
+return
+except:
+

[SCM] Samba Shared Repository - branch master updated

2010-11-15 Thread Matthias Dieter Wallnöfer
The branch, master has been updated
   via  329f76c s4:heimdal - fix the return code of a non-void function
   via  59e22ba s4:torture/basic/base.c - fix output warnings regarding 
time_t
   via  061766e s4:objectclass LDB module - improve the default name 
context checking on modifications
  from  6ff009c s4-join: not all versions of w2003 have 
msDS-SupportedEncryptionTypes

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


- Log -
commit 329f76c410ec0d8eee9ee471dd79d192e305cdba
Author: Matthias Dieter Wallnöfer m...@samba.org
Date:   Mon Nov 15 22:42:22 2010 +0100

s4:heimdal - fix the return code of a non-void function

Autobuild-User: Matthias Dieter Wallnöfer m...@samba.org
Autobuild-Date: Mon Nov 15 23:14:57 UTC 2010 on sn-devel-104

commit 59e22ba9c06adba09ef40d9b1f8f01c7accc3ae8
Author: Matthias Dieter Wallnöfer m...@samba.org
Date:   Mon Nov 15 22:38:09 2010 +0100

s4:torture/basic/base.c - fix output warnings regarding time_t

time_t is generally long int.

commit 061766e732490b81df3e9ce5968b281efd8c3c0d
Author: Matthias Dieter Wallnöfer m...@samba.org
Date:   Mon Nov 15 22:30:16 2010 +0100

s4:objectclass LDB module - improve the default name context checking on 
modifications

Pointed out by abartlet

---

Summary of changes:
 source4/dsdb/samdb/ldb_modules/objectclass.c |   30 +++--
 source4/heimdal/kdc/default_config.c |2 +
 source4/torture/basic/base.c |6 +++-
 3 files changed, 19 insertions(+), 19 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/dsdb/samdb/ldb_modules/objectclass.c 
b/source4/dsdb/samdb/ldb_modules/objectclass.c
index 5e3226a..19feaa5 100644
--- a/source4/dsdb/samdb/ldb_modules/objectclass.c
+++ b/source4/dsdb/samdb/ldb_modules/objectclass.c
@@ -844,23 +844,19 @@ static int objectclass_modify(struct ldb_module *module, 
struct ldb_request *req
 * only on application NCs - not on the standard DCs */
if (oc_changes 
(dsdb_forest_functional_level(ldb)  DS_DOMAIN_FUNCTION_2003)) {
-   int cnt = samdb_search_count(ldb, ac,
-ldb_get_default_basedn(ldb),
-(distinguishedName=%s),
-
ldb_dn_get_linearized(req-op.mod.message-dn));
-   if (cnt == 0) {
-   cnt = samdb_search_count(ldb, ac,
-ldb_get_config_basedn(ldb),
-(distinguishedName=%s),
-
ldb_dn_get_linearized(req-op.mod.message-dn));
-   }
-   if (cnt == 0) {
-   cnt = samdb_search_count(ldb, ac,
-ldb_get_schema_basedn(ldb),
-(distinguishedName=%s),
-
ldb_dn_get_linearized(req-op.mod.message-dn));
+   struct ldb_dn *nc_root;
+
+   ret = dsdb_find_nc_root(ldb, ac, req-op.mod.message-dn,
+   nc_root);
+   if (ret != LDB_SUCCESS) {
+   return ret;
}
-   if (cnt != 0) {
+
+   if ((ldb_dn_compare(nc_root, ldb_get_default_basedn(ldb)) == 0) 
||
+   (ldb_dn_compare(nc_root, ldb_get_config_basedn(ldb)) == 0) 
||
+   (ldb_dn_compare(nc_root, ldb_get_schema_basedn(ldb)) == 0)) 
{
+   ldb_set_errstring(ldb,
+ objectclass: object class changes on 
objects under the standard name contexts not allowed!);
return LDB_ERR_UNWILLING_TO_PERFORM;
}
}
diff --git a/source4/heimdal/kdc/default_config.c 
b/source4/heimdal/kdc/default_config.c
index f745183..66108f4 100644
--- a/source4/heimdal/kdc/default_config.c
+++ b/source4/heimdal/kdc/default_config.c
@@ -297,4 +297,6 @@ krb5_kdc_pkinit_config(krb5_context context, 
krb5_kdc_configuration *config)
 }
 
 #endif /* PKINIT */
+
+return 0;
 }
diff --git a/source4/torture/basic/base.c b/source4/torture/basic/base.c
index eeba252..d5090e9 100644
--- a/source4/torture/basic/base.c
+++ b/source4/torture/basic/base.c
@@ -1777,7 +1777,8 @@ static bool run_birthtimetest(struct torture_context 
*tctx,
smbcli_errstr(cli-tree));
correct = false;
} else {
-   fprintf(stdout,c_time = %d, c_time1 = %d\n,c_time,c_time1);
+   fprintf(stdout, c_time = %li, c_time1 = %li\n,
+   (long) c_time, (long) c_time1);
if (c_time1 != c_time) {

[SCM] Samba Shared Repository - branch master updated

2010-11-15 Thread Andrew Bartlett
The branch, master has been updated
   via  96bdcf7 s4-kdc Don't regenerate the PAC for cross-realm tickets
   via  a32ade6 s4-kdc Don't always regenerate the PAC
   via  4041640 heimdal Fetch the client before the PAC check, but after 
obtaining krbtgt_out
   via  2b7730d s4-gensec Indicate if GENSEC is in client or server mode in 
the debug
  from  329f76c s4:heimdal - fix the return code of a non-void function

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


- Log -
commit 96bdcf7ea9d06e4681af012974458d67d264cfda
Author: Andrew Bartlett abart...@samba.org
Date:   Tue Nov 16 09:33:05 2010 +1100

s4-kdc Don't regenerate the PAC for cross-realm tickets

We should never get a cross-realm ticket that was not issued by a full
DC, but if someone claims to have such a thing, reject it rather than
segfaulting on the NULL client pointer.

Andrew Bartlett

Autobuild-User: Andrew Bartlett abart...@samba.org
Autobuild-Date: Mon Nov 15 23:59:34 UTC 2010 on sn-devel-104

commit a32ade647db710ed84565891fca3e65dd609f69d
Author: Andrew Bartlett abart...@samba.org
Date:   Tue Nov 16 09:30:55 2010 +1100

s4-kdc Don't always regenerate the PAC

The PAC was being regenerated on all normal DCs, because they don't
have a msDS-SecondaryKrbTgtNumber attribute.  Instead we need to check
if it's set and not equal to our RODC number, allowing RODCs to trust
the full DCs and itself, but not other RODCs.

Andrew Bartlett

commit 4041640bd6d7f8747c8229b02dbb847056bdaa35
Author: Andrew Bartlett abart...@samba.org
Date:   Tue Nov 16 09:29:18 2010 +1100

heimdal Fetch the client before the PAC check, but after obtaining 
krbtgt_out

By checking the client principal here, we compare the realm based on
the normalised realm, but do so early enough to validate the PAC (and
regenerate it if required).

Andrew Bartlett

commit 2b7730d291c49a427135ddf62c3aa2ff4b7997e7
Author: Andrew Bartlett abart...@samba.org
Date:   Tue Nov 16 09:28:21 2010 +1100

s4-gensec Indicate if GENSEC is in client or server mode in the debug

---

Summary of changes:
 source4/auth/gensec/gensec_gssapi.c |6 ++-
 source4/heimdal/kdc/krb5tgs.c   |   61 +--
 source4/kdc/pac-glue.c  |6 ++-
 source4/kdc/wdc-samba4.c|3 ++
 4 files changed, 41 insertions(+), 35 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/auth/gensec/gensec_gssapi.c 
b/source4/auth/gensec/gensec_gssapi.c
index 1a2e03f..a6d0ef2 100644
--- a/source4/auth/gensec/gensec_gssapi.c
+++ b/source4/auth/gensec/gensec_gssapi.c
@@ -594,13 +594,15 @@ static NTSTATUS gensec_gssapi_update(struct 
gensec_security *gensec_security,
/* garbage input, possibly from the auto-mech 
detection */
return NT_STATUS_INVALID_PARAMETER;
default:
-   DEBUG(1, (GSS Update(krb5)(%d) Update failed: 
%s\n, 
+   DEBUG(1, (GSS %s Update(krb5)(%d) Update 
failed: %s\n,
+ gensec_security-gensec_role == 
GENSEC_CLIENT ? client : server,
  
gensec_gssapi_state-gss_exchange_count,
  gssapi_error_string(out_mem_ctx, 
maj_stat, min_stat, gensec_gssapi_state-gss_oid)));
return nt_status;
}
} else {
-   DEBUG(1, (GSS Update(%d) failed: %s\n, 
+   DEBUG(1, (GSS %s Update(%d) failed: %s\n,
+ gensec_security-gensec_role == GENSEC_CLIENT 
? client : server,
  gensec_gssapi_state-gss_exchange_count,
  gssapi_error_string(out_mem_ctx, maj_stat, 
min_stat, gensec_gssapi_state-gss_oid)));
return nt_status;
diff --git a/source4/heimdal/kdc/krb5tgs.c b/source4/heimdal/kdc/krb5tgs.c
index 9131e5b..26e3936 100644
--- a/source4/heimdal/kdc/krb5tgs.c
+++ b/source4/heimdal/kdc/krb5tgs.c
@@ -1637,37 +1637,6 @@ server_lookup:
goto out;
 }
 
-ret = _kdc_db_fetch(context, config, cp, HDB_F_GET_CLIENT | HDB_F_CANON,
-   NULL, clientdb, client);
-if(ret == HDB_ERR_NOT_FOUND_HERE) {
-   kdc_log(context, config, 5, client %s does not have secrets at this 
KDC, need to proxy, cp);
-   goto out;
-} else if(ret){
-   const char *krbtgt_realm, *msg;
-
-   /*
-* If the client belongs to the same realm as our krbtgt, it
-* should exist in the local database.
-*
-*/
-
-   krbtgt_realm =
-   krb5_principal_get_comp_string(context,
-

[SCM] Samba Shared Repository - branch master updated

2010-11-15 Thread Andrew Tridgell
The branch, master has been updated
   via  fe5c48c waf: added --git-local-changes configure option
  from  96bdcf7 s4-kdc Don't regenerate the PAC for cross-realm tickets

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


- Log -
commit fe5c48cbed29b669f17370436d0cf18ca0ccb474
Author: Andrew Tridgell tri...@samba.org
Date:   Tue Nov 16 12:05:14 2010 +1100

waf: added --git-local-changes configure option

if you use --git-local-changes then the version number that waf
extracts from git will have a '+' on the end if you have local
changes, as determined by running 'git diff'.

This used to be the default, but unfortunately it is far too slow on
some systems. On a NFS build system I was using the first line of
configure took about 2 minutes.

Autobuild-User: Andrew Tridgell tri...@samba.org
Autobuild-Date: Tue Nov 16 01:51:54 UTC 2010 on sn-devel-104

---

Summary of changes:
 buildtools/wafsamba/samba_patterns.py |4 +---
 buildtools/wafsamba/samba_version.py  |   32 +++-
 buildtools/wafsamba/wscript   |5 +
 source3/wscript   |   10 +-
 source4/wscript   |   16 
 5 files changed, 38 insertions(+), 29 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildtools/wafsamba/samba_patterns.py 
b/buildtools/wafsamba/samba_patterns.py
index 9693c59..37ef419 100644
--- a/buildtools/wafsamba/samba_patterns.py
+++ b/buildtools/wafsamba/samba_patterns.py
@@ -10,9 +10,7 @@ def write_version_header(task):
 src = task.inputs[0].srcpath(task.env)
 tgt = task.outputs[0].bldpath(task.env)
 
-have_git = 'GIT' in task.env
-
-version = samba_version_file(src, task.env.srcdir, have_git=have_git)
+version = samba_version_file(src, task.env.srcdir, env=task.env)
 string = str(version)
 
 f = open(tgt, 'w')
diff --git a/buildtools/wafsamba/samba_version.py 
b/buildtools/wafsamba/samba_version.py
index e6a6ccf..df71584 100644
--- a/buildtools/wafsamba/samba_version.py
+++ b/buildtools/wafsamba/samba_version.py
@@ -44,14 +44,18 @@ def bzr_version_summary(path):
 return (ret, fields)
 
 
-def git_version_summary(path, have_git):
+def git_version_summary(path, env=None):
 # Get version from GIT
-if not have_git:
+if not 'GIT' in env:
 return (GIT-UNKNOWN, {})
 
-git = Utils.cmd_output('git show --pretty=format:%h%n%ct%n%H%n%cd --stat 
HEAD', silent=True)
+os.putenv('GIT_DIR', '%s/.git' % path)
+git = Utils.cmd_output(env.GIT + ' show --pretty=format:%h%n%ct%n%H%n%cd 
--stat HEAD', silent=True)
 
 lines = git.splitlines()
+if not lines or len(lines)  4:
+return (GIT-UNKNOWN, {})
+
 fields = {
 GIT_COMMIT_ABBREV: lines[0],
 GIT_COMMIT_FULLREV: lines[2],
@@ -61,18 +65,20 @@ def git_version_summary(path, have_git):
 
 ret = GIT- + fields[GIT_COMMIT_ABBREV]
 
-clean = Utils.cmd_output('git diff HEAD | wc -l', silent=True)
-if clean == 0\n:
-fields[COMMIT_IS_CLEAN] = 1
-else:
-fields[COMMIT_IS_CLEAN] = 0
-ret += +
+if env.GIT_LOCAL_CHANGES:
+clean = Utils.cmd_output('git diff HEAD | wc -l', silent=True).strip()
+if clean == 0:
+fields[COMMIT_IS_CLEAN] = 1
+else:
+fields[COMMIT_IS_CLEAN] = 0
+ret += +
+
 return (ret, fields)
 
 
 class SambaVersion(object):
 
-def __init__(self, version_dict, path, have_git=False):
+def __init__(self, version_dict, path, env=None):
 '''Determine the version number of samba
 
 See VERSION for the format.  Entries on that file are 
@@ -135,7 +141,7 @@ also accepted as dictionary entries here
 
 if self.IS_SNAPSHOT:
 if os.path.exists(os.path.join(path, .git)):
-suffix, self.vcs_fields = git_version_summary(path, have_git)
+suffix, self.vcs_fields = git_version_summary(path, env=env)
 elif os.path.exists(os.path.join(path, .bzr)):
 suffix, self.vcs_fields = bzr_version_summary(path)
 else:
@@ -217,7 +223,7 @@ also accepted as dictionary entries here
 return string
 
 
-def samba_version_file(version_file, path, have_git=False):
+def samba_version_file(version_file, path, env=None):
 '''Parse the version information from a VERSION file'''
 
 f = open(version_file, 'r')
@@ -237,4 +243,4 @@ def samba_version_file(version_file, path, have_git=False):
 print(Failed to parse line %s from %s % (line, version_file))
 raise
 
-return SambaVersion(version_dict, path, have_git=have_git)
+return SambaVersion(version_dict, path, env=env)
diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript
index 6913f63..0d91237 100644
--- 

[SCM] Samba Shared Repository - branch master updated

2010-11-15 Thread Andrew Bartlett
The branch, master has been updated
   via  ebd8e66 samba-tool Add test for --store-plaintext
   via  c8c52be Update dcerpc_server.pc library name to match reality.
   via  2e44d0d samba-tool pwsettings Allow setting 'store cleartext'
   via  95d33f2 s4-ldif_handlers Add handler for printing 
supplementalCredentials
   via  b863159 s4-test_kinit Add tests for lowercase realm combinations
   via  4908237 heimdal Build ticket with the canonical server name
   via  d76f11a s4-kdc Fix the realm handling again, this time pay 
attention to the flags
   via  5c72c6b s4-kdc use 'flags' to only create the 'admin data' elements 
when requested
   via  935d7a6 s4-kdc Add 'flags' parameter to db fetch calls
  from  fe5c48c waf: added --git-local-changes configure option

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


- Log -
commit ebd8e66ed0c1aae4d482ea933a8a492a2ab82e13
Author: Andrew Bartlett abart...@samba.org
Date:   Tue Nov 16 16:43:05 2010 +1100

samba-tool Add test for --store-plaintext

Autobuild-User: Andrew Bartlett abart...@samba.org
Autobuild-Date: Tue Nov 16 06:29:04 UTC 2010 on sn-devel-104

commit c8c52be4558c1e5bcb0db81f89f5b954f7ac6c05
Author: Brad Hards br...@frogmouth.net
Date:   Tue Nov 16 16:42:50 2010 +1100

Update dcerpc_server.pc library name to match reality.

commit 2e44d0d32980eaec236c8cfc80989b7600c0d25a
Author: Andrew Bartlett abart...@samba.org
Date:   Tue Nov 16 16:32:55 2010 +1100

samba-tool pwsettings Allow setting 'store cleartext'

This allows the 'store cleartext' password policy flag to be (un)set.

Andrew Bartlett

commit 95d33f2f24d7300f2df54ea62b0595ed7d7d0a2c
Author: Andrew Bartlett abart...@samba.org
Date:   Tue Nov 16 16:32:27 2010 +1100

s4-ldif_handlers Add handler for printing supplementalCredentials

commit b8631597f579555416dbd87ded3f329051965e8b
Author: Andrew Bartlett abart...@samba.org
Date:   Tue Nov 16 16:01:19 2010 +1100

s4-test_kinit Add tests for lowercase realm combinations

This tests that the handling of lowercase realms works in our KDC and
libraries.

Andrew Bartlett

commit 4908237403543f6b0e3015637c5c49af47b515b0
Author: Andrew Bartlett abart...@samba.org
Date:   Tue Nov 16 15:05:33 2010 +1100

heimdal Build ticket with the canonical server name

We need to use the name that the HDB entry returned, otherwise we
will not canonicalise the reply as requested.

Andrew Bartlett

commit d76f11a8bd685517b0e5a3be4684bec41af9e822
Author: Andrew Bartlett abart...@samba.org
Date:   Tue Nov 16 14:16:31 2010 +1100

s4-kdc Fix the realm handling again, this time pay attention to the flags

The KDC sets different flags for the AS-REQ (this is client-depenent)
and the TGS-REQ to determine if the realm should be forced to the
canonical value.  If we do this always, or do this never, we get into
trouble, so it's much better to honour the flags we are given.

Andrew Bartlett

commit 5c72c6b760af479b3e88b10cce713025528496c3
Author: Andrew Bartlett abart...@samba.org
Date:   Tue Nov 16 14:12:17 2010 +1100

s4-kdc use 'flags' to only create the 'admin data' elements when requested

This avoids setting these values when the caller simply does not care

Andrew Bartlett

commit 935d7a6f72567f09ccc8710079775fef0f077ada
Author: Andrew Bartlett abart...@samba.org
Date:   Tue Nov 16 14:07:18 2010 +1100

s4-kdc Add 'flags' parameter to db fetch calls

This will allow these calls to honour the flags passed in from the KDC

Andrew Bartlett

---

Summary of changes:
 source4/heimdal/kdc/krb5tgs.c  |2 +-
 source4/kdc/db-glue.c  |   77 ++--
 source4/lib/ldb-samba/ldif_handlers.c  |   23 ++
 source4/lib/ldb-samba/ldif_handlers.h  |2 +-
 source4/rpc_server/dcerpc_server.pc.in |2 +-
 .../scripting/python/samba/netcmd/pwsettings.py|   19 +-
 source4/setup/tests/blackbox_setpassword.sh|2 +-
 testprogs/blackbox/test_kinit.sh   |4 +
 8 files changed, 102 insertions(+), 29 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/heimdal/kdc/krb5tgs.c b/source4/heimdal/kdc/krb5tgs.c
index 26e3936..4af4c29 100644
--- a/source4/heimdal/kdc/krb5tgs.c
+++ b/source4/heimdal/kdc/krb5tgs.c
@@ -2142,7 +2142,7 @@ server_lookup:
 kvno,
 *auth_data,
 server,
-sp,
+server-entry.principal,
 spn,
 client,
 cp,
diff --git a/source4/kdc/db-glue.c b/source4/kdc/db-glue.c
index 1dec6a5..b062282 100644
--- 

Build status as of Tue Nov 16 07:00:20 2010

2010-11-15 Thread build
URL: http://build.samba.org/

--- /home/build/master/cache/broken_results.txt.old 2010-11-15 
00:00:04.0 -0700
+++ /home/build/master/cache/broken_results.txt 2010-11-16 00:01:12.0 
-0700
@@ -1,9 +1,9 @@
-Build status as of Mon Nov 15 07:00:01 2010
+Build status as of Tue Nov 16 07:00:20 2010
 
 Build counts:
 Tree Total  Broken Panic 
 build_farm   0  0  0 
-ccache   36 6  0 
+ccache   36 7  0 
 ccache-maint 35 5  0 
 ldb  36 26 0 
 libreplace   36 36 0 
@@ -14,9 +14,9 @@
 samba-docs   0  0  0 
 samba-web0  0  0 
 samba_3_current 36 26 0 
-samba_3_master 36 20 0 
+samba_3_master 36 19 0 
 samba_3_next 36 35 0 
-samba_4_0_test 42 35 1 
+samba_4_0_test 42 36 0 
 talloc   36 15 0 
 tdb  34 15 0 
 


[SCM] Samba Shared Repository - branch master updated

2010-11-15 Thread Andrew Tridgell
The branch, master has been updated
   via  f99403e s4-test: fixes for test-howto.py
   via  896d1bd s4-spoolss: fixed warning in call to torture_warning()
   via  2421c0d s4-eventlog: fixed dcerpc handle return
  from  ebd8e66 samba-tool Add test for --store-plaintext

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


- Log -
commit f99403e45af7d13e7d2c2184bea391f4a83954cc
Author: Andrew Tridgell tri...@samba.org
Date:   Tue Nov 16 18:14:11 2010 +1100

s4-test: fixes for test-howto.py

this fixes some timing issues, plus ensures we test both with and
without kerberos

Autobuild-User: Andrew Tridgell tri...@samba.org
Autobuild-Date: Tue Nov 16 07:58:55 UTC 2010 on sn-devel-104

commit 896d1bdca2fe094d2aef4439903d8e66143d8f64
Author: Andrew Tridgell tri...@samba.org
Date:   Tue Nov 16 15:14:43 2010 +1100

s4-spoolss: fixed warning in call to torture_warning()

commit 2421c0dcfb80665cbb4469767c5bc67b248b94e0
Author: Andrew Tridgell tri...@samba.org
Date:   Tue Nov 16 15:14:18 2010 +1100

s4-eventlog: fixed dcerpc handle return

---

Summary of changes:
 source4/rpc_server/eventlog/dcesrv_eventlog6.c |   16 +--
 source4/scripting/devel/howto/test-howto.py|   55 ++-
 source4/scripting/devel/howto/tridge.conf  |6 +-
 source4/torture/rpc/spoolss.c  |4 +-
 4 files changed, 50 insertions(+), 31 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/rpc_server/eventlog/dcesrv_eventlog6.c 
b/source4/rpc_server/eventlog/dcesrv_eventlog6.c
index 26b0b49..9a64998 100644
--- a/source4/rpc_server/eventlog/dcesrv_eventlog6.c
+++ b/source4/rpc_server/eventlog/dcesrv_eventlog6.c
@@ -81,10 +81,18 @@ static WERROR 
dcesrv_eventlog6_EvtRpcRegisterControllableOperation(struct dcesrv
 static WERROR dcesrv_eventlog6_EvtRpcRegisterLogQuery(struct dcesrv_call_state 
*dce_call, TALLOC_CTX *mem_ctx,
   struct eventlog6_EvtRpcRegisterLogQuery *r)
 {
-   r-out.handle = dcesrv_handle_new(dce_call-context, 0);
-   W_ERROR_HAVE_NO_MEMORY(r-out.handle);
-   r-out.opControl = dcesrv_handle_new(dce_call-context, 0);
-   W_ERROR_HAVE_NO_MEMORY(r-out.opControl);
+   struct dcesrv_handle *handle;
+
+   handle = dcesrv_handle_new(dce_call-context, 0);
+   W_ERROR_HAVE_NO_MEMORY(handle);
+
+   r-out.handle = handle-wire_handle;
+
+   handle = dcesrv_handle_new(dce_call-context, 0);
+   W_ERROR_HAVE_NO_MEMORY(handle);
+
+   r-out.opControl = handle-wire_handle;
+
return WERR_OK;
 }
 
diff --git a/source4/scripting/devel/howto/test-howto.py 
b/source4/scripting/devel/howto/test-howto.py
index f173083..48e30ab 100755
--- a/source4/scripting/devel/howto/test-howto.py
+++ b/source4/scripting/devel/howto/test-howto.py
@@ -149,7 +149,7 @@ def ping_wait(hostname):
 raise Exception(Failed to ping %s % hostname)
 print(Host %s is up % hostname)
 
-def port_wait(hostname, port, retries=30, delay=2, wait_for_fail=False):
+def port_wait(hostname, port, retries=100, delay=2, wait_for_fail=False):
 '''wait for a host to come up on the network'''
 retry_cmd(nc -v -z -w 1 %s %u % (hostname, port), ['succeeded'],
   retries=retries, delay=delay, wait_for_fail=wait_for_fail)
@@ -188,8 +188,7 @@ def start_s4(prefix=None, interfaces=None):
 run_cmd('killall -9 -q samba smbd nmbd winbindd', checkfail=False)
 run_cmd(['sbin/samba',
  '--option', 'panic action=gnome-terminal -e gdb --pid %PID%',
- '--option', 'interfaces=%s' % interfaces,
- '--option', 'log level=10'])
+ '--option', 'interfaces=%s' % interfaces])
 port_wait(localhost, 445)
 
 def test_smbclient():
@@ -277,18 +276,18 @@ def join_win7():
 child.expect(The command completed successfully)
 child.sendline(shutdown /r -t 0)
 port_wait(${WINDOWS7}, 23, wait_for_fail=True)
-port_wait(${WINDOWS7}, 23, retries=100)
+port_wait(${WINDOWS7}, 23)
 
 
 def test_win7():
 print(Checking the win7 join is OK)
 chdir('${PREFIX}')
-port_wait(${WINDOWS7}, 445, delay=3)
+port_wait(${WINDOWS7}, 445)
 retry_cmd('bin/smbclient -L ${WINDOWS7}.${LCREALM} 
-uadministra...@${lcrealm}%${password1}', [C$, IPC$, Sharename])
 cmd_contains(host -t A ${WINDOWS7}.${LCREALM}., ['has address'])
 cmd_contains('bin/smbclient -L ${WINDOWS7}.${LCREALM} 
-utestallo...@${lcrealm}%${password1}', [C$, IPC$, Sharename])
-cmd_contains('bin/smbclient -L ${WINDOWS7}.${LCREALM} -k yes 
-utestallo...@${lcrealm}%${password1}', [C$, IPC$, Sharename])
 cmd_contains('bin/smbclient -L ${WINDOWS7}.${LCREALM} -k no 
-utestallo...@${lcrealm}%${password1}', [C$, IPC$, Sharename])
+cmd_contains('bin/smbclient -L ${WINDOWS7}.${LCREALM} -k yes 
-utestallo...@${lcrealm}%${password1}',