[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  498383a lib:socket: fix CID 1350010 - integer OVERFLOW_BEFORE_WIDEN
       via  68bb5e2 gencache: Remove unused defines
      from  4c54901 docs: Add smbspool_krb5_wrapper manpage

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


- Log -----------------------------------------------------------------
commit 498383afefccb8c7acd93da2c374b5bed1de6e4a
Author: Michael Adam <obnox at samba.org>
Date:   Wed Feb 3 11:28:32 2016 +0100

    lib:socket: fix CID 1350010 - integer OVERFLOW_BEFORE_WIDEN
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    
    Autobuild-User(master): Volker Lendecke <vl at samba.org>
    Autobuild-Date(master): Thu Feb  4 00:35:11 CET 2016 on sn-devel-144

commit 68bb5e2ba2a4bf2e8326bf1cb575066d66bd8fab
Author: Christof Schmitt <cs at samba.org>
Date:   Tue Feb 2 12:57:25 2016 -0700

    gencache: Remove unused defines
    
    Signed-off-by: Christof Schmitt <cs at samba.org>
    Reviewed-by: Volker Lendecke <vl at samba.org>

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

Summary of changes:
 lib/socket/interfaces.c | 2 +-
 source3/lib/gencache.c  | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/socket/interfaces.c b/lib/socket/interfaces.c
index 98341e2..cf094f0 100644
--- a/lib/socket/interfaces.c
+++ b/lib/socket/interfaces.c
@@ -160,7 +160,7 @@ static void query_iface_speed_from_name(const char *name, uint64_t *speed)
 	if (ret == -1) {
 		goto done;
 	}
-	*speed = (ethtool_cmd_speed(&ecmd)) * 1000 * 1000;
+	*speed = ((uint64_t)ethtool_cmd_speed(&ecmd)) * 1000 * 1000;
 
 done:
 	(void)close(fd);
diff --git a/source3/lib/gencache.c b/source3/lib/gencache.c
index ed16d79..c353aa6 100644
--- a/source3/lib/gencache.c
+++ b/source3/lib/gencache.c
@@ -31,11 +31,7 @@
 #undef  DBGC_CLASS
 #define DBGC_CLASS DBGC_TDB
 
-#define TIMEOUT_LEN 12
 #define CACHE_DATA_FMT	"%12u/"
-#define READ_CACHE_DATA_FMT_TEMPLATE "%%12u/%%%us"
-#define BLOB_TYPE "DATA_BLOB"
-#define BLOB_TYPE_LEN 9
 
 static struct tdb_wrap *cache;
 static struct tdb_wrap *cache_notrans;


-- 
Samba Shared Repository