sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-11-25 00:23:52 +03:00
Code Activity

r25821: always use ndr_push/pull_error() to report errors and not NTSTATUS directly

Browse Source 
metze
This commit is contained in:
Stefan Metzmacher
2007-11-03 10:20:45 +01:00
parent 01c5ec7eb4
commit faa26ed52c
1 changed files with 32 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
source/libcli/nbt/nbtname.c
View File

@@ -49,7 +49,8 @@ static NTSTATUS ndr_pull_component(struct ndr_pull *ndr, uint8_t **component,
uint_t loops = 0; uint_t loops = 0;
while (loops < 5) { while (loops < 5) {
if (*offset >= ndr->data_size) { if (*offset >= ndr->data_size) {
return NT_STATUS_BAD_NETWORK_NAME; return ndr_pull_error(ndr, NDR_ERR_STRING,
"BAD NBT NAME component");
} }
len = ndr->data[*offset]; len = ndr->data[*offset];
if (len == 0) { if (len == 0) {
@@ -61,7 +62,8 @@ static NTSTATUS ndr_pull_component(struct ndr_pull *ndr, uint8_t **component,
if ((len & 0xC0) == 0xC0) { if ((len & 0xC0) == 0xC0) {
/* its a label pointer */ /* its a label pointer */
if (1 + *offset >= ndr->data_size) { if (1 + *offset >= ndr->data_size) {
return NT_STATUS_BAD_NETWORK_NAME; return ndr_pull_error(ndr, NDR_ERR_STRING,
"BAD NBT NAME component");
} }
*max_offset = MAX(*max_offset, *offset + 2); *max_offset = MAX(*max_offset, *offset + 2);
*offset = ((len&0x3F)<<8) | ndr->data[1 + *offset]; *offset = ((len&0x3F)<<8) | ndr->data[1 + *offset];
@@ -71,10 +73,12 @@ static NTSTATUS ndr_pull_component(struct ndr_pull *ndr, uint8_t **component,
} }
if ((len & 0xC0) != 0) { if ((len & 0xC0) != 0) {
/* its a reserved length field */ /* its a reserved length field */
return NT_STATUS_BAD_NETWORK_NAME; return ndr_pull_error(ndr, NDR_ERR_STRING,
"BAD NBT NAME component");
} }
if (*offset + len + 2 > ndr->data_size) { if (*offset + len + 2 > ndr->data_size) {
return NT_STATUS_BAD_NETWORK_NAME; return ndr_pull_error(ndr, NDR_ERR_STRING,
"BAD NBT NAME component");
} }
*component = (uint8_t*)talloc_strndup(ndr, (const char *)&ndr->data[1 + *offset], len); *component = (uint8_t*)talloc_strndup(ndr, (const char *)&ndr->data[1 + *offset], len);
NT_STATUS_HAVE_NO_MEMORY(*component); NT_STATUS_HAVE_NO_MEMORY(*component);
@@ -84,7 +88,7 @@ static NTSTATUS ndr_pull_component(struct ndr_pull *ndr, uint8_t **component,
} }
/* too many pointers */ /* too many pointers */
return NT_STATUS_BAD_NETWORK_NAME; return ndr_pull_error(ndr, NDR_ERR_STRING, "BAD NBT NAME component");
} }
/** /**
@@ -118,7 +122,8 @@ _PUBLIC_ NTSTATUS ndr_pull_nbt_string(struct ndr_pull *ndr, int ndr_flags, const
} }
} }
if (num_components == MAX_COMPONENTS) { if (num_components == MAX_COMPONENTS) {
return NT_STATUS_BAD_NETWORK_NAME; return ndr_pull_error(ndr, NDR_ERR_STRING,
"BAD NBT NAME too many components");
} }
if (num_components == 0) { if (num_components == 0) {
name = talloc_strdup(ndr, ""); name = talloc_strdup(ndr, "");
@@ -203,7 +208,7 @@ _PUBLIC_ NTSTATUS ndr_push_nbt_string(struct ndr_push *ndr, int ndr_flags, const
/* /*
decompress a 'compressed' name component decompress a 'compressed' name component
*/ */
static NTSTATUS decompress_name(char *name, enum nbt_name_type *type) static bool decompress_name(char *name, enum nbt_name_type *type)
{ {
int i; int i;
for (i=0;name[2*i];i++) { for (i=0;name[2*i];i++) {
@@ -211,7 +216,7 @@ static NTSTATUS decompress_name(char *name, enum nbt_name_type *type)
uint8_t c2 = name[1+(2*i)]; uint8_t c2 = name[1+(2*i)];
if (c1 < 'A' || c1 > 'P' || if (c1 < 'A' || c1 > 'P' ||
c2 < 'A' || c2 > 'P') { c2 < 'A' || c2 > 'P') {
return NT_STATUS_BAD_NETWORK_NAME; return false;
} }
name[i] = ((c1-'A')<<4) | (c2-'A'); name[i] = ((c1-'A')<<4) | (c2-'A');
} }
@@ -229,7 +234,7 @@ static NTSTATUS decompress_name(char *name, enum nbt_name_type *type)
name[i-1] = 0; name[i-1] = 0;
} }
return NT_STATUS_OK; return true;
} }
@@ -282,6 +287,7 @@ _PUBLIC_ NTSTATUS ndr_pull_nbt_name(struct ndr_pull *ndr, int ndr_flags, struct
uint8_t *scope; uint8_t *scope;
char *cname; char *cname;
const char *s; const char *s;
bool ok;
if (!(ndr_flags & NDR_SCALARS)) { if (!(ndr_flags & NDR_SCALARS)) {
return NT_STATUS_OK; return NT_STATUS_OK;
@@ -304,12 +310,16 @@ _PUBLIC_ NTSTATUS ndr_pull_nbt_name(struct ndr_pull *ndr, int ndr_flags, struct
/* the first component is limited to 16 bytes in the DOS charset, /* the first component is limited to 16 bytes in the DOS charset,
which is 32 in the 'compressed' form */ which is 32 in the 'compressed' form */
if (strlen(cname) > 32) { if (strlen(cname) > 32) {
return NT_STATUS_BAD_NETWORK_NAME; return ndr_pull_error(ndr, NDR_ERR_STRING,
"NBT NAME cname > 32");
} }
/* decompress the first component */ /* decompress the first component */
status = decompress_name(cname, &r->type); ok = decompress_name(cname, &r->type);
NT_STATUS_NOT_OK_RETURN(status); if (!ok) {
return ndr_pull_error(ndr, NDR_ERR_STRING,
"NBT NAME failed to decompress");
}
r->name = talloc_strdup(ndr->current_mem_ctx, cname); r->name = talloc_strdup(ndr->current_mem_ctx, cname);
NT_STATUS_HAVE_NO_MEMORY(r->name); NT_STATUS_HAVE_NO_MEMORY(r->name);
@@ -547,7 +557,10 @@ _PUBLIC_ NTSTATUS ndr_push_wrepl_nbt_name(struct ndr_push *ndr, int ndr_flags, c
uint32_t name_len; uint32_t name_len;
uint32_t scope_len = 0; uint32_t scope_len = 0;
if (r == NULL) return NT_STATUS_INVALID_PARAMETER_MIX; if (r == NULL) {
return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
"wrepl_nbt_name NULL pointer");
}
if (!(ndr_flags & NDR_SCALARS)) { if (!(ndr_flags & NDR_SCALARS)) {
return NT_STATUS_OK; return NT_STATUS_OK;
@@ -555,14 +568,18 @@ _PUBLIC_ NTSTATUS ndr_push_wrepl_nbt_name(struct ndr_push *ndr, int ndr_flags, c
name_len = strlen(r->name); name_len = strlen(r->name);
if (name_len > 15) { if (name_len > 15) {
return NT_STATUS_INVALID_PARAMETER_MIX; return ndr_push_error(ndr, NDR_ERR_STRING,
"wrepl_nbt_name longer as 15 chars: %s",
r->name);
} }
if (r->scope) { if (r->scope) {
scope_len = strlen(r->scope); scope_len = strlen(r->scope);
} }
if (scope_len > 238) { if (scope_len > 238) {
return NT_STATUS_INVALID_PARAMETER_MIX; return ndr_push_error(ndr, NDR_ERR_STRING,
"wrepl_nbt_name scope longer as 238 chars: %s",
r->scope);
} }
namebuf = (uint8_t *)talloc_asprintf(ndr, "%-15s%c%s", namebuf = (uint8_t *)talloc_asprintf(ndr, "%-15s%c%s",