[SCM] Samba Shared Repository - branch master updated

[Andrew Bartlett]

The branch, master has been updated
       via  1a7bd5e nsswitch: fix some typos
       via  9910b80 s3:lib/dbwrap add missing curly braces
       via  bdc3e9a s3:include remove non-blank line endings
      from  2ed6b08 auth: Ensure auth_sam is not used on the AD DC

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


- Log -----------------------------------------------------------------
commit 1a7bd5e12c519f8d14120f21198038dae1e5c914
Author: Christian Ambach <ambi at samba.org>
Date:   Thu May 16 15:06:49 2013 +0200

    nsswitch: fix some typos
    
    Signed-off-by: Christian Ambach <ambi at samba.org>
    
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    
    Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date(master): Fri May 17 01:09:33 CEST 2013 on sn-devel-104

commit 9910b8050ccb073fe47c26eeeeb60955d9f2d043
Author: Christian Ambach <ambi at samba.org>
Date:   Tue May 14 21:02:15 2013 +0200

    s3:lib/dbwrap add missing curly braces
    
    violation of README.Coding
    
    Signed-off-by: Christian Ambach <ambi at samba.org>
    
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

commit bdc3e9acaf1b03af0e523f60b3260c6fdc62523c
Author: Christian Ambach <ambi at samba.org>
Date:   Tue Apr 23 11:20:42 2013 +0200

    s3:include remove non-blank line endings
    
    Signed-off-by: Christian Ambach <ambi at samba.org>
    
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 nsswitch/libwbclient/wbclient.h  |    4 ++--
 source3/include/smbprofile.h     |    6 +++---
 source3/lib/dbwrap/dbwrap_ctdb.c |    6 ++++--
 3 files changed, 9 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/nsswitch/libwbclient/wbclient.h b/nsswitch/libwbclient/wbclient.h
index a72d09e..dc3e822 100644
--- a/nsswitch/libwbclient/wbclient.h
+++ b/nsswitch/libwbclient/wbclient.h
@@ -850,7 +850,7 @@ wbcErr wbcAllocateGid(gid_t *pgid);
  * @brief Set an user id mapping
  *
  * @param uid       Uid of the desired mapping.
- * @param *sid      Pointer to the sid of the diresired mapping.
+ * @param *sid      Pointer to the sid of the desired mapping.
  *
  * @return #wbcErr
  *
@@ -863,7 +863,7 @@ wbcErr wbcSetUidMapping(uid_t uid, const struct wbcDomainSid *sid);
  * @brief Set a group id mapping
  *
  * @param gid       Gid of the desired mapping.
- * @param *sid      Pointer to the sid of the diresired mapping.
+ * @param *sid      Pointer to the sid of the desired mapping.
  *
  * @return #wbcErr
  *
diff --git a/source3/include/smbprofile.h b/source3/include/smbprofile.h
index 69df2ca..79410e5 100644
--- a/source3/include/smbprofile.h
+++ b/source3/include/smbprofile.h
@@ -1,6 +1,6 @@
 #ifndef _PROFILE_H_
 #define _PROFILE_H_
-/* 
+/*
    Unix SMB/CIFS implementation.
    store smbd profiling information in shared memory
    Copyright (C) Andrew Tridgell 1999
@@ -10,12 +10,12 @@
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
diff --git a/source3/lib/dbwrap/dbwrap_ctdb.c b/source3/lib/dbwrap/dbwrap_ctdb.c
index e55689c..f90e7b8 100644
--- a/source3/lib/dbwrap/dbwrap_ctdb.c
+++ b/source3/lib/dbwrap/dbwrap_ctdb.c
@@ -986,11 +986,13 @@ static bool db_ctdb_can_use_local_hdr(const struct ctdb_ltdb_header *hdr,
 
 static bool db_ctdb_can_use_local_copy(TDB_DATA ctdb_data, bool read_only)
 {
-	if (ctdb_data.dptr == NULL)
+	if (ctdb_data.dptr == NULL) {
 		return false;
+	}
 
-	if (ctdb_data.dsize < sizeof(struct ctdb_ltdb_header))
+	if (ctdb_data.dsize < sizeof(struct ctdb_ltdb_header)) {
 		return false;
+	}
 
 	return db_ctdb_can_use_local_hdr(
 		(struct ctdb_ltdb_header *)ctdb_data.dptr, read_only);


-- 
Samba Shared Repository