[Samba] Lots of smbd/vfs.c:reduce_name(985) in log.smbd
Hi. I subscripted just now to the mailing list, but I've been using a Samba file server (PDC) on Debian for about 2.5 years now. Users are almost all WinXP SP3. No users are complaining but since I changed everything to one share with group permission on underlying directories I see a lot of errors in log.smbd. Anyone knows what the log message exactly means? I guess it has something to do with permissions. Maybe WinXP trying to access subdirectories it can't? It's all about this folder: drwxrwxr-x 14 root root 4096 2009-06-26 13:36 newton_share Subdirectories are restricted to specific groups. Some people are part of one or more groups. drwxrws--- 8 root aankoopdienst 4096 2009-02-05 13:23 aankoopdienst drwxrws--- 10 root boekhouding4096 2009-06-09 12:00 boekhouding drwxrws--- 5 root directie 4096 2009-06-16 10:58 directie drwxrws--- 9 root kindadministratie 4096 2009-06-09 08:31 kindadministratie drwxrws--- 2 root ortho_sociale 4096 2009-06-25 17:21 ortho_en_sociale drwxrws--- 2 root orthopedagogen 4096 2009-06-18 16:18 orthopedagogen drwxrws--- 30 root personeelsdienst 4096 2009-06-26 12:52 personeelsdienst drwxr-s--- 4 root plannen_koca 4096 2009-06-09 08:35 plannen_koca drwxrws--- 5 root sociale_dienst 4096 2009-02-03 16:05 sociale_dienst drwxrws--- 8 root technische_dienst 4096 2009-03-13 09:17 technische_dienst drwxrws--- 5 root uurrooster 4096 2009-06-09 08:33 uurrooster drwxrws--- 16 root veiligheid16384 2009-06-09 08:33 veiligheid [Newton] comment = Gedeelde map op server Newton browseable = yes writeable = yes wide links = no write list = +domusers +domadmins path= /data/shares/newton_share force directory mode = 770 force create mode = 770 valid users = +domusers +domadmins create mode = 770 directory mode = 770 A sample of last hour: [2009/06/29 08:37:40, 1] smbd/vfs.c:reduce_name(985) reduce_name: couldn't get realpath for veiligheid/* [2009/06/29 09:02:17, 1] smbd/vfs.c:reduce_name(985) reduce_name: couldn't get realpath for orthopedagogen/* [2009/06/29 09:09:19, 1] smbd/vfs.c:reduce_name(985) reduce_name: couldn't get realpath for sociale_dienst/* [2009/06/29 09:11:18, 1] smbd/vfs.c:reduce_name(985) reduce_name: couldn't get realpath for personeelsdienst/* [2009/06/29 09:11:19, 1] smbd/vfs.c:reduce_name(985) reduce_name: couldn't get realpath for orthopedagogen/* [2009/06/29 09:11:22, 1] smbd/vfs.c:reduce_name(985) reduce_name: couldn't get realpath for personeelsdienst/* [2009/06/29 09:12:34, 1] smbd/vfs.c:reduce_name(985) reduce_name: couldn't get realpath for personeelsdienst/* [2009/06/29 09:12:58, 1] smbd/vfs.c:reduce_name(985) reduce_name: couldn't get realpath for sociale_dienst/* [2009/06/29 09:23:30, 1] smbd/vfs.c:reduce_name(985) reduce_name: couldn't get realpath for technische_dienst/* [2009/06/29 09:23:30, 1] smbd/vfs.c:reduce_name(985) reduce_name: couldn't get realpath for sociale_dienst/* [2009/06/29 09:30:31, 1] smbd/vfs.c:reduce_name(985) reduce_name: couldn't get realpath for technische_dienst/* [2009/06/29 09:30:31, 1] smbd/vfs.c:reduce_name(985) reduce_name: couldn't get realpath for sociale_dienst/* Greetings, Koen Linders -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] Timed out error
Hi All, I am using backuppc to backup my files in a remote system.Now a days my backups are failing with this error.Its using smbclient to take backup. call timed out server did not respond after 2 milliseconds opening remote file Can anyone give me a suggestion. Regards, Aravind M D -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Timed out error
Hallo, Aravind, Du meintest am 29.06.09: I am using backuppc to backup my files in a remote system.Now a days my backups are failing with this error.Its using smbclient to take backup. call timed out server did not respond after 2 milliseconds opening remote file Can anyone give me a suggestion. Are you quite sure that samba is responsible for this error? Sounds like a connection problem, no samba problem. Viele Gruesse! Helmut -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] Wrong ACL in subdir
Hi, I've noticed the following ACL problem in a newly created subfolder: Let a folder have full rights for the owner, no rights for the primary group, no rights for everyone, no further rights defined. Add, from WinXP, an ACL for another user with ReadExecute rights and the option This folder only. Now create a subfolder: in the new subfolder, the parent group has Full control although it had no rights in the parent. In the log I can find the entry change_dir_owner_to_parent: device/inode/mode on directory ... changed. Refusing to chown ! Happens with Samba 3.2.7, 3.3.5, 3.3.6 (no other versions tested) Details on this are in https://bugzilla.samba.org/show_bug.cgi?id=6507 Peter Rindfuss -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Timed out error
Helmut Hullen wrote: Actually in the internet i have seen that there is a default timeout for smbclient is 2. Is any configuration is there to change default timeout of smbclient. -Aravind Hallo, Aravind, Du meintest am 29.06.09: I am using backuppc to backup my files in a remote system.Now a days my backups are failing with this error.Its using smbclient to take backup. call timed out server did not respond after 2 milliseconds opening remote file Can anyone give me a suggestion. Are you quite sure that samba is responsible for this error? Sounds like a connection problem, no samba problem. Viele Gruesse! Helmut -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] DNS Problems on `net ads join`
Hi, im having Problems joining my ubuntu-Machine to a Win2k3 Active Directory. I tryed m...@ubuntu-05:/home$ sudo net ads join -U domainadmin domainadmin's password: Using short domain name -- INTRANET No DNS domain configured for localhost. Unable to perform DNS Update. DNS update failed! Joined 'UBUNTU-05' to realm 'INTRANET.LAN' What bothers my the most ist the line with 'localhost'. Where does this come from? The ubuntu-Machine or the Windows-Directory? I want the machine joined as ubuntu-05.intranet.lan. But after the join above, its DNS Name is listed as 'localhost' instead of 'ubuntu-05.intranet.lan'. Is this a Problem of the Client (ubuntu-05) or the AD- and DNS-Server? Greets, mala -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] Setting File/Directory permissions
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 I was having an issue granting users access to their home share, the smb.conf masks didn't seem to be applied so I ended up changing the permissions in Linux. What is the appropriate way of handling this, should it be via samba or via the host OS? -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.9 (GNU/Linux) Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org iEYEARECAAYFAkpJBEEACgkQ5B+8XEnAvquccQCfZyqd7r1iIYCYOdZiq6YKnpOT ipwAnA90jnJn9fAwc8Qb+2MHhaWYkz6O =C7eR -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] Re: DNS Problems on `net ads join`
Resolved. Needed to put fdqn in /etc/hosts in the first place for 127.0.0.1 Mala Dibbs wrote: Hi, im having Problems joining my ubuntu-Machine to a Win2k3 Active Directory. I tryed m...@ubuntu-05:/home$ sudo net ads join -U domainadmin domainadmin's password: Using short domain name -- INTRANET No DNS domain configured for localhost. Unable to perform DNS Update. DNS update failed! Joined 'UBUNTU-05' to realm 'INTRANET.LAN' What bothers my the most ist the line with 'localhost'. Where does this come from? The ubuntu-Machine or the Windows-Directory? I want the machine joined as ubuntu-05.intranet.lan. But after the join above, its DNS Name is listed as 'localhost' instead of 'ubuntu-05.intranet.lan'. Is this a Problem of the Client (ubuntu-05) or the AD- and DNS-Server? Greets, mala -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] DNS Problems on `net ads join`
On Mon, Jun 29, 2009 at 11:27 AM, Mala Dibbs griori-m...@yahoo.de wrote: Hi, im having Problems joining my ubuntu-Machine to a Win2k3 Active Directory. I tryed m...@ubuntu-05:/home$ sudo net ads join -U domainadmin domainadmin's password: Using short domain name -- INTRANET No DNS domain configured for localhost. Unable to perform DNS Update. DNS update failed! Joined 'UBUNTU-05' to realm 'INTRANET.LAN' What bothers my the most ist the line with 'localhost'. Where does this come from? The ubuntu-Machine or the Windows-Directory? I want the machine joined as ubuntu-05.intranet.lan. But after the join above, its DNS Name is listed as 'localhost' instead of 'ubuntu-05.intranet.lan'. Is this a Problem of the Client (ubuntu-05) or the AD- and DNS-Server? Greets, mala This is a problem with the client identity. Please edit /etc/hostname with the short name, also edit /etc/hosts with the fully qualified domain name of the machine. Since we have a disjoined DNS space for our AD, I put a line like the following in my /etc/hosts file 127.0.0.1 hostname.domain.local hostname.domain.com hostname Test your edits using the `hostname` command. Check both the short name and the FQDN using the -f flag. You may want to reboot for good measure to be sure the hostname is changed and sticks through reboots. Then try to join again, the DNS update should work in that case now that FQDN of the client now matches the AD domain. Robert LeBlanc Life Sciences Undergraduate Education Computer Support Brigham Young University -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] Windows XP login
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 When WinXP users login to the samba domain a text file opens that contains: [.ShellClassInfo] localizedresourcena...@%systemroot%\system32\shell32.dll,-21787 This seems to be tied to the roaming profile, it only surfaced once I enabled roaming profiles but I am not sure how to correct it. I also noticed that the desktop background setting is persistent when a user logs on but the actual background is not being displayed until the user accesses the desktop properties and clicks ok. Is this an configuration issue with samba, or do I need some logon script? Thanks. -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.9 (GNU/Linux) Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org iEYEARECAAYFAkpJTbcACgkQ5B+8XEnAvqs6jwCfXxNfP0QcNEV8agbA0rFcn7RA MH0AoJfW6kOI5SjGWBxVuBLH3h2bX/Is =Z4Y2 -END PGP SIGNATURE- -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Windows XP login
On Mon, Jun 29, 2009 at 7:26 PM, David Christensendavid.christen...@viveli.com wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 When WinXP users login to the samba domain a text file opens that contains: [.ShellClassInfo] localizedresourcena...@%systemroot%\system32\shell32.dll,-21787 This seems to be tied to the roaming profile, it only surfaced once I enabled roaming profiles but I am not sure how to correct it. I also noticed that the desktop background setting is persistent when a user logs on but the actual background is not being displayed until the user accesses the desktop properties and clicks ok. Is this an configuration issue with samba, or do I need some logon script? This desktop.ini file is a hidden file that windows places in all folders of your system to store the preferences of your explorer view. The problem here is samba is making this hidden file in the startup folder of the start menu visible instead of default hidden. John -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Fwd: [Samba] Windows XP login
This desktop.ini file is a hidden file that windows places in all folders of your system to store the preferences of your explorer view. The problem here is samba is making this hidden file in the startup folder of the start menu visible instead of default hidden. John Thanks for info, what do I need to modify or configure in order for this file to remain hidden on all clients? I have not solved that myself. look at the documentation for hidden file mapping and veto files Is this also the reason why the desktop setting is not being applied on logins? I do not think so. I believe this file is only for view settings of explorer.exe. Detailed, Icon, web view ... John -- John M. Drescher -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[Samba] Linux member server, or something else?
Hello list! I have a Samba PDC with an LDAP backend password database, against which WinXP clients authenticate. I also have a Ubuntu workstation, which authenticates directly to the same LDAP password database (no Samba). I now wish to have the WinXP clients be able to map shares on the Ubuntu workstation, so I obviously need to get Samba working on it. I can slog through the technical details, but I want to make sure I have the concept properly figured out - will the Ubuntu workstation be a member server, configured as such per the Samba documentation using Winbind, or is there a different way I should be thinking about this? Thanks for any general pointers. -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Windows XP login
On Mon, Jun 29, 2009 at 9:59 PM, John Drescherdresche...@gmail.com wrote: This desktop.ini file is a hidden file that windows places in all folders of your system to store the preferences of your explorer view. The problem here is samba is making this hidden file in the startup folder of the start menu visible instead of default hidden. John Thanks for info, what do I need to modify or configure in order for this file to remain hidden on all clients? I have not solved that myself. look at the documentation for hidden file mapping and veto files I have. Using the user_xattr mount option and (IIRC) store dos attributes. Here is an excerpt from my smb.conf profile acls = Yes hide unreadable = Yes map acl inherit = Yes store dos attributes = Yes map archive = No map read only = No HTH, Norberto -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Linux member server, or something else?
I have a Samba PDC with an LDAP backend password database, against which WinXP clients authenticate. I also have a Ubuntu workstation, which authenticates directly to the same LDAP password database (no Samba). I now wish to have the WinXP clients be able to map shares on the Ubuntu workstation, so I obviously need to get Samba working on it. I can slog through the technical details, but I want to make sure I have the concept properly figured out - will the Ubuntu workstation be a member server, configured as such per the Samba documentation using Winbind, or is there a different way I should be thinking about this? Thanks for any general pointers. That is what I have with my samba setup. I mean I have a PDC, a BDC, 3 to 5 LDAP servers and 5 or so member servers. On my PDC and BDC there are no real file shares. The member servers have that. My member servers have winbind. John -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
Re: [Samba] Linux member server, or something else?
Hello, On Mon, Jun 29, 2009 at 11:11 PM, John Drescherdresche...@gmail.com wrote: I have a Samba PDC with an LDAP backend password database, against which WinXP clients authenticate. I also have a Ubuntu workstation, which authenticates directly to the same LDAP password database (no Samba). I now wish to have the WinXP clients be able to map shares on the Ubuntu workstation, so I obviously need to get Samba working on it. I can slog through the technical details, but I want to make sure I have the concept properly figured out - will the Ubuntu workstation be a member server, configured as such per the Samba documentation using Winbind, or is there a different way I should be thinking about this? Thanks for any general pointers. That is what I have with my samba setup. I mean I have a PDC, a BDC, 3 to 5 LDAP servers and 5 or so member servers. On my PDC and BDC there are no real file shares. The member servers have that. My member servers have winbind. At work, we're in the process of starting a migration of our Windows XP clients to Ubuntu. My PDC is a Samba server running on Ubuntu Hardy with LDAP backend. I'm testing with my workstation (Ubuntu Jaunty). Samba uses the PDC as a password server. Users and groups are read from LDAP via nsswitch (i.e. nothing about LDAP in smb.conf on the client). Also, no winbind. It seems to work, but I want to know if I'm missing something. Why should I run winbind? If I need to run winbind, does it need to run on server _and_ clients? Many thanks in advance, Norberto -- To unsubscribe from this list go to the following URL and read the instructions: https://lists.samba.org/mailman/options/samba
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-104-g55ed0be
The branch, master has been updated via 55ed0be65f07b46d51a647e556644039d68a002d (commit) from c5a1aa5224395e2439e0468d653acfbd3faa25fc (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 55ed0be65f07b46d51a647e556644039d68a002d Author: David Markey ad...@dmarkey.com Date: Mon Jun 29 08:12:03 2009 +0200 Fix bug 6514: net gives unhelpful lp_load failed when it's missing smb.conf --- Summary of changes: source3/lib/netapi/netapi.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/lib/netapi/netapi.c b/source3/lib/netapi/netapi.c index 8893881..2f8474b 100644 --- a/source3/lib/netapi/netapi.c +++ b/source3/lib/netapi/netapi.c @@ -89,7 +89,7 @@ NET_API_STATUS libnetapi_init(struct libnetapi_ctx **context) if (!lp_load(get_dyn_CONFIGFILE(), true, false, false, false)) { TALLOC_FREE(frame); - fprintf(stderr, lp_load failed\n); + fprintf(stderr, error loading %s\n, get_dyn_CONFIGFILE() ); return W_ERROR_V(WERR_GENERAL_FAILURE); } -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-105-g1501309
The branch, master has been updated via 15013090df1af6a4e8330f6708d5fc30174140a2 (commit) from 55ed0be65f07b46d51a647e556644039d68a002d (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 15013090df1af6a4e8330f6708d5fc30174140a2 Author: Matthias Dieter Wallnöfer mwallnoe...@yahoo.de Date: Sat Jun 20 22:47:19 2009 +0200 Adds the impersonation level in ntcreatex requests to SAMBA 3 misc torture test Specifies the impersonation level according to the reporter commit in bug #6283 --- Summary of changes: source4/torture/raw/samba3misc.c |4 1 files changed, 4 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/torture/raw/samba3misc.c b/source4/torture/raw/samba3misc.c index 4ec8acc..6d6eabc 100644 --- a/source4/torture/raw/samba3misc.c +++ b/source4/torture/raw/samba3misc.c @@ -99,6 +99,7 @@ bool torture_samba3_checkfsp(struct torture_context *torture) io.ntcreatex.in.share_access = NTCREATEX_SHARE_ACCESS_NONE; io.ntcreatex.in.open_disposition = NTCREATEX_DISP_OPEN; io.ntcreatex.in.create_options = 0; + io.ntcreatex.in.impersonation = NTCREATEX_IMPERSONATION_ANONYMOUS; io.ntcreatex.in.fname = dirname; status = smb_raw_open(cli-tree, mem_ctx, io); if (!NT_STATUS_IS_OK(status)) { @@ -897,6 +898,7 @@ bool torture_samba3_rootdirfid(struct torture_context *tctx) | NTCREATEX_SHARE_ACCESS_READ; io.ntcreatex.in.open_disposition = NTCREATEX_DISP_OPEN; io.ntcreatex.in.create_options = 0; + io.ntcreatex.in.impersonation = NTCREATEX_IMPERSONATION_ANONYMOUS; io.ntcreatex.in.fname = \\; status = smb_raw_open(cli-tree, tctx, io); if (!NT_STATUS_IS_OK(status)) { @@ -918,6 +920,7 @@ bool torture_samba3_rootdirfid(struct torture_context *tctx) io.ntcreatex.in.file_attr = FILE_ATTRIBUTE_NORMAL; io.ntcreatex.in.share_access = NTCREATEX_SHARE_ACCESS_NONE; io.ntcreatex.in.create_options = 0; + io.ntcreatex.in.impersonation = NTCREATEX_IMPERSONATION_ANONYMOUS; io.ntcreatex.in.fname = fname; status = smb_raw_open(cli-tree, tctx, io); @@ -967,6 +970,7 @@ bool torture_samba3_oplock_logoff(struct torture_context *tctx) io.ntcreatex.in.share_access = NTCREATEX_SHARE_ACCESS_NONE; io.ntcreatex.in.open_disposition = NTCREATEX_DISP_OPEN_IF; io.ntcreatex.in.create_options = 0; + io.ntcreatex.in.impersonation = NTCREATEX_IMPERSONATION_ANONYMOUS; io.ntcreatex.in.fname = testfile; status = smb_raw_open(cli-tree, tctx, io); if (!NT_STATUS_IS_OK(status)) { -- Samba Shared Repository
[SCM] SAMBA-CTDB repository - branch v3-4-ctdb updated - 70a9cb880d9c09098930c38dc5482ca874f8cadd
The branch, v3-4-ctdb has been updated discards 10090001ddf672c02d1c7d8221dc3e9ad3795e42 (commit) discards 543bfdcff9759903c4ba476c51f8e7088012894f (commit) discards ff01e8b473599f886e5f1a57bfd569aba9b627f9 (commit) discards c8a03b0043794e57d80caf460d570bb3e3c040bf (commit) discards 9b572412f709a0d755e8846ad6f1610387814c16 (commit) discards 6a0d05e342ad7a5bc4346db24a32185ed7c135b3 (commit) discards 7a3881bd915979b347b19871cd0f0bd771bb530b (commit) discards 29c589359b49c1465d5fb062d550c8422d2df3d1 (commit) discards 061dd90fc54daeaed758b47e3aa413a8362c9a08 (commit) discards e780063d072342cc5c57a7adc6c8ea2cd8084775 (commit) discards 65f92495d27591ce7ed6e8f955484a0c71b0dd37 (commit) discards 3df65b93aa7c0fecebd197b5e335f384c9942c8f (commit) discards 7a1b9fae0108ebaa05e40b44d9dd32d89f346cdf (commit) discards d281d5fdf30cdf9a08c8b53c60405b1d10ff8314 (commit) discards 25038a982bc47845ce05600f62399896e2e78cac (commit) discards 42a7c48712b418acdc030d141a37d10a02c37223 (commit) via 70a9cb880d9c09098930c38dc5482ca874f8cadd (commit) via 1541cf150cc83a01b8ef4545dcbf64c2aa2125bf (commit) via c8d0d9f34ef2abc7a7859e8561a98fa8a189156a (commit) via 97948d23485945178690aa24c64e485526b9854c (commit) via 46d551cae9082b5e30e07ff59ef30eaa9ce27089 (commit) via add9726635e2282fe1105e437f0906ad1f728fbe (commit) via 3c4f2979a8e4b752a014ebd3bf75a3bd6c01accf (commit) via c3a5566525721ee8fd7c6e76c667cf7da2922554 (commit) via 2e26d3c5e7d8d8f4db59eb269761d144954b1c1b (commit) via 142b0a89c98a9af7150a108a8dd9d8563575c055 (commit) via 70c1cf01a09de16e9e332dcf743fb9cd5d2344f3 (commit) via 1e58e3b6cde91ca4eff0e9cab5bb3945ae9bd3cb (commit) via 132c3dedf98118dc10bc77f188afb5ee0969f0ee (commit) via 2072a0e67696b93ac53d5bb6116adaf6f6caa5c5 (commit) via cfd68c05eb9ac87c205957404401dcb809bc0892 (commit) via ca48ecde915a53e41156044695bf6152a953c63a (commit) via 2fdd917894c3571a101ac6f9cafd63585bcb8d52 (commit) via de4c8478e5f6de8c9207f15287b52cb383a903bf (commit) via bb59901d6e4f7c03b815ac6afd297b4230031330 (commit) via 228d43ce016e56396f83ed4fb77b246c539bba79 (commit) via ed9d22f23789aa0b3c3c69aabcd398d52c95de5b (commit) via 410fa8258169bc9b4a61164cd893746d3e6abfae (commit) via 35c8019db31ccb673498b32134944d8acac6ffa9 (commit) from 10090001ddf672c02d1c7d8221dc3e9ad3795e42 (commit) http://gitweb.samba.org/?p=obnox/samba-ctdb.git;a=shortlog;h=v3-4-ctdb - Log - commit 70a9cb880d9c09098930c38dc5482ca874f8cadd Author: Michael Adam ob...@samba.org Date: Tue Jun 23 23:09:09 2009 +0200 packaging(RHEL-CTDB):makerpms.sh: replace source/ by source3/ Michael commit 1541cf150cc83a01b8ef4545dcbf64c2aa2125bf Author: Michael Adam ob...@samba.org Date: Tue Jun 23 23:06:40 2009 +0200 packaging(RHEL-CTDB):makespec.sh: fix detection of version Michael commit c8d0d9f34ef2abc7a7859e8561a98fa8a189156a Author: Michael Adam ob...@samba.org Date: Tue Jun 23 22:41:51 2009 +0200 packaging(RHEL-CTDB): makeversion.sh: v3-4-test uses source3 instead of source Michael commit 97948d23485945178690aa24c64e485526b9854c Author: Michael Adam ob...@samba.org Date: Tue Jun 23 16:41:38 2009 +0200 adapt VERSION to be 3.4.0rc1-ctdb-1 following the versioning scheme of the v3-2-ctdb branch Michael commit 46d551cae9082b5e30e07ff59ef30eaa9ce27089 Author: Michael Adam ob...@samba.org Date: Wed Jan 21 09:49:12 2009 +0100 packaging(RHEL-CTDB): makerpms.sh: build winbind-32bit libs in the 64bit build Michael (cherry picked from commit a9a506b6640986548e2ae8540b7ae93960d6ece5) commit add9726635e2282fe1105e437f0906ad1f728fbe Author: Michael Adam ob...@samba.org Date: Tue Jan 20 19:47:28 2009 +0100 packaging(RHEL-CTDB): Build winbind-32bit package in the 64bit build Michael (cherry picked from commit f5cd88a25f360e6609dc5abe24247fab78af6854) commit 3c4f2979a8e4b752a014ebd3bf75a3bd6c01accf Author: Michael Adam ob...@samba.org Date: Wed Jan 21 11:03:34 2009 +0100 packaging(RHEL-CTDB): extend makespec.sh to extract VENDOR_PATCH from version.h Michael (cherry picked from commit fc122aa276bce379b492e5bdf52ab3e03bc3737f) commit c3a5566525721ee8fd7c6e76c667cf7da2922554 Author: Michael Adam ob...@samba.org Date: Wed Jan 21 10:24:31 2009 +0100 packaging(RHEL-CTDB): The former release number has basically moved into VERSION Michael commit 2e26d3c5e7d8d8f4db59eb269761d144954b1c1b Author: Volker Lendecke v...@samba.org Date: Thu May 14 15:34:42 2009 +0200 Introduce struct stat_ex as a replacement for SMB_STRUCT_STAT This patch introduces struct stat_ex { dev_t st_ex_dev; ino_t
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-107-g6e92505
The branch, master has been updated via 6e92505080fd6764461563e4fdf1172be1ba2963 (commit) via 0e95b807b9ff7dee9d53d7294011c6e8cd82fe0e (commit) from 15013090df1af6a4e8330f6708d5fc30174140a2 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 6e92505080fd6764461563e4fdf1172be1ba2963 Author: Andrew Bartlett abart...@samba.org Date: Mon Jun 29 20:12:23 2009 +1000 Fix ndrdump to use a common setup_logging() API By adding a new common setup_logging_stdout() API, we no longer need to abuse the ABI compatability between the different setup_logging() calls in Samba3 and Samba4's DEBUG() subsystems. The revert of 49a6d757b4d944cd22c91b2838beb83f04fbe1e9 works with this to fix bug 6211. Andrew Bartlett commit 0e95b807b9ff7dee9d53d7294011c6e8cd82fe0e Author: Andrew Bartlett abart...@samba.org Date: Mon Jun 29 19:57:57 2009 +1000 Revert s4:debug: make setup_logging() a bit more compatible with samba3 The problem is that the enum was previously a 'rachet', that is, it would only reset to a level higher than it was previouly set to. Changing the order broke file-based logging for our production sites. This reverts commit 49a6d757b4d944cd22c91b2838beb83f04fbe1e9. --- Summary of changes: lib/util/debug.c|8 lib/util/debug.h| 13 +++-- librpc/tools/ndrdump.c |2 +- source3/include/proto.h |1 + source3/lib/debug.c |9 + 5 files changed, 30 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/util/debug.c b/lib/util/debug.c index 76178e2..996efdf 100644 --- a/lib/util/debug.c +++ b/lib/util/debug.c @@ -198,6 +198,14 @@ _PUBLIC_ void setup_logging(const char *prog_name, enum debug_logtype new_logtyp } /** + Just run logging to stdout for this program +*/ +_PUBLIC_ void setup_logging_stdout(void) +{ + setup_logging(NULL, DEBUG_STDOUT); +} + +/** return a string constant containing n tabs no more than 10 tabs are returned */ diff --git a/lib/util/debug.h b/lib/util/debug.h index 85e64fb..f0d1695 100644 --- a/lib/util/debug.h +++ b/lib/util/debug.h @@ -74,8 +74,12 @@ extern int DEBUGLEVEL; */ #define DEBUGTAB(n) do_debug_tab(n) -/** Possible destinations for the debug log */ -enum debug_logtype {DEBUG_FILE = 0, DEBUG_STDOUT = 1, DEBUG_STDERR = 2}; +/** Possible destinations for the debug log (in order of precedence - + * once set to DEBUG_FILE, it is not possible to reset to DEBUG_STDOUT + * for example. This makes it easy to override for debug to stderr on + * the command line, as the smb.conf cannot reset it back to + * file-based logging */ +enum debug_logtype {DEBUG_STDOUT = 0, DEBUG_FILE = 1, DEBUG_STDERR = 2}; /** the backend for debug messages. Note that the DEBUG() macro has already @@ -102,6 +106,11 @@ _PUBLIC_ void debug_schedule_reopen_logs(void); _PUBLIC_ void setup_logging(const char *prog_name, enum debug_logtype new_logtype); /** + Just run logging to stdout for this program +*/ +_PUBLIC_ void setup_logging_stdout(void); + +/** return a string constant containing n tabs no more than 10 tabs are returned */ diff --git a/librpc/tools/ndrdump.c b/librpc/tools/ndrdump.c index 69b304d..7126d26 100644 --- a/librpc/tools/ndrdump.c +++ b/librpc/tools/ndrdump.c @@ -179,7 +179,7 @@ static void ndrdump_data(uint8_t *d, uint32_t l, bool force) dbf = x_stderr; - setup_logging(argv[0], true); + setup_logging_stdout(); pc = poptGetContext(ndrdump, argc, argv, long_options, 0); diff --git a/source3/include/proto.h b/source3/include/proto.h index 1a8a9a9..49afd8c 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -466,6 +466,7 @@ void debug_message(struct messaging_context *msg_ctx, void *private_data, uint32 void debug_init(void); void debug_register_msgs(struct messaging_context *msg_ctx); void setup_logging(const char *pname, bool interactive); +void setup_logging_stdout( void ); void debug_set_logfile(const char *name); bool reopen_logs( void ); void force_check_log_size( void ); diff --git a/source3/lib/debug.c b/source3/lib/debug.c index 419af61..e7dcfb4 100644 --- a/source3/lib/debug.c +++ b/source3/lib/debug.c @@ -605,6 +605,15 @@ void setup_logging(const char *pname, bool interactive) #endif } +/** + Just run logging to stdout for this program +*/ +_PUBLIC_ void setup_logging_stdout(void) +{ + setup_logging(NULL, True); +} + + /*** Set the logfile name. **/ -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-108-g595d07d
The branch, master has been updated via 595d07d0ab494e3749c71caf86887ad1cebda229 (commit) from 6e92505080fd6764461563e4fdf1172be1ba2963 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 595d07d0ab494e3749c71caf86887ad1cebda229 Author: Jeff Layton jlay...@samba.org Date: Mon Jun 29 06:16:38 2009 -0400 mount.cifs: don't pass text ro/rw options to kernel /bin/mount strips off the ro/rw options after setting the MS_RDONLY flag appropriately. Make mount.cifs do the same thing. Signed-off-by: Jeff Layton jlay...@samba.org --- Summary of changes: client/mount.cifs.c |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/client/mount.cifs.c b/client/mount.cifs.c index db05665..4387f59 100644 --- a/client/mount.cifs.c +++ b/client/mount.cifs.c @@ -771,8 +771,10 @@ static int parse_options(char ** optionsp, unsigned long * filesys_flags) got_password = 1; } else if (strncmp(data, ro, 2) == 0) { *filesys_flags |= MS_RDONLY; + goto nocopy; } else if (strncmp(data, rw, 2) == 0) { *filesys_flags = ~MS_RDONLY; + goto nocopy; } else if (strncmp(data, remount, 7) == 0) { *filesys_flags |= MS_REMOUNT; } /* else if (strnicmp(data, port, 4) == 0) { -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-0-test updated - release-3-0-32-174-gd6c81c7
The branch, v3-0-test has been updated via d6c81c70c45348c86433dd64297e1a659535c155 (commit) via 691c859972ea45b3dcc973d3cf4efdbec3ffb542 (commit) via c8bc6ff5636cc72320ded8b4539362ed4a970208 (commit) via d9bddef7e1dd1e772d528ef15046a37691c13dbf (commit) from a15c816ba5fd4dcedd68beb1fcb0540de325c1cb (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-0-test - Log - commit d6c81c70c45348c86433dd64297e1a659535c155 Author: Karolin Seeger ksee...@samba.org Date: Mon Jun 29 12:22:08 2009 +0200 VERSION: Raise version number up to 3.0.36. Karolin commit 691c859972ea45b3dcc973d3cf4efdbec3ffb542 Author: Karolin Seeger ksee...@samba.org Date: Mon Jun 22 22:35:07 2009 +0200 VERSION: Raise version number to 3.0.35. Karolin (cherry picked from commit 857b6fb063b9968134cc664430ff5d33a992da4a) commit c8bc6ff5636cc72320ded8b4539362ed4a970208 Author: Karolin Seeger ksee...@samba.org Date: Mon Jun 22 22:34:42 2009 +0200 WHATSNEW: Update changes since 3.0.34. Karolin (cherry picked from commit 21d184a8b1b335ff9e8e0515fd70f4a16c00be5a) commit d9bddef7e1dd1e772d528ef15046a37691c13dbf Author: Jeremy Allison j...@samba.org Date: Mon Jun 22 22:29:49 2009 +0200 Fix bug #6488. (cherry picked from commit 689b313404971bb884566710b1468b9bd4091caa) --- Summary of changes: WHATSNEW.txt | 53 - source/VERSION |2 +- source/smbd/posix_acls.c |2 + 3 files changed, 54 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index fa0ae84..01905e2 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -1,4 +1,53 @@ == + Release Notes for Samba 3.0.35 + June, 23 2009 + == + + +This is a security release in order to address CVE-2009-1888. + + o CVE-2009-1888: + In Samba 3.0.31 to 3.3.5 (inclusive), an uninitialized read of a + data value can potentially affect access control when dos filemode + is set to yes. + + +## +Changes +### + +Changes since 3.0.34 + + + +o Jeremy Allison j...@samba.org +* Fix for CVE-2009-1888. + + +## +Reporting bugs Development Discussion +### + +Please discuss this release on the samba-technical mailing list or by +joining the #samba-technical IRC channel on irc.freenode.net. + +If you do report problems then please try to send high quality +feedback. If you don't provide vital information to help us track down +the problem then you will probably be ignored. All bug reports should +be filed under the Samba 3.0 product in the project's Bugzilla +database (https://bugzilla.samba.org/). + + +== +== Our Code, Our Bugs, Our Responsibility. +== The Samba Team +== + + +Release notes for older releases follow: +- + + == Release Notes for Samba 3.0.34 January, 20 2009 == @@ -177,8 +226,8 @@ database (https://bugzilla.samba.org/). == -Release notes for older releases follow: - -- + + == Release Notes for Samba 3.0.33 November, 27 2008 diff --git a/source/VERSION b/source/VERSION index 252351b..595335f 100644 --- a/source/VERSION +++ b/source/VERSION @@ -25,7 +25,7 @@ SAMBA_VERSION_MAJOR=3 SAMBA_VERSION_MINOR=0 -SAMBA_VERSION_RELEASE=34 +SAMBA_VERSION_RELEASE=36 # Bug fix releases use a letter for the patch revision # diff --git a/source/smbd/posix_acls.c b/source/smbd/posix_acls.c index 5f1c2d9..d679304 100644 --- a/source/smbd/posix_acls.c +++ b/source/smbd/posix_acls.c @@ -2296,6 +2296,8 @@ static BOOL acl_group_override(connection_struct *conn, gid_t prim_gid, const ch { SMB_STRUCT_STAT sbuf; + ZERO_STRUCT(sbuf); + if ((errno != EPERM) (errno != EACCES)) { return False; } -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-109-gec5c83c
The branch, master has been updated via ec5c83c0dba28516d5c92f57dd7c88c99b17d4ab (commit) from 595d07d0ab494e3749c71caf86887ad1cebda229 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit ec5c83c0dba28516d5c92f57dd7c88c99b17d4ab Author: Günther Deschner g...@samba.org Date: Fri Jun 26 16:51:53 2009 +0200 s4-smbtorture: add torture_suite_add_machine_workstation_rpc_iface_tcase. Unlike torture_suite_add_machine_bdc_rpc_iface_tcase() which joins as a BDC (ACB_SRVTRUST) this joins as a member workstation (ACB_WSTRUST). Guenther --- Summary of changes: source4/torture/rpc/netlogon.c |2 +- source4/torture/rpc/remote_pac.c |2 +- source4/torture/rpc/rpc.c| 58 +++-- source4/torture/rpc/rpc.h|7 - source4/torture/rpc/samr.c |6 ++-- 5 files changed, 65 insertions(+), 10 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/torture/rpc/netlogon.c b/source4/torture/rpc/netlogon.c index 57bfcbf..2fd8b94 100644 --- a/source4/torture/rpc/netlogon.c +++ b/source4/torture/rpc/netlogon.c @@ -2337,7 +2337,7 @@ struct torture_suite *torture_rpc_netlogon(TALLOC_CTX *mem_ctx) struct torture_rpc_tcase *tcase; struct torture_test *test; - tcase = torture_suite_add_machine_rpc_iface_tcase(suite, netlogon, + tcase = torture_suite_add_machine_bdc_rpc_iface_tcase(suite, netlogon, ndr_table_netlogon, TEST_MACHINE_NAME); torture_rpc_tcase_add_test(tcase, LogonUasLogon, test_LogonUasLogon); diff --git a/source4/torture/rpc/remote_pac.c b/source4/torture/rpc/remote_pac.c index 6d638d1..cae98d9 100644 --- a/source4/torture/rpc/remote_pac.c +++ b/source4/torture/rpc/remote_pac.c @@ -330,7 +330,7 @@ struct torture_suite *torture_rpc_remote_pac(TALLOC_CTX *mem_ctx) struct torture_suite *suite = torture_suite_create(mem_ctx, PAC); struct torture_rpc_tcase *tcase; - tcase = torture_suite_add_machine_rpc_iface_tcase(suite, netlogon, + tcase = torture_suite_add_machine_bdc_rpc_iface_tcase(suite, netlogon, ndr_table_netlogon, TEST_MACHINE_NAME); torture_rpc_tcase_add_test_creds(tcase, verify, test_PACVerify); diff --git a/source4/torture/rpc/rpc.c b/source4/torture/rpc/rpc.c index 19b223b..d7aafef 100644 --- a/source4/torture/rpc/rpc.c +++ b/source4/torture/rpc/rpc.c @@ -124,8 +124,40 @@ NTSTATUS torture_rpc_connection_transport(struct torture_context *tctx, return status; } -static bool torture_rpc_setup_machine(struct torture_context *tctx, - void **data) +static bool torture_rpc_setup_machine_workstation(struct torture_context *tctx, + void **data) +{ + NTSTATUS status; + struct dcerpc_binding *binding; + struct torture_rpc_tcase *tcase = talloc_get_type(tctx-active_tcase, + struct torture_rpc_tcase); + struct torture_rpc_tcase_data *tcase_data; + + status = torture_rpc_binding(tctx, binding); + if (NT_STATUS_IS_ERR(status)) + return false; + + *data = tcase_data = talloc_zero(tctx, struct torture_rpc_tcase_data); + tcase_data-credentials = cmdline_credentials; + tcase_data-join_ctx = torture_join_domain(tctx, tcase-machine_name, + ACB_WSTRUST, + tcase_data-credentials); + if (tcase_data-join_ctx == NULL) + torture_fail(tctx, Failed to join as WORKSTATION); + + status = dcerpc_pipe_connect_b(tctx, + (tcase_data-pipe), + binding, + tcase-table, + tcase_data-credentials, tctx-ev, tctx-lp_ctx); + + torture_assert_ntstatus_ok(tctx, status, Error connecting to server); + + return true; +} + +static bool torture_rpc_setup_machine_bdc(struct torture_context *tctx, + void **data) { NTSTATUS status; struct dcerpc_binding *binding; @@ -156,7 +188,25 @@ static bool torture_rpc_setup_machine(struct torture_context *tctx, return true; } -_PUBLIC_ struct torture_rpc_tcase *torture_suite_add_machine_rpc_iface_tcase( +_PUBLIC_ struct torture_rpc_tcase *torture_suite_add_machine_workstation_rpc_iface_tcase( + struct torture_suite *suite, + const char *name, + const struct ndr_interface_table *table, + const char *machine_name) +{ +
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3632-g97e91b9
The branch, v3-2-test has been updated via 97e91b97c31cbb2c81acebe148bf7084f5effda8 (commit) via 4a27650cd5d1b02bc04489916009e69e5461e18b (commit) via dcd42cc67ef5ec3d331521faacd8077528b95483 (commit) via a13411770606eb868e2f65039038a7ad341e2ab6 (commit) from 471f905f788209d0e76ca2d327d30f830ce4648c (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log - commit 97e91b97c31cbb2c81acebe148bf7084f5effda8 Author: Karolin Seeger ksee...@samba.org Date: Mon Jun 22 23:04:29 2009 +0200 WHATSNEW: Update changes. Karolin (cherry picked from commit c5a0590a2efb9c0e8565e822dfc7cea92af0bece) commit 4a27650cd5d1b02bc04489916009e69e5461e18b Author: Karolin Seeger ksee...@samba.org Date: Fri Jun 19 09:20:04 2009 +0200 WHATSNEW: Update changes since 3.2.12. Karolin (cherry picked from commit d85b881d66841a5dac66a98a94f251f58d66d1c4) commit dcd42cc67ef5ec3d331521faacd8077528b95483 Author: Karolin Seeger ksee...@samba.org Date: Thu Jun 18 10:28:13 2009 +0200 VERSION: Raise version number up to 3.2.13. Karolin (cherry picked from commit 0239c6555dbf515935fed7b958cfcce24810f07f) commit a13411770606eb868e2f65039038a7ad341e2ab6 Author: Volker Lendecke v...@samba.org Date: Tue Jun 16 12:23:31 2009 +0200 Fix bug 6478 This is the part of checkin cfee2025 that is relevant to this bug. (cherry picked from commit 91ea0d3fa11fc209dc653dd09dfab6244fb80f0d) --- Summary of changes: WHATSNEW.txt | 1694 +++- source/VERSION |2 +- source/client/client.c | 40 +- 3 files changed, 1713 insertions(+), 23 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 2e98fdf..8b34c13 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -1,4 +1,60 @@ == + Release Notes for Samba 3.2.13 + June 23, 2009 + == + + +This is a security release in order to address CVE-2009-1886 and CVE-2009-1888. + + o CVE-2009-1886: + In Samba 3.2.0 to 3.2.12 (inclusive), the smbclient commands dealing + with file names treat user input as a format string to asprintf. + With a maliciously crafted file name smbclient can be made + to execute code triggered by the server. + + o CVE-2009-1888: + In Samba 3.0.31 to 3.3.5 (inclusive), an uninitialized read of a data + value can potentially affect access control when dos filemode + is set to yes. + + +## +Changes +### + +Changes since 3.2.12 + + + +o Jeremy Allison j...@samba.org +* Fix for CVE-2009-1886. +* Fix for CVE-2009-1888. + + +## +Reporting bugs Development Discussion +### + +Please discuss this release on the samba-technical mailing list or by +joining the #samba-technical IRC channel on irc.freenode.net. + +If you do report problems then please try to send high quality +feedback. If you don't provide vital information to help us track down +the problem then you will probably be ignored. All bug reports should +be filed under the Samba 3.2 product in the project's Bugzilla +database (https://bugzilla.samba.org/). + + +== +== Our Code, Our Bugs, Our Responsibility. +== The Samba Team +== + + +Release notes for older releases follow: + + + == Release Notes for Samba 3.2.12 June 16, 2009 == @@ -99,8 +155,1642 @@ database (https://bugzilla.samba.org/). == -Release notes for older releases follow: - +-- + + == + Release Notes for Samba 3.2.11 + April 17, 2009 + == + + +This is a maintenance release of the Samba 3.2 series. + +Major enhancements in 3.2.11 include: + +o Fix domain logins for WinXP clients pre SP3 (bug #6263). +o Fix samr_OpenDomain access checks (bug #6089). +o Fix smbd crash for close_on_completion. + + +## +Changes +### + +Changes since 3.2.10
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-5324-g7d9b47a
The branch, v3-3-test has been updated via 7d9b47a927f667025513fa92a8cb339d20869d0a (commit) via 1af510a449e79c43f0af5e52fcff0c1d9edee91f (commit) from aa769edfcef6937927201f765509c10b60764817 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test - Log - commit 7d9b47a927f667025513fa92a8cb339d20869d0a Author: Karolin Seeger ksee...@samba.org Date: Tue Jun 23 11:35:13 2009 +0200 VERSION: Raise version number up to 3.3.6. Karolin (cherry picked from commit b09440c77b93ff6088c2fd474d6b24c081054812) commit 1af510a449e79c43f0af5e52fcff0c1d9edee91f Author: Karolin Seeger ksee...@samba.org Date: Tue Jun 23 11:33:44 2009 +0200 WHATSNEW: Update changes since 3.3.5. Karolin (cherry picked from commit a71fdf8189154cd8949016be725c8319671ba587) --- Summary of changes: WHATSNEW.txt | 54 -- source/VERSION |2 +- 2 files changed, 53 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 70fdb8e..58bb038 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -1,4 +1,55 @@ = + Release Notes for Samba 3.3.6 + June, 23 2009 + = + + +This is a security release in order to address CVE-2009-1888. + + o CVE-2009-1888: + In Samba 3.0.31 to 3.3.5 (inclusive), an uninitialized read of a + data value can potentially affect access control when dos filemode + is set to yes. + + +## +Changes +### + + +Changes since 3.3.5: + + + +o Jeremy Allison j...@samba.org +* BUG 6488: Fix for CVE-2009-1888. + + +## +Reporting bugs Development Discussion +### + +Please discuss this release on the samba-technical mailing list or by +joining the #samba-technical IRC channel on irc.freenode.net. + +If you do report problems then please try to send high quality +feedback. If you don't provide vital information to help us track down +the problem then you will probably be ignored. All bug reports should +be filed under the Samba 3.3 product in the project's Bugzilla +database (https://bugzilla.samba.org/). + + +== +== Our Code, Our Bugs, Our Responsibility. +== The Samba Team +== + + +Release notes for older releases follow: + + + + = Release Notes for Samba 3.3.5 June, 16 2009 = @@ -117,8 +168,7 @@ database (https://bugzilla.samba.org/). == -Release notes for older releases follow: - +-- = diff --git a/source/VERSION b/source/VERSION index 0acca73..96c6f85 100644 --- a/source/VERSION +++ b/source/VERSION @@ -25,7 +25,7 @@ SAMBA_VERSION_MAJOR=3 SAMBA_VERSION_MINOR=3 -SAMBA_VERSION_RELEASE=5 +SAMBA_VERSION_RELEASE=6 # Bug fix releases use a letter for the patch revision # -- Samba Shared Repository
[SCM] SAMBA-CTDB repository - branch v3-4-ctdb updated - 8630a1a6dece8f2c654677e72120e76d3377fd17
The branch, v3-4-ctdb has been updated via 8630a1a6dece8f2c654677e72120e76d3377fd17 (commit) from 70a9cb880d9c09098930c38dc5482ca874f8cadd (commit) http://gitweb.samba.org/?p=obnox/samba-ctdb.git;a=shortlog;h=v3-4-ctdb - Log - commit 8630a1a6dece8f2c654677e72120e76d3377fd17 Author: Michael Adam ob...@samba.org Date: Mon Jun 29 13:19:48 2009 +0200 s3:nfsv4_acl.c: fix build with struct stat_ex. Michael --- Summary of changes: source3/modules/nfs4_acls.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c index 04ea73f..a31d8de 100644 --- a/source3/modules/nfs4_acls.c +++ b/source3/modules/nfs4_acls.c @@ -760,7 +760,7 @@ NTSTATUS smb_set_nt_acl_nfs4(files_struct *fsp, return NT_STATUS_OK; } - theacl = smbacl4_win2nfs4(fsp-fsp_name, psd-dacl, params, sbuf.st_uid, sbuf.st_gid); + theacl = smbacl4_win2nfs4(fsp-fsp_name, psd-dacl, params, sbuf.st_ex_uid, sbuf.st_ex_gid); if (!theacl) return map_nt_error_from_unix(errno); -- SAMBA-CTDB repository
[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-1165-g36791e2
The branch, v3-4-test has been updated via 36791e2d05f05282ac4eaab17541aa857e48d830 (commit) from 2fdd917894c3571a101ac6f9cafd63585bcb8d52 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test - Log - commit 36791e2d05f05282ac4eaab17541aa857e48d830 Author: David Markey ad...@dmarkey.com Date: Mon Jun 29 08:12:03 2009 +0200 Fix bug 6514: net gives unhelpful lp_load failed when it's missing smb.conf (cherry picked from commit 55ed0be65f07b46d51a647e556644039d68a002d) --- Summary of changes: source3/lib/netapi/netapi.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/lib/netapi/netapi.c b/source3/lib/netapi/netapi.c index 8893881..2f8474b 100644 --- a/source3/lib/netapi/netapi.c +++ b/source3/lib/netapi/netapi.c @@ -89,7 +89,7 @@ NET_API_STATUS libnetapi_init(struct libnetapi_ctx **context) if (!lp_load(get_dyn_CONFIGFILE(), true, false, false, false)) { TALLOC_FREE(frame); - fprintf(stderr, lp_load failed\n); + fprintf(stderr, error loading %s\n, get_dyn_CONFIGFILE() ); return W_ERROR_V(WERR_GENERAL_FAILURE); } -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-111-gbd997b2
The branch, master has been updated via bd997b257457d928108747bcca80ed7708f8dc74 (commit) via 50bb4bcc5b271ca2c321b0d0306f0c04afb604a7 (commit) from ec5c83c0dba28516d5c92f57dd7c88c99b17d4ab (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit bd997b257457d928108747bcca80ed7708f8dc74 Author: Günther Deschner g...@samba.org Date: Mon Jun 29 14:34:49 2009 +0200 s3-selftest: add RPC-SAMR-MACHINE-AUTH to list of test to run against s3. Guenther commit 50bb4bcc5b271ca2c321b0d0306f0c04afb604a7 Author: Günther Deschner g...@samba.org Date: Fri Jun 26 16:53:51 2009 +0200 s4-smbtorture: add RPC-SAMR-MACHINE-AUTH test. This test talks to a DC as a joined workstation member - in the same way winbindd does, in particular the calls used in this test's query pattern will all request for SEC_FLAG_MAXIMUM_ALLOWED access_mask (which pretty much all of samba's client code does as well). In fact this test verifies that winbind can correctly talk to a samba dc using samr dcerpc calls. Guenther --- Summary of changes: source3/script/tests/test_posix_s3.sh |5 +- source4/torture/rpc/rpc.c |1 + source4/torture/rpc/samr_accessmask.c | 486 - 3 files changed, 489 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 b861557..b294bea 100755 --- a/source3/script/tests/test_posix_s3.sh +++ b/source3/script/tests/test_posix_s3.sh @@ -42,8 +42,9 @@ rpc=$rpc RPC-SAMBA3-SPOOLSS RPC-SAMBA3-WKSSVC rpc=$rpc RPC-NETLOGSAMBA3 RPC-SAMBA3SESSIONKEY RPC-SAMBA3-GETUSERNAME rpc=$rpc RPC-SVCCTL RPC-SPOOLSS RPC-SPOOLSS-WIN RPC-NTSVCS rpc=$rpc RPC-LSA-GETUSER RPC-LSA-LOOKUPSIDS RPC-LSA-LOOKUPNAMES -rpc=$rpc RPC-SAMR RPC-SAMR-USERS RPC-SAMR-USERS-PRIVILEGES RPC-SAMR-PASSWORDS RPC-SAMR-PASSWORDS-PWDLASTSET RPC-SAMR-LARGE-DC RPC-JOIN -rpc=$rpc RPC-SCHANNEL RPC-SCHANNEL2 RPC-BENCH-SCHANNEL1 +rpc=$rpc RPC-SAMR RPC-SAMR-USERS RPC-SAMR-USERS-PRIVILEGES RPC-SAMR-PASSWORDS +rpc=$rpc RPC-SAMR-PASSWORDS-PWDLASTSET RPC-SAMR-LARGE-DC RPC-SAMR-MACHINE-AUTH +rpc=$rpc RPC-SCHANNEL RPC-SCHANNEL2 RPC-BENCH-SCHANNEL1 RPC-JOIN local=LOCAL-NSS-WRAPPER diff --git a/source4/torture/rpc/rpc.c b/source4/torture/rpc/rpc.c index d7aafef..4043562 100644 --- a/source4/torture/rpc/rpc.c +++ b/source4/torture/rpc/rpc.c @@ -457,6 +457,7 @@ NTSTATUS torture_rpc_init(void) torture_suite_add_suite(suite, torture_rpc_srvsvc(suite)); torture_suite_add_suite(suite, torture_rpc_svcctl(suite)); torture_suite_add_suite(suite, torture_rpc_samr_accessmask(suite)); + torture_suite_add_suite(suite, torture_rpc_samr_workstation_auth(suite)); torture_suite_add_suite(suite, torture_rpc_samr_passwords_pwdlastset(suite)); torture_suite_add_suite(suite, torture_rpc_samr_user_privileges(suite)); torture_suite_add_suite(suite, torture_rpc_samr_large_dc(suite)); diff --git a/source4/torture/rpc/samr_accessmask.c b/source4/torture/rpc/samr_accessmask.c index 1e74455..1af9fac 100644 --- a/source4/torture/rpc/samr_accessmask.c +++ b/source4/torture/rpc/samr_accessmask.c @@ -3,6 +3,7 @@ test suite for accessmasks on the SAMR pipe Copyright (C) Ronnie Sahlberg 2007 + Copyright (C) Guenther Deschner 2009 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 @@ -29,7 +30,7 @@ /* test user created to test the ACLs associated to SAMR objects */ #define TEST_USER_NAME samr_testuser - +#define TEST_MACHINENAME samrtestmach static NTSTATUS torture_samr_Close(struct torture_context *tctx, struct dcerpc_pipe *p, @@ -667,3 +668,486 @@ struct torture_suite *torture_rpc_samr_accessmask(TALLOC_CTX *mem_ctx) return suite; } + +static bool test_LookupRids(struct torture_context *tctx, + struct dcerpc_pipe *p, + struct policy_handle *domain_handle, + uint32_t rid) +{ + struct samr_LookupRids r; + struct lsa_Strings names; + struct samr_Ids types; + + torture_comment(tctx, testing LookupRids %d\n, rid); + + r.in.domain_handle = domain_handle; + r.in.num_rids = 1; + r.in.rids = rid; + r.out.names = names; + r.out.types = types; + + torture_assert_ntstatus_ok(tctx, dcerpc_samr_LookupRids(p, tctx, r), + failed to call samr_LookupRids); + + return true; +} + + +static bool test_user(struct torture_context *tctx, + struct dcerpc_pipe *p, + struct policy_handle *domain_handle, +
[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-1166-gd5c7312
The branch, v3-4-test has been updated via d5c73127b7e6a9ab917c35811fcfdcfe11681086 (commit) from 36791e2d05f05282ac4eaab17541aa857e48d830 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test - Log - commit d5c73127b7e6a9ab917c35811fcfdcfe11681086 Author: Günther Deschner g...@samba.org Date: Mon Jun 29 15:06:40 2009 +0200 s3-selftest: add RPC-SAMR-MACHINE-AUTH to list of test to run against s3. Guenther --- Summary of changes: source3/script/tests/test_posix_s3.sh |5 +++-- 1 files changed, 3 insertions(+), 2 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 0bcf369..04d0eeb 100755 --- a/source3/script/tests/test_posix_s3.sh +++ b/source3/script/tests/test_posix_s3.sh @@ -42,8 +42,9 @@ rpc=$rpc RPC-SAMBA3-SPOOLSS RPC-SAMBA3-WKSSVC rpc=$rpc RPC-NETLOGSAMBA3 RPC-SAMBA3SESSIONKEY RPC-SAMBA3-GETUSERNAME rpc=$rpc RPC-SVCCTL RPC-SPOOLSS RPC-SPOOLSS-WIN RPC-NTSVCS rpc=$rpc RPC-LSA-GETUSER RPC-LSA-LOOKUPSIDS RPC-LSA-LOOKUPNAMES -rpc=$rpc RPC-SAMR-USERS RPC-SAMR-USERS-PRIVILEGES RPC-SAMR-PASSWORDS RPC-SAMR-PASSWORDS-PWDLASTSET RPC-SAMR-LARGE-DC RPC-JOIN -rpc=$rpc RPC-SCHANNEL RPC-SCHANNEL2 RPC-BENCH-SCHANNEL1 +rpc=$rpc RPC-SAMR-USERS RPC-SAMR-USERS-PRIVILEGES RPC-SAMR-PASSWORDS +rpc=$rpc RPC-SAMR-PASSWORDS-PWDLASTSET RPC-SAMR-LARGE-DC RPC-SAMR-MACHINE-AUTH +rpc=$rpc RPC-SCHANNEL RPC-SCHANNEL2 RPC-BENCH-SCHANNEL1 RPC-JOIN # 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 -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-1167-ge742e2b
The branch, v3-4-test has been updated via e742e2b3968801f15f0127f02dff27c78371b5f7 (commit) from d5c73127b7e6a9ab917c35811fcfdcfe11681086 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test - Log - commit e742e2b3968801f15f0127f02dff27c78371b5f7 Author: Karolin Seeger ksee...@samba.org Date: Mon Jun 29 15:28:23 2009 +0200 WHATSNEW: Update changes. Karolin --- Summary of changes: WHATSNEW.txt |4 1 files changed, 4 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 06177ca..011f457 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -218,6 +218,10 @@ oVolker Lendecke v...@samba.org * BUG 6498: Add workaround for MS KB932762. +oDavid Markey ad...@dmarkey.com + * BUG 6514: Improve error message in 'net' when smb.conf is not available. + + oBo Yang boy...@samba.org * BUG 6499: Fix building of pam_smbpass. -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-4-stable updated - release-3-4-0rc1-11-gd96b0c5
The branch, v3-4-stable has been updated via d96b0c5f9e4e53c7dc53532c28e4ec42c70232a4 (commit) via a5061b118743430e5c1adae9dbd74d87370c8b7e (commit) via 21f78dba36388a9ee9ea3a369c1bcd9bb8ce56ba (commit) from 3eac232fdcae51843110ba84cd1698c1ac4be8af (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-stable - Log - commit d96b0c5f9e4e53c7dc53532c28e4ec42c70232a4 Author: Karolin Seeger ksee...@samba.org Date: Mon Jun 29 15:28:23 2009 +0200 WHATSNEW: Update changes. Karolin (cherry picked from commit e742e2b3968801f15f0127f02dff27c78371b5f7) commit a5061b118743430e5c1adae9dbd74d87370c8b7e Author: Günther Deschner g...@samba.org Date: Mon Jun 29 15:06:40 2009 +0200 s3-selftest: add RPC-SAMR-MACHINE-AUTH to list of test to run against s3. Guenther (cherry picked from commit d5c73127b7e6a9ab917c35811fcfdcfe11681086) commit 21f78dba36388a9ee9ea3a369c1bcd9bb8ce56ba Author: David Markey ad...@dmarkey.com Date: Mon Jun 29 08:12:03 2009 +0200 Fix bug 6514: net gives unhelpful lp_load failed when it's missing smb.conf (cherry picked from commit 55ed0be65f07b46d51a647e556644039d68a002d) (cherry picked from commit 36791e2d05f05282ac4eaab17541aa857e48d830) --- Summary of changes: WHATSNEW.txt |4 source3/lib/netapi/netapi.c |2 +- source3/script/tests/test_posix_s3.sh |5 +++-- 3 files changed, 8 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 06177ca..011f457 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -218,6 +218,10 @@ oVolker Lendecke v...@samba.org * BUG 6498: Add workaround for MS KB932762. +oDavid Markey ad...@dmarkey.com + * BUG 6514: Improve error message in 'net' when smb.conf is not available. + + oBo Yang boy...@samba.org * BUG 6499: Fix building of pam_smbpass. diff --git a/source3/lib/netapi/netapi.c b/source3/lib/netapi/netapi.c index 8893881..2f8474b 100644 --- a/source3/lib/netapi/netapi.c +++ b/source3/lib/netapi/netapi.c @@ -89,7 +89,7 @@ NET_API_STATUS libnetapi_init(struct libnetapi_ctx **context) if (!lp_load(get_dyn_CONFIGFILE(), true, false, false, false)) { TALLOC_FREE(frame); - fprintf(stderr, lp_load failed\n); + fprintf(stderr, error loading %s\n, get_dyn_CONFIGFILE() ); return W_ERROR_V(WERR_GENERAL_FAILURE); } diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh index 0bcf369..04d0eeb 100755 --- a/source3/script/tests/test_posix_s3.sh +++ b/source3/script/tests/test_posix_s3.sh @@ -42,8 +42,9 @@ rpc=$rpc RPC-SAMBA3-SPOOLSS RPC-SAMBA3-WKSSVC rpc=$rpc RPC-NETLOGSAMBA3 RPC-SAMBA3SESSIONKEY RPC-SAMBA3-GETUSERNAME rpc=$rpc RPC-SVCCTL RPC-SPOOLSS RPC-SPOOLSS-WIN RPC-NTSVCS rpc=$rpc RPC-LSA-GETUSER RPC-LSA-LOOKUPSIDS RPC-LSA-LOOKUPNAMES -rpc=$rpc RPC-SAMR-USERS RPC-SAMR-USERS-PRIVILEGES RPC-SAMR-PASSWORDS RPC-SAMR-PASSWORDS-PWDLASTSET RPC-SAMR-LARGE-DC RPC-JOIN -rpc=$rpc RPC-SCHANNEL RPC-SCHANNEL2 RPC-BENCH-SCHANNEL1 +rpc=$rpc RPC-SAMR-USERS RPC-SAMR-USERS-PRIVILEGES RPC-SAMR-PASSWORDS +rpc=$rpc RPC-SAMR-PASSWORDS-PWDLASTSET RPC-SAMR-LARGE-DC RPC-SAMR-MACHINE-AUTH +rpc=$rpc RPC-SCHANNEL RPC-SCHANNEL2 RPC-BENCH-SCHANNEL1 RPC-JOIN # 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 -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-5325-g99f68c7
The branch, v3-3-test has been updated via 99f68c7b1c527bc39acd0f9db15f65ce087c5dca (commit) from 7d9b47a927f667025513fa92a8cb339d20869d0a (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test - Log - commit 99f68c7b1c527bc39acd0f9db15f65ce087c5dca Author: Günther Deschner g...@samba.org Date: Mon Jun 29 15:27:13 2009 +0200 s3-test: add RPC-SAMR-MACHINE-AUTH to list of tests to run against s3. Guenther --- Summary of changes: source/script/tests/test_posix_s3.sh |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source/script/tests/test_posix_s3.sh b/source/script/tests/test_posix_s3.sh index 3bd9d1c..5684b27 100755 --- a/source/script/tests/test_posix_s3.sh +++ b/source/script/tests/test_posix_s3.sh @@ -38,7 +38,7 @@ raw=$raw RAW-SAMBA3ROOTDIRFID rpc=RPC-AUTHCONTEXT RPC-BINDSAMBA3 RPC-SAMBA3-SRVSVC RPC-SAMBA3-SHARESEC rpc=$rpc RPC-SAMBA3-SPOOLSS RPC-SAMBA3-WKSSVC rpc=$rpc RPC-NETLOGSAMBA3 RPC-SAMBA3SESSIONKEY RPC-SAMBA3-GETUSERNAME -rpc=$rpc RPC-LSA-LOOKUPSIDS RPC-JOIN +rpc=$rpc RPC-LSA-LOOKUPSIDS RPC-JOIN RPC-SAMR-MACHINE-AUTH # 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 -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3633-gdb7c5d1
The branch, v3-2-test has been updated via db7c5d175ba2d733df445f7d0dc570a79a417f49 (commit) from 97e91b97c31cbb2c81acebe148bf7084f5effda8 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log - commit db7c5d175ba2d733df445f7d0dc570a79a417f49 Author: Günther Deschner g...@samba.org Date: Mon Jun 29 15:48:16 2009 +0200 s3-test: add RPC-SAMR-MACHINE-AUTH to list of tests to run against s3. Guenther --- Summary of changes: source/script/tests/test_posix_s3.sh |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source/script/tests/test_posix_s3.sh b/source/script/tests/test_posix_s3.sh index 3e99986..21a5e9e 100755 --- a/source/script/tests/test_posix_s3.sh +++ b/source/script/tests/test_posix_s3.sh @@ -38,6 +38,8 @@ raw=$raw RAW-SAMBA3ROOTDIRFID rpc=RPC-AUTHCONTEXT RPC-BINDSAMBA3 RPC-SAMBA3-SRVSVC RPC-SAMBA3-SHARESEC rpc=$rpc RPC-SAMBA3-SPOOLSS RPC-SAMBA3-WKSSVC rpc=$rpc RPC-NETLOGSAMBA3 RPC-SAMBA3SESSIONKEY RPC-SAMBA3-GETUSERNAME +rpc=$rpc RPC-LSA-LOOKUPSIDS RPC-JOIN RPC-SAMR-MACHINE-AUTH + # 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 -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-113-g857ed9c
The branch, master has been updated via 857ed9ca5a99e20c0ff58e761ba87c7e6bc872bd (commit) via b1d5e515b23acd50ae5c41c347a2cad1726d03fb (commit) from bd997b257457d928108747bcca80ed7708f8dc74 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 857ed9ca5a99e20c0ff58e761ba87c7e6bc872bd Author: Stefan Metzmacher me...@samba.org Date: Mon Jun 29 13:13:05 2009 +0200 tsocket/bsd: also ask for TEVENT_FD_READ when we want to write into a stream socket Otherwise we would not notice a broken connection. metze commit b1d5e515b23acd50ae5c41c347a2cad1726d03fb Author: Stefan Metzmacher me...@samba.org Date: Mon Jun 29 13:05:27 2009 +0200 tsocket/bsd: more correctly check if the cached tevent_fd is still valid I some cases the pointer value of tevent_context is the same again, if we do something like: ev1 = tevent_context_init(); ... fde = tevent_add_fd(ev1, fd, TEVENT_FD_READ...); ... talloc_free(ev1); ... ev2 = tevent_context_init(); if (ev1 == ev2) { /* this can happen! */ } if (tevent_fd_get_flags(fde) == 0) { /* this is always true */ } But the talloc_free(ev1) will set fde-event_ctx to NULL and tevent_fd_get_flags() will always return 0. metze --- Summary of changes: lib/tsocket/tsocket_bsd.c | 27 +-- 1 files changed, 21 insertions(+), 6 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/tsocket/tsocket_bsd.c b/lib/tsocket/tsocket_bsd.c index a4cbda8..78bca4b 100644 --- a/lib/tsocket/tsocket_bsd.c +++ b/lib/tsocket/tsocket_bsd.c @@ -612,7 +612,9 @@ static int tdgram_bsd_set_readable_handler(struct tdgram_bsd *bsds, TALLOC_FREE(bsds-fde); } - if (bsds-fde == NULL) { + if (tevent_fd_get_flags(bsds-fde) == 0) { + TALLOC_FREE(bsds-fde); + bsds-fde = tevent_add_fd(ev, bsds, bsds-fd, TEVENT_FD_READ, tdgram_bsd_fde_handler, @@ -664,7 +666,9 @@ static int tdgram_bsd_set_writeable_handler(struct tdgram_bsd *bsds, TALLOC_FREE(bsds-fde); } - if (bsds-fde == NULL) { + if (tevent_fd_get_flags(bsds-fde) == 0) { + TALLOC_FREE(bsds-fde); + bsds-fde = tevent_add_fd(ev, bsds, bsds-fd, TEVENT_FD_WRITE, tdgram_bsd_fde_handler, @@ -1288,6 +1292,10 @@ static void tstream_bsd_fde_handler(struct tevent_context *ev, } if (flags TEVENT_FD_READ) { if (!bsds-readable_handler) { + if (bsds-writeable_handler) { + bsds-writeable_handler(bsds-writeable_private); + return; + } TEVENT_FD_NOT_READABLE(bsds-fde); return; } @@ -1325,7 +1333,9 @@ static int tstream_bsd_set_readable_handler(struct tstream_bsd *bsds, TALLOC_FREE(bsds-fde); } - if (bsds-fde == NULL) { + if (tevent_fd_get_flags(bsds-fde) == 0) { + TALLOC_FREE(bsds-fde); + bsds-fde = tevent_add_fd(ev, bsds, bsds-fd, TEVENT_FD_READ, tstream_bsd_fde_handler, @@ -1377,9 +1387,12 @@ static int tstream_bsd_set_writeable_handler(struct tstream_bsd *bsds, TALLOC_FREE(bsds-fde); } - if (bsds-fde == NULL) { + if (tevent_fd_get_flags(bsds-fde) == 0) { + TALLOC_FREE(bsds-fde); + bsds-fde = tevent_add_fd(ev, bsds, - bsds-fd, TEVENT_FD_WRITE, + bsds-fd, + TEVENT_FD_READ | TEVENT_FD_WRITE, tstream_bsd_fde_handler, bsds); if (!bsds-fde) { @@ -1390,7 +1403,9 @@ static int tstream_bsd_set_writeable_handler(struct tstream_bsd *bsds, /* cache the event context we're running on */ bsds-event_ptr = ev; } else if (!bsds-writeable_handler) { - TEVENT_FD_WRITEABLE(bsds-fde); + uint16_t flags = tevent_fd_get_flags(bsds-fde); + flags |= TEVENT_FD_READ | TEVENT_FD_WRITE; + tevent_fd_set_flags(bsds-fde, flags); } bsds-writeable_handler = handler; -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-116-g57d3ada
The branch, master has been updated via 57d3ada2c94cb38c679d791f4e149319c83aa6d7 (commit) via 36501437125fd62020429df719bba4d53e4b35fb (commit) via e4e855563bcbeb7be54de57d8c1d41d35ddc5e7a (commit) from 857ed9ca5a99e20c0ff58e761ba87c7e6bc872bd (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 57d3ada2c94cb38c679d791f4e149319c83aa6d7 Author: Michael Adam ob...@samba.org Date: Mon Jun 29 16:26:42 2009 +0200 s3:fix build of old linux quota system and other unixes' quota implementation By fixing the use of struct stat_ex. Michael commit 36501437125fd62020429df719bba4d53e4b35fb Author: Michael Adam ob...@samba.org Date: Mon Jun 29 16:11:13 2009 +0200 s3:lib/sysquotas: fix usage of SMB_STRUCT_STAT (struct stat_ex). This fixes the build with quotas / configure time detection of sys_quota interface. Michael commit e4e855563bcbeb7be54de57d8c1d41d35ddc5e7a Author: Michael Adam ob...@samba.org Date: Mon Jun 29 15:39:46 2009 +0200 lib/util: fix building tevent_ntstatus without config.h (when called from places with #define NO_CONFIG_H set, such as configure) Michael --- Summary of changes: lib/util/tevent_ntstatus.h |1 - source3/lib/sysquotas.c|6 +++--- source3/smbd/quotas.c | 28 ++-- 3 files changed, 17 insertions(+), 18 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/util/tevent_ntstatus.h b/lib/util/tevent_ntstatus.h index d7194a9..22fe918 100644 --- a/lib/util/tevent_ntstatus.h +++ b/lib/util/tevent_ntstatus.h @@ -22,7 +22,6 @@ #include stdint.h #include stdbool.h -#include config.h #include ../libcli/util/ntstatus.h #include ../tevent/tevent.h diff --git a/source3/lib/sysquotas.c b/source3/lib/sysquotas.c index 5ee199d..7eed0ca 100644 --- a/source3/lib/sysquotas.c +++ b/source3/lib/sysquotas.c @@ -63,7 +63,7 @@ static int sys_path_to_bdev(const char *path, char **mntpath, char **bdev, char if ( sys_stat(path, S) == -1 ) return (-1); - devno = S.st_dev ; + devno = S.st_ex_dev ; fp = setmntent(MOUNTED,r); if (fp == NULL) { @@ -74,7 +74,7 @@ static int sys_path_to_bdev(const char *path, char **mntpath, char **bdev, char if ( sys_stat(mnt-mnt_dir,S) == -1 ) continue ; - if (S.st_dev == devno) { + if (S.st_ex_dev == devno) { (*mntpath) = SMB_STRDUP(mnt-mnt_dir); (*bdev) = SMB_STRDUP(mnt-mnt_fsname); (*fs) = SMB_STRDUP(mnt-mnt_type); @@ -118,7 +118,7 @@ static int sys_path_to_bdev(const char *path, char **mntpath, char **bdev, char return ret; } - if ((ret=devnm(S_IFBLK, S.st_dev, dev_disk, 256, 1))!=0) { + if ((ret=devnm(S_IFBLK, S.st_ex_dev, dev_disk, 256, 1))!=0) { return ret; } diff --git a/source3/smbd/quotas.c b/source3/smbd/quotas.c index c4664e7..43b7009 100644 --- a/source3/smbd/quotas.c +++ b/source3/smbd/quotas.c @@ -227,7 +227,7 @@ bool disk_quotas(const char *path, uint64_t *bsize, uint64_t *dfree, uint64_t *d if ( sys_stat(path, S) == -1 ) return(False) ; - devno = S.st_dev ; + devno = S.st_ex_dev ; if ((fp = setmntent(MOUNTED,r)) == NULL) return(False) ; @@ -238,7 +238,7 @@ bool disk_quotas(const char *path, uint64_t *bsize, uint64_t *dfree, uint64_t *d if ( sys_stat(mnt-mnt_dir,S) == -1 ) continue ; - if (S.st_dev == devno) { + if (S.st_ex_dev == devno) { found = True ; break; } @@ -321,7 +321,7 @@ bool disk_quotas(const char *path, uint64_t *bsize, uint64_t *dfree, uint64_t *d return false; } - devno = sbuf.st_dev ; + devno = sbuf.st_ex_dev ; if ((fd = setmntent(KMTAB)) == NULL) { return false; @@ -331,7 +331,7 @@ bool disk_quotas(const char *path, uint64_t *bsize, uint64_t *dfree, uint64_t *d if (sys_stat(mnt-mnt_dir,sbuf) == -1) { continue; } - if (sbuf.st_dev == devno) { + if (sbuf.st_ex_dev == devno) { found = frue ; break; } @@ -603,7 +603,7 @@ bool disk_quotas(const char *path, return false; } - devno = sbuf.st_dev ; + devno = sbuf.st_ex_dev ; DEBUG(5,(disk_quotas: looking for path \%s\ devno=%x\n, path, (unsigned int)devno)); #if defined(SUNOS5) @@ -620,7 +620,7 @@ bool disk_quotas(const char *path,
[SCM] SAMBA-CTDB repository - branch v3-4-ctdb updated - 7d0d0435315a48ecc964e2d7dfc47b68065ad90c
The branch, v3-4-ctdb has been updated via 7d0d0435315a48ecc964e2d7dfc47b68065ad90c (commit) via 68ddc3239b6bf5bff42d187ec3fac5bd81f9784f (commit) via 4ea6673c3b47c9c17a5eba79069a6adb84d52352 (commit) from 8630a1a6dece8f2c654677e72120e76d3377fd17 (commit) http://gitweb.samba.org/?p=obnox/samba-ctdb.git;a=shortlog;h=v3-4-ctdb - Log - commit 7d0d0435315a48ecc964e2d7dfc47b68065ad90c Author: Michael Adam ob...@samba.org Date: Mon Jun 29 16:26:42 2009 +0200 s3:fix build of old linux quota system and other unixes' quota implementation By fixing the use of struct stat_ex. Michael commit 68ddc3239b6bf5bff42d187ec3fac5bd81f9784f Author: Michael Adam ob...@samba.org Date: Mon Jun 29 16:11:13 2009 +0200 s3:lib/sysquotas: fix usage of SMB_STRUCT_STAT (struct stat_ex). This fixes the build with quotas / configure time detection of sys_quota interface. Michael commit 4ea6673c3b47c9c17a5eba79069a6adb84d52352 Author: Michael Adam ob...@samba.org Date: Mon Jun 29 15:39:46 2009 +0200 lib/util: fix building tevent_ntstatus without config.h (when called from places with #define NO_CONFIG_H set, such as configure) Michael --- Summary of changes: lib/util/tevent_ntstatus.h |1 - source3/lib/sysquotas.c|6 +++--- source3/smbd/quotas.c | 28 ++-- 3 files changed, 17 insertions(+), 18 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/util/tevent_ntstatus.h b/lib/util/tevent_ntstatus.h index 84c275f..acfb903 100644 --- a/lib/util/tevent_ntstatus.h +++ b/lib/util/tevent_ntstatus.h @@ -22,7 +22,6 @@ #include stdint.h #include stdbool.h -#include config.h #include ../libcli/util/ntstatus.h #include ../tevent/tevent.h diff --git a/source3/lib/sysquotas.c b/source3/lib/sysquotas.c index 5ee199d..7eed0ca 100644 --- a/source3/lib/sysquotas.c +++ b/source3/lib/sysquotas.c @@ -63,7 +63,7 @@ static int sys_path_to_bdev(const char *path, char **mntpath, char **bdev, char if ( sys_stat(path, S) == -1 ) return (-1); - devno = S.st_dev ; + devno = S.st_ex_dev ; fp = setmntent(MOUNTED,r); if (fp == NULL) { @@ -74,7 +74,7 @@ static int sys_path_to_bdev(const char *path, char **mntpath, char **bdev, char if ( sys_stat(mnt-mnt_dir,S) == -1 ) continue ; - if (S.st_dev == devno) { + if (S.st_ex_dev == devno) { (*mntpath) = SMB_STRDUP(mnt-mnt_dir); (*bdev) = SMB_STRDUP(mnt-mnt_fsname); (*fs) = SMB_STRDUP(mnt-mnt_type); @@ -118,7 +118,7 @@ static int sys_path_to_bdev(const char *path, char **mntpath, char **bdev, char return ret; } - if ((ret=devnm(S_IFBLK, S.st_dev, dev_disk, 256, 1))!=0) { + if ((ret=devnm(S_IFBLK, S.st_ex_dev, dev_disk, 256, 1))!=0) { return ret; } diff --git a/source3/smbd/quotas.c b/source3/smbd/quotas.c index c4664e7..43b7009 100644 --- a/source3/smbd/quotas.c +++ b/source3/smbd/quotas.c @@ -227,7 +227,7 @@ bool disk_quotas(const char *path, uint64_t *bsize, uint64_t *dfree, uint64_t *d if ( sys_stat(path, S) == -1 ) return(False) ; - devno = S.st_dev ; + devno = S.st_ex_dev ; if ((fp = setmntent(MOUNTED,r)) == NULL) return(False) ; @@ -238,7 +238,7 @@ bool disk_quotas(const char *path, uint64_t *bsize, uint64_t *dfree, uint64_t *d if ( sys_stat(mnt-mnt_dir,S) == -1 ) continue ; - if (S.st_dev == devno) { + if (S.st_ex_dev == devno) { found = True ; break; } @@ -321,7 +321,7 @@ bool disk_quotas(const char *path, uint64_t *bsize, uint64_t *dfree, uint64_t *d return false; } - devno = sbuf.st_dev ; + devno = sbuf.st_ex_dev ; if ((fd = setmntent(KMTAB)) == NULL) { return false; @@ -331,7 +331,7 @@ bool disk_quotas(const char *path, uint64_t *bsize, uint64_t *dfree, uint64_t *d if (sys_stat(mnt-mnt_dir,sbuf) == -1) { continue; } - if (sbuf.st_dev == devno) { + if (sbuf.st_ex_dev == devno) { found = frue ; break; } @@ -603,7 +603,7 @@ bool disk_quotas(const char *path, return false; } - devno = sbuf.st_dev ; + devno = sbuf.st_ex_dev ; DEBUG(5,(disk_quotas: looking for path \%s\ devno=%x\n, path, (unsigned int)devno)); #if defined(SUNOS5) @@ -620,7 +620,7 @@ bool disk_quotas(const
[SCM] SAMBA-CTDB repository - branch v3-4-ctdb updated - 793506c531bbb92db56d0b31f6f94a3a7a820a5b
The branch, v3-4-ctdb has been updated via 793506c531bbb92db56d0b31f6f94a3a7a820a5b (commit) via 1a83fed4bb2c17dad805a3c64a3875fd06c712be (commit) via 7effcb0715233acf8b1cccf5a087620307fd6d2a (commit) via cc324942794b20c0036ca2e5e95536fc1750a8a3 (commit) via 61a7a65f3c6c52723c34ad91134f39ceec1cb4a5 (commit) via 138a7560d9c4ce09b1a7a502a21fcd4befd72498 (commit) via fab2b3e07cee8ffc7a09d3458db1f833c6c836eb (commit) from 7d0d0435315a48ecc964e2d7dfc47b68065ad90c (commit) http://gitweb.samba.org/?p=obnox/samba-ctdb.git;a=shortlog;h=v3-4-ctdb - Log - commit 793506c531bbb92db56d0b31f6f94a3a7a820a5b Author: Michael Adam ob...@samba.org Date: Fri Mar 20 00:47:45 2009 +0100 packaging(RHEL-CTDB): also pack libwbcient in winbind-32bit package Michael Signed-off-by: Michael Adam ob...@samba.org commit 1a83fed4bb2c17dad805a3c64a3875fd06c712be Author: Michael Adam ob...@samba.org Date: Fri Mar 20 00:30:35 2009 +0100 packaging(RHEL-CTDB): add new pam_winbind.mo to the common package Michael Signed-off-by: Michael Adam ob...@samba.org commit 7effcb0715233acf8b1cccf5a087620307fd6d2a Author: Michael Adam ob...@samba.org Date: Fri Mar 20 00:28:36 2009 +0100 packaging(RHEL-CTDB): add new binary sharesec to the client package. Michael Signed-off-by: Michael Adam ob...@samba.org commit cc324942794b20c0036ca2e5e95536fc1750a8a3 Author: Michael Adam ob...@samba.org Date: Fri Mar 20 00:26:11 2009 +0100 packaging(RHEL-CTDB): add new binary ldbrename to the common rpm Michael Signed-off-by: Michael Adam ob...@samba.org commit 61a7a65f3c6c52723c34ad91134f39ceec1cb4a5 Author: Michael Adam ob...@samba.org Date: Mon Jun 29 17:07:14 2009 +0200 packaging(RHEL-CTDB): fix location of nsswitch/ directory for install This has been moved to the top level directory in 3.4. Michael commit 138a7560d9c4ce09b1a7a502a21fcd4befd72498 Author: Michael Adam ob...@samba.org Date: Mon Jun 29 17:05:00 2009 +0200 packaging(RHEL-CTDB): don't pass CFLAGS to make. This breaks the build since 3.3 since it overwrites the CFLAGS set by configure. Michael commit fab2b3e07cee8ffc7a09d3458db1f833c6c836eb Author: Michael Adam ob...@samba.org Date: Mon Jun 29 17:03:09 2009 +0200 packaging(RHEL-CTDB): don't make proto any more. This has become unnecessary in 3.3 Michael --- Summary of changes: packaging/RHEL-CTDB/samba.spec.tmpl | 18 +++--- 1 files changed, 11 insertions(+), 7 deletions(-) Changeset truncated at 500 lines: diff --git a/packaging/RHEL-CTDB/samba.spec.tmpl b/packaging/RHEL-CTDB/samba.spec.tmpl index 9fa4b68..a9bac92 100644 --- a/packaging/RHEL-CTDB/samba.spec.tmpl +++ b/packaging/RHEL-CTDB/samba.spec.tmpl @@ -189,8 +189,6 @@ CFLAGS=$RPM_OPT_FLAGS -D_GNU_SOURCE -m32 ./configure \ make showlayout -make CFLAGS=$RPM_OPT_FLAGS -D_GNU_SOURCE -m32 proto - ## check for gcc 3.4 or later CC_VERSION=`${CC} --version | head -1 | awk '{print $3}'` CC_MAJOR=`echo ${CC_VERSION} | cut -d. -f 1` @@ -201,16 +199,17 @@ if [ ${CC_MAJOR} -ge 3 ]; then fi fi -make CFLAGS=$RPM_OPT_FLAGS -D_GNU_SOURCE -m32 %{?_smp_mflags} \ +make %{?_smp_mflags} \ nss_modules pam_modules rm -rf %{_32bit_tmp_dir} mkdir %{_32bit_tmp_dir} -mv nsswitch/libnss_winbind.so %{_32bit_tmp_dir}/ +mv ../nsswitch/libnss_winbind.so %{_32bit_tmp_dir}/ mv bin/pam_winbind.so %{_32bit_tmp_dir}/ mv bin/libtalloc.so* %{_32bit_tmp_dir}/ mv bin/libtdb.so* %{_32bit_tmp_dir}/ +mv bin/libwbclient.so* %{_32bit_tmp_dir}/ make clean @@ -265,7 +264,7 @@ if [ ${CC_MAJOR} -ge 3 ]; then fi -make CFLAGS=$RPM_OPT_FLAGS -D_GNU_SOURCE %{?_smp_mflags} \ +make %{?_smp_mflags} \ all modules pam_smbpass # Remove some permission bits to avoid to many dependencies @@ -302,14 +301,14 @@ make DESTDIR=$RPM_BUILD_ROOT \ cd .. # NSS winbind support -install -m 755 source3/nsswitch/libnss_winbind.so $RPM_BUILD_ROOT/%{_libarch}/libnss_winbind.so.2 +install -m 755 nsswitch/libnss_winbind.so $RPM_BUILD_ROOT/%{_libarch}/libnss_winbind.so.2 ( cd $RPM_BUILD_ROOT/%{_libarch}; ln -sf libnss_winbind.so.2 libnss_winbind.so ) # # do not install libnss_wins.so in order to reduce dependencies # (we do not need it for the samba-ctdb scenario) # -#install -m 755 source3/nsswitch/libnss_wins.so $RPM_BUILD_ROOT/%{_libarch}/libnss_wins.so +#install -m 755 nsswitch/libnss_wins.so $RPM_BUILD_ROOT/%{_libarch}/libnss_wins.so # ( cd $RPM_BUILD_ROOT/%{_libarch}; ln -sf libnss_wins.so libnss_wins.so.2 ) @@ -321,6 +320,7 @@ install -m 755 %{_32bit_tmp_dir}/libnss_winbind.so ${RPM_BUILD_ROOT}/lib/libnss_ mv %{_32bit_tmp_dir}/libtalloc* ${RPM_BUILD_ROOT}/usr/lib mv
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-117-gce8159b
The branch, master has been updated via ce8159b30e751c9856e983c5b351741ce4b14558 (commit) from 57d3ada2c94cb38c679d791f4e149319c83aa6d7 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit ce8159b30e751c9856e983c5b351741ce4b14558 Author: Stefan Metzmacher me...@samba.org Date: Mon Jun 29 16:31:31 2009 +0200 s3:pdb_ads: we need to make the fd for tldap/tsocket non-blocking metze --- Summary of changes: source3/passdb/pdb_ads.c |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/passdb/pdb_ads.c b/source3/passdb/pdb_ads.c index b7c42c5..be4b4b2 100644 --- a/source3/passdb/pdb_ads.c +++ b/source3/passdb/pdb_ads.c @@ -2074,6 +2074,8 @@ static struct tldap_context *pdb_ads_ld(struct pdb_ads_state *state) return NULL; } + set_blocking(fd, false); + state-ld = tldap_context_create(state, fd); if (state-ld == NULL) { close(fd); -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-119-g772d5de
The branch, master has been updated via 772d5dea303813514d53a42ac4114da8a9cb1c5a (commit) via 28ef5c3ece00e9f314709e74f28dc2ebc3987015 (commit) from ce8159b30e751c9856e983c5b351741ce4b14558 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 772d5dea303813514d53a42ac4114da8a9cb1c5a Author: Günther Deschner g...@samba.org Date: Wed Jun 24 00:24:03 2009 +0200 s4-smbtorture: correctly test comment behaviour in RPC-SAMR-USERS against s3. Guenther commit 28ef5c3ece00e9f314709e74f28dc2ebc3987015 Author: Günther Deschner g...@samba.org Date: Wed Jun 24 00:23:09 2009 +0200 s3-pdb_tdb: give 'unknown_str' the proper name 'comment' and set comment in passdb. pdb_{get,set}_comment were already existing in the API but were never used. Guenther --- Summary of changes: source3/passdb/passdb.c| 25 +++-- source4/torture/rpc/samr.c | 11 --- 2 files changed, 19 insertions(+), 17 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/passdb/passdb.c b/source3/passdb/passdb.c index 502c372..4ed04e4 100644 --- a/source3/passdb/passdb.c +++ b/source3/passdb/passdb.c @@ -1519,7 +1519,7 @@ static bool init_samu_from_buffer_v3(struct samu *sampass, uint8 *buf, uint32 bu char *domain = NULL; char *nt_username = NULL; char *dir_drive = NULL; - char *unknown_str = NULL; + char *comment = NULL; char *munged_dial = NULL; char *fullname = NULL; char *homedir = NULL; @@ -1528,7 +1528,7 @@ static bool init_samu_from_buffer_v3(struct samu *sampass, uint8 *buf, uint32 bu char *acct_desc = NULL; char *workstations = NULL; uint32 username_len, domain_len, nt_username_len, - dir_drive_len, unknown_str_len, munged_dial_len, + dir_drive_len, comment_len, munged_dial_len, fullname_len, homedir_len, logon_script_len, profile_path_len, acct_desc_len, workstations_len; @@ -1570,7 +1570,7 @@ static bool init_samu_from_buffer_v3(struct samu *sampass, uint8 *buf, uint32 bu profile_path_len, profile_path, /* B */ acct_desc_len, acct_desc, /* B */ workstations_len, workstations, /* B */ - unknown_str_len, unknown_str, /* B */ + comment_len, comment, /* B */ munged_dial_len, munged_dial, /* B */ user_rid, /* d */ group_rid, /* d */ @@ -1656,6 +1656,7 @@ static bool init_samu_from_buffer_v3(struct samu *sampass, uint8 *buf, uint32 bu } pdb_set_acct_desc(sampass, acct_desc, PDB_SET); + pdb_set_comment(sampass, comment, PDB_SET); pdb_set_workstations(sampass, workstations, PDB_SET); pdb_set_munged_dial(sampass, munged_dial, PDB_SET); @@ -1724,7 +1725,7 @@ done: SAFE_FREE(acct_desc); SAFE_FREE(workstations); SAFE_FREE(munged_dial); - SAFE_FREE(unknown_str); + SAFE_FREE(comment); SAFE_FREE(lm_pw_ptr); SAFE_FREE(nt_pw_ptr); SAFE_FREE(nt_pw_hist_ptr); @@ -1757,7 +1758,7 @@ static uint32 init_buffer_from_samu_v3 (uint8 **buf, struct samu *sampass, bool const char *domain; const char *nt_username; const char *dir_drive; - const char *unknown_str; + const char *comment; const char *munged_dial; const char *fullname; const char *homedir; @@ -1766,7 +1767,7 @@ static uint32 init_buffer_from_samu_v3 (uint8 **buf, struct samu *sampass, bool const char *acct_desc; const char *workstations; uint32 username_len, domain_len, nt_username_len, - dir_drive_len, unknown_str_len, munged_dial_len, + dir_drive_len, comment_len, munged_dial_len, fullname_len, homedir_len, logon_script_len, profile_path_len, acct_desc_len, workstations_len; @@ -1900,8 +1901,12 @@ static uint32 init_buffer_from_samu_v3 (uint8 **buf, struct samu *sampass, bool workstations_len = 0; } - unknown_str = NULL; - unknown_str_len = 0; + comment = pdb_get_comment(sampass); + if (comment) { + comment_len = strlen(comment) +1; + } else { + comment_len = 0; + } munged_dial = pdb_get_munged_dial(sampass); if (munged_dial) { @@ -1931,7 +1936,7 @@ static uint32 init_buffer_from_samu_v3 (uint8 **buf, struct samu *sampass, bool profile_path_len,
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-120-g69af9ea
The branch, master has been updated via 69af9eacb9214106b7448c59eb13a8bf0b832c91 (commit) from 772d5dea303813514d53a42ac4114da8a9cb1c5a (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 69af9eacb9214106b7448c59eb13a8bf0b832c91 Author: Michael Adam ob...@samba.org Date: Mon Jun 29 23:23:07 2009 +0200 s3:build: check for external liblua, link lua statically if using internal lib So liblua is treated the same way as libtalloc and libtdb. Michael --- Summary of changes: source3/Makefile.in | 14 +- source3/configure.in | 42 +- 2 files changed, 42 insertions(+), 14 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/Makefile.in b/source3/Makefile.in index cdca9c1..62d4fbe 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -2352,19 +2352,7 @@ bin/libbigballofm...@shlibext@: $(BINARY_PREREQS) $(LIBBIGBALLOFMUD_OBJ) @LIBTAL # #--- -LIBLUA_OBJ0 = lua-5.1.4/src/lapi.o lua-5.1.4/src/lauxlib.o \ - lua-5.1.4/src/lbaselib.o lua-5.1.4/src/lcode.o \ - lua-5.1.4/src/ldblib.o lua-5.1.4/src/ldebug.o lua-5.1.4/src/ldo.o \ - lua-5.1.4/src/ldump.o lua-5.1.4/src/lfunc.o lua-5.1.4/src/lgc.o \ - lua-5.1.4/src/linit.o lua-5.1.4/src/liolib.o lua-5.1.4/src/llex.o \ - lua-5.1.4/src/lmathlib.o lua-5.1.4/src/lmem.o \ - lua-5.1.4/src/loadlib.o lua-5.1.4/src/lobject.o \ - lua-5.1.4/src/lopcodes.o lua-5.1.4/src/loslib.o \ - lua-5.1.4/src/lparser.o lua-5.1.4/src/lstate.o \ - lua-5.1.4/src/lstring.o lua-5.1.4/src/lstrlib.o \ - lua-5.1.4/src/ltable.o lua-5.1.4/src/ltablib.o lua-5.1.4/src/ltm.o \ - lua-5.1.4/src/lundump.o lua-5.1.4/src/lvm.o \ - lua-5.1.4/src/lzio.o lua-5.1.4/src/print.o +LIBLUA_OBJ0 = @LIBLUA_OBJ0@ LIBLUA_OBJ = $(LIBLUA_OBJ0) diff --git a/source3/configure.in b/source3/configure.in index d8ca0a7..97d1a8b 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -4775,10 +4775,50 @@ then AC_SUBST(TDBTORTURE) fi + +AC_ARG_ENABLE(external_liblua, + [AS_HELP_STRING([--enable-external-liblua], + [Enable external lua [default=auto]])], + [ enable_external_liblua=$enableval ], + [ enable_external_liblua=auto ]) + +if test x$enable_external_liblua != xno +then + PKG_CHECK_MODULES(LIBLUA, lua5.1 = 5.1.4, + [ enable_external_liblua=yes ], + [ + if test x$enable_external_liblua = xyes; then + AC_MSG_ERROR([Unable to find liblua]) + else + enable_external_liblua=no + fi + ]) +fi + +AC_SUBST(LIBLUA_OBJ0) +if test x$enable_external_liblua = xno +then + LINK_LIBLUA=STATIC + SMB_LIBRARY(lua, 0) + LIBLUA_OBJ0=lua-5.1.4/src/lapi.o lua-5.1.4/src/lauxlib.o \ + lua-5.1.4/src/lbaselib.o lua-5.1.4/src/lcode.o \ + lua-5.1.4/src/ldblib.o lua-5.1.4/src/ldebug.o lua-5.1.4/src/ldo.o \ + lua-5.1.4/src/ldump.o lua-5.1.4/src/lfunc.o lua-5.1.4/src/lgc.o \ + lua-5.1.4/src/linit.o lua-5.1.4/src/liolib.o lua-5.1.4/src/llex.o \ + lua-5.1.4/src/lmathlib.o lua-5.1.4/src/lmem.o \ + lua-5.1.4/src/loadlib.o lua-5.1.4/src/lobject.o \ + lua-5.1.4/src/lopcodes.o lua-5.1.4/src/loslib.o \ + lua-5.1.4/src/lparser.o lua-5.1.4/src/lstate.o \ + lua-5.1.4/src/lstring.o lua-5.1.4/src/lstrlib.o \ + lua-5.1.4/src/ltable.o lua-5.1.4/src/ltablib.o lua-5.1.4/src/ltm.o \ + lua-5.1.4/src/lundump.o lua-5.1.4/src/lvm.o \ + lua-5.1.4/src/lzio.o lua-5.1.4/src/print.o + AC_SUBST(LIBLUA_OBJ0) +fi + SMB_LIBRARY(netapi, 0) SMB_LIBRARY(smbclient, 0) SMB_LIBRARY(smbsharemodes, 0) -SMB_LIBRARY(lua, 0) SMB_LIBRARY(addns, 0, no, [undefined API]) -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-121-g0b2b9fd
The branch, master has been updated via 0b2b9fdeda0f7933df29a73ab7d6c511d5fd1c87 (commit) from 69af9eacb9214106b7448c59eb13a8bf0b832c91 (commit) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 0b2b9fdeda0f7933df29a73ab7d6c511d5fd1c87 Author: Günther Deschner g...@samba.org Date: Mon Jun 29 23:42:58 2009 +0200 s4-smbtorture: use torture_comment torture_warning in RPC samr tests. Guenther --- Summary of changes: source4/torture/rpc/samr.c | 411 ++-- 1 files changed, 206 insertions(+), 205 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c index 11f7b3e..f8853c1 100644 --- a/source4/torture/rpc/samr.c +++ b/source4/torture/rpc/samr.c @@ -633,7 +633,7 @@ static bool test_SetUserPass(struct dcerpc_pipe *p, struct torture_context *tctx status = dcerpc_fetch_session_key(p, session_key); if (!NT_STATUS_IS_OK(status)) { - printf(SetUserInfo level %u - no session key - %s\n, + torture_warning(tctx, SetUserInfo level %u - no session key - %s\n, s.in.level, nt_errstr(status)); return false; } @@ -644,7 +644,7 @@ static bool test_SetUserPass(struct dcerpc_pipe *p, struct torture_context *tctx status = dcerpc_samr_SetUserInfo(p, tctx, s); if (!NT_STATUS_IS_OK(status)) { - printf(SetUserInfo level %u failed - %s\n, + torture_warning(tctx, SetUserInfo level %u failed - %s\n, s.in.level, nt_errstr(status)); ret = false; } else { @@ -689,7 +689,7 @@ static bool test_SetUserPass_23(struct dcerpc_pipe *p, struct torture_context *t status = dcerpc_fetch_session_key(p, session_key); if (!NT_STATUS_IS_OK(status)) { - printf(SetUserInfo level %u - no session key - %s\n, + torture_warning(tctx, SetUserInfo level %u - no session key - %s\n, s.in.level, nt_errstr(status)); return false; } @@ -700,7 +700,7 @@ static bool test_SetUserPass_23(struct dcerpc_pipe *p, struct torture_context *t status = dcerpc_samr_SetUserInfo(p, tctx, s); if (!NT_STATUS_IS_OK(status)) { - printf(SetUserInfo level %u failed - %s\n, + torture_warning(tctx, SetUserInfo level %u failed - %s\n, s.in.level, nt_errstr(status)); ret = false; } else { @@ -711,7 +711,7 @@ static bool test_SetUserPass_23(struct dcerpc_pipe *p, struct torture_context *t status = dcerpc_fetch_session_key(p, session_key); if (!NT_STATUS_IS_OK(status)) { - printf(SetUserInfo level %u - no session key - %s\n, + torture_warning(tctx, SetUserInfo level %u - no session key - %s\n, s.in.level, nt_errstr(status)); return false; } @@ -724,7 +724,7 @@ static bool test_SetUserPass_23(struct dcerpc_pipe *p, struct torture_context *t status = dcerpc_samr_SetUserInfo(p, tctx, s); if (!NT_STATUS_EQUAL(status, NT_STATUS_WRONG_PASSWORD)) { - printf(SetUserInfo level %u should have failed with WRONG_PASSWORD- %s\n, + torture_warning(tctx, SetUserInfo level %u should have failed with WRONG_PASSWORD- %s\n, s.in.level, nt_errstr(status)); ret = false; } @@ -771,7 +771,7 @@ static bool test_SetUserPassEx(struct dcerpc_pipe *p, struct torture_context *tc status = dcerpc_fetch_session_key(p, session_key); if (!NT_STATUS_IS_OK(status)) { - printf(SetUserInfo level %u - no session key - %s\n, + torture_warning(tctx, SetUserInfo level %u - no session key - %s\n, s.in.level, nt_errstr(status)); return false; } @@ -790,7 +790,7 @@ static bool test_SetUserPassEx(struct dcerpc_pipe *p, struct torture_context *tc status = dcerpc_samr_SetUserInfo(p, tctx, s); if (!NT_STATUS_IS_OK(status)) { - printf(SetUserInfo level %u failed - %s\n, + torture_warning(tctx, SetUserInfo level %u failed - %s\n, s.in.level, nt_errstr(status)); ret = false; } else { @@ -807,7 +807,7 @@ static bool test_SetUserPassEx(struct dcerpc_pipe *p, struct torture_context *tc status = dcerpc_samr_SetUserInfo(p, tctx, s); if (!NT_STATUS_EQUAL(status, NT_STATUS_WRONG_PASSWORD)) { - printf(SetUserInfo level %u should have failed with WRONG_PASSWORD: %s\n, + torture_warning(tctx, SetUserInfo level %u should have failed with WRONG_PASSWORD: %s\n,
[SCM] CTDB repository - branch master updated - ctdb-1.0.85-11-g841a2d9
The branch, master has been updated via 841a2d9635341baa1a6dd9ec558fc7cadb4e3af4 (commit) from 3db8b1d7425ed5bd41e58b43c55fdac517d71baf (commit) http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master - Log - commit 841a2d9635341baa1a6dd9ec558fc7cadb4e3af4 Author: Ronnie Sahlberg ronniesahlb...@gmail.com Date: Tue Jun 30 09:09:06 2009 +1000 New version 1.0.86 --- Summary of changes: packaging/RPM/ctdb.spec | 11 ++- 1 files changed, 10 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/packaging/RPM/ctdb.spec b/packaging/RPM/ctdb.spec index 3bcd87e..b5d8554 100644 --- a/packaging/RPM/ctdb.spec +++ b/packaging/RPM/ctdb.spec @@ -4,7 +4,7 @@ Summary: Clustered TDB Vendor: Samba Team Packager: Samba Team sa...@samba.org Name: ctdb -Version: 1.0.85 +Version: 1.0.86 Release: 1 Epoch: 0 License: GNU GPL version 3 @@ -131,6 +131,15 @@ fi %{_libdir}/pkgconfig/ctdb.pc %changelog +* Tue Jun 30 2009 : Version 1.0.86 + - Do not access the reclock at all if VerifyRecoveryLock is zero, not even try to probe it. + - Allow setting the reclock file as , which means that no reclock file at all should be used. + - Document that a reclock file is no longer required, but that it is dangerous. + - Add a control that can be used to set/clear/change the reclock file in the daemon during runtime. + - Update the recovery daemon to poll whether a reclock file should be sued and if so which file at runtime in each monitoring cycle. + - Automatically disable VerifyRecoveryLock everytime a user changes the location of the reclock file. + - do not allow the VerifyRecoveryLock to be set using ctdb setvar if there is no recovery lock file specified. + - Add two commands ctdb getreclock and ctdb setreclock to modify the reclock file. * Tue Jun 23 2009 : Version 1.0.85 - From William Jojo : Dont use getopt on AIX - Make it possible to use ctdb listnodes also when the daemon is not running -- CTDB repository
Build status as of Tue Jun 30 00:00:03 2009
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2009-06-29 00:00:30.0 + +++ /home/build/master/cache/broken_results.txt 2009-06-30 00:00:38.0 + @@ -1,22 +1,22 @@ -Build status as of Mon Jun 29 00:00:02 2009 +Build status as of Tue Jun 30 00:00:03 2009 Build counts: Tree Total Broken Panic build_farm 0 0 0 -ccache 23 3 0 +ccache 28 6 0 distcc 0 0 0 -ldb 23 23 0 -libreplace 23 8 0 +ldb 28 28 0 +libreplace 28 9 0 lorikeet 0 0 0 -pidl 17 2 0 -ppp 10 0 0 -rsync22 8 0 +pidl 19 2 0 +ppp 12 0 0 +rsync28 10 0 samba-docs 0 0 0 samba-web0 0 0 -samba_3_current 21 13 0 -samba_3_master 22 17 1 -samba_3_next 22 20 0 -samba_4_0_test 23 20 1 -talloc 22 23 0 -tdb 21 19 0 +samba_3_current 26 17 0 +samba_3_master 27 21 3 +samba_3_next 26 24 1 +samba_4_0_test 28 24 2 +talloc 28 28 0 +tdb 26 22 0
[SCM] CTDB repository - branch master updated - ctdb-1.0.85-19-g5cdc046
The branch, master has been updated via 5cdc04669db8c2ddbbff5af82307a16e8d807b83 (commit) via cb8dd896914d4e44ad7b8bb000176a7c78f394ae (commit) via c17dafc79bec25bbb796478c33f503503d382a20 (commit) via 75dea671f68ac6649095357c36b3697a927721e9 (commit) via 65b94d280731df3245b26d69f39acfaf5bccf0d8 (commit) via 9a2c4c3ed09ac9ea781d06999d11e5c3b5b4a97a (commit) via 945f04f06a425fd3940a2e4b832c63223a3f26b3 (commit) via a73f316cb9cec877dc0bc3f7baa21be1b1454273 (commit) from 841a2d9635341baa1a6dd9ec558fc7cadb4e3af4 (commit) http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master - Log - commit 5cdc04669db8c2ddbbff5af82307a16e8d807b83 Author: Ronnie Sahlberg ronniesahlb...@gmail.com Date: Tue Jun 30 12:17:05 2009 +1000 dont try sending a keepalive if the transport is down commit cb8dd896914d4e44ad7b8bb000176a7c78f394ae Author: Ronnie Sahlberg ronniesahlb...@gmail.com Date: Tue Jun 30 12:16:13 2009 +1000 Dont even try allocating and sending a CALL packet if the transport is down commit c17dafc79bec25bbb796478c33f503503d382a20 Author: Ronnie Sahlberg ronniesahlb...@gmail.com Date: Tue Jun 30 12:14:58 2009 +1000 failing a dmaster send due to the transport being down is fatal commit 75dea671f68ac6649095357c36b3697a927721e9 Author: Ronnie Sahlberg ronniesahlb...@gmail.com Date: Tue Jun 30 12:13:15 2009 +1000 if we fail a dmaster migration due to the transport being down, then that is a fatal condition. commit 65b94d280731df3245b26d69f39acfaf5bccf0d8 Author: Ronnie Sahlberg ronniesahlb...@gmail.com Date: Tue Jun 30 12:10:27 2009 +1000 dont try to send error packets if the transport is down commit 9a2c4c3ed09ac9ea781d06999d11e5c3b5b4a97a Author: Ronnie Sahlberg ronniesahlb...@gmail.com Date: Tue Jun 30 12:09:28 2009 +1000 dont even try to send a message from the main daemon if the transport is down commit 945f04f06a425fd3940a2e4b832c63223a3f26b3 Author: Ronnie Sahlberg ronniesahlb...@gmail.com Date: Tue Jun 30 12:03:12 2009 +1000 Dont try to allocate and send packets if the transport is down commit a73f316cb9cec877dc0bc3f7baa21be1b1454273 Author: Ronnie Sahlberg ronniesahlb...@gmail.com Date: Tue Jun 30 11:55:42 2009 +1000 dont even try to allocate a packet if the transport is down since it will fail --- Summary of changes: server/ctdb_call.c| 33 - server/ctdb_control.c |5 + server/ctdb_daemon.c |5 + 3 files changed, 42 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/server/ctdb_call.c b/server/ctdb_call.c index ca6fba7..b666a9e 100644 --- a/server/ctdb_call.c +++ b/server/ctdb_call.c @@ -69,6 +69,11 @@ static void ctdb_send_error(struct ctdb_context *ctdb, char *msg; int msglen, len; + if (ctdb-methods == NULL) { + DEBUG(DEBUG_ERR,(__location__ Failed to send error. Transport is DOWN\n)); + return; + } + va_start(ap, fmt); msg = talloc_vasprintf(ctdb, fmt, ap); if (msg == NULL) { @@ -141,7 +146,12 @@ static void ctdb_send_dmaster_reply(struct ctdb_db_context *ctdb_db, header-dmaster = new_dmaster; ret = ctdb_ltdb_store(ctdb_db, key, header, data); if (ret != 0) { - ctdb_fatal(ctdb, ctdb_req_dmaster unable to update dmaster); + ctdb_fatal(ctdb, ctdb_send_dmaster_reply unable to update dmaster); + return; + } + + if (ctdb-methods == NULL) { + ctdb_fatal(ctdb, ctdb_send_dmaster_reply cant update dmaster sicne transport is down); return; } @@ -186,6 +196,11 @@ static void ctdb_call_send_dmaster(struct ctdb_db_context *ctdb_db, int len; uint32_t lmaster = ctdb_lmaster(ctdb, key); + if (ctdb-methods == NULL) { + ctdb_fatal(ctdb, Failed ctdb_call_send_dmaster since transport is down); + return; + } + if (lmaster == ctdb-pnn) { ctdb_send_dmaster_reply(ctdb_db, header, *key, *data, c-hdr.srcnode, c-hdr.reqid); @@ -367,6 +382,12 @@ void ctdb_request_call(struct ctdb_context *ctdb, struct ctdb_req_header *hdr) struct ctdb_call *call; struct ctdb_db_context *ctdb_db; + if (ctdb-methods == NULL) { + DEBUG(DEBUG_ERR,(__location__ Failed ctdb_request_call. Transport is DOWN\n)); + return; + } + + ctdb_db = find_ctdb_db(ctdb, c-db_id); if (!ctdb_db) { ctdb_send_error(ctdb, hdr, -1, @@ -663,6 +684,11 @@ struct ctdb_call_state *ctdb_daemon_call_send_remote(struct ctdb_db_context *ctd struct ctdb_call_state *state; struct ctdb_context