Changes from APPLIANCE_HEAD:

[ira/wip.git] / source3 / passdb / secrets.c

diff --git a/source3/passdb/secrets.c b/source3/passdb/secrets.c
index a09b45ad74559e53e80ba41affe5ba2649406e5a..9591474861a8d652c49b714ac15e68bf177fa62f 100644 (file)
--- a/source3/passdb/secrets.c
+++ b/source3/passdb/secrets.c
@@ -99,6 +99,7 @@ BOOL secrets_fetch_domain_sid(char *domain, DOM_SID *sid)
        size_t size;
 
        slprintf(key, sizeof(key), "%s/%s", SECRETS_DOMAIN_SID, domain);
        size_t size;
 
        slprintf(key, sizeof(key), "%s/%s", SECRETS_DOMAIN_SID, domain);

+       dos_to_unix(key, True);                /* Convert key to unix-codepage */

        dyn_sid = (DOM_SID *)secrets_fetch(key, &size);
 
        if (dyn_sid == NULL)
        dyn_sid = (DOM_SID *)secrets_fetch(key, &size);
 
        if (dyn_sid == NULL)


@@ -123,6 +124,7 @@ char *trust_keystr(char *domain)
 {
        static fstring keystr;
        slprintf(keystr,sizeof(keystr),"%s/%s", SECRETS_MACHINE_ACCT_PASS, domain);
 {
        static fstring keystr;
        slprintf(keystr,sizeof(keystr),"%s/%s", SECRETS_MACHINE_ACCT_PASS, domain);

+       dos_to_unix(keystr, True);         /* Convert key to unix-codepage */

        return keystr;
 }
 
        return keystr;
 }