Jeremy Allison [Thu, 8 Sep 2011 21:10:16 +0000 (14:10 -0700)]
Second part of fix for bug #8443 - Default user entry is set to minimal permissions on incoming ACL change with no user specified.
Be smarter about setting default permissions when a ACL_USER_OBJ isn't given. Use the principle of least surprises for the user.
(cherry picked from commit
abf0629535a8082229810c6905c356b20c482be9)
Jeremy Allison [Thu, 8 Sep 2011 20:56:06 +0000 (13:56 -0700)]
First part of fix for bug #8443 - Default user entry is set to minimal permissions on incoming ACL change with no user specified.
create_default_mode() is not needed - it's taken care of by code
inside ensure_canon_entry_valid().
(cherry picked from commit
0dba9c975a8bfa9e6441c3a4726e1e68cbf364ca)
Jeremy Allison [Fri, 2 Sep 2011 22:08:42 +0000 (15:08 -0700)]
Part 3 of bugfix for bug #7509 - smb_acl_to_posix: ACL is invalid for set (Invalid argument)
Don't call check_owning_objs() to convert ACL_USER->ACL_USER_OBJ and
AC_GROUP->ACL_GROUP_OBJ for default (directory) ACLs, we do this separately
inside ensure_canon_entry_valid().
(cherry picked from commit
06fd08dea1dde4b86546a8f87574d68dcac0e840)
Jeremy Allison [Fri, 2 Sep 2011 22:07:48 +0000 (15:07 -0700)]
Part 2 of bugfix for bug #7509 - smb_acl_to_posix: ACL is invalid for set (Invalid argument)
Only map CREATOR_OWNER/CREATOR_GROUP to ACL_USER_OBJ/ACL_GROUP_OBJ in
a default(directory) ACL set.
(cherry picked from commit
36f60cef6d6ac5625a88a73ce53bdb2b0fe0f000)
Jeremy Allison [Fri, 2 Sep 2011 21:59:31 +0000 (14:59 -0700)]
Part 1 of bugfix for bug #7509 - smb_acl_to_posix: ACL is invalid for set (Invalid argument)
Remove the code I added for bug "6878 - Cannot change ACL's inherit flag". It is incorrect
and causes the POSIX ACL ACL_USER_OBJ duplication.
(cherry picked from commit
cd5d9a5c8fb0660835d60479fb783e4f7cae743f)
Jeremy Allison [Fri, 7 Oct 2011 15:56:59 +0000 (08:56 -0700)]
Fix bug #8458 - IE9 on Windows 7 cannot download files to samba 3.5.11 share
Handle the SECINFO_LABEL flag in the same way as Win2k3.
(cherry picked from commit
4b26ffd1ea430b2cc612884c8ba194498a64932b)
Jeremy Allison [Fri, 30 Sep 2011 20:35:59 +0000 (13:35 -0700)]
Fix bug #8493 - DFS breaks zip file extracting unless "follow symlinks = no" set
If a client sends a mangled name as part of a DFS path, use the
post-mangled name for the pathname walk, not the mangled name.
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Sat Oct 1 00:45:59 CEST 2011 on sn-devel-104
(cherry picked from commit
149875f887287dbbf016d2252962b023b0bae967)
(cherry picked from commit
1ed1b19b2eeda3217d03d66d4220abd871b03cb4)
Karolin Seeger [Wed, 28 Sep 2011 18:17:42 +0000 (20:17 +0200)]
s3-docs: Remove "experimental" label on VFS ACL modules
in the documentation also (bug #8494).
Karolin
(cherry picked from commit
bd5d9d9fba23ea585b701c41ec27482a0076729e)
(cherry picked from commit
4c060730723dcf4a2d6e2833361fa4737bc9a29b)
Jeremy Allison [Fri, 20 May 2011 21:43:50 +0000 (14:43 -0700)]
Patch for bug #8156 - net ads join fails to use the user's kerberos ticket.
If kerberos_get_realm_from_hostname() or kerberos_get_default_realm_from_ccache() fails due to
a misconfigured krb5.conf, try the "realm =" from smb.conf as a fallcback before going back to
NTLMSSP (which we'll do anyway).
(cherry picked from commit
ccab9efb653cfacdd357986f7a8a85c17df7abbb)
(cherry picked from commit
f16e4cc11fd4f195da7c4f0de13d0bb23e5b79d1)
Pierre Carrier [Tue, 14 Sep 2010 23:43:39 +0000 (16:43 -0700)]
Allows changing the maximum number of simultaneous clients in winbindd through an smb.conf option.
Signed-off-by: Jeremy Allison <jra@samba.org>
Fix bug #8186 (Allows changing the maximum number of simultaneous clients in
winbindd through an smb.conf option).
(cherry picked from commit
b6f691ede0a80aaf7226b6862120b5052e63668d)
Günther Deschner [Wed, 28 Sep 2011 16:12:49 +0000 (18:12 +0200)]
s3-winbind: Fix bug 7888 -- deal with buggy 3.0 based PDCs.
Guenther
(cherry picked from commit
d7f0de06c119abad609f87121a8a4fb533e82747)
Günther Deschner [Thu, 4 Aug 2011 15:28:05 +0000 (17:28 +0200)]
s3-nmbd: fix memleak in create_listen_fdset().
Guenther
The last 2 patches address bug #8491 (fix some coverity issues).
(cherry picked from commit
702443500268ceb4dd3e0d3a1a130bca465be266)
Stefan Metzmacher [Wed, 1 Dec 2010 23:40:01 +0000 (00:40 +0100)]
libcli/auth: let spnego_write_mech_types() check the asn1_load() return
metze
Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Tue Dec 7 18:23:41 CET 2010 on sn-devel-104
(cherry picked from commit
363b81899401f01de11ddbd8036b55a472806b38)
David Disseldorp [Wed, 28 Sep 2011 00:46:29 +0000 (17:46 -0700)]
Fix bug 8480 - acl_xattr can free an invalid pointer if no blob is loaded.
(cherry picked from commit
62b9ad45e27bb6a2af22aa9ee133ed6075abc62b)
Günther Deschner [Wed, 21 Sep 2011 15:47:27 +0000 (17:47 +0200)]
s3-netapi: allow to use default krb5 credential cache for libnetapi users.
Guenther
(cherry picked from commit
52e5c8002f1ccd417eaf56f0c1c9abb9d13bb7d6)
Günther Deschner [Wed, 21 Sep 2011 15:28:58 +0000 (17:28 +0200)]
s3-libnet: allow to use default krb5 ccache in libnet_Join/libnet_Unjoin.
We force using a MEMORY ccache though in the wkssvc server.
Guenther
(cherry picked from commit
01f30f5c3e690956f1bd85006c88b6d79e63a1c7)
Volker Lendecke [Mon, 6 Dec 2010 20:01:35 +0000 (21:01 +0100)]
s3: Fix bug 7844: Race in winbind
If a child dies, the parent process right away closes the socket.
This is wrong, with tevent we still have events pending. This works
fine for epoll but does not for at least the FreeBSD select variant.
Tevent sticks a closed socket into the select masks. This then
returns an error EBADF. When this happens, the parent winbind dies
instead of forking a new child.
This moves the socket close from the SIGCHLD cleanup function to
the socket receiver. I could not reproduce the parent death anymore
and it did not create an obvious fd leak.
(cherry picked from commit
da08c8ac7cf9e2833c39e7ef39caafa4ab34424d)
Stefan Metzmacher [Mon, 12 Sep 2011 19:10:54 +0000 (12:10 -0700)]
s3:libsmb: check the wct of the incoming SMBnegprot responses
metze
Fix bug #8452 (negprot reply needs to check vwv vector length).
The corresponding commit in master is
85332eb1c721d585e1a33101bddafdca4073e10f.
(cherry picked from commit
c5bf8ac4ee60fe808a2593a5ece12e8bfad5695b)
Volker Lendecke [Thu, 25 Aug 2011 18:13:09 +0000 (20:13 +0200)]
v3-5-test: Fix getent group if trusted domains are not reachable
Fix bug #8420 (wb_group_members: non-resistance against garbage).
(cherry picked from commit
126d343580e7ba6465cfdf60ea60958cbe98b242)
Jeremy Allison [Mon, 29 Aug 2011 23:53:04 +0000 (16:53 -0700)]
Fix bug Bug 8422 - Infinite loop in ACL module code.
Missing assignment means this loop will never terminate. Need to be applied
to 3.5.x and 3.6.1.
(cherry picked from commit
4db250449dda30e3ffa05c8918e0cf39cbacc5d8)
Jeremy Allison [Sat, 20 Aug 2011 18:49:59 +0000 (20:49 +0200)]
s3-vfs: Fix vfs_chown_fsp.
Fix bug #8370 (vfs_chown_fsp broken -- returns in the wrong directory).
(cherry picked from commit
0b1ce3f177b75e146fdae0b5531c54dedffada1d)
Volker Lendecke [Thu, 11 Aug 2011 14:52:22 +0000 (16:52 +0200)]
s3: Fix bug 8360
OS/2 sends an unexpected write&x/read&x chain
(cherry picked from commit
2aca833308049d005c647aabcd9d894f59698ef4)
(cherry picked from commit
b42573acbf7eee1580eaceb1b9c57ddbbe3a2532)
Volker Lendecke [Fri, 29 Jul 2011 22:43:46 +0000 (15:43 -0700)]
s3: Add a fallback for missing open&x support in OS/X Lion
The last 4 patches address bug #8338 (MAC Lion - smbclient "Open AndX
Request->STATUS_NOT_SUPPORTED).
(cherry picked from commit
8e9dfd04fac5353fb12270647209ac45d19a1ad2)
Volker Lendecke [Fri, 29 Jul 2011 22:03:03 +0000 (15:03 -0700)]
s3: Make map_open_params_to_ntcreate() available in lib/
(cherry picked from commit
aa0c6eb76a6e16652a2ef46560eaffb881792cf6)
Volker Lendecke [Fri, 29 Jul 2011 21:41:10 +0000 (14:41 -0700)]
s3: Make is_executable() available in lib/
(cherry picked from commit
612361bdcaf4256eb54913423e127d0628b35356)
Volker Lendecke [Fri, 29 Jul 2011 21:26:58 +0000 (14:26 -0700)]
s3: We only need base_name in map_open_params_to_ntcreate
(cherry picked from commit
1fa4b369d2fabbf34cda576d91d8aa9baa4e8b68)
Björn Jacke [Thu, 4 Aug 2011 14:25:08 +0000 (16:25 +0200)]
s3/swat: use strlcat instead of strncat to fix build on old Linux distros
SLES 9's glibc for example had weird macros where the use of strncat resulted
in the use of strcat which we don't allow.
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User: Björn Jacke <bj@sernet.de>
Autobuild-Date: Thu Aug 4 17:50:24 CEST 2011 on sn-devel-104
(cherry picked from commit
d3b4d75364210e2d2a4a1cd806f28b0021f22909)
Fix bug #8362 (build issue on old glibc systems).
(cherry picked from commit
87fa72a5202fe3780d4a61289bf755027cd078f4)
(cherry picked from commit
552ccc6588b0744ae9b3731b1406749baea03d5a)
Stefan Metzmacher [Fri, 5 Aug 2011 17:48:38 +0000 (19:48 +0200)]
s3:web/swat: use strtoll() instead of atoi/atol/atoll
This is more portable, as we have a strtoll replacement
in lib/replace.
metze
Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Sat Aug 6 11:55:45 CEST 2011 on sn-devel-104
(cherry picked from commit
a6be0820d09b3f3eabfbb5f4356add303aa8a494)
Fix bug #8347 (CVE-2011-2522 regression for HP-UX, AIX and OSF).
(cherry picked from commit
34b8765d894f13490fab734ee91bd53e235d10e6)
Karolin Seeger [Sun, 7 Aug 2011 18:50:50 +0000 (20:50 +0200)]
WHATSNEW: Fix typo.
Karolin
(cherry picked from commit
921e87af9c531e1cf88cd207ffee16320dd9a81d)
Karolin Seeger [Thu, 4 Aug 2011 19:40:47 +0000 (21:40 +0200)]
WHATSNEW: Remove wrong entry.
This one was added by accident, sorry!
Karolin
(cherry picked from commit
f5233d9179d1c8817f2f227f7fc7fad54d78bc73)
Karolin Seeger [Thu, 4 Aug 2011 19:38:26 +0000 (21:38 +0200)]
WHATSNEW: Start release notes for 3.5.12.
Karolin
(cherry picked from commit
b9c7ca1abbbd5017a2b143e2ae91fa82ff598475)
Karolin Seeger [Thu, 4 Aug 2011 19:35:51 +0000 (21:35 +0200)]
VERSION: Bump version up to 3.5.12.
Karolin
(cherry picked from commit
be1ba3365ad5369b4a72c4343e9237d7d69b1992)
Karolin Seeger [Wed, 3 Aug 2011 18:20:58 +0000 (20:20 +0200)]
WHATSNEW: Add changes since 3.5.10.
Karolin
(cherry picked from commit
529bfe1d43fc8f6c7a1ef93d437f40cd89b1ab63)
Jeremy Allison [Tue, 2 Aug 2011 18:49:46 +0000 (20:49 +0200)]
Fix bug 7462 - Non-standard SA_RESETHAND is used in ...lib/tevent/tevent_sig
Make SA_RESETHAND conditional on its existance.
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Mon Aug 1 22:03:45 CEST 2011 on sn-devel-104
(cherry picked from commit
0c67efdd68b9808542c090b9fd9920e4e37d85d0)
(cherry picked from commit
490986add9d5e80b24e90dbfe3e3ef23ce5584a0)
Volker Lendecke [Mon, 10 May 2010 09:53:03 +0000 (11:53 +0200)]
s3: Test for "__attribute__((destructor))"
(cherry picked from commit
36e736871e28665ffcbbc4d0c87e1a2b60fcf0e0)
Fix bug #8322 (HAVE_FUNCTION_ATTRIBUTE_DESTRUCTOR is missing from 3.5.x).
(cherry picked from commit
c69ab4252d9aea274f44f96b1e3f41ca57185987)
Stefan Metzmacher [Mon, 4 Jul 2011 09:47:24 +0000 (11:47 +0200)]
s3:librpc/gen_ndr: regen after wbint.idl changes
metze
Part of a fix for bug #7841 (WINBINDD_LOOKUPRIDS asks the wrong domain).
(cherry picked from commit
12a4b5633d5c3488f48f3e7a5084402f6eeeb9c5)
Stefan Metzmacher [Thu, 30 Jun 2011 08:09:56 +0000 (10:09 +0200)]
s3:nmbd_subnetdb: close all sockets attached to a subnet in close_subnet() (bug #8276)
metze
(cherry picked from commit
75e9f2110876137a57632d223248ac51dbfc4569)
(cherry picked from commit
48355dae98885ca0d44dbf4206a0bdf16c64fced)
Stefan Metzmacher [Thu, 30 Jun 2011 07:56:06 +0000 (09:56 +0200)]
s3:nmbd_packets: make sure create_listen_fdset() returns initialized data (bug #8276)
Fix bug #7949 (DoS in Winbind and smbd with many file descriptors open)
(commit
feb3fcd0fa4bda0967b881315595d7702f4d1752) changed the bahavior,
so that we skipped some sockets.
This should work for v3-5-test.
metze
(cherry picked from commit
9d5738f779b803fb257537d6308a5f34625cb1b0)
Gregor Beck [Tue, 21 Jun 2011 06:16:56 +0000 (08:16 +0200)]
s3:smbldap: make smbldap_connect_system self contained
The last 5 patches address bug #8253 (winbindd panics if verify_idpool() fails).
(cherry picked from commit
1da14b93bc664948699f62cca2fc777c6f7523c9)
Gregor Beck [Tue, 21 Jun 2011 06:06:28 +0000 (08:06 +0200)]
s3:smbldap: add a destructor to smbldap_state, just in case
(cherry picked from commit
6a3869da05b0d0e4d47db2502489de359d5e7e45)
Gregor Beck [Tue, 21 Jun 2011 06:02:53 +0000 (08:02 +0200)]
s3:smbldap: let smbldap_free_struct do what it claims to
(cherry picked from commit
df03f6c2c98f65bf9656d27e1cc9dc72cd587e31)
Gregor Beck [Tue, 21 Jun 2011 06:00:59 +0000 (08:00 +0200)]
s3:smbldap: free the idle event scheduled in smbldap_open in smbldap_close
(cherry picked from commit
70856a728a0be1c97e9e13382cd2d880450e07c4)
Gregor Beck [Tue, 21 Jun 2011 05:51:41 +0000 (07:51 +0200)]
s3:smbldap: use smbldap_state as memory context for idle event
ensure the event is canceled if the smbldap_state gets freed
this fixes a panic of winbindd if verify_idpool fails
(cherry picked from commit
3d78bea9ac27c3f6c98561e287add632a17ce747)
Volker Lendecke [Mon, 27 Jun 2011 12:34:39 +0000 (14:34 +0200)]
s3: explicitly pass domain_sid to wbint_LookupRids() (bug #7841)
(cherry picked from commit
1a8155d347e2a8de3432ce0fe99d598c25c2bafb)
Jeremy Allison [Thu, 23 Jun 2011 21:42:27 +0000 (14:42 -0700)]
Fix bug #8254 - "acl check permissions = no" does not work in all cases
Move lp_acl_check_permissions() into can_delete_file_in_directory()
where it makes sense. Remove ACL check when requesting DELETE_ACCESS
when lp_acl_check_permissions is false.
Thanks to John Janosik @ IBM for noticing this.
(cherry picked from commit
83357ecf6adafe3d23ada705e79c3af25ad4e734)
David Disseldorp [Wed, 16 Feb 2011 16:23:25 +0000 (17:23 +0100)]
s3: increase the log level for missing PIDs on SIGCHLD
Since the fix for bso#7836, the parent smbd is responsible for
maintaining an up-to-date printcap cache. It does this by forking a
child process to asynchronously fetch printcap data from CUPS.
When the child process exits after fetching all printcap data, the
parent smbd is sent SIGCHLD. This triggers smbd_sig_chld_handler() which
looks for the exited process PID on a "children" list.
Child smbd process PIDs are added to the "children" list to ensure
cleanup on unclean shutdown and log level change notification messages.
Printcap update process PIDs are not added to the list as they do not
maintain any state that requires cleanup, nor do they wait on tevent for
messages.
Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Thu Feb 17 11:11:45 CET 2011 on sn-devel-104
(cherry picked from commit
9c12232f1ae36e00d04114ad73edd8ba3c2c6a5c)
Fix bug #8269 (smbd spams log with "Could not find child X -- ignoring"
messages).
(cherry picked from commit
ba118ac287d49267dd2f346d4ddd2e590ebbe653)
Karolin Seeger [Fri, 24 Jun 2011 19:16:17 +0000 (21:16 +0200)]
WHATSNEW: Formatting.
Karolin
(cherry picked from commit
efd437efea9096837f3f45b47daff3e147cddea8)
Andrew Bartlett [Tue, 14 Jun 2011 12:04:11 +0000 (22:04 +1000)]
s3-WHATSNEW 3.5.9 Add information on kerberos change
(cherry picked from commit
eb7c10ea16ff7db34d8ab71306c7d5d298df8d40)
Volker Lendecke [Thu, 16 Jun 2011 20:20:49 +0000 (22:20 +0200)]
s3: Fix bug 8238 -- KB2536276 prevents access to shares
Without this we were not sending the workgroup name in the negprot reply if
plain text passwords are used.
(cherry picked from commit
d42bf679b0807ebc47f43c62d4b883e0b5096abb)
Michael Adam [Tue, 5 Apr 2011 21:07:01 +0000 (23:07 +0200)]
docs: fix the missing parameter description section in the smb.conf manpage
The smb.conf (5) manpage recently sometimes failed to contain the
contents of the description of each parameter section. The reason
was a unreliable chain of dependencies in the Makefile.
The error can be reproduced by touching manpages-3/smb.conf.5.xml
and then building the manpages.
Then smb.conf.5.xml is newer than any of the smbdotconf/*/*.xml
files and hence the intermediate inexistent parameters.*.xml
don't get generated.
This patch fixes this problem by introducing a phony "parameters"
target referencing the parameters.*.xml targets, so that they
get build unconditionally.
Fix bug #7997 (smb.conf.5 manpage truncated in 3.5.8).
(cherry picked from commit
08e64ab50b9202ccbc6c0b397f9ac8cc467c2254)
Björn Jacke [Sun, 30 May 2010 19:52:39 +0000 (21:52 +0200)]
libreplace: include sys/file.h only when available
thanks to Joachim Schmitz <schmitz@hp.com>. This fixes #7460.
(cherry picked from commit
a33b6032beb45f7ba07432899236fccb133a6dfc)
Andrew Bartlett [Tue, 14 Jun 2011 12:16:02 +0000 (22:16 +1000)]
s3-docs Add documentation for 'client use spnego principal'
(cherry picked from commit
4829da5bd4989b7e4b7e858af1770f13d9d2e647)
Karolin Seeger [Tue, 26 Jul 2011 18:39:28 +0000 (20:39 +0200)]
WHATSNEW: Start release notes for 3.5.11.
Karolin
Karolin Seeger [Tue, 26 Jul 2011 18:36:37 +0000 (20:36 +0200)]
VERSION: Bump version up to 3.5.11.
Karolin
Karolin Seeger [Sun, 24 Jul 2011 19:09:38 +0000 (21:09 +0200)]
s3-swat: Fix typo.
Thanks to Simo for reporting!
Karolin
Kai Blin [Tue, 12 Jul 2011 06:08:24 +0000 (08:08 +0200)]
s3 swat: Create random nonce in CGI mode
In CGI mode, we don't get access to the user's password, which would
reduce the hash used so far to parameters an attacker can easily guess.
To work around this, read the nonce from secrets.tdb or generate one if
it's not there.
Also populate the C_user field so we can use that for token creation.
Signed-off-by: Kai Blin <kai@samba.org>
The last 12 patches address bug #8290 (CSRF vulnerability in SWAT).
This addresses CVE-2011-2522 (Cross-Site Request Forgery in SWAT).
Kai Blin [Sat, 9 Jul 2011 07:52:07 +0000 (09:52 +0200)]
s3 swat: Add time component to XSRF token
Signed-off-by: Kai Blin <kai@samba.org>
Kai Blin [Fri, 8 Jul 2011 13:06:13 +0000 (15:06 +0200)]
s3 swat: Add XSRF protection to printer page
Signed-off-by: Kai Blin <kai@samba.org>
Kai Blin [Fri, 8 Jul 2011 13:05:38 +0000 (15:05 +0200)]
s3 swat: Add XSRF protection to password page
Signed-off-by: Kai Blin <kai@samba.org>
Kai Blin [Fri, 8 Jul 2011 13:04:48 +0000 (15:04 +0200)]
s3 swat: Add XSRF protection to shares page
Signed-off-by: Kai Blin <kai@samba.org>
Kai Blin [Fri, 8 Jul 2011 13:04:12 +0000 (15:04 +0200)]
s3 swat: Add XSRF protection to globals page
Signed-off-by: Kai Blin <kai@samba.org>
Kai Blin [Fri, 8 Jul 2011 13:03:44 +0000 (15:03 +0200)]
s3 swat: Add XSRF protection to wizard page
Signed-off-by: Kai Blin <kai@samba.org>
Kai Blin [Fri, 8 Jul 2011 13:03:15 +0000 (15:03 +0200)]
s3 swat: Add XSRF protection to wizard_params page
Signed-off-by: Kai Blin <kai@samba.org>
Kai Blin [Fri, 8 Jul 2011 13:02:53 +0000 (15:02 +0200)]
s3 swat: Add XSRF protection to viewconfig page
Signed-off-by: Kai Blin <kai@samba.org>
Kai Blin [Fri, 8 Jul 2011 10:58:53 +0000 (12:58 +0200)]
s3 swat: Add XSRF protection to status page
Signed-off-by: Kai Blin <kai@samba.org>
Kai Blin [Fri, 8 Jul 2011 10:57:43 +0000 (12:57 +0200)]
s3 swat: Add support for anti-XSRF token
Signed-off-by: Kai Blin <kai@samba.org>
Kai Blin [Fri, 8 Jul 2011 10:56:21 +0000 (12:56 +0200)]
s3 swat: Allow getting the user's HTTP auth password
Signed-off-by: Kai Blin <kai@samba.org>
Kai Blin [Thu, 7 Jul 2011 08:03:33 +0000 (10:03 +0200)]
s3 swat: Fix possible XSS attack (bug #8289)
Nobuhiro Tsuji of NTT DATA SECURITY CORPORATION reported a possible XSS attack
against SWAT, the Samba Web Administration Tool. The attack uses reflection to
insert arbitrary content into the "change password" page.
This patch fixes the reflection issue by not printing user-specified content on
the website anymore.
Signed-off-by: Kai Blin <kai@samba.org>
CVE-2011-2694.
Karolin Seeger [Sun, 24 Jul 2011 20:00:16 +0000 (22:00 +0200)]
WHATSNEW: Update release notes.
Karolin
Karolin Seeger [Tue, 14 Jun 2011 17:11:21 +0000 (19:11 +0200)]
WHATSNEW: Start release notes for 3.5.10.
Karolin
(cherry picked from commit
a32956ad21b70d10a5b2a8516e39cbd35aa09045)
Karolin Seeger [Tue, 14 Jun 2011 17:08:58 +0000 (19:08 +0200)]
VERSION: Bump version up to 3.5.10.
Karolin
(cherry picked from commit
767cf9e13421c00a658dac93ef77353587539344)
Karolin Seeger [Tue, 14 Jun 2011 11:15:37 +0000 (13:15 +0200)]
WHATSNEW: Update changes since 3.5.8.
Karolin
(cherry picked from commit
d1880d237bdf79b036623ebf5ae477838c9482c9)
Jeremy Allison [Tue, 7 Jun 2011 19:36:24 +0000 (12:36 -0700)]
Fix re-opened bug 8083 - "inherit owner = yes" doesn't interact correctly with vfs_acl_xattr or vfs_acl_tdb module.
Fix incorrect interaction when all of
"inherit permissions = yes"
"inherit acls = yes"
"inherit owner = yes"
are set. Found by Björn Jacke. Thanks Björn !
(cherry picked from commit
b5011e4c2cee39d4334c04ce7c8adc43a8ca7e6b)
Jeremy Allison [Wed, 8 Jun 2011 21:37:25 +0000 (14:37 -0700)]
Part 5 of bugfix for #8211 - "inherit owner = yes" doesn't interact correctly with "inherit permissions = yes" and POSIX ACLs
Ensure when creating a directory, if we make any changes due to inheritance parameters, we update the stat returned.
(cherry picked from commit
f5e238cbd97d63e107b64268691dff67cce8fe94)
Jeremy Allison [Wed, 8 Jun 2011 21:21:52 +0000 (14:21 -0700)]
Part 4 of bugfix for #8211 - "inherit owner = yes" doesn't interact correctly with "inherit permissions = yes" and POSIX ACLs
We don't need to check mode bits as well as dev/ino to
ensure we're in the same place.
(cherry picked from commit
0c1b1b73870bd477c83c130cab297b7f2615fe55)
Jeremy Allison [Wed, 8 Jun 2011 17:25:33 +0000 (10:25 -0700)]
Part 3 of bugfix for #8211 - "inherit owner = yes" doesn't interact correctly with "inherit permissions = yes" and POSIX ACLs
When changing ownership on a new file make sure we
must have a valid stat struct before making the inheritance
calls (as they may look at it), and if we make changes we
must have a valid stat struct after them.
(cherry picked from commit
d18d6df840d3a47fa1d7b877e07f804f025811ee)
Jeremy Allison [Wed, 8 Jun 2011 17:17:42 +0000 (10:17 -0700)]
Part 2 of bugfix for #8211 - "inherit owner = yes" doesn't interact correctly with "inherit permissions = yes" and POSIX ACLs
When changing ownership on a new file make sure we
also change the returned stat struct to have the correct uid.
(cherry picked from commit
59e77811b7774ad76e082ee9fd840a277df75c4c)
Jeremy Allison [Wed, 8 Jun 2011 17:24:02 +0000 (10:24 -0700)]
Part 1 of bugfix for #8211 - "inherit owner = yes" doesn't interact correctly with "inherit permissions = yes" and POSIX ACLs
When changing ownership on a new directory make sure we
also change the returned stat struct to have the correct uid.
(cherry picked from commit
f3900b0a96f98cc65d957cda5f92963f636d6ec1)
Stefan Metzmacher [Sun, 24 Apr 2011 19:20:19 +0000 (21:20 +0200)]
s3:lib/access: normalize IPv4 mapped IPv6 addresses in both directions (bug #7383)
metze
(cherry picked from commit
4bfe2d5655d97fbc7e65744425b5a098e77f5ba1)
(cherry picked from commit
62b2083c627abeb8a2fb7e5adc793c630d0d561c)
Signed-off-by: Stefan Metzmacher <metze@samba.org>
(cherry picked from commit
d9ea6a10a8ba84e8a5a5a65c903ed96f9aa59aa5)
Karolin Seeger [Sun, 5 Jun 2011 19:10:53 +0000 (21:10 +0200)]
WHATSNEW: Add more changes since 3.5.8.
Karolin
(cherry picked from commit
7e307ac32ca074e47e27229fcef894343ec0f9c9)
Jim McDonough [Wed, 25 May 2011 14:49:41 +0000 (10:49 -0400)]
s3-winbind: BUG 8166 - Don't lockout users when offline.
Windows does not track bad password attempts when offline. We were locking users out but not honoring the lockout duration.
Autobuild-User: Jim McDonough <jmcd@samba.org>
Autobuild-Date: Wed May 25 18:11:10 CEST 2011 on sn-devel-104
(cherry picked from commit
b58534f1fca27e3e72f4f4107538ec05734bd42a)
(cherry picked from commit
a73963dd49d33bcfdd5cbc310dad0f895683eadf)
Jeremy Allison [Wed, 1 Jun 2011 18:38:48 +0000 (20:38 +0200)]
Fix bug #7528 - Solaris with NIS autohome.
(cherry picked from commit
0ffdf2288b1e6798e43259568818378c43b979e5)
Karolin Seeger [Tue, 31 May 2011 19:27:29 +0000 (21:27 +0200)]
WHATSNEW: Start to add changes since 3.5.8.
To be completed...
Karolin
(cherry picked from commit
ac4aca977ecb5fd1a644aa29c4b70503e906f83a)
Jeremy Allison [Tue, 19 Apr 2011 20:25:43 +0000 (13:25 -0700)]
Fix bug #8083 - "inherit owner = yes" doesn't interact correctly with vfs_acl_xattr or vfs_acl_tdb module.
If "inherit owner = yes", pass in the directory owner and group
owner as the target for CREATOR_OWNER and CREATOR_GROUP substitutions,
and also as the owner and primary group of the new security descriptor
being applied to the object.
Jeremy.
(cherry picked from commit
ea331419108ed8575e33394f989240abeede2671)
Jeremy Allison [Thu, 26 May 2011 23:39:30 +0000 (16:39 -0700)]
Fix bug #6911 - Kerberos authentication from vista to samba fails when security blob size is greater than 16 kB
We were not correctly checking the output of asn1_start_tag().
asn1_start_tag() returns -1 and sets data->has_error if the
remaining blob size is too short to contain the tag length.
We were checking data->has_error and returning NT_STATUS_OK
(to allow the second asn.1 parse to fail in that case). We
should not be checking data->has_error in this case, but
falling through to the code that already checks the length.
Thanks to Jim for reproducing this for me. We don't get bitten
by this as we announce a max buffer size of 16k, greater than
Windows's 4k, which means that most krb5 spnego packets already
fit.
Jeremy.
(cherry picked from commit
c718b7d43bc5616f7f5e110afdf5332a62e04cb8)
Jim McDonough [Thu, 26 May 2011 18:29:24 +0000 (20:29 +0200)]
s3-libnet: fix bug #6364: Pull realm from supplied username on libnet join
(cherry picked from commit
67a9d4bb376d89c4411024164165ca1ed7a0b157)
David Disseldorp [Tue, 24 May 2011 09:50:12 +0000 (11:50 +0200)]
s3-printing: remove duplicate cups response processing code
There is currently a lot of duplicate code included for processing
responses to CUPS_GET_PRINTERS and CUPS_GET_CLASSES requests. This
change splits this code into a separate function.
Signed-off-by: Günther Deschner <gd@samba.org>
(cherry picked from commit
4f0077cd6a8ffcb9f4980d71c9fc434f7fc1051c)
David Disseldorp [Tue, 24 May 2011 09:46:25 +0000 (11:46 +0200)]
s3-printing: use printcap IDL for IPC
Use printcap IDL for marshalling and unmarshalling messages between cups
child and parent smbd processes. This simplifies the IPC and ensures
the parent is notified of cups errors encountered by the child.
https://bugzilla.samba.org/show_bug.cgi?id=7994
Signed-off-by: Günther Deschner <gd@samba.org>
(cherry picked from commit
53ecbc4a8cffe24f94d3e624faf3a9ea9067cc23)
David Disseldorp [Tue, 24 May 2011 09:41:27 +0000 (11:41 +0200)]
idl: define printcap IPC message format
Signed-off-by: Günther Deschner <gd@samba.org>
(cherry picked from commit
2bf4660f2e3cf1921d22f74c2db1a5fb3b531657)
David Disseldorp [Tue, 24 May 2011 09:34:59 +0000 (11:34 +0200)]
s3-printing: an empty cups printer list is treated as an error
cups_async_callback() is called to receive new printcap data from a
child process which requests the information from cupsd.
Newly received printcap information is stored in a temporary printcap
cache (tmp_pcap_cache). Once the child process closes the printcap IPC
file descriptor, the system printcap cache is replaced with the newly
populated tmp_pcap_cache, however this only occurs if tmp_pcap_cache is
non null (has at least one printer).
If the printcap cache is empty, which is the case when cups is not
exporting any printers, the printcap cache is not replaced resulting in
stale data.
Signed-off-by: Günther Deschner <gd@samba.org>
(cherry picked from commit
683b0652e23b787c5038ff5d7466fdc2a8b3c07f)
Jeremy Allison [Tue, 24 May 2011 19:47:31 +0000 (12:47 -0700)]
Fix our asn.1 parser to handle negative numbers.
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Tue May 24 22:57:16 CEST 2011 on sn-devel-104
(cherry picked from commit
e719dfd4dc178f001a5f804fb1ac4e587574415f)
Fix bug #8163 (asn.1 library does not correctly read negative integers).
(cherry picked from commit
859d13141cd831488b60e413f7141514ae4464b5)
(cherry picked from commit
d210395a50b5d5043bdcfb75f670f8abab91f974)
Jeremy Allison [Fri, 20 May 2011 19:36:56 +0000 (12:36 -0700)]
Fix bug #8157 - std_pcap_cache_reload() fails to parse a cups printcap file correctly.
The parsing code made some strange assumptions about what is a printer
name, and what is a comment.
(cherry picked from commit
ef1a0c14ab41c87f133d310c5f976548caf15b9a)
David Disseldorp [Mon, 17 Jan 2011 15:09:32 +0000 (16:09 +0100)]
s3-printing: remove pcap_cache_loaded asserts
pcap_cache_loaded() assertions were added to the (re)load_printers()
functions, to ensure the caller had called pcap_cache_reload() prior to
reloading printer shares.
The problem is, pcap_cache_loaded() returns false if the the pcap_cache
contains no printer entries. i.e. pcap_cache_reload() has run but not
detected any printers.
Remove these assertions, correct call ordering is already enforced.
Signed-off-by: Günther Deschner <gd@samba.org>
The last 3 patches address bug #7836 (A newly added printer isn't visbile to
clients).
(cherry picked from commit
a88126d6e8577a9e0b6196acdee70633d0e06259)
David Disseldorp [Thu, 19 May 2011 09:22:37 +0000 (11:22 +0200)]
Revert "Revert "s3-printing: update parent smbd pcap cache""
This reverts commit
b6268f507fa3276c2ef22c58bad400a3fed48cd9.
Signed-off-by: Günther Deschner <gd@samba.org>
(cherry picked from commit
8070240ed7e73b94aba591b6d985e7e32037bb5e)
David Disseldorp [Thu, 19 May 2011 09:22:18 +0000 (11:22 +0200)]
Revert "Revert "s3-printing: reload shares after pcap cache fill""
This reverts commit
e4579eab7fe3eab7a5209e6de74e6fd2f53099d0.
Signed-off-by: Günther Deschner <gd@samba.org>
(cherry picked from commit
9e427e5aced5caeedeeff29b9b962913ee4f796d)
Karolin Seeger [Mon, 23 May 2011 18:17:13 +0000 (20:17 +0200)]
Revert "s3-spoolss: Added EN ISO 216, A0 and A1 to builtin forms."
This reverts commit
73bec197a91a15aa9a69c9a3868ed51bdd3674ea.
Please see bug #8129 (Application requests printing on Format A5, but prints as
A4) fro details.
(cherry picked from commit
f51ee94ee9034f88566c4441eed4ff11697454ec)
Volker Lendecke [Fri, 23 Apr 2010 17:41:29 +0000 (19:41 +0200)]
libwbclient: Fix bug 8087 -- wbcChangeUserPasswordEx in RESPONSE mode does not work
This is
03115efae89c8c4f51dea1ce82613817bd9fcf5b from master
Actually copy something in wbcChangeUserPasswordEx
The length argument for memcpy was initialized to 0 and not initialized
(cherry picked from commit
c707b1f3b199b8c785a79db308d80eee2926b060)
Günther Deschner [Fri, 1 Oct 2010 04:08:12 +0000 (06:08 +0200)]
s3-net: make sure we dont crash when publishing a single printer.
Guenther
(cherry picked from commit
21576e3f8c32878910460bf9575c200ad93d682a)
Part of a fix for bug #7993 ("net rpc printer MIGRATE" command fails).
(cherry picked from commit
9c75728c62cccb8da606ece2d9df08b592e7c7c0)
Björn Jacke [Fri, 26 Nov 2010 14:14:14 +0000 (15:14 +0100)]
s3/configure: fix GNU ld version detection with old gcc releases
needed as old gcc releases output everything to stderr, even stdout output from
ld
Fixes #7825
Autobuild-User: Björn Jacke <bj@sernet.de>
Autobuild-Date: Fri Nov 26 20:15:24 CET 2010 on sn-devel-104
(cherry picked from commit
70a7da0e101910e3ceb08b86d4b840b219e24d7d)
(cherry picked from commit
19bbd0a4f0c39aaf6f0f3ecdcce7c52bb8264a5a)
Simo Sorce [Mon, 18 Apr 2011 12:45:11 +0000 (22:15 +0930)]
tdb_expand: limit the expansion with huge records
ldb can create huge records when saving indexes.
Limit the tdb expansion to avoid consuming a lot of memory for
no good reason if the record being saved is huge.
Fix bug #7610 (winbindd_cache.tdb grows too large when scaled).
(cherry picked from commit
c8ba5d41f3c2ab25cb9b9d0fa78b4f884d4b9721)