trying to get HEAD building again. If you want the code

[abartlet/samba.git/.git] / source3 / passdb / secrets.c

diff --git a/source3/passdb/secrets.c b/source3/passdb/secrets.c
index 5df0edc29aab06cc2abee768fc2c1f20b8ece94e..bad8e96865c2327ed434f8b8cec0e106020f2062 100644 (file)
--- a/source3/passdb/secrets.c
+++ b/source3/passdb/secrets.c
@@ -100,7 +100,7 @@ BOOL secrets_store_domain_sid(const char *domain, const DOM_SID *sid)
        fstring key;
 
        slprintf(key, sizeof(key)-1, "%s/%s", SECRETS_DOMAIN_SID, domain);
-       strupper(key);
+       strupper_m(key);
        return secrets_store(key, sid, sizeof(DOM_SID));
 }
 
@@ -111,7 +111,7 @@ BOOL secrets_fetch_domain_sid(const char *domain, DOM_SID *sid)
        size_t size;
 
        slprintf(key, sizeof(key)-1, "%s/%s", SECRETS_DOMAIN_SID, domain);
-       strupper(key);
+       strupper_m(key);
        dyn_sid = (DOM_SID *)secrets_fetch(key, &size);
 
        if (dyn_sid == NULL)
@@ -133,7 +133,7 @@ BOOL secrets_store_domain_guid(const char *domain, GUID *guid)
        fstring key;
 
        slprintf(key, sizeof(key)-1, "%s/%s", SECRETS_DOMAIN_GUID, domain);
-       strupper(key);
+       strupper_m(key);
        return secrets_store(key, guid, sizeof(GUID));
 }
 
@@ -145,13 +145,13 @@ BOOL secrets_fetch_domain_guid(const char *domain, GUID *guid)
        GUID new_guid;
 
        slprintf(key, sizeof(key)-1, "%s/%s", SECRETS_DOMAIN_GUID, domain);
-       strupper(key);
+       strupper_m(key);
        dyn_guid = (GUID *)secrets_fetch(key, &size);
 
        DEBUG(6,("key is %s, size is %d\n", key, (int)size));
 
        if ((NULL == dyn_guid) && (ROLE_DOMAIN_PDC == lp_server_role())) {
-               uuid_generate_random(&new_guid);
+               smb_uuid_generate_random(&new_guid);
                if (!secrets_store_domain_guid(domain, &new_guid))
                        return False;
                dyn_guid = (GUID *)secrets_fetch(key, &size);
@@ -183,7 +183,7 @@ const char *trust_keystr(const char *domain)
 
        slprintf(keystr,sizeof(keystr)-1,"%s/%s", 
                 SECRETS_MACHINE_ACCT_PASS, domain);
-       strupper(keystr);
+       strupper_m(keystr);
 
        return keystr;
 }
@@ -200,7 +200,7 @@ char *trustdom_keystr(const char *domain)
        static char* keystr;
 
        asprintf(&keystr, "%s/%s", SECRETS_DOMTRUST_ACCT_PASS, domain);
-       strupper(keystr);
+       strupper_m(keystr);
                
        return keystr;
 }
@@ -252,8 +252,7 @@ BOOL secrets_fetch_trust_account_password(const char *domain, uint8 ret_pwd[16],
        plaintext = secrets_fetch_machine_password(domain, pass_last_set_time, 
                                                   channel);
        if (plaintext) {
-               /* we have an ADS password - use that */
-               DEBUG(4,("Using ADS machine password\n"));
+               DEBUG(4,("Using cleartext machine password\n"));
                E_md4hash(plaintext, ret_pwd);
                SAFE_FREE(plaintext);
                return True;
@@ -400,7 +399,7 @@ BOOL secrets_store_machine_password(const char *pass, const char *domain, uint32
        asprintf(&key, "%s/%s", SECRETS_MACHINE_PASSWORD, domain);
        if (!key) 
                return False;
-       strupper(key);
+       strupper_m(key);
 
        ret = secrets_store(key, pass, strlen(pass)+1);
        SAFE_FREE(key);
@@ -411,7 +410,7 @@ BOOL secrets_store_machine_password(const char *pass, const char *domain, uint32
        asprintf(&key, "%s/%s", SECRETS_MACHINE_LAST_CHANGE_TIME, domain);
        if (!key) 
                return False;
-       strupper(key);
+       strupper_m(key);
 
        SIVAL(&last_change_time, 0, time(NULL));
        ret = secrets_store(key, &last_change_time, sizeof(last_change_time));
@@ -420,7 +419,7 @@ BOOL secrets_store_machine_password(const char *pass, const char *domain, uint32
        asprintf(&key, "%s/%s", SECRETS_MACHINE_SEC_CHANNEL_TYPE, domain);
        if (!key) 
                return False;
-       strupper(key);
+       strupper_m(key);
 
        SIVAL(&sec_channel_type, 0, sec_channel);
        ret = secrets_store(key, &sec_channel_type, sizeof(sec_channel_type));
@@ -441,7 +440,7 @@ char *secrets_fetch_machine_password(const char *domain,
        char *key = NULL;
        char *ret;
        asprintf(&key, "%s/%s", SECRETS_MACHINE_PASSWORD, domain);
-       strupper(key);
+       strupper_m(key);
        ret = (char *)secrets_fetch(key, NULL);
        SAFE_FREE(key);
        
@@ -449,10 +448,11 @@ char *secrets_fetch_machine_password(const char *domain,
                size_t size;
                uint32 *last_set_time;
                asprintf(&key, "%s/%s", SECRETS_MACHINE_LAST_CHANGE_TIME, domain);
-               strupper(key);
+               strupper_m(key);
                last_set_time = secrets_fetch(key, &size);
                if (last_set_time) {
                        *pass_last_set_time = IVAL(last_set_time,0);
+                       SAFE_FREE(last_set_time);
                } else {
                        *pass_last_set_time = 0;
                }
@@ -463,10 +463,11 @@ char *secrets_fetch_machine_password(const char *domain,
                size_t size;
                uint32 *channel_type;
                asprintf(&key, "%s/%s", SECRETS_MACHINE_SEC_CHANNEL_TYPE, domain);
-               strupper(key);
+               strupper_m(key);
                channel_type = secrets_fetch(key, &size);
                if (channel_type) {
                        *channel = IVAL(channel_type,0);
+                       SAFE_FREE(channel_type);
                } else {
                        *channel = get_default_sec_channel();
                }
@@ -614,7 +615,7 @@ NTSTATUS secrets_get_trusted_domains(TALLOC_CTX* ctx, int* enum_ctx, unsigned in
                        DEBUG(0, ("strndup failed!\n"));
                        return NT_STATUS_NO_MEMORY;
                }
-                               
+
                packed_pass = secrets_fetch(secrets_key, &size);
                packed_size = tdb_trusted_dom_pass_unpack(packed_pass, size, pass);
                /* packed representation isn't needed anymore */