sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-06-28 00:49:42 +03:00
Code

remove some statics

Browse Source 
(This used to be commit 97c9a4042d36178a728b5e0f8923091c7069366d)
This commit is contained in:
Volker Lendecke 2007-11-24 15:47:04 +01:00
parent 78c6ee0090
commit 195d6be38d
4 changed files with 72 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source3/libsmb/credentials.c
View File

@ -26,11 +26,13 @@
char *credstr(const unsigned char *cred)
{
static fstring buf;
slprintf(buf, sizeof(buf) - 1, "%02X%02X%02X%02X%02X%02X%02X%02X",
char *result;
result = talloc_asprintf(talloc_tos(),
"%02X%02X%02X%02X%02X%02X%02X%02X",
cred[0], cred[1], cred[2], cred[3],
cred[4], cred[5], cred[6], cred[7]);
return buf;
SMB_ASSERT(result != NULL);
return result;
}
/****************************************************************************

49
source3/libsmb/nmblib.c
View File

@ -347,20 +347,19 @@ static int put_nmb_name(char *buf,int offset,struct nmb_name *name)
char *nmb_namestr(const struct nmb_name *n)
{
static int i=0;
static fstring ret[4];
fstring name;
char *p = ret[i];
char *result;
pull_ascii_fstring(name, n->name);
if (!n->scope[0])
slprintf(p,sizeof(fstring)-1, "%s<%02x>",name,n->name_type);
result = talloc_asprintf(talloc_tos(), "%s<%02x>", name,
n->name_type);
else
slprintf(p,sizeof(fstring)-1, "%s<%02x>.%s",
name,n->name_type,n->scope);
result = talloc_asprintf(talloc_tos(), "%s<%02x>.%s", name,
n->name_type, n->scope);
i = (i+1)%4;
return(p);
SMB_ASSERT(result != NULL);
return result;
}
/*******************************************************************
@ -1239,40 +1238,6 @@ void sort_query_replies(char *data, int n, struct in_addr ip)
qsort(data, n, 6, QSORT_CAST name_query_comp);
}
/*******************************************************************
Convert, possibly using a stupid microsoft-ism which has destroyed
the transport independence of netbios (for CIFS vendors that usually
use the Win95-type methods, not for NT to NT communication, which uses
DCE/RPC and therefore full-length unicode strings...) a dns name into
a netbios name.
The netbios name (NOT necessarily null-terminated) is truncated to 15
characters.
******************************************************************/
char *dns_to_netbios_name(const char *dns_name)
{
static nstring netbios_name;
int i;
StrnCpy(netbios_name, dns_name, MAX_NETBIOSNAME_LEN-1);
netbios_name[15] = 0;
/* ok. this is because of a stupid microsoft-ism. if the called host
name contains a '.', microsoft clients expect you to truncate the
netbios name up to and including the '.' this even applies, by
mistake, to workgroup (domain) names, which is _really_ daft.
*/
for (i = 0; i < 15; i++) {
if (netbios_name[i] == '.') {
netbios_name[i] = 0;
break;
}
}
return netbios_name;
}
/****************************************************************************
Interpret the weird netbios "name" into a unix fstring. Return the name type.
****************************************************************************/

43
source3/libsmb/unexpected.c
View File

@ -112,18 +112,22 @@ void clear_unexpected(time_t t)
tdb_traverse(tdbd, traverse_fn, NULL);
}
static struct packet_struct *matched_packet;
static int match_id;
static enum packet_type match_type;
static const char *match_name;
struct receive_unexpected_state {
struct packet_struct *matched_packet;
int match_id;
enum packet_type match_type;
const char *match_name;
};
/****************************************************************************
tdb traversal fn to find a matching 137 packet.
**************************************************************************/
static int traverse_match(TDB_CONTEXT *ttdb, TDB_DATA kbuf, TDB_DATA dbuf, void *state)
static int traverse_match(TDB_CONTEXT *ttdb, TDB_DATA kbuf, TDB_DATA dbuf,
void *private_data)
{
struct receive_unexpected_state *state =
(struct receive_unexpected_state *)private_data;
struct unexpected_key key;
struct in_addr ip;
uint32_t enc_ip;
@ -132,7 +136,7 @@ static int traverse_match(TDB_CONTEXT *ttdb, TDB_DATA kbuf, TDB_DATA dbuf, void
memcpy(&key, kbuf.dptr, sizeof(key));
if (key.packet_type != match_type) return 0;
if (key.packet_type != state->match_type) return 0;
if (dbuf.dsize < 6) {
return 0;
@ -145,15 +149,15 @@ static int traverse_match(TDB_CONTEXT *ttdb, TDB_DATA kbuf, TDB_DATA dbuf, void
p = parse_packet((char *)&dbuf.dptr[6],
dbuf.dsize-6,
match_type,
state->match_type,
ip,
port);
if ((match_type == NMB_PACKET &&
p->packet.nmb.header.name_trn_id == match_id) ||
(match_type == DGRAM_PACKET &&
match_mailslot_name(p, match_name))) {
matched_packet = p;
if ((state->match_type == NMB_PACKET &&
p->packet.nmb.header.name_trn_id == state->match_id) ||
(state->match_type == DGRAM_PACKET &&
match_mailslot_name(p, state->match_name))) {
state->matched_packet = p;
return -1;
}
@ -170,18 +174,19 @@ struct packet_struct *receive_unexpected(enum packet_type packet_type, int id,
const char *mailslot_name)
{
TDB_CONTEXT *tdb2;
struct receive_unexpected_state state;
tdb2 = tdb_open_log(lock_path("unexpected.tdb"), 0, 0, O_RDONLY, 0);
if (!tdb2) return NULL;
matched_packet = NULL;
match_id = id;
match_type = packet_type;
match_name = mailslot_name;
state.matched_packet = NULL;
state.match_id = id;
state.match_type = packet_type;
state.match_name = mailslot_name;
tdb_traverse(tdb2, traverse_match, NULL);
tdb_traverse(tdb2, traverse_match, &state);
tdb_close(tdb2);
return matched_packet;
return state.matched_packet;
}

34
source3/torture/rpctorture.c
View File

@ -45,6 +45,40 @@ void rpcclient_init(void)
smb_cli->capabilities |= CAP_NT_SMBS;
}
/*******************************************************************
Convert, possibly using a stupid microsoft-ism which has destroyed
the transport independence of netbios (for CIFS vendors that usually
use the Win95-type methods, not for NT to NT communication, which uses
DCE/RPC and therefore full-length unicode strings...) a dns name into
a netbios name.
The netbios name (NOT necessarily null-terminated) is truncated to 15
characters.
******************************************************************/
static char *dns_to_netbios_name(const char *dns_name)
{
static nstring netbios_name;
int i;
StrnCpy(netbios_name, dns_name, MAX_NETBIOSNAME_LEN-1);
netbios_name[15] = 0;
/* ok. this is because of a stupid microsoft-ism. if the called host
name contains a '.', microsoft clients expect you to truncate the
netbios name up to and including the '.' this even applies, by
mistake, to workgroup (domain) names, which is _really_ daft.
*/
for (i = 0; i < 15; i++) {
if (netbios_name[i] == '.') {
netbios_name[i] = 0;
break;
}
}
return netbios_name;
}
/****************************************************************************
make smb client connection
****************************************************************************/