summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2008-09-04 11:51:55 -0700
committerJeremy Allison <jra@samba.org>2008-09-04 11:51:55 -0700
commit7c16514eb9f36ee00e1846e6ae9f99fec06e5630 (patch)
tree7db08c72fa7627ee395b6d662dda026f5c4313f1 /source3
parent304554115a2f2dc316386a9ea5bec237d67f595f (diff)
parent862ff66da912e840860452ef0846793961f3bb82 (diff)
downloadsamba-7c16514eb9f36ee00e1846e6ae9f99fec06e5630.tar.gz
samba-7c16514eb9f36ee00e1846e6ae9f99fec06e5630.tar.bz2
samba-7c16514eb9f36ee00e1846e6ae9f99fec06e5630.zip
Merge branch 'v3-devel' of ssh://jra@git.samba.org/data/git/samba into v3-devel
(This used to be commit 98b2fbef5273b055242e24490736b0c9677b1732)
Diffstat (limited to 'source3')
-rw-r--r--source3/libads/kerberos.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/libads/kerberos.c b/source3/libads/kerberos.c
index 31e5af4224..501ef010fd 100644
--- a/source3/libads/kerberos.c
+++ b/source3/libads/kerberos.c
@@ -893,9 +893,9 @@ bool create_local_private_krb5_conf_for_domain(const char *realm,
file_contents = talloc_asprintf(fname,
"[libdefaults]\n\tdefault_realm = %s\n"
- "default_tgs_enctypes = RC4-HMAC DES-CBC-CRC DES-CBC-MD5\n"
- "default_tkt_enctypes = RC4-HMAC DES-CBC-CRC DES-CBC-MD5\n"
- "preferred_enctypes = RC4-HMAC DES-CBC-CRC DES-CBC-MD5\n\n"
+ "\tdefault_tgs_enctypes = RC4-HMAC DES-CBC-CRC DES-CBC-MD5\n"
+ "\tdefault_tkt_enctypes = RC4-HMAC DES-CBC-CRC DES-CBC-MD5\n"
+ "\tpreferred_enctypes = RC4-HMAC DES-CBC-CRC DES-CBC-MD5\n\n"
"[realms]\n\t%s = {\n"
"\t%s\t}\n",
realm_upper, realm_upper, kdc_ip_string);