r17997: Ensure lockdir exists for winbindd. Store tmp

krb5.conf files under lockdir, not privatedir.
Jeremy.
(This used to be commit c59eff3e53f5bfae3a9fb136e8566628339863ad)

diff --git a/source3/libads/kerberos.c b/source3/libads/kerberos.c
index 4ddbf0abc5aa227864faf2a000938fb5e130aa45..a077ce1fce6e22a93b24af8c670dc972bbcc394b 100644 (file)
--- a/source3/libads/kerberos.c
+++ b/source3/libads/kerberos.c
@@ -474,7 +474,7 @@ int kerberos_kinit_password(const char *principal,
 BOOL create_local_private_krb5_conf_for_domain(const char *realm, const char *domain, struct in_addr ip)
 {
        XFILE *xfp = NULL;
-       char *dname = talloc_asprintf(NULL, "%s/smb_krb5", lp_private_dir());
+       char *dname = talloc_asprintf(NULL, "%s/smb_krb5", lp_lockdir());
        char *fname = NULL;
        char *file_contents = NULL;
        size_t flen = 0;

diff --git a/source3/nsswitch/winbindd.c b/source3/nsswitch/winbindd.c
index f6e742ac20ada6cf3cf93c55e8a82a88d1ad0cea..df8f821c8bf4bc58fc468c14de00a4f48eba82b1 100644 (file)
--- a/source3/nsswitch/winbindd.c
+++ b/source3/nsswitch/winbindd.c
@@ -963,6 +963,10 @@ int main(int argc, char **argv)
                exit(1);
        }
 
+       if (!directory_exist(lp_lockdir(), NULL)) {
+               mkdir(lp_lockdir(), 0755);
+       }
+
        /* Setup names. */
 
        if (!init_names())