mirror of
https://github.com/samba-team/samba.git
synced 2025-01-05 09:18:06 +03:00
Fixed some globals that escaped the recent globalcide.
(This used to be commit 4580e16908
)
This commit is contained in:
parent
a75f1ba9d4
commit
d1bedec87c
@ -45,9 +45,6 @@ static BOOL initialised;
|
||||
|
||||
void py_samba_init(void)
|
||||
{
|
||||
extern pstring global_myname;
|
||||
char *p;
|
||||
|
||||
if (initialised)
|
||||
return;
|
||||
|
||||
@ -59,11 +56,7 @@ void py_samba_init(void)
|
||||
/* Misc other stuff */
|
||||
|
||||
load_interfaces();
|
||||
|
||||
fstrcpy(global_myname, myhostname());
|
||||
p = strchr(global_myname, '.');
|
||||
if (p)
|
||||
*p = 0;
|
||||
init_names();
|
||||
|
||||
initialised = True;
|
||||
}
|
||||
|
@ -61,7 +61,6 @@ static PyObject *py_smb_session_request(PyObject *self, PyObject *args,
|
||||
static char *kwlist[] = { "called", "calling", NULL };
|
||||
char *calling_name = NULL, *called_name;
|
||||
struct nmb_name calling, called;
|
||||
extern pstring global_myname;
|
||||
BOOL result;
|
||||
|
||||
if (!PyArg_ParseTupleAndKeywords(args, kw, "s|s", kwlist, &called_name,
|
||||
@ -69,7 +68,7 @@ static PyObject *py_smb_session_request(PyObject *self, PyObject *args,
|
||||
return NULL;
|
||||
|
||||
if (!calling_name)
|
||||
calling_name = global_myname;
|
||||
calling_name = global_myname();
|
||||
|
||||
make_nmb_name(&calling, calling_name, 0x00);
|
||||
make_nmb_name(&called, called_name, 0x20);
|
||||
|
Loading…
Reference in New Issue
Block a user