The branch, v3-2-test has been updated
via 3ac4f935c074af768d0b83514f86d010c387817a (commit)
via 8725dbc8888cf7a1d3d9d1205678fcd3ca3c6350 (commit)
via 27065382d9b692b5885265c9d60ffb7ec7748c38 (commit)
from 2ce76ce2bccefb4a072bed039a4837ae334dea55 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit 3ac4f935c074af768d0b83514f86d010c387817a
Author: Volker Lendecke <[EMAIL PROTECTED]>
Date: Sun Mar 9 11:26:50 2008 +0100
Make use of talloc_asprintf_strupper_m in secrets.c
commit 8725dbc8888cf7a1d3d9d1205678fcd3ca3c6350
Author: Volker Lendecke <[EMAIL PROTECTED]>
Date: Sun Mar 9 11:21:08 2008 +0100
Avoid some pointless checks
secrets_init() makes sure that the tdb is initialized
commit 27065382d9b692b5885265c9d60ffb7ec7748c38
Author: Volker Lendecke <[EMAIL PROTECTED]>
Date: Sun Mar 9 11:17:48 2008 +0100
Use talloc_tos() in secrets_init
-----------------------------------------------------------------------
Summary of changes:
source/passdb/secrets.c | 87 ++++++++++++++---------------------------------
1 files changed, 26 insertions(+), 61 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/passdb/secrets.c b/source/passdb/secrets.c
index 6c5375e..2ef8f43 100644
--- a/source/passdb/secrets.c
+++ b/source/passdb/secrets.c
@@ -51,22 +51,15 @@ static void get_rand_seed(int *new_seed)
/* open up the secrets database */
bool secrets_init(void)
{
- TALLOC_CTX *ctx;
char *fname = NULL;
unsigned char dummy;
if (tdb)
return True;
- ctx = talloc_init("secrets_init");
- if (!ctx) {
- return false;
- }
- fname = talloc_asprintf(ctx,
- "%s/secrets.tdb",
- lp_private_dir());
- if (!fname) {
- TALLOC_FREE(ctx);
+ fname = talloc_asprintf(talloc_tos(), "%s/secrets.tdb",
+ lp_private_dir());
+ if (fname == NULL) {
return false;
}
@@ -74,11 +67,11 @@ bool secrets_init(void)
if (!tdb) {
DEBUG(0,("Failed to open %s\n", fname));
- TALLOC_FREE(ctx);
+ TALLOC_FREE(fname);
return False;
}
- TALLOC_FREE(ctx);
+ TALLOC_FREE(fname);
/**
* Set a reseed function for the crypto random generator
@@ -118,10 +111,6 @@ void *secrets_fetch(const char *key, size_t *size)
return NULL;
}
- if (!tdb) {
- return NULL;
- }
-
dbuf = tdb_fetch(tdb, string_tdb_data(key));
if (size) {
*size = dbuf.dsize;
@@ -138,10 +127,6 @@ bool secrets_store(const char *key, const void *data,
size_t size)
return false;
}
- if (!tdb) {
- return false;
- }
-
return tdb_trans_store(tdb, string_tdb_data(key),
make_tdb_data((const uint8 *)data, size),
TDB_REPLACE) == 0;
@@ -156,10 +141,6 @@ bool secrets_delete(const char *key)
return false;
}
- if (!tdb) {
- return false;
- }
-
return tdb_trans_delete(tdb, string_tdb_data(key)) == 0;
}
@@ -174,12 +155,9 @@ static const char *domain_sid_keystr(const char *domain)
{
char *keystr;
- keystr = talloc_asprintf(talloc_tos(), "%s/%s",
- SECRETS_DOMAIN_SID, domain);
+ keystr = talloc_asprintf_strupper_m(talloc_tos(), "%s/%s",
+ SECRETS_DOMAIN_SID, domain);
SMB_ASSERT(keystr != NULL);
-
- strupper_m(keystr);
-
return keystr;
}
@@ -269,12 +247,10 @@ static const char *machine_sec_channel_type_keystr(const
char *domain)
{
char *keystr;
- keystr = talloc_asprintf(talloc_tos(), "%s/%s",
- SECRETS_MACHINE_SEC_CHANNEL_TYPE, domain);
+ keystr = talloc_asprintf_strupper_m(talloc_tos(), "%s/%s",
+ SECRETS_MACHINE_SEC_CHANNEL_TYPE,
+ domain);
SMB_ASSERT(keystr != NULL);
-
- strupper_m(keystr);
-
return keystr;
}
@@ -289,12 +265,10 @@ static const char *machine_last_change_time_keystr(const
char *domain)
{
char *keystr;
- keystr = talloc_asprintf(talloc_tos(), "%s/%s",
- SECRETS_MACHINE_LAST_CHANGE_TIME, domain);
+ keystr = talloc_asprintf_strupper_m(talloc_tos(), "%s/%s",
+ SECRETS_MACHINE_LAST_CHANGE_TIME,
+ domain);
SMB_ASSERT(keystr != NULL);
-
- strupper_m(keystr);
-
return keystr;
}
@@ -310,12 +284,9 @@ static const char *machine_password_keystr(const char
*domain)
{
char *keystr;
- keystr = talloc_asprintf(talloc_tos(), "%s/%s",
- SECRETS_MACHINE_PASSWORD, domain);
+ keystr = talloc_asprintf_strupper_m(talloc_tos(), "%s/%s",
+ SECRETS_MACHINE_PASSWORD, domain);
SMB_ASSERT(keystr != NULL);
-
- strupper_m(keystr);
-
return keystr;
}
@@ -330,12 +301,9 @@ static const char *trust_keystr(const char *domain)
{
char *keystr;
- keystr = talloc_asprintf(talloc_tos(), "%s/%s",
- SECRETS_MACHINE_ACCT_PASS, domain);
+ keystr = talloc_asprintf_strupper_m(talloc_tos(), "%s/%s",
+ SECRETS_MACHINE_ACCT_PASS, domain);
SMB_ASSERT(keystr != NULL);
-
- strupper_m(keystr);
-
return keystr;
}
@@ -350,11 +318,10 @@ static char *trustdom_keystr(const char *domain)
{
char *keystr;
- keystr = talloc_asprintf(talloc_tos(), "%s/%s",
- SECRETS_DOMTRUST_ACCT_PASS, domain);
+ keystr = talloc_asprintf_strupper_m(talloc_tos(), "%s/%s",
+ SECRETS_DOMTRUST_ACCT_PASS,
+ domain);
SMB_ASSERT(keystr != NULL);
- strupper_m(keystr);
-
return keystr;
}
@@ -1230,14 +1197,13 @@ bool secrets_store_schannel_session_info(TALLOC_CTX
*mem_ctx,
TDB_CONTEXT *tdb_sc = NULL;
TDB_DATA value;
bool ret;
- char *keystr = talloc_asprintf(mem_ctx, "%s/%s", SECRETS_SCHANNEL_STATE,
- remote_machine);
+ char *keystr = talloc_asprintf_strupper_m(mem_ctx, "%s/%s",
+ SECRETS_SCHANNEL_STATE,
+ remote_machine);
if (!keystr) {
return False;
}
- strupper_m(keystr);
-
/* Work out how large the record is. */
value.dsize = tdb_pack(NULL, 0, "dBBBBBfff",
pdc->sequence,
@@ -1304,8 +1270,9 @@ bool secrets_restore_schannel_session_info(TALLOC_CTX
*mem_ctx,
uint32 l1, l2, l3, l4, l5;
int ret;
struct dcinfo *pdc = NULL;
- char *keystr = talloc_asprintf(mem_ctx, "%s/%s", SECRETS_SCHANNEL_STATE,
- remote_machine);
+ char *keystr = talloc_asprintf_strupper_m(mem_ctx, "%s/%s",
+ SECRETS_SCHANNEL_STATE,
+ remote_machine);
*ppdc = NULL;
@@ -1313,8 +1280,6 @@ bool secrets_restore_schannel_session_info(TALLOC_CTX
*mem_ctx,
return False;
}
- strupper_m(keystr);
-
tdb_sc = open_schannel_session_store(mem_ctx);
if (!tdb_sc) {
TALLOC_FREE(keystr);
--
Samba Shared Repository
