The branch, master has been updated
via 0d5adad s3-smbstatus: Fix exit code of profile output.
via bcb0d46 messaging3: Fix sending large messages on FreeBSD
via 281c58e unix_msg: Reformat unix_dgram_send a bit
via 6557a02 s3-smbclient: Return success if we listed the shares.
via 4083ba6 dsdb: Remove a self-assignment
from 80cc52c dbwrap: Fix a enum conversion
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 0d5adad07b572e6f7c4ac1a560593469df48352c
Author: Andreas Schneider <[email protected]>
Date: Mon Nov 24 17:46:27 2014 +0100
s3-smbstatus: Fix exit code of profile output.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=10961
Signed-off-by: Andreas Schneider <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
Autobuild-User(master): Jeremy Allison <[email protected]>
Autobuild-Date(master): Mon Nov 24 21:13:51 CET 2014 on sn-devel-104
commit bcb0d46bb27ba78cd045926a81894d1f09d2c02b
Author: Volker Lendecke <[email protected]>
Date: Mon Nov 24 16:31:07 2014 +0100
messaging3: Fix sending large messages on FreeBSD
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
commit 281c58e04654e152caead47602603cfbf7fd4e0f
Author: Volker Lendecke <[email protected]>
Date: Mon Nov 24 16:27:39 2014 +0100
unix_msg: Reformat unix_dgram_send a bit
This makes the next commit a bit more readable
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
commit 6557a0218a3f8d9b6072718ef2ed0e548bd9b5c2
Author: Andreas Schneider <[email protected]>
Date: Mon Nov 24 16:26:13 2014 +0100
s3-smbclient: Return success if we listed the shares.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=10960
Signed-off-by: Andreas Schneider <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
commit 4083ba6fe5ce9378b9194db4272cbf8fb847baa9
Author: Volker Lendecke <[email protected]>
Date: Mon Nov 24 14:34:24 2014 +0100
dsdb: Remove a self-assignment
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
source3/client/client.c | 2 +-
source3/lib/unix_msg/unix_msg.c | 8 +++++++-
source3/utils/status.c | 7 +++++--
source4/dsdb/samdb/ldb_modules/dirsync.c | 1 -
4 files changed, 13 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/client/client.c b/source3/client/client.c
index c90c450..5d70897 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -5303,7 +5303,7 @@ static int do_host_query(const char *query_host)
if (cli == NULL) {
d_printf("NetBIOS over TCP disabled -- no workgroup
available\n");
- return 1;
+ return 0;
}
cli_set_timeout(cli, io_timeout*1000);
diff --git a/source3/lib/unix_msg/unix_msg.c b/source3/lib/unix_msg/unix_msg.c
index 00ac7f5..7ca506a 100644
--- a/source3/lib/unix_msg/unix_msg.c
+++ b/source3/lib/unix_msg/unix_msg.c
@@ -741,7 +741,13 @@ static int unix_dgram_send(struct unix_dgram_ctx *ctx,
if (ret >= 0) {
return 0;
}
- if ((errno != EWOULDBLOCK) && (errno != EAGAIN) && (errno != EINTR)) {
+ if ((errno != EWOULDBLOCK) &&
+ (errno != EAGAIN) &&
+#ifdef ENOBUFS
+ /* FreeBSD can give this for large messages */
+ (errno != ENOBUFS) &&
+#endif
+ (errno != EINTR)) {
return errno;
}
diff --git a/source3/utils/status.c b/source3/utils/status.c
index 64c2a93..4e1dae7 100644
--- a/source3/utils/status.c
+++ b/source3/utils/status.c
@@ -364,6 +364,7 @@ int main(int argc, const char *argv[])
int ret = 0;
struct messaging_context *msg_ctx;
char *db_path;
+ bool ok;
sec_init();
load_case_tables();
@@ -463,10 +464,12 @@ int main(int argc, const char *argv[])
switch (profile_only) {
case 'P':
/* Dump profile data */
- return status_profile_dump(verbose);
+ ok = status_profile_dump(verbose);
+ return ok ? 0 : 1;
case 'R':
/* Continuously display rate-converted data */
- return status_profile_rates(verbose);
+ ok = status_profile_rates(verbose);
+ return ok ? 0 : 1;
default:
break;
}
diff --git a/source4/dsdb/samdb/ldb_modules/dirsync.c
b/source4/dsdb/samdb/ldb_modules/dirsync.c
index c93189e..b5510ec 100644
--- a/source4/dsdb/samdb/ldb_modules/dirsync.c
+++ b/source4/dsdb/samdb/ldb_modules/dirsync.c
@@ -571,7 +571,6 @@ skip:
if (tmpel->values ==
NULL) {
return
ldb_oom(ldb);
}
- tmpel = tmpel;
}
tmpel->values[tmpel->num_values
-1].data =talloc_steal(tmpel->values, el->values[k].data);
tmpel->values[tmpel->num_values
-1].length = el->values[k].length;
--
Samba Shared Repository
