svn commit: samba r11405 - in branches/SAMBA_4_0/source/torture/rpc: .

[abartlet at samba.org]

Author: abartlet
Date: 2005-10-31 02:58:29 +0000 (Mon, 31 Oct 2005)
New Revision: 11405

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=11405

Log:
Ensure we can never have secret4 be uninitialised.  Found after
volker's urging on the use of -O1.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/torture/rpc/lsa.c


Changeset:
Modified: branches/SAMBA_4_0/source/torture/rpc/lsa.c
===================================================================
--- branches/SAMBA_4_0/source/torture/rpc/lsa.c	2005-10-31 02:46:15 UTC (rev 11404)
+++ branches/SAMBA_4_0/source/torture/rpc/lsa.c	2005-10-31 02:58:29 UTC (rev 11405)
@@ -797,13 +797,13 @@
 		status = dcerpc_lsa_OpenSecret(p, mem_ctx, &r2);
 		if (!NT_STATUS_IS_OK(status)) {
 			printf("OpenSecret failed - %s\n", nt_errstr(status));
-			ret = False;
+			return False;
 		}
 		
 		status = dcerpc_fetch_session_key(p, &session_key);
 		if (!NT_STATUS_IS_OK(status)) {
 			printf("dcerpc_fetch_session_key failed - %s\n", nt_errstr(status));
-			ret = False;
+			return False;
 		}
 		
 		enc_key = sess_encrypt_string(secret1, &session_key);
@@ -820,7 +820,7 @@
 		status = dcerpc_lsa_SetSecret(p, mem_ctx, &r3);
 		if (!NT_STATUS_IS_OK(status)) {
 			printf("SetSecret failed - %s\n", nt_errstr(status));
-			ret = False;
+			return False;
 		}
 		
 		r3.in.sec_handle = &sec_handle;
@@ -916,12 +916,14 @@
 		if (!NT_STATUS_IS_OK(status)) {
 			printf("QuerySecret failed - %s\n", nt_errstr(status));
 			ret = False;
+			secret4 = NULL;
 		} else {
 
 			if (r6.out.new_val->buf == NULL || r6.out.old_val->buf == NULL 
 				|| r6.out.new_mtime == NULL || r6.out.old_mtime == NULL) {
 				printf("Both secret buffers and both times not returned\n");
 				ret = False;
+				secret4 = NULL;
 			} else {
 				blob1.data = r6.out.new_val->buf->data;
 				blob1.length = r6.out.new_val->buf->size;