sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-08 05:57:51 +03:00
Code

started converting some of the only-ascii code to use srvstr_*

Browse Source 
added srvstr_push_ascii() and srvstr_pull_ascii() as convenience
routines to replace the current usage of strncpy() like fns
for packet pull/push. We need to do this in *lots* of places
in Samba in order to get our codepage handling right
This commit is contained in:
Andrew Tridgell -
parent f952380c5d
commit 8b0e3679a6
3 changed files with 494 additions and 475 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

930
source/include/proto.h
View File

File diff suppressed because it is too large Load Diff

21
source/smbd/lanman.c
View File

@ -368,7 +368,7 @@ static void PackDriverData(struct pack_desc* desc)
SIVAL(drivdata,0,sizeof drivdata); /* cb */
SIVAL(drivdata,4,1000); /* lVersion */
memset(drivdata+8,0,32); /* szDeviceName */
pstrcpy(drivdata+8,"NULL");
srvstr_push_ascii(drivdata+8,"NULL",-1);
PACKl(desc,"l",drivdata,sizeof drivdata); /* pDriverData */
}
@ -1267,11 +1267,11 @@ static int fill_srv_info(struct srv_info_struct *service,
switch (uLevel)
{
case 0:
StrnCpy(p,service->name,15);
srvstr_push_ascii(p,service->name,15);
break;
case 1:
StrnCpy(p,service->name,15);
srvstr_push_ascii(p,service->name,15);
SIVAL(p,18,service->type);
SIVAL(p,22,PTR_DIFF(p2,baseaddr));
len += CopyAndAdvance(&p2,service->comment,&l2);
@ -1352,9 +1352,9 @@ static BOOL api_RNetServerEnum(connection_struct *conn, uint16 vuid, char *param
DEBUG(4, ("local_only:%s\n", BOOLSTR(local_request)));
if (strcmp(str1, "WrLehDz") == 0) {
StrnCpy(domain, p, sizeof(fstring)-1);
srvstr_pull_ascii(domain, p, sizeof(fstring));
} else {
StrnCpy(domain, global_myworkgroup, sizeof(fstring)-1);
fstrcpy(domain, global_myworkgroup);
}
if (lp_browse_list())
@ -1527,7 +1527,7 @@ static int fill_share_info(connection_struct *conn, int snum, int uLevel,
}
if (!baseaddr) baseaddr = p;
StrnCpy(p,lp_servicename(snum),13);
srvstr_push_ascii(p,lp_servicename(snum),13);
if (uLevel > 0)
{
@ -1739,7 +1739,7 @@ static BOOL api_SetUserPassword(connection_struct *conn,uint16 vuid, char *param
fstring user;
fstring pass1,pass2;
fstrcpy(user,p);
srvstr_pull_ascii(user,p,sizeof(user));
p = skip_string(p,1);
@ -1876,8 +1876,7 @@ static BOOL api_SamOEMChangePassword(connection_struct *conn,uint16 vuid, char *
}
p = skip_string(p,1);
fstrcpy(user,p);
p = skip_string(p,1);
p += srvstr_pull_ascii(user,p,sizeof(user));
DEBUG(3,("api_SamOEMChangePassword: Change password for <%s>\n",user));
@ -2146,8 +2145,8 @@ static BOOL api_RNetServerGetInfo(connection_struct *conn,uint16 vuid, char *par
p = *rdata;
p2 = p + struct_len;
if (uLevel != 20) {
StrnCpy(p,local_machine,16);
strupper(p);
srvstr_push(NULL, p,local_machine,16,
STR_ASCII|STR_UPPER|STR_TERMINATE|STR_CONVERT);
}
p += 16;
if (uLevel > 0)

18
source/smbd/srvstr.c
View File

@ -144,3 +144,21 @@ int srvstr_align(void *inbuf, int offset)
if (!UNICODE_FLAG(inbuf)) return 0;
return offset & 1;
}
/****************************************************************************
these are useful for replacing all those StrnCpy() ops for copying data
to/from the wire
****************************************************************************/
int srvstr_push_ascii(void *dest, const char *src, int dest_len)
{
return srvstr_push(NULL, dest, src, dest_len,
STR_ASCII|STR_CONVERT|STR_TERMINATE);
}
int srvstr_pull_ascii(char *dest, const void *src, int dest_len)
{
return srvstr_pull(NULL, dest, src, dest_len, -1,
STR_ASCII|STR_CONVERT|STR_TERMINATE);
}