summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2011-06-01 16:40:05 -0700
committerJeremy Allison <jra@samba.org>2011-06-02 02:51:06 +0200
commite98fb2f2b9542de97dee3f1a3e077d5306ec27b1 (patch)
tree22cecf621efb73dc7f5524a1e00ac5dd07949037
parent388bba05cf2bf3674831409d781a65c1f90292fa (diff)
downloadsamba-e98fb2f2b9542de97dee3f1a3e077d5306ec27b1.tar.gz
samba-e98fb2f2b9542de97dee3f1a3e077d5306ec27b1.tar.bz2
samba-e98fb2f2b9542de97dee3f1a3e077d5306ec27b1.zip
Remove another PATH_MAX.
Autobuild-User: Jeremy Allison <jra@samba.org> Autobuild-Date: Thu Jun 2 02:51:06 CEST 2011 on sn-devel-104
-rw-r--r--source3/libads/kerberos.c39
1 files changed, 27 insertions, 12 deletions
diff --git a/source3/libads/kerberos.c b/source3/libads/kerberos.c
index 0b62ebf4e4..48a832e1a9 100644
--- a/source3/libads/kerberos.c
+++ b/source3/libads/kerberos.c
@@ -958,22 +958,37 @@ bool create_local_private_krb5_conf_for_domain(const char *realm,
/* Insanity, sheer insanity..... */
if (strequal(realm, lp_realm())) {
- char linkpath[PATH_MAX+1];
- int lret;
-
- lret = readlink(SYSTEM_KRB5_CONF_PATH, linkpath, sizeof(linkpath)-1);
- if (lret != -1) {
- linkpath[lret] = '\0';
- }
-
- if (lret != -1 || strcmp(linkpath, fname) == 0) {
- /* Symlink already exists. */
- goto done;
+ SMB_STRUCT_STAT sbuf;
+
+ if (sys_lstat(SYSTEM_KRB5_CONF_PATH, &sbuf, false) == 0) {
+ if (S_ISLNK(sbuf.st_ex_mode) && sbuf.st_ex_size) {
+ int lret;
+ size_t alloc_size = sbuf.st_ex_size + 1;
+ char *linkpath = TALLOC_ARRAY(talloc_tos(), char,
+ alloc_size);
+ if (!linkpath) {
+ goto done;
+ }
+ lret = readlink(SYSTEM_KRB5_CONF_PATH, linkpath,
+ alloc_size - 1);
+ if (lret == -1) {
+ TALLOC_FREE(linkpath);
+ goto done;
+ }
+ linkpath[lret] = '\0';
+
+ if (strcmp(linkpath, fname) == 0) {
+ /* Symlink already exists. */
+ TALLOC_FREE(linkpath);
+ goto done;
+ }
+ TALLOC_FREE(linkpath);
+ }
}
/* Try and replace with a symlink. */
if (symlink(fname, SYSTEM_KRB5_CONF_PATH) == -1) {
- const char *newpath = SYSTEM_KRB5_CONF_PATH ## ".saved";
+ const char *newpath = SYSTEM_KRB5_CONF_PATH ".saved";
if (errno != EEXIST) {
DEBUG(0,("create_local_private_krb5_conf_for_domain: symlink "
"of %s to %s failed. Errno %s\n",