The branch, master has been updated
via d8f1d267cde util: Fix a signed/unsigned comparison
via cfd34eef585 tdb: Fix some signed/unsigned comparisons
via 6fc0a486262 smbd: Remove code inside #ifdef HAVE_BROKEN_READDIR_NAME
via ee6b31ad9b0 lib/util: Remove code inside #ifdef
HAVE_BROKEN_READDIR_NAME
via eecd65d475d lib/util: Remove code inside #ifdef NEXT2
via 268994f514a s4:client: Remove code inside #ifdef NEXT2
via 2162d50316f smbd: Remove code inside #ifdef NEXT2
from d23e2678e93 s3:smbd: stop accepting multichannel connections early
in exit_server_common()
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit d8f1d267cde21b75dd8652a0d5c98cf0890e1996
Author: Martin Schwenke <[email protected]>
Date: Thu May 7 17:14:34 2020 +1000
util: Fix a signed/unsigned comparison
[107/390] Compiling lib/util/time.c
../../../lib/util/time.c: In function ‘timespec_string_buf’:
../../../lib/util/time.c:416:10: warning: comparison of integer expressions
of different signedness: ‘size_t’ {aka ‘long unsigned int’} and ‘int’
[-Wsign-compare]
416 | if (len == -1) {
| ^~
Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Volker Lendecke <[email protected]>
Autobuild-User(master): Volker Lendecke <[email protected]>
Autobuild-Date(master): Thu Jul 16 04:00:52 UTC 2020 on sn-devel-184
commit cfd34eef58577480ff546df44a210c8b98936387
Author: Martin Schwenke <[email protected]>
Date: Thu May 7 16:57:07 2020 +1000
tdb: Fix some signed/unsigned comparisons
[207/389] Compiling lib/tdb/tools/tdbdump.c
../../../lib/tdb/tools/tdbrestore.c: In function ‘read_linehead’:
../../../lib/tdb/tools/tdbrestore.c:43:13: warning: comparison of integer
expressions of different signedness: ‘int’ and ‘long unsigned int’
[-Wsign-compare]
43 | for (i=0; i<sizeof(prefix); i++) {
| ^
../../../lib/tdb/tools/tdbrestore.c: In function ‘read_data’:
../../../lib/tdb/tools/tdbrestore.c:95:13: warning: comparison of integer
expressions of different signedness: ‘int’ and ‘size_t’ {aka ‘long unsigned
int’} [-Wsign-compare]
95 | for (i=0; i<size; i++) {
| ^
Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Volker Lendecke <[email protected]>
commit 6fc0a48626206d5964ed04acbbf86f81e51b34c3
Author: Christof Schmitt <[email protected]>
Date: Tue Jun 23 11:55:05 2020 -0700
smbd: Remove code inside #ifdef HAVE_BROKEN_READDIR_NAME
This is dead code, the define is never set.
Signed-off-by: Christof Schmitt <[email protected]>
Reviewed-by: Volker Lendecke <[email protected]>
commit ee6b31ad9b0f54e3d19e1c64033dec357d9f5b0d
Author: Christof Schmitt <[email protected]>
Date: Tue Jun 23 11:51:41 2020 -0700
lib/util: Remove code inside #ifdef HAVE_BROKEN_READDIR_NAME
This is dead code, the define is never set.
Signed-off-by: Christof Schmitt <[email protected]>
Reviewed-by: Volker Lendecke <[email protected]>
commit eecd65d475dc39af65f4284acddb11d0573b2008
Author: Christof Schmitt <[email protected]>
Date: Tue Jun 23 11:49:46 2020 -0700
lib/util: Remove code inside #ifdef NEXT2
This is dead code, the define is never set.
Signed-off-by: Christof Schmitt <[email protected]>
Reviewed-by: Volker Lendecke <[email protected]>
commit 268994f514a8fe7f3831f78ac3b0fc2bc6133157
Author: Christof Schmitt <[email protected]>
Date: Tue Jun 23 11:48:53 2020 -0700
s4:client: Remove code inside #ifdef NEXT2
This is dead code, the define is never set.
Signed-off-by: Christof Schmitt <[email protected]>
Reviewed-by: Volker Lendecke <[email protected]>
commit 2162d50316fce9a2015121642013902eeffa2367
Author: Christof Schmitt <[email protected]>
Date: Tue Jun 23 11:46:38 2020 -0700
smbd: Remove code inside #ifdef NEXT2
This is dead code, the define is never set.
Signed-off-by: Christof Schmitt <[email protected]>
Reviewed-by: Volker Lendecke <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
lib/tdb/tools/tdbrestore.c | 5 +++--
lib/util/time.c | 2 +-
source3/lib/util.c | 10 ----------
source3/smbd/vfs.c | 11 -----------
source4/client/client.c | 5 -----
5 files changed, 4 insertions(+), 29 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/tdb/tools/tdbrestore.c b/lib/tdb/tools/tdbrestore.c
index 81c986c6003..9d5146272cc 100644
--- a/lib/tdb/tools/tdbrestore.c
+++ b/lib/tdb/tools/tdbrestore.c
@@ -27,7 +27,8 @@
static int read_linehead(FILE *f)
{
- int i, c;
+ size_t i;
+ int c;
int num_bytes;
char prefix[128];
@@ -84,7 +85,7 @@ static int read_hex(void) {
static int read_data(FILE *f, TDB_DATA *d, size_t size) {
int c, low, high;
- int i;
+ size_t i;
d->dptr = (unsigned char *)malloc(size);
if (d->dptr == NULL) {
diff --git a/lib/util/time.c b/lib/util/time.c
index 0fac5e2e397..93e68dcf724 100644
--- a/lib/util/time.c
+++ b/lib/util/time.c
@@ -374,7 +374,7 @@ const char *timespec_string_buf(const struct timespec *tp,
{
time_t t;
struct tm *tm = NULL;
- size_t len;
+ int len;
if (is_omit_timespec(tp)) {
strlcpy(buf->buf, "SAMBA_UTIME_OMIT", sizeof(buf->buf));
diff --git a/source3/lib/util.c b/source3/lib/util.c
index 6aa551176ed..a51c4aaf514 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -867,16 +867,6 @@ const char *readdirname(DIR *p)
dname = ptr->d_name;
-#ifdef NEXT2
- if (telldir(p) < 0)
- return(NULL);
-#endif
-
-#ifdef HAVE_BROKEN_READDIR_NAME
- /* using /usr/ucb/cc is BAD */
- dname = dname - 2;
-#endif
-
return talloc_strdup(talloc_tos(), dname);
}
diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c
index f8c71014955..2194e09ab16 100644
--- a/source3/smbd/vfs.c
+++ b/source3/smbd/vfs.c
@@ -854,17 +854,6 @@ const char *vfs_readdirname(connection_struct *conn, void
*p,
dname = ptr->d_name;
-
-#ifdef NEXT2
- if (telldir(p) < 0)
- return(NULL);
-#endif
-
-#ifdef HAVE_BROKEN_READDIR_NAME
- /* using /usr/ucb/cc is BAD */
- dname = dname - 2;
-#endif
-
status = SMB_VFS_TRANSLATE_NAME(conn, dname, vfs_translate_to_windows,
talloc_tos(), &translated);
if (NT_STATUS_EQUAL(status, NT_STATUS_NONE_MAPPED)) {
diff --git a/source4/client/client.c b/source4/client/client.c
index c77281cc8cd..27e20975156 100644
--- a/source4/client/client.c
+++ b/source4/client/client.c
@@ -1348,11 +1348,6 @@ static const char *readdirname(DIR *p)
dname = ptr->d_name;
-#ifdef NEXT2
- if (telldir(p) < 0)
- return(NULL);
-#endif
-
#ifdef HAVE_BROKEN_READDIR
/* using /usr/ucb/cc is BAD */
dname = dname - 2;
--
Samba Shared Repository
