The branch, master has been updated via 6404c07 ldb: Fix a "ignoring return value" warning via c17df7c messages: messages.h needs data_blob.h via 7e45bec examples: Fix unchecked result warnings via af03f5b lib: Remove a includes.h reference via e11008ea lib: Include samba_util.h in server_id_db.h via 58418df lib: dbwrap_local_open references loadparm_context via ed833d5 smbd: Fix a comment from f33e618 ctdb-include: Remove unused header file include/ctdb_typesafe_cb.h
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 6404c07266be0a2986473aacec7079c5849f3703 Author: Volker Lendecke <v...@samba.org> Date: Tue Jun 23 18:29:53 2015 +0200 ldb: Fix a "ignoring return value" warning Signed-off-by: Volker Lendecke <v...@samba.org> Reviewed-by: Michael Adam <ob...@samba.org> Autobuild-User(master): Volker Lendecke <v...@samba.org> Autobuild-Date(master): Wed Oct 28 19:04:15 CET 2015 on sn-devel-104 commit c17df7c0b19819fa05c41fcfbb01e92a79d5b897 Author: Volker Lendecke <v...@samba.org> Date: Sun Jul 12 14:33:55 2015 +0200 messages: messages.h needs data_blob.h Normally it somehow comes via includes.h, but if you want to directly include messages.h you need this Signed-off-by: Volker Lendecke <v...@samba.org> Reviewed-by: Michael Adam <ob...@samba.org> commit 7e45bec38fe31be3fdad1d42bfdd7136c1663ba5 Author: Volker Lendecke <v...@samba.org> Date: Tue Jun 30 20:41:55 2015 +0200 examples: Fix unchecked result warnings Signed-off-by: Volker Lendecke <v...@samba.org> Reviewed-by: Michael Adam <ob...@samba.org> commit af03f5b4e838003b1d9f2e77239f28e1e363d463 Author: Volker Lendecke <v...@samba.org> Date: Sun Jul 12 18:45:18 2015 +0200 lib: Remove a includes.h reference Signed-off-by: Volker Lendecke <v...@samba.org> Reviewed-by: Michael Adam <ob...@samba.org> commit e11008ea4e2b104dd58e276c38030667f5c6c182 Author: Volker Lendecke <v...@samba.org> Date: Sun Jul 12 18:43:35 2015 +0200 lib: Include samba_util.h in server_id_db.h Usually this came in via server_id.h's includes.h. This will go. Signed-off-by: Volker Lendecke <v...@samba.org> Reviewed-by: Michael Adam <ob...@samba.org> commit 58418df6794059c83c681f59dcc2095736d021ec Author: Volker Lendecke <v...@samba.org> Date: Wed Oct 28 12:29:50 2015 +0100 lib: dbwrap_local_open references loadparm_context Signed-off-by: Volker Lendecke <v...@samba.org> Reviewed-by: Michael Adam <ob...@samba.org> commit ed833d518ab6aa352c77d5a21085d61cfcf9cdcf Author: Volker Lendecke <v...@samba.org> Date: Wed Oct 28 12:04:56 2015 +0100 smbd: Fix a comment Signed-off-by: Volker Lendecke <v...@samba.org> Reviewed-by: Michael Adam <ob...@samba.org> ----------------------------------------------------------------------- Summary of changes: examples/libsmbclient/get_auth_data_fn.h | 16 +++++++++++++--- lib/dbwrap/dbwrap.h | 1 + lib/ldb-samba/ldb_wrap.c | 8 ++++++-- source3/include/messages.h | 1 + source3/include/serverid.h | 2 +- source3/lib/server_id_db_util.c | 1 + source3/smbd/server.c | 5 +++-- 7 files changed, 26 insertions(+), 8 deletions(-) Changeset truncated at 500 lines: diff --git a/examples/libsmbclient/get_auth_data_fn.h b/examples/libsmbclient/get_auth_data_fn.h index 6b91c97..5f2be72 100644 --- a/examples/libsmbclient/get_auth_data_fn.h +++ b/examples/libsmbclient/get_auth_data_fn.h @@ -16,6 +16,7 @@ get_auth_data_fn(const char * pServer, char workgroup[256] = { '\0' }; char username[256] = { '\0' }; char password[256] = { '\0' }; + char *ret; static int krb5_set = 1; @@ -36,7 +37,10 @@ get_auth_data_fn(const char * pServer, } fprintf(stdout, "Workgroup: [%s] ", pWorkgroup); - fgets(temp, sizeof(temp), stdin); + ret = fgets(temp, sizeof(temp), stdin); + if (ret == NULL) { + return; + } if (temp[strlen(temp) - 1] == '\n') /* A new line? */ { @@ -49,7 +53,10 @@ get_auth_data_fn(const char * pServer, } fprintf(stdout, "Username: [%s] ", pUsername); - fgets(temp, sizeof(temp), stdin); + ret = fgets(temp, sizeof(temp), stdin); + if (ret == NULL) { + return; + } if (temp[strlen(temp) - 1] == '\n') /* A new line? */ { @@ -62,7 +69,10 @@ get_auth_data_fn(const char * pServer, } fprintf(stdout, "Password: "); - fgets(temp, sizeof(temp), stdin); + ret = fgets(temp, sizeof(temp), stdin); + if (ret == NULL) { + return; + } if (temp[strlen(temp) - 1] == '\n') /* A new line? */ { diff --git a/lib/dbwrap/dbwrap.h b/lib/dbwrap/dbwrap.h index 0a5c918..5e13a59 100644 --- a/lib/dbwrap/dbwrap.h +++ b/lib/dbwrap/dbwrap.h @@ -24,6 +24,7 @@ #include <talloc.h> #include "libcli/util/ntstatus.h" #include "tdb.h" +#include "lib/param/loadparm.h" struct db_record; struct db_context; diff --git a/lib/ldb-samba/ldb_wrap.c b/lib/ldb-samba/ldb_wrap.c index 05d0451..838306f 100644 --- a/lib/ldb-samba/ldb_wrap.c +++ b/lib/ldb-samba/ldb_wrap.c @@ -67,8 +67,12 @@ static void ldb_wrap_debug(void *context, enum ldb_debug_level level, }; if (CHECK_DEBUGLVL(samba_level)) { char *s = NULL; - vasprintf(&s, fmt, ap); - if (!s) return; + int ret; + + ret = vasprintf(&s, fmt, ap); + if (ret == -1) { + return; + } DEBUG(samba_level, ("ldb: %s\n", s)); free(s); } diff --git a/source3/include/messages.h b/source3/include/messages.h index 9a3ea25..35f5ea7 100644 --- a/source3/include/messages.h +++ b/source3/include/messages.h @@ -59,6 +59,7 @@ #define MSG_SRVID_SAMBA 0x0000000100000000LL #include "librpc/gen_ndr/server_id.h" +#include "lib/util/data_blob.h" #define MSG_BROADCAST_PID_STR "0:0" diff --git a/source3/include/serverid.h b/source3/include/serverid.h index 03022dc..5db61b9 100644 --- a/source3/include/serverid.h +++ b/source3/include/serverid.h @@ -20,7 +20,7 @@ #ifndef __SERVERID_H__ #define __SERVERID_H__ -#include "includes.h" +#include "replace.h" #include "lib/dbwrap/dbwrap.h" /* diff --git a/source3/lib/server_id_db_util.c b/source3/lib/server_id_db_util.c index bc1eb0c..98ee07d 100644 --- a/source3/lib/server_id_db_util.c +++ b/source3/lib/server_id_db_util.c @@ -20,6 +20,7 @@ #include "replace.h" #include "server_id_db_util.h" #include "serverid.h" +#include "lib/util/samba_util.h" static int server_id_db_check_exclusive( struct server_id_db *db, const char *name, diff --git a/source3/smbd/server.c b/source3/smbd/server.c index ceb9599..5fa0885 100644 --- a/source3/smbd/server.c +++ b/source3/smbd/server.c @@ -1211,8 +1211,9 @@ extern void build_options(bool screen); exit(1); } - /* we want to re-seed early to prevent time delays causing - client problems at a later date. (tridge) */ + /* + * We want to die early if we can't open /dev/urandom + */ generate_random_buffer(NULL, 0); /* get initial effective uid and gid */ -- Samba Shared Repository