The branch, v3-2-test has been updated
via 5b8ca7ebdef5d385420c89af246c2dae737c5717 (commit)
via 5490e2d77233f594a42cb32eda8215014db544e3 (commit)
via f5468d2c9abad41cb1e9d9b9ec6a1b56564961a4 (commit)
from 934964c90f39d588d2399f10e3738ab1b4e01290 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit 5b8ca7ebdef5d385420c89af246c2dae737c5717
Author: Volker Lendecke <[EMAIL PROTECTED]>
Date: Mon Nov 5 03:14:16 2007 +0100
Fix the smbmount build
commit 5490e2d77233f594a42cb32eda8215014db544e3
Author: Volker Lendecke <[EMAIL PROTECTED]>
Date: Sun Nov 4 18:15:37 2007 +0100
static pstring removal
commit f5468d2c9abad41cb1e9d9b9ec6a1b56564961a4
Author: Volker Lendecke <[EMAIL PROTECTED]>
Date: Thu Nov 1 17:49:31 2007 +0100
pstring removal
-----------------------------------------------------------------------
Summary of changes:
source/client/smbmount.c | 2 +-
source/passdb/passdb.c | 7 +++++--
source/passdb/pdb_ldap.c | 8 ++++++--
source/passdb/pdb_tdb.c | 4 ++--
source/passdb/secrets.c | 14 +++++++++-----
source/rpc_server/srv_lsa_hnd.c | 7 ++++---
source/rpc_server/srv_wkssvc_nt.c | 23 ++++++++---------------
7 files changed, 35 insertions(+), 30 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/client/smbmount.c b/source/client/smbmount.c
index 9c671e3..7befd6e 100644
--- a/source/client/smbmount.c
+++ b/source/client/smbmount.c
@@ -382,7 +382,7 @@ static void send_fs_socket(char *the_service, char
*mount_point, struct cli_stat
If we don't do this we will "leak" sockets and memory on
each reconnection we have to make. */
- c->smb_rw_error = DO_NOT_DO_TDIS;
+ c->smb_rw_error = SMB_DO_NOT_DO_TDIS;
cli_shutdown(c);
c = NULL;
diff --git a/source/passdb/passdb.c b/source/passdb/passdb.c
index 9254aba..e1e5967 100644
--- a/source/passdb/passdb.c
+++ b/source/passdb/passdb.c
@@ -261,7 +261,8 @@ NTSTATUS samu_alloc_rid_unix(struct samu *user, const
struct passwd *pwd)
char *pdb_encode_acct_ctrl(uint32 acct_ctrl, size_t length)
{
- static fstring acct_str;
+ fstring acct_str;
+ char *result;
size_t i = 0;
@@ -288,7 +289,9 @@ char *pdb_encode_acct_ctrl(uint32 acct_ctrl, size_t length)
acct_str[i++] = ']';
acct_str[i++] = '\0';
- return acct_str;
+ result = talloc_strdup(talloc_tos(), acct_str);
+ SMB_ASSERT(result != NULL);
+ return result;
}
/**********************************************************
diff --git a/source/passdb/pdb_ldap.c b/source/passdb/pdb_ldap.c
index 53bca86..0c60e3f 100644
--- a/source/passdb/pdb_ldap.c
+++ b/source/passdb/pdb_ldap.c
@@ -159,7 +159,8 @@ static const char** get_userattr_delete_list( TALLOC_CTX
*mem_ctx,
static const char* get_objclass_filter( int schema_ver )
{
- static fstring objclass_filter;
+ fstring objclass_filter;
+ char *result;
switch( schema_ver ) {
case SCHEMAVER_SAMBAACCOUNT:
@@ -170,10 +171,13 @@ static const char* get_objclass_filter( int schema_ver )
break;
default:
DEBUG(0,("get_objclass_filter: Invalid schema version
specified!\n"));
+ objclass_filter[0] = '\0';
break;
}
- return objclass_filter;
+ result = talloc_strdup(talloc_tos(), objclass_filter);
+ SMB_ASSERT(result != NULL);
+ return result;
}
/*****************************************************************
diff --git a/source/passdb/pdb_tdb.c b/source/passdb/pdb_tdb.c
index 79427a5..099b443 100644
--- a/source/passdb/pdb_tdb.c
+++ b/source/passdb/pdb_tdb.c
@@ -55,7 +55,7 @@ static bool pwent_initialized;
static TDB_CONTEXT *tdbsam;
static int ref_count = 0;
-static pstring tdbsam_filename;
+static char *tdbsam_filename;
/**********************************************************************
Marshall/unmarshall struct samu structs.
@@ -1609,7 +1609,7 @@ static NTSTATUS pdb_init_tdbsam(struct pdb_methods
**pdb_method, const char *loc
pstr_sprintf( tdbfile, "%s/%s", dyn_STATEDIR(),
PASSDB_FILE_NAME );
pfile = tdbfile;
}
- pstrcpy( tdbsam_filename, pfile );
+ tdbsam_filename = SMB_STRDUP(pfile);
/* no private data */
diff --git a/source/passdb/secrets.c b/source/passdb/secrets.c
index 512c3de..a7221df 100644
--- a/source/passdb/secrets.c
+++ b/source/passdb/secrets.c
@@ -209,10 +209,12 @@ bool secrets_fetch_domain_guid(const char *domain, struct
GUID *guid)
**/
static const char *trust_keystr(const char *domain)
{
- static fstring keystr;
+ char *keystr;
+
+ keystr = talloc_asprintf(talloc_tos(), "%s/%s",
+ SECRETS_MACHINE_ACCT_PASS, domain);
+ SMB_ASSERT(keystr != NULL);
- slprintf(keystr,sizeof(keystr)-1,"%s/%s",
- SECRETS_MACHINE_ACCT_PASS, domain);
strupper_m(keystr);
return keystr;
@@ -227,9 +229,11 @@ static const char *trust_keystr(const char *domain)
**/
static char *trustdom_keystr(const char *domain)
{
- static pstring keystr;
+ char *keystr;
- pstr_sprintf(keystr, "%s/%s", SECRETS_DOMTRUST_ACCT_PASS, domain);
+ keystr = talloc_asprintf(talloc_tos(), "%s/%s",
+ SECRETS_DOMTRUST_ACCT_PASS, domain);
+ SMB_ASSERT(keystr != NULL);
strupper_m(keystr);
return keystr;
diff --git a/source/rpc_server/srv_lsa_hnd.c b/source/rpc_server/srv_lsa_hnd.c
index fa63c80..a8341e6 100644
--- a/source/rpc_server/srv_lsa_hnd.c
+++ b/source/rpc_server/srv_lsa_hnd.c
@@ -53,9 +53,10 @@ bool init_pipe_handle_list(pipes_struct *p, const char
*pipe_name)
if (strequal( plist->name, pipe_name) ||
(is_samr_lsa_pipe(plist->name) &&
is_samr_lsa_pipe(pipe_name))) {
if (!plist->pipe_handles) {
- pstring msg;
- slprintf(msg, sizeof(msg)-1,
"init_pipe_handles: NULL pipe_handle pointer in pipe %s",
- pipe_name );
+ char *msg;
+ asprintf(&msg, "init_pipe_handles: NULL "
+ "pipe_handle pointer in pipe %s",
+ pipe_name);
smb_panic(msg);
}
hl = plist->pipe_handles;
diff --git a/source/rpc_server/srv_wkssvc_nt.c
b/source/rpc_server/srv_wkssvc_nt.c
index 417ce8e..11ca891 100644
--- a/source/rpc_server/srv_wkssvc_nt.c
+++ b/source/rpc_server/srv_wkssvc_nt.c
@@ -27,26 +27,19 @@
#define DBGC_CLASS DBGC_RPC_SRV
/*******************************************************************
- Fill in the valiues for the struct wkssvc_NetWkstaInfo100.
+ Fill in the values for the struct wkssvc_NetWkstaInfo100.
********************************************************************/
static void create_wks_info_100(struct wkssvc_NetWkstaInfo100 *info100)
{
- pstring my_name;
- pstring domain;
+ info100->platform_id = 0x000001f4; /* unknown */
+ info100->version_major = lp_major_announce_version();
+ info100->version_minor = lp_minor_announce_version();
- pstrcpy (my_name, global_myname());
- strupper_m(my_name);
-
- pstrcpy (domain, lp_workgroup());
- strupper_m(domain);
-
- info100->platform_id = 0x000001f4; /* unknown */
- info100->version_major = lp_major_announce_version();
- info100->version_minor = lp_minor_announce_version();
-
- info100->server_name = talloc_strdup( info100, my_name );
- info100->domain_name = talloc_strdup( info100, domain );
+ info100->server_name = talloc_strdup(
+ info100, strupper_static(global_myname()));
+ info100->domain_name = talloc_strdup(
+ info100, strupper_static(lp_workgroup()));
return;
}
--
Samba Shared Repository
