Re: [Samba] Second user password.
Ok that could do the trick but I don't find it so handy. My idea was to create a common second password for each user after it was created in the ldap database. This password would only be known by the sysadmin and allow him to log in without any modification to the user environment when it's needed. In short: I would like to create one login with 2 passwords. Password A would only be known by the user. Password B only known by the sysadmin. In this way the sysadmin can avoid to ask password A of the user if he must work in his environment. 2010/3/16 Gaiseric Vandal gaiseric.van...@gmail.com On 03/16/2010 09:38 AM, Vincent Zakofski wrote: Hello, I'm using samba with ldap backend and I would like to know if there's a way to add a second password to a user account. I need this to work in the user environment without asking him his password. If it's not possible, is there a way to test the user environment without a user intervention? Thanks for your help. I would think the simplest thing would probably be to use a GUI LDAP browser (you could use the command line ldap tools) to copy the user's password to a text file for backup, change the password to something you know, then copy the old password back when done. -- 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] Second user password.
2010/3/19 Vincent Zakofski vlamsd...@gmail.com: In this way the sysadmin can avoid to ask password A of the user if he must work in his environment. Hm, don't do that unless you have your user's written permission. Depending on where you live, you could get into legal trouble. We ask the password to our users and after we did whatever we wanted to do on the account, we simply ask them to change the password so they know we won't mess with their information. Anyway, if really really really really really really really want to mess with users' info without they knowing, you could setup LDAP to store clear-text passwords, and configure samba to sync unix passwords. Then simple read userpassword attribute from ldap. HTH, Norberto -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] samba4: getent group stalls
Using 4.0.0alpha12-GIT-580f955 version getent group works fine. Upgrading newer version results getent group stalling after listing 3 ldap groups. Server is 64 bit debian lenny and i have tried two clients: 64 bit debian lenny and 64 bit opensuse 10.1. getent passwd works ok. any hints? regards Hannu -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] Fix bugs with the full Windows ACL support
Hi! Could you explain what does mean 'Fix bugs with the full Windows ACL support' in samba 3.5.0pre2 release notes. I am asking because I know that samba 3 does not support full Windows ACL (Samba 4 will be supporting in user space). Best regards /Aleksey Konradov -- You Rock! Your E-Mail Should Too! Signup Now at Rock.com and get 250MB of Storage! http://webmail.rock.com/signup/ -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] Samba refresh problem
Hello, we are experiencing some problems when accessing linux samba server(SUSE 11.1 with samba 3.2.7) via Windows XP clients. Content of the shared folder is regularly updated via CVS, after such updates windows clients do not see new data on the server. Refreshing via F5 does not help with the update, only solution is to unmount and remount samba share which can get annoying if you have to do this on several machines every week. Are there any solutions or known problems about this issue? I have tried setting strict sync and sync always to yes but this did not yield any success. Any comment and help is greatly appreciated. Regards, Rok -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] cupsaddsmb error: cli_pipe_validate_current_pdu: RPC fault code DCERPC_FAULT_OP_RNG_ERROR received
Hello, when i send the SIGHUP signal to Samba, then Samba won't load the printers from CUPS. I need to shutdown Samba and start it again. Now when i'am running cupsaddsmb i got the following errors(this error occours in 3.5.x but not in 3.2.x): server-p:/# cupsaddsmb -H server-p -v edv01 edv02 edv03 Kennwort für root erforderlich, um über SAMBA auf server-p zugreifen zu können: Befehl ausführen: smbclient //server-p/print$ -N -A /tmp/4ba38b6546c6f -c „mkdir W32X86;put /tmp/4ba38b6126eb3 W32X86/edv01.ppd;put /usr/share/cups/drivers/ps5ui.dll W32X86/ps5ui.dll;put /usr/share/cups/drivers/pscript.hlp W32X86/pscript.hlp;put /usr/share/cups/drivers/pscript.ntf W32X86/pscript.ntf;put /usr/share/cups/drivers/pscript5.dll W32X86/pscript5.dll“ Domain=[PRUEFUNG] OS=[Unix] Server=[Samba 3.5.1] NT_STATUS_OBJECT_NAME_COLLISION making remote directory \W32X86 putting file /tmp/4ba38b6126eb3 as \W32X86/edv01.ppd (2216,4 kb/s) (average 2216,4 kb/s) putting file /usr/share/cups/drivers/ps5ui.dll as \W32X86/ps5ui.dll (136486,7 kb/s) (average 12545,9 kb/s) putting file /usr/share/cups/drivers/pscript.hlp as \W32X86/pscript.hlp (510,9 kb/s) (average 3075,8 kb/s) putting file /usr/share/cups/drivers/pscript.ntf as \W32X86/pscript.ntf (41426,1 kb/s) (average 14224,2 kb/s) putting file /usr/share/cups/drivers/pscript5.dll as \W32X86/pscript5.dll (234488,6 kb/s) (average 19230,4 kb/s) Befehl ausführen: rpcclient server-p -N -A /tmp/4ba38b6546c6f -c „adddriver Windows NT x86 edv01:pscript5.dll:edv01.ppd:ps5ui.dll:pscript.hlp:NULL:RAW:pscript5.dll,edv01.ppd,ps5ui.dll,pscript.hlp,pscript.ntf“ Printer Driver edv01 successfully installed. Befehl ausführen: rpcclient server-p -N -A /tmp/4ba38b6546c6f -c „setdriver edv01 edv01“ cli_pipe_validate_current_pdu: RPC fault code DCERPC_FAULT_OP_RNG_ERROR received from host server-p! Successfully set edv01 to driver edv01. cli_pipe_validate_current_pdu: RPC fault code DCERPC_FAULT_OP_RNG_ERROR received from host server-p! Befehl ausführen: smbclient //server-p/print$ -N -A /tmp/4ba38b6611474 -c „mkdir W32X86;put /tmp/4ba38b6611328 W32X86/edv02.ppd;put /usr/share/cups/drivers/ps5ui.dll W32X86/ps5ui.dll;put /usr/share/cups/drivers/pscript.hlp W32X86/pscript.hlp;put /usr/share/cups/drivers/pscript.ntf W32X86/pscript.ntf;put /usr/share/cups/drivers/pscript5.dll W32X86/pscript5.dll“ Domain=[PRUEFUNG] OS=[Unix] Server=[Samba 3.5.1] NT_STATUS_OBJECT_NAME_COLLISION making remote directory \W32X86 putting file /tmp/4ba38b6611328 as \W32X86/edv02.ppd (27235,0 kb/s) (average inf kb/s) putting file /usr/share/cups/drivers/ps5ui.dll as \W32X86/ps5ui.dll (136486,7 kb/s) (average 163096,7 kb/s) putting file /usr/share/cups/drivers/pscript.hlp as \W32X86/pscript.hlp (437,9 kb/s) (average 3291,6 kb/s) putting file /usr/share/cups/drivers/pscript.ntf as \W32X86/pscript.ntf (30460,4 kb/s) (average 13442,6 kb/s) putting file /usr/share/cups/drivers/pscript5.dll as \W32X86/pscript5.dll (234488,6 kb/s) (average 18196,5 kb/s) Befehl ausführen: rpcclient server-p -N -A /tmp/4ba38b6611474 -c „adddriver Windows NT x86 edv02:pscript5.dll:edv02.ppd:ps5ui.dll:pscript.hlp:NULL:RAW:pscript5.dll,edv02.ppd,ps5ui.dll,pscript.hlp,pscript.ntf“ Printer Driver edv02 successfully installed. Befehl ausführen: rpcclient server-p -N -A /tmp/4ba38b6611474 -c „setdriver edv02 edv02“ cli_pipe_validate_current_pdu: RPC fault code DCERPC_FAULT_OP_RNG_ERROR received from host server-p! Successfully set edv02 to driver edv02. cli_pipe_validate_current_pdu: RPC fault code DCERPC_FAULT_OP_RNG_ERROR received from host server-p! Befehl ausführen: smbclient //server-p/print$ -N -A /tmp/4ba38b66759ee -c „mkdir W32X86;put /tmp/4ba38b667589a W32X86/edv03.ppd;put /usr/share/cups/drivers/ps5ui.dll W32X86/ps5ui.dll;put /usr/share/cups/drivers/pscript.hlp W32X86/pscript.hlp;put /usr/share/cups/drivers/pscript.ntf W32X86/pscript.ntf;put /usr/share/cups/drivers/pscript5.dll W32X86/pscript5.dll“ Domain=[PRUEFUNG] OS=[Unix] Server=[Samba 3.5.1] NT_STATUS_OBJECT_NAME_COLLISION making remote directory \W32X86 putting file /tmp/4ba38b667589a as \W32X86/edv03.ppd (27235,0 kb/s) (average inf kb/s) putting file /usr/share/cups/drivers/ps5ui.dll as \W32X86/ps5ui.dll (136486,7 kb/s) (average 163096,7 kb/s) putting file /usr/share/cups/drivers/pscript.hlp as \W32X86/pscript.hlp (252,8 kb/s) (average 1914,5 kb/s) putting file /usr/share/cups/drivers/pscript.ntf as \W32X86/pscript.ntf (30460,4 kb/s) (average 9267,3 kb/s) putting file /usr/share/cups/drivers/pscript5.dll as \W32X86/pscript5.dll (234488,6 kb/s) (average 12628,9 kb/s) Befehl ausführen: rpcclient server-p -N -A /tmp/4ba38b66759ee -c „adddriver Windows NT x86 edv03:pscript5.dll:edv03.ppd:ps5ui.dll:pscript.hlp:NULL:RAW:pscript5.dll,edv03.ppd,ps5ui.dll,pscript.hlp,pscript.ntf“ Printer Driver edv03 successfully installed. Befehl ausführen: rpcclient server-p -N -A /tmp/4ba38b66759ee -c „setdriver edv03 edv03“
Re: [Samba] Fix bugs with the full Windows ACL support
On Fri, Mar 19, 2010 at 03:12:28PM +0100, Adrian Berlin wrote: Hi! Could you explain what does mean 'Fix bugs with the full Windows ACL support' in samba 3.5.0pre2 release notes. I am asking because I know that samba 3 does not support full Windows ACL (Samba 4 will be supporting in user space). I missed the release window to update the notes. Samba 3.5.0 does support full Windows ACLs in user space, using the vfs_acl_xattr or vfs_acl_tdb VFS modules. Jeremy -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] Upgrade to sernet 3.5.1-42 not working
I have installed 3.5.1-42.el5 on an RHEL 5.4 box, added it to the domain, wbinfo -u and -g work fine. kinit works fine. It seems to recognize and use the global admin users section properly. If I add people or groups to the admin users group in the global section everything works fine. (this is obviously not the desired setup though) It doesn't seem to honour the valid users section inside the shares, however. I can put whatever I want in there and it fails to recognize them. The only error I can find is the following, however it seems unrelated to putting people in the global admin users group or not and more to unclean DNS. This setup is working on an RHEL 5.4 with 3.3.10 [2010/03/19 10:00:11.062710, 0] libsmb/ntlmssp_sign.c:209(ntlmssp_check_packet) NTLMSSP NTLM2 packet check failed due to invalid signature! [2010/03/19 10:00:11.062784, 0] rpc_server/srv_pipe_hnd.c:398(process_request_pdu) process_request_pdu: failed to do auth processing. [2010/03/19 10:00:11.062826, 0] rpc_server/srv_pipe_hnd.c:399(process_request_pdu) process_request_pdu: error was NT_STATUS_ACCESS_DENIED. [2010/03/19 10:00:13.508036, 0] lib/util_sock.c:675(write_data) [2010/03/19 10:00:13.508104, 0] lib/util_sock.c:1432(get_peer_addr_internal) getpeername failed. Error was Transport endpoint is not connected write_data: write failure in writing to client 0.0.0.0. Error Connection reset by peer [2010/03/19 10:00:13.508224, 0] smbd/process.c:79(srv_send_smb) Error writing 4 bytes to client. -1. (Transport endpoint is not connected) [2010/03/19 10:00:13.528683, 0] smbd/service.c:988(make_connection_snum) canonicalize_connect_path failed for service G_drive, path /data/G_drive [2010/03/19 10:00:13.530587, 0] smbd/service.c:988(make_connection_snum) canonicalize_connect_path failed for service G_drive, path /data/G_drive [2010/03/19 10:00:15.753830, 0] smbd/service.c:988(make_connection_snum) canonicalize_connect_path failed for service G_drive, path /data/G_drive smb.conf Load smb config files from /etc/samba/smb.conf Processing section [G_drive] Loaded services file OK. 'winbind separator = +' might cause problems with group membership. Server role: ROLE_DOMAIN_MEMBER Press enter to see a dump of your service definitions [global] workgroup = realm = .LOCAL server string = %h security = ADS password server = zeus dione client NTLMv2 auth = Yes log file = /var/log/samba/%m deadtime = 15 printcap name = cups local master = No domain master = No idmap uid = 1-2 idmap gid = 1-2 template homedir = /data/user_home/%D/%U template shell = /bin/bash winbind separator = + winbind enum users = Yes winbind enum groups = Yes winbind use default domain = Yes winbind expand groups = 5 admin users = @+domain admins, +Administrator inherit owner = Yes use sendfile = Yes veto oplock files = /*.mdb/*.MDB/*.mde/*.MDE/*.accdb/*.ACCDB/*.ldb/*.LDB/ access based share enum = Yes [G_drive] comment = G_Groups on Bubbles path = /data/G_drive valid users = @+domain admins, @+domain users, +Administrator, @+r_g_drive read only = No force create mode = 0770 force directory mode = 0770 inherit permissions = Yes inherit acls = Yes hide unreadable = Yes browseable = No -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Samba refresh problem
On Fri, Mar 19, 2010 at 02:56:12PM +0100, Rok Kosir wrote: Hello, we are experiencing some problems when accessing linux samba server(SUSE 11.1 with samba 3.2.7) via Windows XP clients. Content of the shared folder is regularly updated via CVS, after such updates windows clients do not see new data on the server. Refreshing via F5 does not help with the update, only solution is to unmount and remount samba share which can get annoying if you have to do this on several machines every week. Are there any solutions or known problems about this issue? I have tried setting strict sync and sync always to yes but this did not yield any success. Any comment and help is greatly appreciated. You're saying that you can see the files with ls on the server, but you can not see those files in a Windows explorer Windows having mapped that directory? That is *REALLY* weird. Can you try to connect via smbclient, do the update and look if another dir command in smbclient shows the new files? Volker signature.asc Description: Digital signature -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] winbind doing dns on short domain
-Original Message-
From: samba-boun...@lists.samba.org
[mailto:samba-boun...@lists.samba.org] On Behalf Of Jim Kusznir
Sent: Wednesday, March 10, 2010 7:20 PM
To: samba@lists.samba.org
Subject: [Samba] winbind doing dns on short domain
Hi all:
I'm building an authentication infrastructure for combined windows
plus linux clients. To that end, I have a Win Server 2008r2 ADS and a
win svr 2008r2 client, and an ubuntu 9.10 client running the default
samba + winbind (whatever is in their production repos).
I had it 95% working this morning...Then all of a sudden, all winbind
queries died. No idea why. I spent the entire day debugging it, and
I finally found out what its doing: Its DNS requests for the
_kerberos... host are using the short domain, not the fqdn:
16:03:37.479967 IP 192.168.3.11.38775 192.168.3.16.53: 44000+ SRV?
_kerberos._tcp.CASAS. (38)
(domain is CASAS.WSU.EDU). I can do a DNS lookup with the fqdn, and
it works fine, but the short name definitely does NOT work. I've even
modified /etc/resolv.conf to directly query the windows dns server
that is serving up casas.wsu.edu (which the normal production dns
server is set to delegate to). DNS queries for any of the magic
entries in proper form do work (with exception of reverse resolution
of the linux host itself -- it returns a different domain name when
querying the correct servers).
I've gone through both /etc/krb5.conf and smb.conf; there are now NO
occurrences of the short domain name in there. (I even changed
workgroup in smb.conf to the fqdn, as that was the last remaining
occurrence). Keep in mind that winbind was working fine with no edits
to either files yesterday and early this morning, no changes had
occurred anywhere on that line...all I did was tweak pam files to try
and correct a different problem).
Here are my config files:
-- smb.conf --
[global]
workgroup = CASAS.WSU.EDU
server string = %h Ubuntu Termserver
dns proxy = no
log file = /var/log/samba/log.%m
max log size = 1000
syslog = 0
panic action = /usr/share/samba/panic-action %d
security = ads
realm = CASAS.WSU.EDU
password server = 192.168.3.16
idmap uid = 1-2
idmap gid = 1-2
idmap backend = rid:CASAS.WSU.EDU=1-2
allow trusted domains = no
winbind use default domain = yes
winbind enum users = yes
winbind enum groups = yes
template homedir = /home/%U
template shell = /bin/bash
client use spnego = yes
client ntlmv2 auth = yes
restrict anonymous = 2
encrypt passwords = true
passdb backend = tdbsam
obey pam restrictions = yes
unix password sync = yes
passwd program = /usr/bin/passwd %u
passwd chat = *Enter\snew\s*\spassword:* %n\n
*Retype\snew\s*\spassword:* %n\n *password\supdated\ssuccessfully* .
pam password change = yes
map to guest = bad user
usershare allow guests = yes
[printers]
comment = All Printers
browseable = no
path = /var/spool/samba
printable = yes
guest ok = no
read only = yes
create mask = 0700
[print$]
comment = Printer Drivers
path = /var/lib/samba/printers
browseable = yes
read only = yes
guest ok = no
/etc/krb5.conf
[libdefaults]
default_realm = CASAS.WSU.EDU
krb4_config = /etc/krb.conf
krb4_realms = /etc/krb.realms
kdc_timesync = 1
ccache_type = 4
forwardable = true
proxiable = true
v4_instance_resolve = false
v4_name_convert = {
host = {
rcmd = host
ftp = ftp
}
plain = {
something = something-else
}
}
fcc-mit-ticketflags = true
[realms]
CASAS.WSU.EDU = {
kdc = ad1.casas.wsu.edu:88
admin_server = ad1.casas.wsu.edu
default_domain = casas.wsu.edu
}
[domain_realm]
.casas.wsu.edu = CASAS.WSU.EDU
casas.wsu.edu = CASAS.WSU.EDU
[login]
krb4_convert = true
krb4_get_tickets = false
-
And here's a tcpdump done filtering on port 53 during a winbind restart:
-
16:03:37.399967 IP 192.168.3.11.49438 192.168.3.16.53: 3748+ A?
AD1.CASAS.WSU.EDU. (35)
16:03:37.399967 IP 192.168.3.16.53 192.168.3.11.49438: 3748* 1/0/0
A[|domain]
16:03:37.399967 IP 192.168.3.11.43851 192.168.3.16.53: 27311+ A?
AD1.CASAS.WSU.EDU. (35)
16:03:37.399967 IP 192.168.3.16.53 192.168.3.11.43851: 27311* 1/0/0
A[|domain]
16:03:37.429967 IP 192.168.3.11.40739 192.168.3.16.53: 46827+ A?
ad1.casas.wsu.edu. (35)
16:03:37.429967 IP 192.168.3.16.53 192.168.3.11.40739: 46827* 1/0/0
A[|domain]
16:03:37.429967 IP 192.168.3.11.54465 192.168.3.16.53: 44669+[|domain]
16:03:37.429967 IP 192.168.3.16.53 192.168.3.11.54465: 44669
NXDomain*[|domain]
16:03:37.429967 IP 192.168.3.11.57928 192.168.3.16.53:
[Samba] looking for source/documentation for old version 1.8.06
I searched samba.org, the old cvs server, and the old samba site ( lake.canberra.edu.au/pub/samba/) on archive.org and could not find source for versions earlier than 1.9. Does anyone know where I could get source for version 1.8.06? Thanks. Garrett -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] looking for source/documentation for old version 1.8.06
Does anyone know where I could get source for version 1.8.06? Version 1.8.05 is here ( the most obvious place :-) ): http://samba.org/samba/ftp/old-versions/ -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] USERMGR 'A device attached to the system is not functioning'
Hey everyone, I've got a Samba server running with an LDAP backend, and for the most part it works great. The only issue I'm having is that when I attempt to use USERMGR.exe on the windows side I get this (typical Microsoft) error: A device attached to the system is not functioning I'm running Samba 3.4.5, and OpenLDAP 2.4.21 on FreeBSD 8.0 Here's the relevant config files: smb.conf - http://pastebin.com/VSUXFDst slapd.conf - http://pastebin.com/u8b0Hw8U Any help would be great! Let me know if any further information about the configuration would help. - Ben -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] USERMGR 'A device attached to the system is not functioning'
On 03/19/2010 05:26 PM, Ben LeMasurier wrote: Hey everyone, I've got a Samba server running with an LDAP backend, and for the most part it works great. The only issue I'm having is that when I attempt to use USERMGR.exe on the windows side I get this (typical Microsoft) error: A device attached to the system is not functioning I'm running Samba 3.4.5, and OpenLDAP 2.4.21 on FreeBSD 8.0 Here's the relevant config files: smb.conf - http://pastebin.com/VSUXFDst slapd.conf - http://pastebin.com/u8b0Hw8U Any help would be great! Let me know if any further information about the configuration would help. - Ben This is the NT user manager for domains command? Are on you an Windows server or workstation? I have seen that message when the account for the machine or user is not working correctly (e.g. if I try to logon as user from a trusted domain and the domain trusts were not working..) My guess is you logged in as Domain Administrator, the PC can't really figure out who are, then tries to treat you as the local Administrator. (you therefore would not immediately realize that there is a problem.) I would check a few things- - Does net groupmap... look OK? -You also want to make sure that domain administrator is listed in the domain admins group. The net ... group ... command (not sure exact syntax) your help verify. - Also look on the logs for that machine on the samba server. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] looking for source/documentation for old version 1.8.06
Thanks Miguel. I had asked about 1.8.06 because of a note in the hints file in a recent release that a delete job feature was added in that release. I see in the change-log for 1.9.00 that the feature was added in 1.9.00 and the change-log for 1.9.00 does not list a version 1.8.06. Maybe there was no 1.8.06? Either way, I have what I need. Thanks for pointing me to the list of releases. Garrett -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] config backend = registry; printers not shown
hi! no one knows? 2009/12/22 Zoolook nbe...@gmail.com: Hello, I couldn't find an answer to this small question in google/man/faq: why do I use lose my printer if I use registry backend? config backend = file (full config file below): ... [printers] comment = All Printers path = /var/spool/samba create mask = 0700 printable = Yes browseable = No guest ok = yes ... $ smbclient -kL //venkman ... EPSON_Stylus_CX5900 Printer EPSON Stylus CX5900 ... config backend = files, delete everything except [printers] and include include = registry: ... [global] include = registry [printers] comment = All Printers path = /var/spool/samba create mask = 0700 printable = Yes browseable = No guest ok = yes ... $ smbclient -kL //venkman ... EPSON_Stylus_CX5900 Printer EPSON Stylus CX5900 ... **BUT** if I change to config backend = registry, I no longer see my printer ... [global] config backend = registry ... $ smbclient -kL //venkman Domain=[BENSA] OS=[Unix] Server=[Samba 3.4.0] Sharename Type Comment - --- IPC$ IPC IPC Service (venkman server (Samba, Ubuntu)) zoolook Disk Home Directory print$ Disk Printer Drivers Domain=[BENSA] OS=[Unix] Server=[Samba 3.4.0] Server Comment - --- VENKMAN venkman server (Samba, Ubuntu) Workgroup Master - --- BENSA VENKMAN Why? (and no, disabling kerberos makes no difference...) samba is 2:3.4.0-3ubuntu5.3, ubuntu karmic. Here's my net conf list $ sudo net conf list [global] workgroup = BENSA server string = %h server (Samba, Ubuntu) map to guest = Bad User obey pam restrictions = Yes passdb backend = ldapsam:ldap://localhost dedicated keytab file = /etc/samba/smb.keytab kerberos method = dedicated keytab syslog = 0 log file = /var/log/samba/log.%m max log size = 1000 announce version = 5.9 time server = Yes add user script = /usr/sbin/smbldap-useradd -m '%u' delete user script = /usr/sbin/smbldap-userdel '%u' add group script = /usr/sbin/smbldap-groupadd '%g' delete group script = /usr/sbin/smbldap-userdel '%g' add user to group script = /usr/sbin/smbldap-groupmod -m '%u' '%g' delete user from group script = /usr/sbin/smbldap-groupmod -x '%u' '%g' set primary group script = /usr/sbin/smbldap-usermod -g '%g' '%u' add machine script = /usr/sbin/smbldap-useradd -t 0 -w '%u' domain logons = Yes os level = 255 preferred master = Yes dns proxy = No wins support = Yes ldap admin dn = cn=admin,dc=bensa,dc=ar ldap group suffix = ou=groups ldap idmap suffix = ou=idmap ldap machine suffix = ou=machines ldap passwd sync = yes ldap suffix = dc=bensa,dc=ar ldap ssl = no ldap user suffix = ou=users usershare allow guests = Yes panic action = /usr/share/samba/panic-action %d realm = BENSA.AR [printers] comment = All Printers path = /var/spool/samba create mask = 0700 printable = Yes browseable = No guest ok = yes [print$] comment = Printer Drivers path = /var/lib/samba/printers [homes] comment = Home Directory browseable = No -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Compile problem: lib/ldb/ldb_map/ldb_map.h, line 64: syntax error before or at: 0x20
Anybody have any ideas? I'm using opensolaris. From: Alfred Monticello ajmce...@yahoo.com To: samba@lists.samba.org Sent: Sat, March 13, 2010 12:07:38 AM Subject: [Samba] Compile problem: lib/ldb/ldb_map/ldb_map.h, line 64: syntax error before or at: 0x20 Trying to compile samba source4. Anybody have any ideas? Here's the error: With gcc, version 3.4.3, I get: Compiling lib/ldb/ldb_map/ldb_map_inbound.c In file included from lib/ldb/ldb_map/ldb_map_inbound.c:28: lib/ldb/ldb_map/ldb_map.h:64: error: syntax error before numeric constant The following command failed: gcc -O2 -m64 -g -DDEBUG_PASSWORD -DDEVELOPER -Wall -Wshadow -Werror-implicit-function-declaration -Wstrict-prototypes -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -Wmissing-format-attribute -Wformat=2 -Wdeclaration-after-statement -Wunused-macros -Wno-format-y2k -Wno-unused-parameter -Ilib/ldb/ldb_map -Ilib/ldb/include -Ilib/ldb/include -Ilib/ldb/include -Ilib/ldb/include -Ilib/ldb/include -Ilib/ldb/include -Ilib/ldb/include -Iheimdal/../heimdal_build -Iheimdal/lib/hdb -Iheimdal_build -Iheimdal/lib/roken -Iheimdal/lib/hdb -Ilib/ldb/include -Ilib/ldb/include -Ilib/ldb/ldb_tdb -Ilib/ldb/include -Ilib/ldb/include -Iheimdal/../heimdal_build -Iheimdal/lib/gssapi -Iheimdal/lib/gssapi/gssapi -Iheimdal/lib/gssapi/spnego -Iheimdal/lib/gssapi/krb5 -Iheimdal/lib/gssapi/mech -Iheimdal/lib/gssapi -Iheimdal/lib/gssapi -I../lib/tdb/include -I./../lib/talloc -Iheimdal/../heimdal_build -Iheimdal/lib/krb5 -Iheimdal/lib/asn1 -Iheimdal/lib/com_err -Iheimdal/../heimdal_build -Iheimdal/lib/hx509 -Iheimdal/lib/hx509 -Iheimdal/lib/asn1 -Iheimdal/lib/asn1 -Iheimdal/lib/asn1 -Iheimdal/lib/hx509 -Iheimdal/../heimdal_build -Iheimdal/lib/hcrypto -Iheimdal/lib -Iheimdal/../heimdal_build -Iheimdal/lib/hcrypto/imath -Iheimdal/../heimdal_build -Iheimdal/lib/wind -Iheimdal/lib/asn1 -Iheimdal/lib/asn1 -Iheimdal/lib/asn1 -Iheimdal/lib/asn1 -Iheimdal/../heimdal_build -Iheimdal/lib/asn1 -Iheimdal/../heimdal_build -Iheimdal/lib/com_err -Iheimdal/../heimdal_build -Iheimdal/lib/roken -Iheimdal/include -I../lib/socket_wrapper-g -Ilib/events -I../lib/tevent -I../lib/talloc -Ilib/replace -DSTATIC_LIBLDB_MODULES=LDB_MODULE(wins_ldb), LDB_MODULE(ranged_results), LDB_MODULE(schema_fsmo), LDB_MODULE(rootdse), LDB_MODULE(objectclass), LDB_MODULE(linked_attributes), LDB_MODULE(samldb), LDB_MODULE(extended_dn_out_ldb),LDB_MODULE(extended_dn_out_dereference), LDB_MODULE(skel), LDB_MODULE(entryuuid),LDB_MODULE(nsuniqueid), LDB_MODULE(paged_results), LDB_MODULE(dsdb_cache), LDB_MODULE(samba3sam), LDB_MODULE(objectguid), LDB_MODULE(instancetype), LDB_MODULE(descriptor), LDB_MODULE(update_keytab), LDB_MODULE(partition), LDB_MODULE(show_deleted), LDB_BACKEND(tdb), LDB_MODULE(paged_searches), LDB_MODULE(subtree_delete), LDB_MODULE(pdc_fsmo), LDB_MODULE(acl), LDB_MODULE(subtree_rename), LDB_MODULE(password_hash), LDB_MODULE(resolve_oids), LDB_BACKEND(ldapi),LDB_BACKEND(ldaps),LDB_BACKEND(ldap), LDB_MODULE(naming_fsmo), LDB_MODULE(operational), LDB_MODULE(extended_dn_in), LDB_MODULE(extended_dn_store), LDB_MODULE(asq), LDB_MODULE(repl_meta_data), LDB_MODULE(kludge_acl), LDB_MODULE(local_password), LDB_MODULE(rdn_name), LDB_MODULE(anr), LDB_MODULE(server_sort),NULL -fPIC -I./include -I. -I./lib -I./../lib/replace -I./../lib/talloc -I./.. -D_SAMBA_BUILD_=4 -DHAVE_CONFIG_H -c lib/ldb/ldb_map/ldb_map_inbound.c -o lib/ldb/ldb_map/ldb_map_inbound.o gmake: *** [lib/ldb/ldb_map/ldb_map_inbound.o] Error 1 With Sun Studio, version 12, I get: Compiling lib/ldb/ldb_map/ldb_map_inbound.c lib/ldb/ldb_map/ldb_map.h, line 64: syntax error before or at: 0x20 lib/ldb/ldb_map/ldb_map_inbound.c, line 85: undefined symbol: MAP_CONVERT lib/ldb/ldb_map/ldb_map_inbound.c, line 85: non-constant case expression lib/ldb/ldb_map/ldb_map_inbound.c, line 99: undefined symbol: MAP_GENERATE lib/ldb/ldb_map/ldb_map_inbound.c, line 99: non-constant case expression cc: acomp failed for lib/ldb/ldb_map/ldb_map_inbound.c The following command failed: cc -m64 -Ilib/ldb/ldb_map -Ilib/ldb/include -Ilib/ldb/include -Ilib/ldb/include -Ilib/ldb/include -Ilib/ldb/include -Ilib/ldb/include -Ilib/ldb/include -Iheimdal/../heimdal_build -Iheimdal/lib/hdb -Iheimdal_build -Iheimdal/lib/roken -Iheimdal/lib/hdb -Ilib/ldb/include -Ilib/ldb/include -Ilib/ldb/ldb_tdb -Ilib/ldb/include -Ilib/ldb/include -Iheimdal/../heimdal_build -Iheimdal/lib/gssapi -Iheimdal/lib/gssapi/gssapi -Iheimdal/lib/gssapi/spnego -Iheimdal/lib/gssapi/krb5 -Iheimdal/lib/gssapi/mech -Iheimdal/lib/gssapi -Iheimdal/lib/gssapi -I../lib/tdb/include -I./../lib/talloc -Iheimdal/../heimdal_build -Iheimdal/lib/krb5 -Iheimdal/lib/asn1 -Iheimdal/lib/com_err -Iheimdal/../heimdal_build -Iheimdal/lib/hx509 -Iheimdal/lib/hx509 -Iheimdal/lib/asn1 -Iheimdal/lib/asn1 -Iheimdal/lib/asn1 -Iheimdal/lib/hx509 -Iheimdal/../heimdal_build
Build status as of Fri Mar 19 06:00:01 2010
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2010-03-18 00:00:06.0 -0600 +++ /home/build/master/cache/broken_results.txt 2010-03-19 00:00:02.0 -0600 @@ -1,4 +1,4 @@ -Build status as of Thu Mar 18 06:00:05 2010 +Build status as of Fri Mar 19 06:00:01 2010 Build counts: Tree Total Broken Panic @@ -13,9 +13,10 @@ samba-docs 0 0 0 samba-web0 0 0 samba_3_current 32 32 2 -samba_3_master 32 32 2 -samba_3_next 29 29 4 +samba_3_master 32 32 3 +samba_3_next 29 28 4 samba_4_0_test 34 32 0 +samba_4_0_waf 2 2 0 talloc 34 11 0 tdb 32 22 0
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via e7cc45c... error_codes: fix NT_STATUS_RPC_UNKNOWN_IF typo.
via dd4e2eb... s4-smbtorture: use torture_context in policy function in
RPC-LSA-LOOKUP test.
from 421a926... s3:libsmb/nterr.c: fix/add NT_STATUS_RPC_* codes
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit e7cc45cb140e1df5731619ae09af6c10b8f9fffa
Author: Günther Deschner g...@samba.org
Date: Fri Mar 19 09:30:36 2010 +0100
error_codes: fix NT_STATUS_RPC_UNKNOWN_IF typo.
Metze, please check.
Guenther
commit dd4e2ebda5c3febe89025781921f7f6875b57e07
Author: Günther Deschner g...@samba.org
Date: Thu Mar 18 23:54:14 2010 +0100
s4-smbtorture: use torture_context in policy function in RPC-LSA-LOOKUP
test.
Guenther
---
Summary of changes:
libcli/util/ntstatus.h |2 +-
source3/libsmb/nterr.c |2 +-
source4/libcli/util/nterr.c |2 +-
source4/torture/rpc/lsa_lookup.c | 32 +---
4 files changed, 20 insertions(+), 18 deletions(-)
Changeset truncated at 500 lines:
diff --git a/libcli/util/ntstatus.h b/libcli/util/ntstatus.h
index dca1490..31f9d28 100644
--- a/libcli/util/ntstatus.h
+++ b/libcli/util/ntstatus.h
@@ -604,7 +604,7 @@ typedef uint32_t NTSTATUS;
#define NT_STATUS_NO_SUCH_JOB NT_STATUS(0xC000 | 0xEDE) /* scheduler */
#define NT_STATUS_RPC_PROTSEQ_NOT_SUPPORTED NT_STATUS(0xC000 | 0x20004)
#define NT_STATUS_RPC_UNSUPPORTED_NAME_SYNTAX NT_STATUS(0xC000 | 0x20026)
-#define NT_STAUTS_RPC_UNKNOWN_IF NT_STATUS(0xC000 | 0x20012)
+#define NT_STATUS_RPC_UNKNOWN_IF NT_STATUS(0xC000 | 0x20012)
#define NT_STATUS_RPC_CALL_FAILED NT_STATUS(0xC000 | 0x2001B)
#define NT_STATUS_RPC_PROTOCOL_ERROR NT_STATUS(0xC000 | 0x2001D)
#define NT_STATUS_RPC_PROCNUM_OUT_OF_RANGE NT_STATUS(0xC000 | 0x2002E)
diff --git a/source3/libsmb/nterr.c b/source3/libsmb/nterr.c
index 7efd32e..817bb56 100644
--- a/source3/libsmb/nterr.c
+++ b/source3/libsmb/nterr.c
@@ -545,7 +545,7 @@ static const nt_err_code_struct nt_errs[] =
{ STATUS_NO_MORE_FILES, STATUS_NO_MORE_FILES },
{ NT_STATUS_RPC_PROTSEQ_NOT_SUPPORTED,
NT_STATUS_RPC_PROTSEQ_NOT_SUPPORTED },
{ NT_STATUS_RPC_UNSUPPORTED_NAME_SYNTAX,
NT_STATUS_RPC_UNSUPPORTED_NAME_SYNTAX },
- { NT_STAUTS_RPC_UNKNOWN_IF, NT_STAUTS_RPC_UNKNOWN_IF },
+ { NT_STATUS_RPC_UNKNOWN_IF, NT_STATUS_RPC_UNKNOWN_IF },
{ NT_STATUS_RPC_CALL_FAILED, NT_STATUS_RPC_CALL_FAILED },
{ NT_STATUS_RPC_PROTOCOL_ERROR, NT_STATUS_RPC_PROTOCOL_ERROR },
{ NT_STATUS_RPC_PROCNUM_OUT_OF_RANGE,
NT_STATUS_RPC_PROCNUM_OUT_OF_RANGE },
diff --git a/source4/libcli/util/nterr.c b/source4/libcli/util/nterr.c
index c70c331..3a850a0 100644
--- a/source4/libcli/util/nterr.c
+++ b/source4/libcli/util/nterr.c
@@ -546,7 +546,7 @@ static const nt_err_code_struct nt_errs[] =
{ NT_STATUS_NO_MORE_ENTRIES, NT_STATUS_NO_MORE_ENTRIES },
{ NT_STATUS_RPC_PROTSEQ_NOT_SUPPORTED,
NT_STATUS_RPC_PROTSEQ_NOT_SUPPORTED },
{ NT_STATUS_RPC_UNSUPPORTED_NAME_SYNTAX,
NT_STATUS_RPC_UNSUPPORTED_NAME_SYNTAX },
- { NT_STAUTS_RPC_UNKNOWN_IF, NT_STAUTS_RPC_UNKNOWN_IF },
+ { NT_STATUS_RPC_UNKNOWN_IF, NT_STATUS_RPC_UNKNOWN_IF },
{ NT_STATUS_RPC_CALL_FAILED, NT_STATUS_RPC_CALL_FAILED },
{ NT_STATUS_RPC_PROTOCOL_ERROR, NT_STATUS_RPC_PROTOCOL_ERROR },
{ NT_STATUS_RPC_PROCNUM_OUT_OF_RANGE,
NT_STATUS_RPC_PROCNUM_OUT_OF_RANGE },
diff --git a/source4/torture/rpc/lsa_lookup.c b/source4/torture/rpc/lsa_lookup.c
index 0ca086c..3765fae 100644
--- a/source4/torture/rpc/lsa_lookup.c
+++ b/source4/torture/rpc/lsa_lookup.c
@@ -23,15 +23,15 @@
#include librpc/gen_ndr/ndr_lsa_c.h
#include libcli/security/security.h
-static bool open_policy(TALLOC_CTX *mem_ctx, struct dcerpc_binding_handle *b,
+static bool open_policy(struct torture_context *tctx,
+ struct dcerpc_binding_handle *b,
struct policy_handle **handle)
{
struct lsa_ObjectAttribute attr;
struct lsa_QosInfo qos;
struct lsa_OpenPolicy2 r;
- NTSTATUS status;
- *handle = talloc(mem_ctx, struct policy_handle);
+ *handle = talloc(tctx, struct policy_handle);
if (!*handle) {
return false;
}
@@ -53,31 +53,32 @@ static bool open_policy(TALLOC_CTX *mem_ctx, struct
dcerpc_binding_handle *b,
r.in.access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
r.out.handle = *handle;
- status = dcerpc_lsa_OpenPolicy2_r(b, mem_ctx, r);
+ torture_assert_ntstatus_ok(tctx, dcerpc_lsa_OpenPolicy2_r(b, tctx, r),
OpenPolicy2 failed);
- return NT_STATUS_IS_OK(status);
+ return NT_STATUS_IS_OK(r.out.result);
}
-static bool get_domainsid(TALLOC_CTX *mem_ctx, struct
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 53d35fc... s3-selftest: rearrange uid/gid calculation to achieve
correct membership.
via 20d73f7... s3-selftest: rearrange uid/gid calculation to achieve
correct membership.
via f067796... nss_wrapper.pl: allow to specify gid for new users.
from e7cc45c... error_codes: fix NT_STATUS_RPC_UNKNOWN_IF typo.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 53d35fc9587234c4d72b9622fc5144d50ba47a80
Author: Günther Deschner g...@samba.org
Date: Fri Mar 19 10:33:54 2010 +0100
s3-selftest: rearrange uid/gid calculation to achieve correct membership.
(make test variant)
Guenther
commit 20d73f768d002faf62f760f99c608f139b229491
Author: Günther Deschner g...@samba.org
Date: Fri Mar 19 10:23:39 2010 +0100
s3-selftest: rearrange uid/gid calculation to achieve correct membership.
Guenther
commit f06779629db8f810f1ff8ad8f16ac2b580052b2c
Author: Günther Deschner g...@samba.org
Date: Fri Mar 19 09:50:56 2010 +0100
nss_wrapper.pl: allow to specify gid for new users.
Guenther
---
Summary of changes:
lib/nss_wrapper/nss_wrapper.pl | 45 +++-
selftest/target/Samba3.pm| 58 +
source3/script/tests/selftest.sh | 46 -
3 files changed, 82 insertions(+), 67 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/nss_wrapper/nss_wrapper.pl b/lib/nss_wrapper/nss_wrapper.pl
index 1f1aef1..48fa2c5 100644
--- a/lib/nss_wrapper/nss_wrapper.pl
+++ b/lib/nss_wrapper/nss_wrapper.pl
@@ -13,18 +13,19 @@ my $opt_action = undef;
my $opt_type = undef;
my $opt_name = undef;
my $opt_member = undef;
+my $opt_gid = 65534;# nogroup gid
my $passwdfn = undef;
my $groupfn = undef;
my $memberfn = undef;
my $actionfn = undef;
-sub passwd_add();
-sub passwd_delete();
-sub group_add();
-sub group_delete();
-sub member_add();
-sub member_delete();
+sub passwd_add($);
+sub passwd_delete($);
+sub group_add($);
+sub group_delete($);
+sub member_add($);
+sub member_delete($);
sub check_path($$);
@@ -35,7 +36,8 @@ my $result = GetOptions(
'action=s' = \$opt_action,
'type=s'= \$opt_type,
'name=s'= \$opt_name,
- 'member=s' = \$opt_member
+ 'member=s' = \$opt_member,
+ 'gid=i' = \$opt_gid
);
sub usage($;$)
@@ -58,6 +60,8 @@ sub usage($;$)
--name name The name of the object.
--member member The name of the member.
+
+ --gid gid Primary Group ID for new users.
;
exit($ret);
}
@@ -110,7 +114,7 @@ if ($opt_name eq ) {
usage(1, invalid: --name name);
}
-exit $actionfn-($opt_fullpath_passwd, $opt_member, $opt_fullpath_group,
$opt_name);
+exit $actionfn-($opt_fullpath_passwd, $opt_member, $opt_fullpath_group,
$opt_name, $opt_gid);
sub check_path($$)
{
@@ -388,9 +392,9 @@ sub group_save($)
rename($tmppath, $path) or die(Unable to rename $tmppath = $path);
}
-sub passwd_add()
+sub passwd_add($)
{
- my ($path, $dummy, $dummy2, $name) = @_;
+ my ($path, $dummy, $dummy2, $name, $gid) = @_;
#print passwd_add: '$name' in '$path'\n;
@@ -400,7 +404,6 @@ sub passwd_add()
die(account[$name] already exists in '$path') if defined($e);
my $uid = passwd_get_free_uid($passwd);
- my $gid = 65534;# nogroup gid
my $pwent = $name.:x:.$uid.:.$gid.:.$name.
gecos:/nodir:/bin/false;
@@ -411,9 +414,9 @@ sub passwd_add()
return 0;
}
-sub passwd_delete()
+sub passwd_delete($)
{
- my ($path, $dummy, $dummy2, $name) = @_;
+ my ($path, $dummy, $dummy2, $name, $dummy3) = @_;
#print passwd_delete: '$name' in '$path'\n;
@@ -429,9 +432,9 @@ sub passwd_delete()
return 0;
}
-sub group_add()
+sub group_add($)
{
- my ($dummy, $dummy2, $path, $name) = @_;
+ my ($dummy, $dummy2, $path, $name, $dummy3) = @_;
#print group_add: '$name' in '$path'\n;
@@ -453,9 +456,9 @@ sub group_add()
return 0;
}
-sub group_delete()
+sub group_delete($)
{
- my ($dummy, $dummy2, $path, $name) = @_;
+ my ($dummy, $dummy2, $path, $name, $dummy3) = @_;
#print group_delete: '$name' in '$path'\n;
@@ -471,9 +474,9 @@ sub group_delete()
return 0;
}
-sub member_add()
+sub member_add($)
{
- my ($passwd_path, $username, $group_path, $groupname) = @_;
+ my ($passwd_path, $username, $group_path, $groupname, $dummy) = @_;
#print member_add: adding '$username' in '$passwd_path' to
'$groupname' in '$group_path'\n;
@@ -494,9 +497,9 @@ sub
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 4d6368f... s3-selftest: enable RAP calls testsuite against samba3.
via 3144a98... s4-smbtorture: skip RAP netservergetinfo level 1 test
against s3.
from 53d35fc... s3-selftest: rearrange uid/gid calculation to achieve
correct membership.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 4d6368f5f5b384af7e8d06425357cb1666ac853f
Author: Günther Deschner g...@samba.org
Date: Fri Mar 19 09:19:39 2010 +0100
s3-selftest: enable RAP calls testsuite against samba3.
Guenther
commit 3144a988e5e95671fd49bd2326099dff789fec5d
Author: Günther Deschner g...@samba.org
Date: Fri Mar 19 10:54:12 2010 +0100
s4-smbtorture: skip RAP netservergetinfo level 1 test against s3.
Guenther
---
Summary of changes:
source3/script/tests/test_posix_s3.sh |4 +++-
source4/torture/rap/rap.c | 13 +++--
2 files changed, 14 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/script/tests/test_posix_s3.sh
b/source3/script/tests/test_posix_s3.sh
index f1b5608..1e95b07 100755
--- a/source3/script/tests/test_posix_s3.sh
+++ b/source3/script/tests/test_posix_s3.sh
@@ -54,12 +54,14 @@ local=LOCAL-NSS-WRAPPER LOCAL-NDR
winbind=WINBIND-STRUCT WINBIND-WBCLIENT
+rap=RAP-BASIC
+
# NOTE: to enable the UNIX-WHOAMI test, we need to change the default share
# config to allow guest access. I'm not sure whether this would break other
# tests, so leaving it alone for now -- jpeach
unix=UNIX-INFO2
-tests=$base $raw $rpc $unix $local $winbind
+tests=$base $raw $rpc $unix $local $winbind $rap
if test x$POSIX_SUBTESTS != x ; then
tests=$POSIX_SUBTESTS
diff --git a/source4/torture/rap/rap.c b/source4/torture/rap/rap.c
index 2660aaf..78fc6a4 100644
--- a/source4/torture/rap/rap.c
+++ b/source4/torture/rap/rap.c
@@ -510,9 +510,18 @@ static bool test_netservergetinfo(struct torture_context
*tctx,
r.in.bufsize = 0x;
r.in.level = 0;
- torture_assert_ntstatus_ok(tctx, smbcli_rap_netservergetinfo(cli-tree,
lp_iconv_convenience(tctx-lp_ctx), tctx, r), );
+ torture_assert_ntstatus_ok(tctx,
+ smbcli_rap_netservergetinfo(cli-tree,
lp_iconv_convenience(tctx-lp_ctx), tctx, r),
+ rap_netservergetinfo level 0 failed);
+
+ if (torture_setting_bool(tctx, samba3, false)) {
+ torture_skip(tctx, skipping netservergetinfo level 1 against
samba3);
+ }
+
r.in.level = 1;
- torture_assert_ntstatus_ok(tctx, smbcli_rap_netservergetinfo(cli-tree,
lp_iconv_convenience(tctx-lp_ctx), tctx, r), );
+ torture_assert_ntstatus_ok(tctx,
+ smbcli_rap_netservergetinfo(cli-tree,
lp_iconv_convenience(tctx-lp_ctx), tctx, r),
+ rap_netservergetinfo level 1 failed);
return res;
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via b82f168... s3:librpc: remove unused stuff
from 4d6368f... s3-selftest: enable RAP calls testsuite against samba3.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit b82f168c3cbd49fdefa9f469ececcbdbce2730a7
Author: Stefan Metzmacher me...@samba.org
Date: Wed Mar 10 14:33:58 2010 +0100
s3:librpc: remove unused stuff
metze
---
Summary of changes:
source3/Makefile.in |1 -
source3/include/proto.h | 11 ---
source3/librpc/rpc/dcerpc.c | 187 ---
source3/librpc/rpc/dcerpc.h | 30 ---
4 files changed, 0 insertions(+), 229 deletions(-)
delete mode 100644 source3/librpc/rpc/dcerpc.c
Changeset truncated at 500 lines:
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 4c12157..3d5a618 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -537,7 +537,6 @@ LIBMSRPC_OBJ = rpc_client/cli_lsarpc.o
rpc_client/cli_samr.o \
rpc_client/cli_spoolss.o \
rpc_client/init_spoolss.o \
rpc_client/init_samr.o \
- librpc/rpc/dcerpc.o \
../librpc/rpc/binding.o
LIBMSRPC_GEN_OBJ = ../librpc/gen_ndr/cli_lsa.o \
diff --git a/source3/include/proto.h b/source3/include/proto.h
index ad95863..9200802 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -2135,17 +2135,6 @@ _PUBLIC_ NTSTATUS dcerpc_binding_build_tower(TALLOC_CTX
*mem_ctx,
const struct dcerpc_binding
*binding,
struct epm_tower *tower);
-/* The following definitions come from librpc/rpc/dcerpc.c */
-
-struct rpc_request *dcerpc_ndr_request_send(struct dcerpc_pipe *p, const
struct GUID *object,
- const struct ndr_interface_table
*table, uint32_t opnum,
- TALLOC_CTX *mem_ctx, void *r);
-NTSTATUS dcerpc_ndr_request_recv(struct rpc_request *req);
-_PUBLIC_ NTSTATUS dcerpc_pipe_connect(TALLOC_CTX *parent_ctx, struct
dcerpc_pipe **pp,
- const char *binding_string, const struct
ndr_interface_table *table,
- struct cli_credentials *credentials,
struct event_context *ev,
- struct loadparm_context *lp_ctx);
-
/* The following definitions come from libsmb/cliconnect.c */
ADS_STATUS cli_session_setup_spnego(struct cli_state *cli, const char *user,
diff --git a/source3/librpc/rpc/dcerpc.c b/source3/librpc/rpc/dcerpc.c
deleted file mode 100644
index e6c4cb4..000
--- a/source3/librpc/rpc/dcerpc.c
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- Unix SMB/CIFS implementation.
- Samba 4-compatible DCE/RPC API on top of the Samba 3 DCE/RPC client library.
- Copyright (C) Jelmer Vernooij jel...@samba.org 2008
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see http://www.gnu.org/licenses/.
-*/
-
-#include includes.h
-#include librpc/rpc/dcerpc.h
-
-/**
- * Send a struct-based RPC request using the Samba 3 RPC client library.
- */
-struct rpc_request *dcerpc_ndr_request_send(struct dcerpc_pipe *p, const
struct GUID *object,
- const struct ndr_interface_table
*table, uint32_t opnum,
- TALLOC_CTX *mem_ctx, void *r)
-{
- const struct ndr_interface_call *call;
- struct ndr_push *push;
- struct rpc_request *ret = talloc(mem_ctx, struct rpc_request);
- enum ndr_err_code ndr_err;
- DATA_BLOB blob;
-
- if (ret == NULL)
- return NULL;
-
- SMB_ASSERT(p-table-num_calls opnum);
-
- call = p-table-calls[opnum];
-
- ret-call = call;
- ret-r = r;
-
- push = ndr_push_init_ctx(mem_ctx, NULL);
- if (!push) {
- return NULL;
- }
-
- ndr_err = call-ndr_push(push, NDR_IN, r);
- if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
- /* FIXME: ndr_map_error2ntstatus(ndr_err); */
- return NULL;
- }
-
- blob = ndr_push_blob(push);
-
- if (!prs_init_data_blob(ret-q_ps, blob, mem_ctx)) {
- return
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via f470029... s4:librpc/rpc: add NCACN_INTERNAL from s3
from b82f168... s3:librpc: remove unused stuff
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit f4700296b3296c013cdb186a5de02baa77d6bad8
Author: Stefan Metzmacher me...@samba.org
Date: Fri Mar 19 17:38:32 2010 +0100
s4:librpc/rpc: add NCACN_INTERNAL from s3
metze
---
Summary of changes:
source4/librpc/rpc/dcerpc.h |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/librpc/rpc/dcerpc.h b/source4/librpc/rpc/dcerpc.h
index 70e90c4..22988e6 100644
--- a/source4/librpc/rpc/dcerpc.h
+++ b/source4/librpc/rpc/dcerpc.h
@@ -38,7 +38,7 @@ struct dcerpc_binding_handle;
enum dcerpc_transport_t {
NCA_UNKNOWN, NCACN_NP, NCACN_IP_TCP, NCACN_IP_UDP, NCACN_VNS_IPC,
NCACN_VNS_SPP, NCACN_AT_DSP, NCADG_AT_DDP, NCALRPC, NCACN_UNIX_STREAM,
- NCADG_UNIX_DGRAM, NCACN_HTTP, NCADG_IPX, NCACN_SPX };
+ NCADG_UNIX_DGRAM, NCACN_HTTP, NCADG_IPX, NCACN_SPX, NCACN_INTERNAL };
/*
this defines a generic security context for signed/sealed dcerpc pipes.
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 5d5c6e1... s3-selftest: use proper names for samba3 dcerpc tests.
via f5ab6fd... s4-smbtorture: put all RPC-SAMB3-X torture tests into
their own torture_suite.
from f470029... s4:librpc/rpc: add NCACN_INTERNAL from s3
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 5d5c6e132098a88f2c3f80c53019d91bdc82c0bb
Author: Günther Deschner g...@samba.org
Date: Fri Mar 19 19:59:15 2010 +0100
s3-selftest: use proper names for samba3 dcerpc tests.
Guenther
commit f5ab6fd7886da7c9018bbb31877966605eb393b4
Author: Günther Deschner g...@samba.org
Date: Fri Mar 19 19:58:24 2010 +0100
s4-smbtorture: put all RPC-SAMB3-X torture tests into their own
torture_suite.
Guenther
---
Summary of changes:
source3/script/tests/test_posix_s3.sh |4 +-
source4/torture/rpc/rpc.c | 18 +
source4/torture/rpc/samba3rpc.c | 47
3 files changed, 38 insertions(+), 31 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/script/tests/test_posix_s3.sh
b/source3/script/tests/test_posix_s3.sh
index 1e95b07..dfbeadb 100755
--- a/source3/script/tests/test_posix_s3.sh
+++ b/source3/script/tests/test_posix_s3.sh
@@ -37,10 +37,10 @@ raw=$raw RAW-SAMBA3HIDE RAW-SAMBA3BADPATH
RAW-SFILEINFO-RENAME
raw=$raw RAW-SAMBA3CASEINSENSITIVE RAW-SAMBA3POSIXTIMEDLOCK
raw=$raw RAW-SAMBA3ROOTDIRFID RAW-SFILEINFO-END-OF-FILE
-rpc=RPC-AUTHCONTEXT RPC-BINDSAMBA3 RPC-SAMBA3-SRVSVC RPC-SAMBA3-SHARESEC
+rpc=RPC-AUTHCONTEXT RPC-SAMBA3-BIND RPC-SAMBA3-SRVSVC RPC-SAMBA3-SHARESEC
rpc=$rpc RPC-SAMBA3-SPOOLSS RPC-SAMBA3-WKSSVC RPC-SAMBA3-WINREG
rpc=$rpc RPC-SAMBA3-GETALIASMEMBERSHIP-0
-rpc=$rpc RPC-NETLOGSAMBA3 RPC-SAMBA3SESSIONKEY RPC-SAMBA3-GETUSERNAME
+rpc=$rpc RPC-SAMBA3-NETLOGON RPC-SAMBA3-SESSIONKEY RPC-SAMBA3-GETUSERNAME
rpc=$rpc RPC-SVCCTL RPC-NTSVCS RPC-WINREG RPC-EVENTLOG
rpc=$rpc RPC-SPOOLSS RPC-SPOOLSS-WIN RPC-SPOOLSS-NOTIFY RPC-SPOOLSS-PRINTER
rpc=$rpc RPC-LSA-GETUSER RPC-LSA-LOOKUPSIDS RPC-LSA-LOOKUPNAMES
diff --git a/source4/torture/rpc/rpc.c b/source4/torture/rpc/rpc.c
index 1973440..01e36ea 100644
--- a/source4/torture/rpc/rpc.c
+++ b/source4/torture/rpc/rpc.c
@@ -476,27 +476,11 @@ NTSTATUS torture_rpc_init(void)
torture_suite_add_simple_test(suite, COUNTCALLS,
torture_rpc_countcalls);
torture_suite_add_simple_test(suite, MULTIBIND, torture_multi_bind);
torture_suite_add_simple_test(suite, AUTHCONTEXT,
torture_bind_authcontext);
- torture_suite_add_simple_test(suite, BINDSAMBA3, torture_bind_samba3);
- torture_suite_add_simple_test(suite, NETLOGSAMBA3,
torture_netlogon_samba3);
- torture_suite_add_simple_test(suite, SAMBA3SESSIONKEY,
torture_samba3_sessionkey);
- torture_suite_add_simple_test(suite, SAMBA3-SRVSVC,
torture_samba3_rpc_srvsvc);
- torture_suite_add_simple_test(suite, SAMBA3-SHARESEC,
- torture_samba3_rpc_sharesec);
- torture_suite_add_simple_test(suite, SAMBA3-GETUSERNAME,
- torture_samba3_rpc_getusername);
- torture_suite_add_simple_test(suite, SAMBA3-RANDOMAUTH2,
- torture_samba3_rpc_randomauth2);
- torture_suite_add_simple_test(suite, SAMBA3-LSA,
torture_samba3_rpc_lsa);
- torture_suite_add_simple_test(suite, SAMBA3-SPOOLSS,
torture_samba3_rpc_spoolss);
- torture_suite_add_simple_test(suite, SAMBA3-WKSSVC,
torture_samba3_rpc_wkssvc);
- torture_suite_add_simple_test(suite, SAMBA3-WINREG,
torture_samba3_rpc_winreg);
- torture_suite_add_simple_test(suite, SAMBA3-GETALIASMEMBERSHIP-0,
- torture_samba3_getaliasmembership_0);
+ torture_suite_add_suite(suite, torture_rpc_samba3(suite));
torture_rpc_drsuapi_tcase(suite);
torture_rpc_drsuapi_cracknames_tcase(suite);
torture_suite_add_suite(suite, torture_rpc_dssetup(suite));
torture_suite_add_suite(suite, torture_rpc_browser(suite));
- torture_suite_add_simple_test(suite, SAMBA3-REGCONFIG,
torture_samba3_regconfig);
torture_suite_add_simple_test(suite, ALTERCONTEXT,
torture_rpc_alter_context);
torture_suite_add_simple_test(suite, JOIN, torture_rpc_join);
torture_drs_rpc_dssync_tcase(suite);
diff --git a/source4/torture/rpc/samba3rpc.c b/source4/torture/rpc/samba3rpc.c
index 91be716..7419750 100644
--- a/source4/torture/rpc/samba3rpc.c
+++ b/source4/torture/rpc/samba3rpc.c
@@ -283,7 +283,7 @@ static bool bindtest(struct smbcli_state *cli,
* test authenticated RPC binds with the variants Samba3 does support
*/
-bool torture_bind_samba3(struct torture_context *torture)
+static bool torture_bind_samba3(struct torture_context *torture)
{
TALLOC_CTX
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 3cb5694... s4-smbtorture: rework RPC-DFS test a bit.
from 5d5c6e1... s3-selftest: use proper names for samba3 dcerpc tests.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 3cb56942ed958723bf312040dd9245cd08e9ffcb
Author: Günther Deschner g...@samba.org
Date: Fri Mar 19 22:37:53 2010 +0100
s4-smbtorture: rework RPC-DFS test a bit.
Guenther
---
Summary of changes:
source4/torture/rpc/dfs.c | 405 ++---
source4/torture/rpc/rpc.c |2 +-
2 files changed, 196 insertions(+), 211 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/torture/rpc/dfs.c b/source4/torture/rpc/dfs.c
index a778e68..3327223 100644
--- a/source4/torture/rpc/dfs.c
+++ b/source4/torture/rpc/dfs.c
@@ -40,8 +40,7 @@
return true;\
}\
-static bool test_NetShareAdd(TALLOC_CTX *mem_ctx,
-struct torture_context *tctx,
+static bool test_NetShareAdd(struct torture_context *tctx,
const char *host,
const char *sharename,
const char *dir)
@@ -72,7 +71,7 @@ static bool test_NetShareAdd(TALLOC_CTX *mem_ctx,
r.in.server_name= host;
r.in.share = i;
- status = libnet_AddShare(libnetctx, mem_ctx, r);
+ status = libnet_AddShare(libnetctx, tctx, r);
if (!NT_STATUS_IS_OK(status)) {
d_printf(Failed to add new share: %s (%s)\n,
nt_errstr(status), r.out.error_string);
@@ -82,8 +81,7 @@ static bool test_NetShareAdd(TALLOC_CTX *mem_ctx,
return true;
}
-static bool test_NetShareDel(TALLOC_CTX *mem_ctx,
-struct torture_context *tctx,
+static bool test_NetShareDel(struct torture_context *tctx,
const char *host,
const char *sharename)
{
@@ -91,7 +89,7 @@ static bool test_NetShareDel(TALLOC_CTX *mem_ctx,
struct libnet_context* libnetctx;
struct libnet_DelShare r;
- printf(Deleting share %s\n, sharename);
+ torture_comment(tctx, Deleting share %s\n, sharename);
if (!(libnetctx = libnet_context_init(tctx-ev, tctx-lp_ctx))) {
return false;
@@ -102,7 +100,7 @@ static bool test_NetShareDel(TALLOC_CTX *mem_ctx,
r.in.share_name = sharename;
r.in.server_name= host;
- status = libnet_DelShare(libnetctx, mem_ctx, r);
+ status = libnet_DelShare(libnetctx, tctx, r);
if (!NT_STATUS_IS_OK(status)) {
d_printf(Failed to delete share: %s (%s)\n,
nt_errstr(status), r.out.error_string);
@@ -132,10 +130,11 @@ static bool test_CreateDir(TALLOC_CTX *mem_ctx,
return true;
}
-static bool test_DeleteDir(struct smbcli_state *cli,
+static bool test_DeleteDir(struct torture_context *tctx,
+ struct smbcli_state *cli,
const char *dir)
{
- printf(Deleting directory %s\n, dir);
+ torture_comment(tctx, Deleting directory %s\n, dir);
if (smbcli_deltree(cli-tree, dir) == -1) {
printf(Unable to delete dir %s - %s\n, dir,
@@ -146,47 +145,57 @@ static bool test_DeleteDir(struct smbcli_state *cli,
return true;
}
-static bool test_GetManagerVersion(struct dcerpc_binding_handle *b,
- TALLOC_CTX *mem_ctx,
- enum dfs_ManagerVersion *version)
+static bool test_GetManagerVersion_opts(struct torture_context *tctx,
+ struct dcerpc_binding_handle *b,
+ enum dfs_ManagerVersion *version_p)
{
- NTSTATUS status;
struct dfs_GetManagerVersion r;
+ enum dfs_ManagerVersion version;
- r.out.version = version;
+ r.out.version = version;
- status = dcerpc_dfs_GetManagerVersion_r(b, mem_ctx, r);
- if (!NT_STATUS_IS_OK(status)) {
- printf(GetManagerVersion failed - %s\n, nt_errstr(status));
- return false;
+ torture_assert_ntstatus_ok(tctx,
+ dcerpc_dfs_GetManagerVersion_r(b, tctx, r),
+ GetManagerVersion failed);
+
+ if (version_p) {
+ *version_p = version;
}
return true;
}
-static bool test_ManagerInitialize(struct dcerpc_binding_handle *b,
- TALLOC_CTX *mem_ctx,
- const char *host)
+
+static bool test_GetManagerVersion(struct torture_context *tctx,
+ struct dcerpc_pipe *p)
+{
+ struct dcerpc_binding_handle *b = p-binding_handle;
+
+ return
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via a52b3df... s4-selftest: skip RPC-DFS for s4 entirely. from 3cb5694... s4-smbtorture: rework RPC-DFS test a bit. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit a52b3dfb26f01ca93daa3a69d19c27dd2de922fb Author: Günther Deschner g...@samba.org Date: Sat Mar 20 02:56:20 2010 +0100 s4-selftest: skip RPC-DFS for s4 entirely. Guenther --- Summary of changes: source4/selftest/knownfail |1 - source4/selftest/skip |1 + 2 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/selftest/knownfail b/source4/selftest/knownfail index ccae4ef..a6b7161 100644 --- a/source4/selftest/knownfail +++ b/source4/selftest/knownfail @@ -18,7 +18,6 @@ rpc.handles.*.lsarpc-shared rpc.handles.*.mixed-shared rpc.epmapper.*.Insert rpc.epmapper.*.InqObject -rpc.dfs.* rpc.drsuapi.* rpc.lsalookup rpc.cracknames diff --git a/source4/selftest/skip b/source4/selftest/skip index a2abd41..4061589 100644 --- a/source4/selftest/skip +++ b/source4/selftest/skip @@ -50,6 +50,7 @@ rpc.svcctl # Not provided by Samba 4 rpc.atsvc # Not provided by Samba 4 rpc.frsapi # Not provided by Samba 4 rpc.ntsvcs # Not provided by Samba 4 +rpc.dfs# Not provided by Samba 4 ^samba4.base.samba3.* # Samba3-specific test ^samba4.ntvfs.cifs.base.samba3.* # Samba3-specific test ^samba4.raw.samba3.* # Samba3-specific test -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via c04922e... build: useful shell vars for setting up selftest
via 429102e... subunit: fixed reporting of unexpected failures
via 77b77e6... subunit: keep total error and failure counts
from a52b3df... s4-selftest: skip RPC-DFS for s4 entirely.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit c04922ec20034beec9e37232ce5fa35596bf7ca0
Author: Andrew Tridgell tri...@samba.org
Date: Fri Mar 19 17:24:53 2010 +1100
build: useful shell vars for setting up selftest
commit 429102e6bde396492e53a1984242de46e28dd9d1
Author: Andrew Tridgell tri...@samba.org
Date: Fri Mar 19 14:26:18 2010 +1100
subunit: fixed reporting of unexpected failures
commit 77b77e6ba13137522b542d364891aba031a3ede8
Author: Andrew Tridgell tri...@samba.org
Date: Fri Mar 19 14:24:31 2010 +1100
subunit: keep total error and failure counts
---
Summary of changes:
selftest/Subunit.pm | 17 ++---
selftest/Subunit/Filter.pm |8
source4/scripting/devel/selftest-vars.sh |9 +
3 files changed, 27 insertions(+), 7 deletions(-)
create mode 100644 source4/scripting/devel/selftest-vars.sh
Changeset truncated at 500 lines:
diff --git a/selftest/Subunit.pm b/selftest/Subunit.pm
index 718b8ce..2a9fc0e 100644
--- a/selftest/Subunit.pm
+++ b/selftest/Subunit.pm
@@ -27,8 +27,6 @@ sub parse_results($$$)
{
my ($msg_ops, $statistics, $fh) = @_;
my $expected_fail = 0;
- my $unexpected_fail = 0;
- my $unexpected_err = 0;
my $open_tests = [];
while($fh) {
@@ -72,7 +70,6 @@ sub parse_results($$$)
pop(@$open_tests); #FIXME: Check that popped
value == $testname
$statistics-{TESTS_UNEXPECTED_FAIL}++;
$msg_ops-end_test($testname, failure, 1,
$reason);
- $unexpected_fail++;
} elsif ($result eq skip) {
$statistics-{TESTS_SKIP}++;
# Allow tests to be skipped without prior
announcement of test
@@ -85,7 +82,6 @@ sub parse_results($$$)
$statistics-{TESTS_ERROR}++;
pop(@$open_tests); #FIXME: Check that popped
value == $testname
$msg_ops-end_test($testname, error, 1,
$reason);
- $unexpected_err++;
} elsif ($result eq skip-testsuite) {
$msg_ops-skip_testsuite($testname);
} elsif ($result eq testsuite-success) {
@@ -110,11 +106,18 @@ sub parse_results($$$)
$msg_ops-end_test(pop(@$open_tests), error, 1,
was started but never finished!);
$statistics-{TESTS_ERROR}++;
- $unexpected_err++;
}
- return 1 if $unexpected_err 0;
- return 1 if $unexpected_fail 0;
+ # if the Filter module is in use, it will have the right counts
+ if (defined($msg_ops-{total_error})) {
+ $statistics-{TESTS_ERROR} = $msg_ops-{total_error};
+ $statistics-{TESTS_UNEXPECTED_FAIL} = $msg_ops-{total_fail};
+ $statistics-{TESTS_EXPECTED_FAIL} = $msg_ops-{total_xfail};
+ }
+
+ return 1 if $statistics-{TESTS_ERROR} 0;
+ return 1 if $statistics-{TESTS_UNEXPECTED_FAIL} 0;
+
return 0;
}
diff --git a/selftest/Subunit/Filter.pm b/selftest/Subunit/Filter.pm
index 896721a..4a94f25 100644
--- a/selftest/Subunit/Filter.pm
+++ b/selftest/Subunit/Filter.pm
@@ -88,20 +88,24 @@ sub end_test($)
if (($result eq fail or $result eq failure) and not $unexpected) {
$result = xfail;
$self-{xfail_added}++;
+ $self-{total_xfail}++;
}
my $xfail_reason = find_in_list($self-{expected_failures}, $testname);
if (defined($xfail_reason) and ($result eq fail or $result eq
failure)) {
$result = xfail;
$self-{xfail_added}++;
+ $self-{total_xfail}++;
$reason .= $xfail_reason;
}
if ($result eq fail or $result eq failure) {
$self-{fail_added}++;
+ $self-{total_fail}++;
}
if ($result eq error) {
$self-{error_added}++;
+ $self-{total_error}++;
}
if ($self-{strip_ok_output}) {
@@ -124,6 +128,7 @@ sub start_testsuite($;$)
{
my ($self, $name) = @_;
Subunit::start_testsuite($name);
+
$self-{error_added} = 0;
$self-{fail_added} = 0;
$self-{xfail_added} = 0;
@@ -171,6 +176,9 @@ sub new {
