[SCM] Samba Shared Repository - branch v3-2-stable updated -
release-3-2-0-14-gddb3d01
Karolin Seeger
kseeger at samba.org
Sun Jul 6 20:58:05 GMT 2008
The branch, v3-2-stable has been updated
via ddb3d012647c9ae0e5f7a9ada4219c934839d5a5 (commit)
via ef56ba8503cd46ad32f1412b9bf53e1d309a74c9 (commit)
via f3aa7dd077b1a2a7e26aa32e02dbff9fbc218887 (commit)
via f130de5441160b53a0dceb5d102fe2783b067048 (commit)
via d30d79090e182f96ebcbe5f28d5c018341076569 (commit)
via 2e196f81434ba85aa2769f787e47eb654d94995f (commit)
via 7dc5ed3892663654a9697d7719422ad5a237ea3d (commit)
via 12bc4e0abb33a4bca7db4584155a11d8885de8d4 (commit)
via e343d4c7e3cb49b804715e78d5f01431d2af0d24 (commit)
via d3df80c1549e44d8b02b548fa1571100cfa7db1c (commit)
via c16aa24e0866a3c5e5df0242e390f6030d69328e (commit)
via a479ab4f693a2faaaa385341417c150db6c26604 (commit)
via 0ec030c573cc96534f53b7e9840d231d472cdbde (commit)
via 67e401b0d4d841984e62415ff9e81c403b6a9839 (commit)
from a5d2b6a0228634dda3e495e0cf86db551b11e4d7 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-stable
- Log -----------------------------------------------------------------
commit ddb3d012647c9ae0e5f7a9ada4219c934839d5a5
Author: Karolin Seeger <kseeger at samba.org>
Date: Sun Jul 6 22:26:43 2008 +0200
WHATSNEW: Update changes since 3.2.0.
Karolin
(cherry picked from commit e6ddd28000c92ecd119fdc06197d931394f762cb)
commit ef56ba8503cd46ad32f1412b9bf53e1d309a74c9
Author: Karolin Seeger <kseeger at samba.org>
Date: Sun Jul 6 22:10:55 2008 +0200
VERSION: Raise version number to 3.2.1.
Karolin
(cherry picked from commit 00fc0003f6d163c7a51eda726a7ca542be671718)
commit f3aa7dd077b1a2a7e26aa32e02dbff9fbc218887
Author: Lars Müller <lars at samba.org>
Date: Fri Jul 4 14:51:01 2008 +0200
Add SMB_VFS_OP_RECVFILE to get it in sync with vfs.h
Fix "vfs_full_audit.c: name table not in sync with vfs.h" panic reported
by Franz Sirl.
(cherry picked from commit 567c6def08d91716c687ed43de0938e1556f26e2)
commit f130de5441160b53a0dceb5d102fe2783b067048
Author: Jeremy Allison <jra at samba.org>
Date: Thu Jul 3 10:25:26 2008 -0700
Patch from SATOH Fumiyasu <fumiyas at osstech.co.jp> for bug #5202. Re-activate "acl group control"
parameter and make it only apply to owning group. Also added man page fix.
Jeremy.
(cherry picked from commit 93e91e5364a7f131d988648cf5fe822a9bd68734)
commit d30d79090e182f96ebcbe5f28d5c018341076569
Author: Günther Deschner <gd at samba.org>
Date: Thu Jul 3 12:01:36 2008 +0200
libnetjoin: fix Bug #5570.
Thanks to Atte Peltomäki.
Guenther
(cherry picked from commit 144d374ad9dd981430a82369ceaa2783e6dae90a)
(cherry picked from commit 3e5bff08dac4faf575a11fe3edb17af08170ed74)
commit 2e196f81434ba85aa2769f787e47eb654d94995f
Author: Günther Deschner <gd at samba.org>
Date: Thu Jul 3 11:09:32 2008 +0200
Fix build warning.
Thanks to Thorkil Olesen.
Guenther
(cherry picked from commit c18e5983c1e9274131ac7fca7ca5e6739ba2b312)
(cherry picked from commit b7a53f20494bec008aabd4de4d3a14ece8b9cda1)
commit 7dc5ed3892663654a9697d7719422ad5a237ea3d
Author: Jeremy Allison <jra at samba.org>
Date: Wed Jul 2 16:32:02 2008 -0700
Remove worrying warning message when safe_strcpy tries to copy a pseaudo interface
name that's too long. Reported by James Kosin <JKosin at intcomgrp.com>.
Jeremy.
(cherry picked from commit e7c7246300bf060a93c2685ce9496b52f91d0a96)
commit 12bc4e0abb33a4bca7db4584155a11d8885de8d4
Author: Jeremy Allison <jra at samba.org>
Date: Wed Jul 2 16:11:43 2008 -0700
Canonicalize servername in the printer functions to remove leading '\\' characters. Ensure we always return consistent names.
Jeremy.
(cherry picked from commit d47ab1d07ba043f42a24a17f7644bf672c12791a)
commit e343d4c7e3cb49b804715e78d5f01431d2af0d24
Author: Jeremy Allison <jra at samba.org>
Date: Wed Jul 2 11:57:59 2008 -0700
Fix bug #5578, reported by sendel2000 at hotbox.ru. Bad (non-Samba) use of strlcat gives error.
Jeremy.
(cherry picked from commit a93c7a2170124f24aac4063c853475ae3f6b0720)
commit d3df80c1549e44d8b02b548fa1571100cfa7db1c
Author: Jeremy Allison <jra at samba.org>
Date: Wed Jul 2 10:51:33 2008 -0700
Ensure consistent use of pdb_get_nt_passwd instead of pdb_get_lanman_passwd.
Reported by hongbing Zhang <hongbing.zhang at gmail.com>.
Jeremy.
(cherry picked from commit 00e48ea5d113a0bde1a2b044d6869174cb536035)
commit c16aa24e0866a3c5e5df0242e390f6030d69328e
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jul 1 18:00:51 2008 -0700
MSG_DEBUG now forwarded to all the winbindd children by parent.
smbcontrol winbindd debug level would only set the debug level of the
parent winbindd process and not the child processes. This patch adds
the functionality of broadcasting the debug message to all winbindd
children. Now the debug level message is propagated to all the winbindd
processes that includes parent and children.
From Darshan Purandare <dpurandare at isilon.com> - had to patch separately
due to proto.h not being under git control in 3.2.x.
Jeremy.
(cherry picked from commit f6d4f487332baf74acec8f50e31bcfea44775570)
commit a479ab4f693a2faaaa385341417c150db6c26604
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jul 1 15:50:27 2008 -0700
Jim Brown <jim.brown at miami.edu> was right, this needs to be a signed int or
the loop never terminates.
Jeremy.
(cherry picked from commit 0108d32d1d9d7fd975df3ec7d1f1c830f170503f)
commit 0ec030c573cc96534f53b7e9840d231d472cdbde
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jul 1 15:40:07 2008 -0700
Two more fixes from Jim Brown <jim.brown at miami.edu> for SGI compiler warnings.
Jeremy.
(cherry picked from commit 8dd833b908cc8d4c0aa34cdece014d0e160aaf9e)
commit 67e401b0d4d841984e62415ff9e81c403b6a9839
Author: Jeremy Allison <jra at samba.org>
Date: Tue Jul 1 15:27:37 2008 -0700
Fix problem noticed by Jim Brown <jim.brown at miami.edu>. When reverse searching decrement index,
not increment. Michael please check !
Jeremy.
(cherry picked from commit 042c5008d8411f03980f967edb2f78d1a3262aed)
-----------------------------------------------------------------------
Summary of changes:
WHATSNEW.txt | 277 ++-------------------
docs-xml/smbdotconf/misc/dosfilemode.xml | 17 +-
docs-xml/smbdotconf/security/aclgroupcontrol.xml | 6 +-
source/VERSION | 2 +-
source/client/mount.cifs.c | 3 +
source/groupdb/mapping_tdb.c | 2 +-
source/lib/debug.c | 2 +-
source/lib/interface.c | 2 +-
source/lib/replace/replace.c | 3 +
source/lib/smbconf/smbconf_util.c | 4 +-
source/libnet/libnet_join.c | 2 +-
source/libsmb/clientgen.c | 7 +-
source/modules/vfs_full_audit.c | 1 +
source/pam_smbpass/support.c | 19 +-
source/param/loadparm.c | 2 +-
source/rpc_server/srv_spoolss_nt.c | 113 +++++-----
source/smbd/oplock_irix.c | 2 +-
source/smbd/posix_acls.c | 40 ++-
source/winbindd/winbindd.c | 5 +
source/winbindd/winbindd_dual.c | 34 +++
20 files changed, 197 insertions(+), 346 deletions(-)
Changeset truncated at 500 lines:
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 7ef47ed..5a90af9 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,278 +1,55 @@
==============================
- Release Notes for Samba 3.2.0
- July 1, 2008
+ Release Notes for Samba 3.2.1
+ August 5, 2008
==============================
-This is the first stable release of Samba 3.2.0.
-
-Please be aware that Samba is now distributed under the version 3
-of the new GNU General Public License. You may refer to the COPYING
-file that accompanies these release notes for further licensing details.
-
-Major enhancements in Samba 3.2.0 include:
-
- File Serving:
- o Use of IDL generated parsing layer for several DCE/RPC
- interfaces.
- o Removal of the 1024 byte limit on pathnames and 256 byte limit on
- filename components to honor the MAX_PATH setting from the host OS.
- o Introduction of a registry based configuration system.
- o Improved CIFS Unix Extensions support.
- o Experimental support for file serving clusters.
- o Support for IPv6 in the server, and client tools and libraries.
- o Support for storing alternate data streams in xattrs.
- o Encrypted SMB transport in client tools and libraries, and server.
- o Support for Vista clients authenticating via Kerberos.
-
- Winbind and Active Directory Integration:
- o Full support for Windows 2003 cross-forest, transitive trusts
- and one-way domain trusts.
- o Support for userPrincipalName logons via pam_winbind and NSS
- lookups.
- o Expansion of nested domain groups via NSS calls.
- o Support for Active Directory LDAP Signing policy.
- o New LGPL Winbind client library (libwbclient.so).
- o Support for establishing interdomain trust relationships with
- Windows 2008.
-
- Joining:
- o New NetApi library for domain join related queries (libnetapi.so)
- and example GTK+ Domain join gui.
- o New client and server support for remotely joining and unjoining
- Domains.
- o Support for joining into Windows 2008 domains.
-
- Users & Groups:
- o New ldb backend for local group mapping tables
- o Raised level of security defaults for authentication operations.
- o New NetApi library for user account related queries.
-
-
-
-Now Licensed under the GNU GPLv3
-================================
-
-The Samba Team has adopted the Version 3 of the GNU General Public
-License for the 3.2 and later releases. The GPLv3 is the updated
-version of the GPLv2 license under which Samba is currently
-distributed. It has been updated to improve compatibility with other
-licenses and to make it easier to adopt internationally, and is an
-improved version of the license to better suit the needs of Free
-Software in the 21st Century.
-
-The original announcement is available on-line at
-
- http://news.samba.org/announcements/samba_gplv3/
-
-
-New Security Defaults for Authentication
-========================================
-
-Support for LanMan passwords is now disabled in both client and server
-applications. Additionally, clear text authentication requests are
-disabled by default in client utilities such as smbclient and all
-libsmbclient based applications. This will affect connection both
-to and from hosts running DOS, Windows 9x/ME, and OS/2. Please refer
-to the "Changes" section for details on the exact parameters that were
-updated.
-
-
-Registry Configuration Backend
-==============================
-
-Samba is now able to use a registry based configuration backed to
-supplement smb.conf settings. This feature may be enabled by setting
-"config backend = registry" in the [global] section of smb.conf for a
-registry only configuration, or by specifying "include = registry" to
-include global options from registry for a mixed setup.
-
-The new parameter "registry shares = yes" in the [global] section of
-smb.conf can be used to activate share definitions from registry.
-These shares are loaded on demand by the server. Registry shares are
-automatically activated by the global registry options above.
-
-The configuration stored in registry can be conveniently managed using
-the "net conf" command.
-
-More information may be obtained from the smb.conf(5) and net(8) man
-pages.
-
-
-Removed Features
-================
-
-Both the Python bindings and the libmsrpc shared library have been
-removed from the tree due to lack of an official maintainer.
-
-As smbfs is no longer supported in current kernel versions, smbmount has
-been removed in this Samba version. Please use cifs (mount.cifs) instead.
-See examples/scripts/mount/mount.smbfs as an example for a wrapper which
-calls mount.cifs instead of smbmount/mount.smbfs.
-
-
-Modified API for libsmbclient
-==============================================================================
-
-Maintaining ABI compatibility for libsmbclient has become increasingly
-difficult to accomplish, while also keeping the code organization such that it
-is easily readable. Towards the goal of maintaining ABI compatibility and
-also keeping the code easy to maintain and enhance, the API has been enhanced.
-In particular, the fields in the SMBCCTX context structure are no longer
-intended to be read/write by the user, and are marked as deprecated. An
-application that previously accessed the members of the SMBCCTX context
-structure will now encounter warnings if recompiled. This is intentional, to
-encourage implementation of the small changes required for the new interface.
-The number of changes is expected to be quite small for the vast majority of
-applications, and no changes need be made for many applications. The changes
-required for KDE (konqueror) to conform to the new interface, for example, are
-only four lines in only one file.
-
-Instead of the application manually changing or reading values in the context
-structure, there are now setter and getter functions for each configurable
-member in that structure. Similarly, the smbc_option_get() and
-smbc_option_set() functions are deprecated in favor of the setter/getter
-interface. The setters and getters are all documented in libsmbclient.h
-under these comment blocks:
-
- Getters and setters for CONFIGURATION
- Getters and setters for OPTIONS
- Getters and setters for FUNCTIONS
- Callable functions for files
- Callable functions for directories
- Callable functions applicable to both files and directories
-
-Example changes that may be required to eliminate "deprecated" warnings:
-
- /* Set the debug level */
- context->debug = 99;
-changes to:
- smbc_setDebug(context, 99);
-
- /* Specify the authentication callback function */
- context->callbacks.auth_fn = auth_smbc_get_data;
-changes to:
- smbc_setFunctionAuthData(context, auth_smbc_get_data);
-
- /* Specify the new-style authentication callback with context parameter */
- smbc_option_set("auth_function", auth_smbc_get_data_with_ctx);
-changes to:
- smbc_setFunctionAuthDataWithContext(context, auth_smbc_get_data_with_ctx);
-
- /* Set kerberos flags */
- context->flags = (SMB_CTX_FLAG_USE_KERBEROS |
- SMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS);
-changes to:
- smbc_setOptionUseKerberos(context, 1);
- smbc_setOptionFallbackAfterKerberos(context, 1);
+This is the second stable release of Samba 3.2.
+Major bug fixes included in Samba 3.2.1 are:
+ o
######################################################################
Changes
#######
-smb.conf changes
-----------------
-
- Parameter Name Description Default
- -------------- ----------- -------
- administrative share New No
- client lanman auth Changed Default No
- client ldap sasl wrapping New plain
- client plaintext auth Changed Default No
- clustering New No
- cluster addresses New ""
- config backend New file
- ctdbd socket New ""
- debug class New No
- lanman auth Changed Default No
- ldap connection timeout New 2
- ldap debug level New 0
- ldap debug threshold New 10
- mangled map Removed
- min receive file size New 0
- open files database hashsize Removed
- read bmpx Removed
- registry shares New No
- smb encrypt New Auto
- winbind expand groups New 1
- winbind rpc only New No
-
- New special meaning of "include = registry".
-
-
-Changes since 3.2.0rc2:
------------------------
+Changes since 3.2.0
+-------------------
o Jeremy Allison <jra at samba.org>
- * BUG 5531: Fix conversion of ns units when converting
- from nttime to timespec.
- * BUG 5533: Fix handling of workgroup names containing a '.' in Winbindd.
- * BUG 5551: Fix group enumeration with 'wbinfo -g' on PDCs.
- * BUG 5555: Fix setting of the password last set field during domain joins.
- * BUG 5568: Fix net rpc trustdom add.
- * Fix gcc warnings at -O3.
-
+ * BUG 5578: Fix error from strlcat.
+ * Ensure consistent use of pdb_get_nt_passwd instead of
+ pdb_get_lanman_passwd.
+ * Remove worrying warning message when safe_strcpy tries to copy a
+ pseaudo interface name that's too long.
+ * Canonicalize servername in the printer functions to remove leading
+ '\\' characters.
-o Michael Adam <obnox at samba.org>
- * BUG 5548: Fix segfaults in handle_include with %m macro expansion.
- * Add several tests to the testsuite.
-
-o Steven Danneman <steven.danneman at isilon.com>
- * Make winbindd enum users and groups async.
+o Jim Brown <jim.brown at miami.edu>
+ * Fix SGI compiler warnings.
o Günther Deschner <gd at samba.org>
- * BUG 5542: Fix empty passwords of samsync.
-
-
-o Volker Lendecke <vl at samba.org>
- * BUG 5500: Add missing become_root to enable access to LDAP DB.
- * Fix coverity IDs 464, 474.
- * Fix an uninitialized variable found by the IBM checker.
- * Fix group parsing in libwbclient's copy_group_entry().
- * Fix max_fd calculation in event_loop_once.
- * Fix warnings on Fedory Core 9.
- * Fix several memleaks.
- * Fix a segfaults in wbcLookupRids.
- * Fix a segfault in clitar.
- * Fix the build on FreeBSD 4.6.2 and Darwin.
- * Fix a double-closedir() in form_junctions().
- * Fix a crash in _dfs_Enum.
- * Fix a segfault in rpcclient adddriver.
- * Fix valgrind errors in _spoolss_addprinterdriver.
- * Fix warnings on SuSE 9.0.
- * Fix a file descriptor leak in add_port_hook.
-
-
-o William Jojo <jojowil at hvcc.edu>
- * Fix several AIX build issues.
- * Add -brtl to the AIX linker flags.
-
-
-o Atte Peltomäki <atte.peltomaki at f-secure.com>
- * Fix winbindd group expansion.
-
-
-o Andreas Schneider <anschneider at suse.de>
- * Add documentation for kerberos support in libsmbclient.
- * Add krb5 support for the testbrowse example.
+ * BUG 5570: Fix bogus error message during AD domain join.
+ * Fix build warning.
-o John H Terpstra <jht at samba.org>
- * Fix net help info.
- * Add documentation for TDB file.
+o SATOH Fumiyasu <fumiyas at osstech.co.jp>
+ * BUG 5202: Fix setting of ACEs for users/groups with write access
+ in setups with 'dos filemode = yes'.
+ * Re-activate 'acl group control' parameter and make it only apply
+ to owning group.
-o Bo Yang <boyang at novell.com>
- * Fix update of cached credentials during password change in pam_winbind.
+o Lars Müller <lars at samba.org>
+ * Fix "vfs_full_audit.c: name table not in sync with vfs.h" panic.
-o Christoph Zauner <christoph.zauner at sernet.de>
- * Fix several typos in the man pages and the Samba3 HowTo Collection.
+o Darshan Purandare <dpurandare at isilon.com>
+ * Add broadcasting of the debug message to all winbindd children.
diff --git a/docs-xml/smbdotconf/misc/dosfilemode.xml b/docs-xml/smbdotconf/misc/dosfilemode.xml
index ae3b475..e67ccd9 100644
--- a/docs-xml/smbdotconf/misc/dosfilemode.xml
+++ b/docs-xml/smbdotconf/misc/dosfilemode.xml
@@ -3,15 +3,16 @@
type="boolean"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
- <para> The default behavior in Samba is to provide
- UNIX-like behavior where only the owner of a file/directory is
+ <para> The default behavior in Samba is to provide
+ UNIX-like behavior where only the owner of a file/directory is
able to change the permissions on it. However, this behavior
- is often confusing to DOS/Windows users. Enabling this parameter
- allows a user who has write access to the file (by whatever
- means) to modify the permissions (including ACL) on it. Note that a user
- belonging to the group owning the file will not be allowed to
- change permissions if the group is only granted read access.
- Ownership of the file/directory may also be changed.</para>
+ is often confusing to DOS/Windows users. Enabling this parameter
+ allows a user who has write access to the file (by whatever
+ means, including an ACL permission) to modify the permissions
+ (including ACL) on it. Note that a user belonging to the group
+ owning the file will not be allowed to change permissions if
+ the group is only granted read access. Ownership of the
+ file/directory may also be changed.</para>
</description>
<value type="default">no</value>
</samba:parameter>
diff --git a/docs-xml/smbdotconf/security/aclgroupcontrol.xml b/docs-xml/smbdotconf/security/aclgroupcontrol.xml
index e2600ca..6efd46d 100644
--- a/docs-xml/smbdotconf/security/aclgroupcontrol.xml
+++ b/docs-xml/smbdotconf/security/aclgroupcontrol.xml
@@ -30,8 +30,10 @@
</para>
<para>
- This is parameter has been marked deprecated in Samba 3.0.23. The same behavior is now
- implemented by the <parameter moreinfo="none">dos filemode</parameter> option.
+ This is parameter has been was deprecated in Samba 3.0.23, but re-activated in
+ Samba 3.0.31 and above, as it now only controls permission changes if the user
+ is in the owning primary group. It is now no longer equivalent to the
+ <parameter moreinfo="none">dos filemode</parameter> option.
</para>
</description>
diff --git a/source/VERSION b/source/VERSION
index 27e250f..c48d6c2 100644
--- a/source/VERSION
+++ b/source/VERSION
@@ -25,7 +25,7 @@
########################################################
SAMBA_VERSION_MAJOR=3
SAMBA_VERSION_MINOR=2
-SAMBA_VERSION_RELEASE=0
+SAMBA_VERSION_RELEASE=1
########################################################
# Bug fix releases use a letter for the patch revision #
diff --git a/source/client/mount.cifs.c b/source/client/mount.cifs.c
index c42375b..c24c22e 100644
--- a/source/client/mount.cifs.c
+++ b/source/client/mount.cifs.c
@@ -115,6 +115,9 @@ size_t strlcat(char *d, const char *s, size_t bufsize)
size_t ret = len1 + len2;
if (len1+len2 >= bufsize) {
+ if (bufsize < (len1+1)) {
+ return ret;
+ }
len2 = bufsize - (len1+1);
}
if (len2 > 0) {
diff --git a/source/groupdb/mapping_tdb.c b/source/groupdb/mapping_tdb.c
index c6d9735..f116888 100644
--- a/source/groupdb/mapping_tdb.c
+++ b/source/groupdb/mapping_tdb.c
@@ -127,7 +127,7 @@ static bool add_mapping_entry(GROUP_MAP *map, int flag)
key = group_mapping_key(talloc_tos(), &map->sid);
if (key == NULL) {
- return NULL;
+ return false;
}
len = tdb_pack(NULL, 0, "ddff",
diff --git a/source/lib/debug.c b/source/lib/debug.c
index a76a8db..2ded6bd 100644
--- a/source/lib/debug.c
+++ b/source/lib/debug.c
@@ -476,7 +476,7 @@ bool debug_parse_levels(const char *params_str)
Receive a "set debug level" message.
****************************************************************************/
-static void debug_message(struct messaging_context *msg_ctx,
+void debug_message(struct messaging_context *msg_ctx,
void *private_data,
uint32_t msg_type,
struct server_id src,
diff --git a/source/lib/interface.c b/source/lib/interface.c
index 9627bf6..eb0af9e 100644
--- a/source/lib/interface.c
+++ b/source/lib/interface.c
@@ -469,7 +469,7 @@ static void interpret_interface(char *token)
token));
ZERO_STRUCT(ifs);
- safe_strcpy(ifs.name, token, sizeof(ifs.name)-1);
+ (void)strlcpy(ifs.name, token, sizeof(ifs.name));
ifs.flags = IFF_BROADCAST;
ifs.ip = ss;
ifs.netmask = ss_mask;
diff --git a/source/lib/replace/replace.c b/source/lib/replace/replace.c
index 2c3f14c..106c9df 100644
--- a/source/lib/replace/replace.c
+++ b/source/lib/replace/replace.c
@@ -82,6 +82,9 @@ size_t rep_strlcat(char *d, const char *s, size_t bufsize)
size_t ret = len1 + len2;
if (len1+len2 >= bufsize) {
+ if (bufsize < (len1+1)) {
+ return ret;
+ }
len2 = bufsize - (len1+1);
}
if (len2 > 0) {
diff --git a/source/lib/smbconf/smbconf_util.c b/source/lib/smbconf/smbconf_util.c
index b2e253d..271fc47 100644
--- a/source/lib/smbconf/smbconf_util.c
+++ b/source/lib/smbconf/smbconf_util.c
@@ -132,13 +132,13 @@ bool smbconf_find_in_array(const char *string, char **list,
bool smbconf_reverse_find_in_array(const char *string, char **list,
uint32_t num_entries, uint32_t *entry)
{
- uint32_t i;
+ int32_t i;
if ((string == NULL) || (list == NULL) || (num_entries == 0)) {
return false;
}
- for (i = num_entries - 1; i >= 0; i++) {
+ for (i = num_entries - 1; i >= 0; i--) {
if (strequal(string, list[i])) {
if (entry != NULL) {
*entry = i;
diff --git a/source/libnet/libnet_join.c b/source/libnet/libnet_join.c
index b19d90b..86cbce0 100644
--- a/source/libnet/libnet_join.c
+++ b/source/libnet/libnet_join.c
@@ -503,7 +503,7 @@ static bool libnet_join_create_keytab(TALLOC_CTX *mem_ctx,
return true;
}
- if (!ads_keytab_create_default(r->in.ads)) {
+ if (ads_keytab_create_default(r->in.ads) != 0) {
return false;
}
diff --git a/source/libsmb/clientgen.c b/source/libsmb/clientgen.c
index 2af4383..d6d26e4 100644
--- a/source/libsmb/clientgen.c
+++ b/source/libsmb/clientgen.c
@@ -97,7 +97,12 @@ static ssize_t client_receive_smb(struct cli_state *cli, size_t maxlen)
return -1;
}
- if (len < 0) {
+ /*
+ * I don't believe len can be < 0 with NT_STATUS_OK
+ * returned above, but this check doesn't hurt. JRA.
+ */
+
+ if ((ssize_t)len < 0) {
return len;
}
diff --git a/source/modules/vfs_full_audit.c b/source/modules/vfs_full_audit.c
index db933f7..4a66fb4 100644
--- a/source/modules/vfs_full_audit.c
+++ b/source/modules/vfs_full_audit.c
@@ -571,6 +571,7 @@ static struct {
{ SMB_VFS_OP_PWRITE, "pwrite" },
{ SMB_VFS_OP_LSEEK, "lseek" },
{ SMB_VFS_OP_SENDFILE, "sendfile" },
+ { SMB_VFS_OP_RECVFILE, "recvfile" },
{ SMB_VFS_OP_RENAME, "rename" },
{ SMB_VFS_OP_FSYNC, "fsync" },
{ SMB_VFS_OP_STAT, "stat" },
diff --git a/source/pam_smbpass/support.c b/source/pam_smbpass/support.c
--
Samba Shared Repository
More information about the samba-cvs
mailing list