[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-397-g7070c77

[Volker Lendecke]

The branch, v3-2-test has been updated
       via  7070c77ee2a9c3c9ff1b3c7b93008b13b80ac02b (commit)
       via  9e0ee1ad4fe0f0e7dec0b6824ef234147d845b8d (commit)
       via  0d50b4ee9068d04d1d9eb7786e08775d7ba16bc8 (commit)
      from  4e609ffb2f9983362f817c1346e0a4116d2dd74a (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 7070c77ee2a9c3c9ff1b3c7b93008b13b80ac02b
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Mar 23 15:58:09 2008 +0100

    Fix Coverity ID 432

commit 9e0ee1ad4fe0f0e7dec0b6824ef234147d845b8d
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Mar 23 15:56:41 2008 +0100

    Fix Coverity ID 436

commit 0d50b4ee9068d04d1d9eb7786e08775d7ba16bc8
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Mar 23 15:51:52 2008 +0100

    Fix Coverity warnings
    
    ID 449, 448, 447, 446, 445, 444, 443, 442, 441, 440, 439, 438, 437

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

Summary of changes:
 source/lib/popt_common.c             |    5 +++++
 source/modules/vfs_audit.c           |    6 +++++-
 source/modules/vfs_extd_audit.c      |    6 +++++-
 source/rpc_server/srv_eventlog_lib.c |    2 --
 4 files changed, 15 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/popt_common.c b/source/lib/popt_common.c
index 7f7d23f..8f0f7c6 100644
--- a/source/lib/popt_common.c
+++ b/source/lib/popt_common.c
@@ -327,6 +327,11 @@ static void get_password_file(void)
 		close_it = True;
 	}
 
+	if (fd < 0) {
+		fprintf(stderr, "fd = %d, < 0\n", fd);
+		exit(1);
+	}
+
 	for(p = pass, *p = '\0'; /* ensure that pass is null-terminated */
 		p && p - pass < sizeof(pass);) {
 		switch (read(fd, p, 1)) {
diff --git a/source/modules/vfs_audit.c b/source/modules/vfs_audit.c
index a63bf4f..cfb4ddf 100644
--- a/source/modules/vfs_audit.c
+++ b/source/modules/vfs_audit.c
@@ -111,7 +111,11 @@ static int audit_syslog_priority(vfs_handle_struct *handle)
 
 	int priority;
 
-	priority = lp_parm_enum(SNUM(handle->conn), "audit", "priority", enum_log_priorities, LOG_NOTICE);
+	priority = lp_parm_enum(SNUM(handle->conn), "audit", "priority",
+				enum_log_priorities, LOG_NOTICE);
+	if (priority == -1) {
+		priority = LOG_WARNING;
+	}
 
 	return priority;
 }
diff --git a/source/modules/vfs_extd_audit.c b/source/modules/vfs_extd_audit.c
index a21e281..926ec36 100644
--- a/source/modules/vfs_extd_audit.c
+++ b/source/modules/vfs_extd_audit.c
@@ -114,7 +114,11 @@ static int audit_syslog_priority(vfs_handle_struct *handle)
 
 	int priority;
 
-	priority = lp_parm_enum(SNUM(handle->conn), "extd_audit", "priority", enum_log_priorities, LOG_NOTICE);
+	priority = lp_parm_enum(SNUM(handle->conn), "extd_audit", "priority",
+				enum_log_priorities, LOG_NOTICE);
+	if (priority == -1) {
+		priority = LOG_WARNING;
+	}
 
 	return priority;
 }
diff --git a/source/rpc_server/srv_eventlog_lib.c b/source/rpc_server/srv_eventlog_lib.c
index 269e2f3..e232a30 100644
--- a/source/rpc_server/srv_eventlog_lib.c
+++ b/source/rpc_server/srv_eventlog_lib.c
@@ -464,8 +464,6 @@ int write_eventlog_tdb( TDB_CONTEXT * the_tdb, Eventlog_entry * ee )
 	if ( mem_ctx == NULL )
 		return 0;
 
-	if ( !ee )
-		return 0;
 	/* discard any entries that have bogus time, which usually indicates a bogus entry as well. */
 	if ( ee->record.time_generated == 0 )
 		return 0;


-- 
Samba Shared Repository