svn commit: samba r25019 - in branches: SAMBA_3_2/source/utils SAMBA_3_2_0/source/utils

[jra at samba.org]

Author: jra
Date: 2007-09-08 04:45:59 +0000 (Sat, 08 Sep 2007)
New Revision: 25019

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

Log:
Fix coverity bug #105, run #332. Use of uninitialized variable.
Jeremy.

Modified:
   branches/SAMBA_3_2/source/utils/net_sam.c
   branches/SAMBA_3_2_0/source/utils/net_sam.c


Changeset:
Modified: branches/SAMBA_3_2/source/utils/net_sam.c
===================================================================
--- branches/SAMBA_3_2/source/utils/net_sam.c	2007-09-08 01:40:24 UTC (rev 25018)
+++ branches/SAMBA_3_2/source/utils/net_sam.c	2007-09-08 04:45:59 UTC (rev 25019)
@@ -362,7 +362,8 @@
 static int net_sam_policy_set(int argc, const char **argv)
 {
 	const char *account_policy = NULL;
-	uint32 value, old_value;
+	uint32 value = 0;
+	uint32 old_value = 0;
 	int field;
 	char *endptr;
 
@@ -409,19 +410,20 @@
 	if (!pdb_get_account_policy(field, &old_value)) {
 		d_fprintf(stderr, "Valid account policy, but unable to fetch "
 			  "value!\n");
+	} else {
+		d_printf("Account policy \"%s\" value was: %d\n", account_policy,
+			old_value);
 	}
 
 	if (!pdb_set_account_policy(field, value)) {
 		d_fprintf(stderr, "Valid account policy, but unable to "
 			  "set value!\n");
 		return -1;
+	} else {
+		d_printf("Account policy \"%s\" value is now: %d\n", account_policy,
+			value);
 	}
 
-	d_printf("Account policy \"%s\" value was: %d\n", account_policy,
-		 old_value);
-
-	d_printf("Account policy \"%s\" value is now: %d\n", account_policy,
-		 value);
 	return 0;
 }
 

Modified: branches/SAMBA_3_2_0/source/utils/net_sam.c
===================================================================
--- branches/SAMBA_3_2_0/source/utils/net_sam.c	2007-09-08 01:40:24 UTC (rev 25018)
+++ branches/SAMBA_3_2_0/source/utils/net_sam.c	2007-09-08 04:45:59 UTC (rev 25019)
@@ -362,7 +362,8 @@
 static int net_sam_policy_set(int argc, const char **argv)
 {
 	const char *account_policy = NULL;
-	uint32 value, old_value;
+	uint32 value = 0;
+	uint32 old_value = 0;
 	int field;
 	char *endptr;
 
@@ -409,19 +410,20 @@
 	if (!pdb_get_account_policy(field, &old_value)) {
 		d_fprintf(stderr, "Valid account policy, but unable to fetch "
 			  "value!\n");
+	} else {
+		d_printf("Account policy \"%s\" value was: %d\n", account_policy,
+			old_value);
 	}
 
 	if (!pdb_set_account_policy(field, value)) {
 		d_fprintf(stderr, "Valid account policy, but unable to "
 			  "set value!\n");
 		return -1;
+	} else {
+		d_printf("Account policy \"%s\" value is now: %d\n", account_policy,
+			value);
 	}
 
-	d_printf("Account policy \"%s\" value was: %d\n", account_policy,
-		 old_value);
-
-	d_printf("Account policy \"%s\" value is now: %d\n", account_policy,
-		 value);
 	return 0;
 }