sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-28 01:58:17 +03:00
Code

Refactor libnetapi error string functions a bit.

Browse Source 
Guenther
(This used to be commit 3b450a8bcc97b6d03c4b7b9373a3a382c0fcea30)
This commit is contained in:
Günther Deschner 2008-01-11 14:47:23 +01:00
parent 2bcba87572
commit 4eed7883bb
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
source3/lib/netapi/netapi.c
View File

@ -192,8 +192,7 @@ NET_API_STATUS libnetapi_set_workgroup(struct libnetapi_ctx *ctx,
/****************************************************************
****************************************************************/
const char *libnetapi_errstr(struct libnetapi_ctx *ctx,
NET_API_STATUS status)
const char *libnetapi_errstr(NET_API_STATUS status)
{
if (status & 0xc0000000) {
return get_friendly_nt_error_msg(NT_STATUS(status));
@ -220,9 +219,23 @@ NET_API_STATUS libnetapi_set_error_string(struct libnetapi_ctx *ctx,
/****************************************************************
****************************************************************/
const char *libnetapi_get_error_string(struct libnetapi_ctx *ctx)
const char *libnetapi_get_error_string(struct libnetapi_ctx *ctx,
NET_API_STATUS status)
{
return ctx->error_string;
struct libnetapi_ctx *tmp_ctx = ctx;
if (!tmp_ctx) {
status = libnetapi_getctx(&tmp_ctx);
if (status != 0) {
return NULL;
}
}
if (tmp_ctx->error_string) {
return tmp_ctx->error_string;
}
return libnetapi_errstr(status);
}
/****************************************************************

5
source3/lib/netapi/netapi.h
View File

@ -46,9 +46,10 @@ NET_API_STATUS libnetapi_get_debuglevel(struct libnetapi_ctx *ctx, char **debugl
NET_API_STATUS libnetapi_set_username(struct libnetapi_ctx *ctx, const char *username);
NET_API_STATUS libnetapi_set_password(struct libnetapi_ctx *ctx, const char *password);
NET_API_STATUS libnetapi_set_workgroup(struct libnetapi_ctx *ctx, const char *workgroup);
const char *libnetapi_errstr(struct libnetapi_ctx *ctx, NET_API_STATUS status);
const char *libnetapi_errstr(NET_API_STATUS status);
NET_API_STATUS libnetapi_set_error_string(struct libnetapi_ctx *ctx, const char *error_string);
const char *libnetapi_get_error_string(struct libnetapi_ctx *ctx);
const char *libnetapi_get_error_string(struct libnetapi_ctx *ctx, NET_API_STATUS status);
/****************************************************************
****************************************************************/