r6271: Don't zero the cli_credentials structure - instead allow valgrind to

track the use of un-initialised values.

This change will require a recompile from clean, as the enum
describing the status of each element now has a default of
CRED_UNINITIALISED.

Andrew Bartlett
(This used to be commit 83c2eb806d43f588bd06336aa7e2dbdc00dc2c67)

diff --git a/source4/include/credentials.h b/source4/include/credentials.h
index d7bf8997eb69458debf8b485f740f2fdb65a6187..e7df58f2179a0c3e7f2e7fa31bd3dc14883d78f1 100644 (file)
--- a/source4/include/credentials.h
+++ b/source4/include/credentials.h
@@ -23,7 +23,8 @@
 
 /* In order of priority */
 enum credentials_obtained { 
-       CRED_GUESSED    = 0, /* Current value should be used, which was guessed */
+       CRED_UNINITIALISED = 0,  /* We don't even have a guess yet */
+       CRED_GUESSED,            /* Current value should be used, which was guessed */
        CRED_CALLBACK,           /* Callback should be used to obtain value */
        CRED_SPECIFIED           /* Was explicitly specified on the command-line */
 };

diff --git a/source4/lib/credentials.c b/source4/lib/credentials.c
index 9c892b06880e72fb86ee66972b61ee22ea94f794..ba263260bb8710da90e6f6c52550dca877e078d1 100644 (file)
--- a/source4/lib/credentials.c
+++ b/source4/lib/credentials.c
@@ -32,11 +32,17 @@
  */
 struct cli_credentials *cli_credentials_init(TALLOC_CTX *mem_ctx) 
 {
-       struct cli_credentials *cred = talloc_zero(mem_ctx, struct cli_credentials);
+       struct cli_credentials *cred = talloc(mem_ctx, struct cli_credentials);
        if (!cred) {
                return cred;
        }
 
+       cred->machine_account_pending = False;
+       cred->workstation_obtained = CRED_UNINITIALISED;
+       cred->username_obtained = CRED_UNINITIALISED;
+       cred->password_obtained = CRED_UNINITIALISED;
+       cred->domain_obtained = CRED_UNINITIALISED;
+       cred->realm_obtained = CRED_UNINITIALISED;
        return cred;
 }