[SCM] Samba Shared Repository - branch master updated -
584da3fea3f4391bb8b68cac90947edf88d0c28d
Michael Adam
obnox at samba.org
Fri Jan 16 00:09:40 GMT 2009
The branch, master has been updated
via 584da3fea3f4391bb8b68cac90947edf88d0c28d (commit)
via 166ffc0d0dd55e6d7f530cfb806aa21142088e26 (commit)
via 0cea990d75d957fc12c17d0944093a76cfa06d81 (commit)
via 99ef38c84fa902494b7b6fe8e75dd78303a5f7a9 (commit)
via edbc7efa35c39819e1ca31e1b45ce47f3e6924b5 (commit)
via 62e7849ddca3f727b2e954acb6b2ece02a275911 (commit)
via 0b87f210f17396d188cbd342bcfa94a33e031917 (commit)
via 37c77643f9c9ef683991d001991b30264e9e2a7d (commit)
via 2fb694df23616c660000f3bfa471927163c0f9ff (commit)
via 26e5e4f6fd07893d914ac9a397669b6b4097e0be (commit)
via 2f06192523633939c2df87e05c3f97655455da27 (commit)
from 660d7794b67c1af9d699e5f99b9e5275b06ad67b (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 584da3fea3f4391bb8b68cac90947edf88d0c28d
Author: Michael Adam <obnox at samba.org>
Date: Fri Jan 16 00:50:45 2009 +0100
s3: put the gpo cache dir under cache_dir instead of lock_dir
Michael
commit 166ffc0d0dd55e6d7f530cfb806aa21142088e26
Author: Michael Adam <obnox at samba.org>
Date: Fri Jan 16 00:48:29 2009 +0100
s3: put printing/ under cache_dir, not lock_dir
Michael
commit 0cea990d75d957fc12c17d0944093a76cfa06d81
Author: Michael Adam <obnox at samba.org>
Date: Fri Jan 16 00:44:55 2009 +0100
s3: put netsamlogon_cache.tdb into cache_dir instead of lock_dir
Michael
commit 99ef38c84fa902494b7b6fe8e75dd78303a5f7a9
Author: Michael Adam <obnox at samba.org>
Date: Fri Jan 16 00:40:48 2009 +0100
s3:put the browse list into cache_dir, not lock_dir.
Michael
commit edbc7efa35c39819e1ca31e1b45ce47f3e6924b5
Author: Michael Adam <obnox at samba.org>
Date: Fri Jan 16 00:31:17 2009 +0100
s3:winbindd: put winbindd_cache.tdb into cache_dir, not lock_dir.
Michael
commit 62e7849ddca3f727b2e954acb6b2ece02a275911
Author: Michael Adam <obnox at samba.org>
Date: Fri Jan 16 00:30:36 2009 +0100
s3:passdb: put login_cache.tdb into cache_dir, not lock_dir.
Michael
commit 0b87f210f17396d188cbd342bcfa94a33e031917
Author: Michael Adam <obnox at samba.org>
Date: Fri Jan 16 00:17:51 2009 +0100
s3:libads: use lock_path for creating paths to local krb5.conf files
instead of manually doing an asprintf with lp_lockdir()
Michael
squash
commit 37c77643f9c9ef683991d001991b30264e9e2a7d
Author: Michael Adam <obnox at samba.org>
Date: Fri Jan 16 00:10:29 2009 +0100
s3:libads: give create_local_private_krb5_conf_for_domain() a common exit point
Michael
commit 2fb694df23616c660000f3bfa471927163c0f9ff
Author: Michael Adam <obnox at samba.org>
Date: Thu Jan 15 23:43:00 2009 +0100
s3:vfs_xattr_tdb: don't leak state_path() to talloc_tos in xattr_tdb_init().
Michael
commit 26e5e4f6fd07893d914ac9a397669b6b4097e0be
Author: Michael Adam <obnox at samba.org>
Date: Thu Jan 15 23:34:00 2009 +0100
s3:nmbd: don't leak state_path() to talloc_tos() in wins_write_database()
Michael
commit 2f06192523633939c2df87e05c3f97655455da27
Author: Michael Adam <obnox at samba.org>
Date: Thu Jan 15 23:31:17 2009 +0100
s3:vfs_acl_tdb: don't leak state_path() to talloc_tos() in acl_tdb_init()
Michael
-----------------------------------------------------------------------
Summary of changes:
source3/libads/kerberos.c | 55 +++++++++++++++---------------------
source3/libgpo/gpo_fetch.c | 4 +-
source3/libsmb/samlogon_cache.c | 2 +-
source3/modules/vfs_acl_tdb.c | 2 +
source3/modules/vfs_xattr_tdb.c | 13 ++++++---
source3/nmbd/nmbd_serverlistdb.c | 9 +-----
source3/nmbd/nmbd_winsserver.c | 2 +-
source3/passdb/login_cache.c | 5 ++-
source3/printing/nt_printing.c | 2 +-
source3/printing/printing.c | 4 +-
source3/printing/printing_db.c | 2 +-
source3/smbd/lanman.c | 4 +-
source3/utils/smbcontrol.c | 8 +++---
source3/winbindd/winbindd_cache.c | 12 ++++----
14 files changed, 58 insertions(+), 66 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/libads/kerberos.c b/source3/libads/kerberos.c
index 7dfc19b..b752fc2 100644
--- a/source3/libads/kerberos.c
+++ b/source3/libads/kerberos.c
@@ -847,7 +847,7 @@ bool create_local_private_krb5_conf_for_domain(const char *realm,
const char *sitename,
struct sockaddr_storage *pss)
{
- char *dname = talloc_asprintf(NULL, "%s/smb_krb5", lp_lockdir());
+ char *dname = lock_path("smb_krb5");
char *tmpname = NULL;
char *fname = NULL;
char *file_contents = NULL;
@@ -856,28 +856,26 @@ bool create_local_private_krb5_conf_for_domain(const char *realm,
ssize_t ret;
int fd;
char *realm_upper = NULL;
+ bool result = false;
if (!dname) {
- return False;
+ return false;
}
if ((mkdir(dname, 0755)==-1) && (errno != EEXIST)) {
DEBUG(0,("create_local_private_krb5_conf_for_domain: "
"failed to create directory %s. Error was %s\n",
dname, strerror(errno) ));
- TALLOC_FREE(dname);
- return False;
+ goto done;
}
- tmpname = talloc_asprintf(dname, "%s/smb_tmp_krb5.XXXXXX", lp_lockdir());
+ tmpname = lock_path("smb_tmp_krb5.XXXXXX");
if (!tmpname) {
- TALLOC_FREE(dname);
- return False;
+ goto done;
}
fname = talloc_asprintf(dname, "%s/krb5.conf.%s", dname, domain);
if (!fname) {
- TALLOC_FREE(dname);
- return False;
+ goto done;
}
DEBUG(10,("create_local_private_krb5_conf_for_domain: fname = %s, realm = %s, domain = %s\n",
@@ -888,8 +886,7 @@ bool create_local_private_krb5_conf_for_domain(const char *realm,
kdc_ip_string = get_kdc_ip_string(dname, realm, sitename, pss);
if (!kdc_ip_string) {
- TALLOC_FREE(dname);
- return False;
+ goto done;
}
file_contents = talloc_asprintf(fname,
@@ -902,8 +899,7 @@ bool create_local_private_krb5_conf_for_domain(const char *realm,
realm_upper, realm_upper, kdc_ip_string);
if (!file_contents) {
- TALLOC_FREE(dname);
- return False;
+ goto done;
}
flen = strlen(file_contents);
@@ -913,8 +909,7 @@ bool create_local_private_krb5_conf_for_domain(const char *realm,
DEBUG(0,("create_local_private_krb5_conf_for_domain: smb_mkstemp failed,"
" for file %s. Errno %s\n",
tmpname, strerror(errno) ));
- TALLOC_FREE(dname);
- return false;
+ goto done;
}
if (fchmod(fd, 0644)==-1) {
@@ -923,8 +918,7 @@ bool create_local_private_krb5_conf_for_domain(const char *realm,
tmpname, strerror(errno) ));
unlink(tmpname);
close(fd);
- TALLOC_FREE(dname);
- return False;
+ goto done;
}
ret = write(fd, file_contents, flen);
@@ -934,15 +928,13 @@ bool create_local_private_krb5_conf_for_domain(const char *realm,
(int)ret, (unsigned int)flen, strerror(errno) ));
unlink(tmpname);
close(fd);
- TALLOC_FREE(dname);
- return False;
+ goto done;
}
if (close(fd)==-1) {
DEBUG(0,("create_local_private_krb5_conf_for_domain: close failed."
" Errno %s\n", strerror(errno) ));
unlink(tmpname);
- TALLOC_FREE(dname);
- return False;
+ goto done;
}
if (rename(tmpname, fname) == -1) {
@@ -950,8 +942,7 @@ bool create_local_private_krb5_conf_for_domain(const char *realm,
"of %s to %s failed. Errno %s\n",
tmpname, fname, strerror(errno) ));
unlink(tmpname);
- TALLOC_FREE(dname);
- return False;
+ goto done;
}
DEBUG(5,("create_local_private_krb5_conf_for_domain: wrote "
@@ -961,6 +952,8 @@ bool create_local_private_krb5_conf_for_domain(const char *realm,
/* Set the environment variable to this file. */
setenv("KRB5_CONFIG", fname, 1);
+ result = true;
+
#if defined(OVERWRITE_SYSTEM_KRB5_CONF)
#define SYSTEM_KRB5_CONF_PATH "/etc/krb5.conf"
@@ -977,8 +970,7 @@ bool create_local_private_krb5_conf_for_domain(const char *realm,
if (lret != -1 || strcmp(linkpath, fname) == 0) {
/* Symlink already exists. */
- TALLOC_FREE(dname);
- return True;
+ goto done;
}
/* Try and replace with a symlink. */
@@ -988,8 +980,7 @@ bool create_local_private_krb5_conf_for_domain(const char *realm,
DEBUG(0,("create_local_private_krb5_conf_for_domain: symlink "
"of %s to %s failed. Errno %s\n",
fname, SYSTEM_KRB5_CONF_PATH, strerror(errno) ));
- TALLOC_FREE(dname);
- return True; /* Not a fatal error. */
+ goto done; /* Not a fatal error. */
}
/* Yes, this is a race conditon... too bad. */
@@ -998,23 +989,23 @@ bool create_local_private_krb5_conf_for_domain(const char *realm,
"of %s to %s failed. Errno %s\n",
SYSTEM_KRB5_CONF_PATH, newpath,
strerror(errno) ));
- TALLOC_FREE(dname);
- return True; /* Not a fatal error. */
+ goto done; /* Not a fatal error. */
}
if (symlink(fname, SYSTEM_KRB5_CONF_PATH) == -1) {
DEBUG(0,("create_local_private_krb5_conf_for_domain: "
"forced symlink of %s to /etc/krb5.conf failed. Errno %s\n",
fname, strerror(errno) ));
- TALLOC_FREE(dname);
- return True; /* Not a fatal error. */
+ goto done; /* Not a fatal error. */
}
}
}
#endif
+done:
+ TALLOC_FREE(tmpname);
TALLOC_FREE(dname);
- return True;
+ return result;
}
#endif
diff --git a/source3/libgpo/gpo_fetch.c b/source3/libgpo/gpo_fetch.c
index 2ec0664..302003f 100644
--- a/source3/libgpo/gpo_fetch.c
+++ b/source3/libgpo/gpo_fetch.c
@@ -59,7 +59,7 @@ NTSTATUS gpo_explode_filesyspath(TALLOC_CTX *mem_ctx,
if ((path = talloc_asprintf(mem_ctx,
"%s/%s",
- lock_path(GPO_CACHE_DIR),
+ cache_path(GPO_CACHE_DIR),
file_sys_path)) == NULL) {
return NT_STATUS_NO_MEMORY;
}
@@ -82,7 +82,7 @@ NTSTATUS gpo_explode_filesyspath(TALLOC_CTX *mem_ctx,
static NTSTATUS gpo_prepare_local_store(TALLOC_CTX *mem_ctx,
const char *unix_path)
{
- const char *top_dir = lock_path(GPO_CACHE_DIR);
+ const char *top_dir = cache_path(GPO_CACHE_DIR);
char *current_dir;
char *tok;
diff --git a/source3/libsmb/samlogon_cache.c b/source3/libsmb/samlogon_cache.c
index 7af93cf..c96f5da 100644
--- a/source3/libsmb/samlogon_cache.c
+++ b/source3/libsmb/samlogon_cache.c
@@ -35,7 +35,7 @@ static TDB_CONTEXT *netsamlogon_tdb = NULL;
bool netsamlogon_cache_init(void)
{
if (!netsamlogon_tdb) {
- netsamlogon_tdb = tdb_open_log(lock_path(NETSAMLOGON_TDB), 0,
+ netsamlogon_tdb = tdb_open_log(cache_path(NETSAMLOGON_TDB), 0,
TDB_DEFAULT, O_RDWR | O_CREAT, 0600);
}
diff --git a/source3/modules/vfs_acl_tdb.c b/source3/modules/vfs_acl_tdb.c
index a796981..be28b5f 100644
--- a/source3/modules/vfs_acl_tdb.c
+++ b/source3/modules/vfs_acl_tdb.c
@@ -61,10 +61,12 @@ static bool acl_tdb_init(struct db_context **pp_db)
#else
errno = ENOSYS;
#endif
+ TALLOC_FREE(dbname);
return false;
}
ref_count++;
+ TALLOC_FREE(dbname);
return true;
}
diff --git a/source3/modules/vfs_xattr_tdb.c b/source3/modules/vfs_xattr_tdb.c
index c4806e2..44bfffb 100644
--- a/source3/modules/vfs_xattr_tdb.c
+++ b/source3/modules/vfs_xattr_tdb.c
@@ -574,15 +574,18 @@ static bool xattr_tdb_init(int snum, struct db_context **p_db)
{
struct db_context *db;
const char *dbname;
+ char *def_dbname;
- dbname = lp_parm_const_string(snum, "xattr_tdb", "file",
- state_path("xattr.tdb"));
-
- if (dbname == NULL) {
+ def_dbname = state_path("xattr.tdb");
+ if (def_dbname == NULL) {
errno = ENOSYS;
return false;
}
+ dbname = lp_parm_const_string(snum, "xattr_tdb", "file", def_dbname);
+
+ /* now we know dbname is not NULL */
+
become_root();
db = db_open(NULL, dbname, 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
unbecome_root();
@@ -593,10 +596,12 @@ static bool xattr_tdb_init(int snum, struct db_context **p_db)
#else
errno = ENOSYS;
#endif
+ TALLOC_FREE(def_dbname);
return false;
}
*p_db = db;
+ TALLOC_FREE(def_dbname);
return true;
}
diff --git a/source3/nmbd/nmbd_serverlistdb.c b/source3/nmbd/nmbd_serverlistdb.c
index 349c3f4..28c164f 100644
--- a/source3/nmbd/nmbd_serverlistdb.c
+++ b/source3/nmbd/nmbd_serverlistdb.c
@@ -326,14 +326,7 @@ void write_browse_list(time_t t, bool force_write)
updatecount++;
- fname = talloc_strdup(ctx, lp_lockdir());
- if (!fname) {
- return;
- }
- trim_char(fname,'\0' ,'/');
- fname = talloc_asprintf_append(fname,
- "/%s",
- SERVER_LIST);
+ fname = cache_path(SERVER_LIST);
if (!fname) {
return;
}
diff --git a/source3/nmbd/nmbd_winsserver.c b/source3/nmbd/nmbd_winsserver.c
index fecc5ba..0a5b1c8 100644
--- a/source3/nmbd/nmbd_winsserver.c
+++ b/source3/nmbd/nmbd_winsserver.c
@@ -2395,7 +2395,7 @@ void wins_write_database(time_t t, bool background)
err_exit:
SAFE_FREE(fnamenew);
- /* fname is talloced and doesn't need to be freed */
+ TALLOC_FREE(fname);
if (background) {
_exit(0);
diff --git a/source3/passdb/login_cache.c b/source3/passdb/login_cache.c
index 4e14293..2a63500 100644
--- a/source3/passdb/login_cache.c
+++ b/source3/passdb/login_cache.c
@@ -35,7 +35,8 @@ bool login_cache_init(void)
/* skip file open if it's already opened */
if (cache) return True;
- if (asprintf(&cache_fname, "%s/%s", lp_lockdir(), LOGIN_CACHE_FILE) == -1) {
+ cache_fname = cache_path(LOGIN_CACHE_FILE);
+ if (cache_fname == NULL) {
DEBUG(0, ("Filename allocation failed.\n"));
return False;
}
@@ -48,7 +49,7 @@ bool login_cache_init(void)
if (!cache)
DEBUG(5, ("Attempt to open %s failed.\n", cache_fname));
- SAFE_FREE(cache_fname);
+ TALLOC_FREE(cache_fname);
return (cache ? True : False);
}
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index ac3817b..bfbc35f 100644
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -2577,7 +2577,7 @@ uint32 del_a_printer(const char *sharename)
if (geteuid() == 0) {
if (asprintf(&printdb_path, "%s%s.tdb",
- lock_path("printing/"),
+ cache_path("printing/"),
sharename) < 0) {
return (uint32)-1;
}
diff --git a/source3/printing/printing.c b/source3/printing/printing.c
index 0f38aea..fffe917 100644
--- a/source3/printing/printing.c
+++ b/source3/printing/printing.c
@@ -183,8 +183,8 @@ bool print_backend_init(struct messaging_context *msg_ctx)
int services = lp_numservices();
int snum;
- unlink(lock_path("printing.tdb"));
- mkdir(lock_path("printing"),0755);
+ unlink(cache_path("printing.tdb"));
+ mkdir(cache_path("printing"),0755);
/* handle a Samba upgrade */
diff --git a/source3/printing/printing_db.c b/source3/printing/printing_db.c
index 94319f9..746e768 100644
--- a/source3/printing/printing_db.c
+++ b/source3/printing/printing_db.c
@@ -91,7 +91,7 @@ struct tdb_print_db *get_print_db_byname(const char *printername)
}
if (asprintf(&printdb_path, "%s%s.tdb",
- lock_path("printing/"),
+ cache_path("printing/"),
printername) < 0) {
DLIST_REMOVE(print_db_head, p);
SAFE_FREE(p);
diff --git a/source3/smbd/lanman.c b/source3/smbd/lanman.c
index 6ed3ce2..c8e3578 100644
--- a/source3/smbd/lanman.c
+++ b/source3/smbd/lanman.c
@@ -1154,9 +1154,9 @@ static int get_server_info(uint32 servertype,
bool local_list_only;
int i;
- lines = file_lines_load(lock_path(SERVER_LIST), NULL, 0, NULL);
+ lines = file_lines_load(cache_path(SERVER_LIST), NULL, 0, NULL);
if (!lines) {
- DEBUG(4,("Can't open %s - %s\n",lock_path(SERVER_LIST),strerror(errno)));
+ DEBUG(4,("Can't open %s - %s\n",cache_path(SERVER_LIST),strerror(errno)));
return 0;
}
diff --git a/source3/utils/smbcontrol.c b/source3/utils/smbcontrol.c
index 330e764..b139ed7 100644
--- a/source3/utils/smbcontrol.c
+++ b/source3/utils/smbcontrol.c
@@ -867,10 +867,10 @@ static bool do_winbind_online(struct messaging_context *msg_ctx,
/* Remove the entry in the winbindd_cache tdb to tell a later
starting winbindd that we're online. */
- tdb = tdb_open_log(lock_path("winbindd_cache.tdb"), 0, TDB_DEFAULT, O_RDWR, 0600);
+ tdb = tdb_open_log(cache_path("winbindd_cache.tdb"), 0, TDB_DEFAULT, O_RDWR, 0600);
if (!tdb) {
fprintf(stderr, "Cannot open the tdb %s for writing.\n",
- lock_path("winbindd_cache.tdb"));
+ cache_path("winbindd_cache.tdb"));
return False;
}
@@ -897,13 +897,13 @@ static bool do_winbind_offline(struct messaging_context *msg_ctx,
starting winbindd that we're offline. We may actually create
it here... */
- tdb = tdb_open_log(lock_path("winbindd_cache.tdb"),
+ tdb = tdb_open_log(cache_path("winbindd_cache.tdb"),
WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE,
TDB_DEFAULT /* TDB_CLEAR_IF_FIRST */, O_RDWR|O_CREAT, 0600);
if (!tdb) {
fprintf(stderr, "Cannot open the tdb %s for writing.\n",
- lock_path("winbindd_cache.tdb"));
+ cache_path("winbindd_cache.tdb"));
return False;
}
diff --git a/source3/winbindd/winbindd_cache.c b/source3/winbindd/winbindd_cache.c
index 863852e..a0df81e 100644
--- a/source3/winbindd/winbindd_cache.c
+++ b/source3/winbindd/winbindd_cache.c
@@ -2537,7 +2537,7 @@ bool init_wcache(void)
return true;
/* when working offline we must not clear the cache on restart */
- wcache->tdb = tdb_open_log(lock_path("winbindd_cache.tdb"),
+ wcache->tdb = tdb_open_log(cache_path("winbindd_cache.tdb"),
WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE,
lp_winbind_offline_logon() ? TDB_DEFAULT : (TDB_DEFAULT | TDB_CLEAR_IF_FIRST),
O_RDWR|O_CREAT, 0600);
@@ -2580,9 +2580,9 @@ bool initialize_winbindd_cache(void)
tdb_close(wcache->tdb);
wcache->tdb = NULL;
- if (unlink(lock_path("winbindd_cache.tdb")) == -1) {
+ if (unlink(cache_path("winbindd_cache.tdb")) == -1) {
DEBUG(0,("initialize_winbindd_cache: unlink %s failed %s ",
- lock_path("winbindd_cache.tdb"),
+ cache_path("winbindd_cache.tdb"),
strerror(errno) ));
return false;
}
@@ -2864,7 +2864,7 @@ void wcache_flush_cache(void)
return;
/* when working offline we must not clear the cache on restart */
- wcache->tdb = tdb_open_log(lock_path("winbindd_cache.tdb"),
+ wcache->tdb = tdb_open_log(cache_path("winbindd_cache.tdb"),
WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE,
lp_winbind_offline_logon() ? TDB_DEFAULT : (TDB_DEFAULT | TDB_CLEAR_IF_FIRST),
O_RDWR|O_CREAT, 0600);
@@ -3693,7 +3693,7 @@ static void validate_panic(const char *const why)
int winbindd_validate_cache(void)
{
int ret = -1;
- const char *tdb_path = lock_path("winbindd_cache.tdb");
+ const char *tdb_path = cache_path("winbindd_cache.tdb");
TDB_CONTEXT *tdb = NULL;
DEBUG(10, ("winbindd_validate_cache: replacing panic function\n"));
@@ -3735,7 +3735,7 @@ done:
int winbindd_validate_cache_nobackup(void)
{
int ret = -1;
- const char *tdb_path = lock_path("winbindd_cache.tdb");
+ const char *tdb_path = cache_path("winbindd_cache.tdb");
DEBUG(10, ("winbindd_validate_cache: replacing panic function\n"));
smb_panic_fn = validate_panic;
--
Samba Shared Repository
More information about the samba-cvs
mailing list