[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  0d8ab38... s3: fix buildwarning in smbta-util.
      from  2070c04... s4-smbtorture: add lsa_SetTrustedDomainInfoByName NDR test.

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


- Log -----------------------------------------------------------------
commit 0d8ab380551941ab5880a6e5be49b73d541746a4
Author: Günther Deschner <gd at samba.org>
Date:   Tue Mar 16 22:17:55 2010 +0100

    s3: fix buildwarning in smbta-util.
    
    Guenther

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

Summary of changes:
 source3/utils/smbta-util.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/utils/smbta-util.c b/source3/utils/smbta-util.c
index 8ce87b3..75669c1 100644
--- a/source3/utils/smbta-util.c
+++ b/source3/utils/smbta-util.c
@@ -19,7 +19,7 @@
 #include "includes.h"
 
 
-static void delete_key();
+static void delete_key(void);
 
 
 static void help()
@@ -36,11 +36,12 @@ printf("\n");
 
 static void check_key()
 {	size_t size;
+	char *akey;
 	if (!secrets_init()) {
 		printf("Error opening secrets database.");
 		exit(1);
         }
-	char *akey = (char *) secrets_fetch("smb_traffic_analyzer_key", &size);
+	akey = (char *) secrets_fetch("smb_traffic_analyzer_key", &size);
 	if (akey != NULL) {
 		printf("A key is installed: %s\n",akey);
 		printf("Encryption activated.\n");
@@ -127,7 +128,7 @@ static void create_new_key_and_activate( char *filename )
 	create_file_from_key(filename);
 }
 
-static void delete_key()
+static void delete_key(void)
 {
 	size_t size;
 	char *akey = (char *) secrets_fetch("smb_traffic_analyzer_key", &size);
@@ -204,4 +205,5 @@ int main(int argc, char **argv)
 	}
 
 	process_arguments(argc, argv);
+	exit(0);
 }


-- 
Samba Shared Repository