git.samba.org
/
nivanova
/
samba-autobuild
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
s3-param Remove special case for global_myname(), rename to lp_netbios_name()
[nivanova/samba-autobuild/.git]
/
source3
/
smbd
/
trans2.c
diff --git
a/source3/smbd/trans2.c
b/source3/smbd/trans2.c
index 92ac78c6e9027ab0e8abb5ea59e5fe9846b1219e..b853722eae0947db984bf51cde9b0204b0f441cc 100644
(file)
--- a/
source3/smbd/trans2.c
+++ b/
source3/smbd/trans2.c
@@
-5301,7
+5301,7
@@
total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
}
/* Copy the lock range data. */
}
/* Copy the lock range data. */
- lock_data = (char *)
TALLOC_MEMDUP
(
+ lock_data = (char *)
talloc_memdup
(
req, pdata, total_data);
if (!lock_data) {
reply_nterror(req, NT_STATUS_NO_MEMORY);
req, pdata, total_data);
if (!lock_data) {
reply_nterror(req, NT_STATUS_NO_MEMORY);
@@
-8377,7
+8377,7
@@
static void call_trans2ioctl(connection_struct *conn,
SSVAL(pdata, 0, 0);
}
srvstr_push(pdata, req->flags2, pdata + 2,
SSVAL(pdata, 0, 0);
}
srvstr_push(pdata, req->flags2, pdata + 2,
-
global_my
name(), 15,
+
lp_netbios_
name(), 15,
STR_ASCII|STR_TERMINATE); /* Our NetBIOS name */
srvstr_push(pdata, req->flags2, pdata+18,
lp_servicename(SNUM(conn)), 13,
STR_ASCII|STR_TERMINATE); /* Our NetBIOS name */
srvstr_push(pdata, req->flags2, pdata+18,
lp_servicename(SNUM(conn)), 13,