diff options
author | Günther Deschner <gd@samba.org> | 2021-02-08 15:59:32 +0100 |
---|---|---|
committer | Günther Deschner <gd@samba.org> | 2021-07-14 16:49:30 +0000 |
commit | adcdb696cfeb28a1611b69c6f03ea4e495ce7186 (patch) | |
tree | 18d62da1000eec0b5d844e8c0bb738c99f18d969 /source3/lib/netapi | |
parent | eff9610e7b02726d25ed952c5b1440f4d763b63c (diff) | |
download | samba-adcdb696cfeb28a1611b69c6f03ea4e495ce7186.tar.gz |
re-run make libnetapi ....
Guenther
Signed-off-by: Guenther Deschner <gd@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
Diffstat (limited to 'source3/lib/netapi')
-rw-r--r-- | source3/lib/netapi/libnetapi.c | 126 | ||||
-rw-r--r-- | source3/lib/netapi/libnetapi.h | 8 |
2 files changed, 119 insertions, 15 deletions
diff --git a/source3/lib/netapi/libnetapi.c b/source3/lib/netapi/libnetapi.c index 6e89cb566ca..1fdec7934b7 100644 --- a/source3/lib/netapi/libnetapi.c +++ b/source3/lib/netapi/libnetapi.c @@ -41,6 +41,8 @@ NET_API_STATUS NetJoinDomain(const char * server /* [in] [unique] */, WERROR werr; TALLOC_CTX *frame = talloc_stackframe(); + ZERO_STRUCT(r); + status = libnetapi_getctx(&ctx); if (status != 0) { TALLOC_FREE(frame); @@ -92,6 +94,8 @@ NET_API_STATUS NetUnjoinDomain(const char * server_name /* [in] [unique] */, WERROR werr; TALLOC_CTX *frame = talloc_stackframe(); + ZERO_STRUCT(r); + status = libnetapi_getctx(&ctx); if (status != 0) { TALLOC_FREE(frame); @@ -140,6 +144,8 @@ NET_API_STATUS NetGetJoinInformation(const char * server_name /* [in] [unique] * WERROR werr; TALLOC_CTX *frame = talloc_stackframe(); + ZERO_STRUCT(r); + status = libnetapi_getctx(&ctx); if (status != 0) { TALLOC_FREE(frame); @@ -190,6 +196,8 @@ NET_API_STATUS NetGetJoinableOUs(const char * server_name /* [in] [unique] */, WERROR werr; TALLOC_CTX *frame = talloc_stackframe(); + ZERO_STRUCT(r); + status = libnetapi_getctx(&ctx); if (status != 0) { TALLOC_FREE(frame); @@ -242,6 +250,8 @@ NET_API_STATUS NetRenameMachineInDomain(const char * server_name /* [in] */, WERROR werr; TALLOC_CTX *frame = talloc_stackframe(); + ZERO_STRUCT(r); + status = libnetapi_getctx(&ctx); if (status != 0) { TALLOC_FREE(frame); @@ -291,6 +301,8 @@ NET_API_STATUS NetServerGetInfo(const char * server_name /* [in] [unique] */, WERROR werr; TALLOC_CTX *frame = talloc_stackframe(); + ZERO_STRUCT(r); + status = libnetapi_getctx(&ctx); if (status != 0) { TALLOC_FREE(frame); @@ -339,6 +351,8 @@ NET_API_STATUS NetServerSetInfo(const char * server_name /* [in] [unique] */, WERROR werr; TALLOC_CTX *frame = talloc_stackframe(); + ZERO_STRUCT(r); + status = libnetapi_getctx(&ctx); if (status != 0) { TALLOC_FREE(frame); @@ -377,9 +391,9 @@ NET_API_STATUS NetServerSetInfo(const char * server_name /* [in] [unique] */, NetWkstaGetInfo ****************************************************************/ -NET_API_STATUS NetWkstaGetInfo(const char * wksta_name /* [in] [unique] */, - uint32_t level /* [in] */, - uint8_t **buffer /* [out] [ref] */) +NET_API_STATUS NetWkstaGetInfo(const char * server_name /* [in] [unique] */, + uint32_t level /* [in] */, + uint8_t **buffer /* [out] [ref] */) { struct NetWkstaGetInfo r; struct libnetapi_ctx *ctx = NULL; @@ -387,6 +401,8 @@ NET_API_STATUS NetWkstaGetInfo(const char * wksta_name /* [in] [unique] */, WERROR werr; TALLOC_CTX *frame = talloc_stackframe(); + ZERO_STRUCT(r); + status = libnetapi_getctx(&ctx); if (status != 0) { TALLOC_FREE(frame); @@ -394,7 +410,7 @@ NET_API_STATUS NetWkstaGetInfo(const char * wksta_name /* [in] [unique] */, } /* In parameters */ - r.in.server_name = wksta_name; + r.in.server_name = server_name; r.in.level = level; /* Out parameters */ @@ -404,7 +420,7 @@ NET_API_STATUS NetWkstaGetInfo(const char * wksta_name /* [in] [unique] */, NDR_PRINT_IN_DEBUG(NetWkstaGetInfo, &r); } - if (LIBNETAPI_LOCAL_SERVER(wksta_name)) { + if (LIBNETAPI_LOCAL_SERVER(server_name)) { werr = NetWkstaGetInfo_l(ctx, &r); } else { werr = NetWkstaGetInfo_r(ctx, &r); @@ -434,6 +450,8 @@ NET_API_STATUS NetGetDCName(const char * server_name /* [in] [unique] */, WERROR werr; TALLOC_CTX *frame = talloc_stackframe(); + ZERO_STRUCT(r); + status = libnetapi_getctx(&ctx); if (status != 0) { TALLOC_FREE(frame); @@ -481,6 +499,8 @@ NET_API_STATUS NetGetAnyDCName(const char * server_name /* [in] [unique] */, WERROR werr; TALLOC_CTX *frame = talloc_stackframe(); + ZERO_STRUCT(r); + status = libnetapi_getctx(&ctx); if (status != 0) { TALLOC_FREE(frame); @@ -531,6 +551,8 @@ NET_API_STATUS DsGetDcName(const char * server_name /* [in] [unique] */, WERROR werr; TALLOC_CTX *frame = talloc_stackframe(); + ZERO_STRUCT(r); + status = libnetapi_getctx(&ctx); if (status != 0) { TALLOC_FREE(frame); @@ -582,6 +604,8 @@ NET_API_STATUS NetUserAdd(const char * server_name /* [in] [unique] */, WERROR werr; TALLOC_CTX *frame = talloc_stackframe(); + ZERO_STRUCT(r); + status = libnetapi_getctx(&ctx); if (status != 0) { TALLOC_FREE(frame); @@ -629,6 +653,8 @@ NET_API_STATUS NetUserDel(const char * server_name /* [in] [unique] */, WERROR werr; TALLOC_CTX *frame = talloc_stackframe(); + ZERO_STRUCT(r); + status = libnetapi_getctx(&ctx); if (status != 0) { TALLOC_FREE(frame); @@ -680,6 +706,8 @@ NET_API_STATUS NetUserEnum(const char * server_name /* [in] [unique] */, WERROR werr; TALLOC_CTX *frame = talloc_stackframe(); + ZERO_STRUCT(r); + status = libnetapi_getctx(&ctx); if (status != 0) { TALLOC_FREE(frame); @@ -734,6 +762,8 @@ NET_API_STATUS NetUserChangePassword(const char * domain_name /* [in] */, WERROR werr; TALLOC_CTX *frame = talloc_stackframe(); + ZERO_STRUCT(r); + status = libnetapi_getctx(&ctx); if (status != 0) { TALLOC_FREE(frame); @@ -752,11 +782,7 @@ NET_API_STATUS NetUserChangePassword(const char * domain_name /* [in] */, NDR_PRINT_IN_DEBUG(NetUserChangePassword, &r); } - if (LIBNETAPI_LOCAL_SERVER(domain_name)) { - werr = NetUserChangePassword_l(ctx, &r); - } else { - werr = NetUserChangePassword_r(ctx, &r); - } + werr = NetUserChangePassword_l(ctx, &r); r.out.result = W_ERROR_V(werr); @@ -783,6 +809,8 @@ NET_API_STATUS NetUserGetInfo(const char * server_name /* [in] */, WERROR werr; TALLOC_CTX *frame = talloc_stackframe(); + ZERO_STRUCT(r); + status = libnetapi_getctx(&ctx); if (status != 0) { TALLOC_FREE(frame); @@ -833,6 +861,8 @@ NET_API_STATUS NetUserSetInfo(const char * server_name /* [in] */, WERROR werr; TALLOC_CTX *frame = talloc_stackframe(); + ZERO_STRUCT(r); + status = libnetapi_getctx(&ctx); if (status != 0) { TALLOC_FREE(frame); @@ -886,6 +916,8 @@ NET_API_STATUS NetUserGetGroups(const char * server_name /* [in] */, WERROR werr; TALLOC_CTX *frame = talloc_stackframe(); + ZERO_STRUCT(r); + status = libnetapi_getctx(&ctx); if (status != 0) { TALLOC_FREE(frame); @@ -939,6 +971,8 @@ NET_API_STATUS NetUserSetGroups(const char * server_name /* [in] */, WERROR werr; TALLOC_CTX *frame = talloc_stackframe(); + ZERO_STRUCT(r); + status = libnetapi_getctx(&ctx); if (status != 0) { TALLOC_FREE(frame); @@ -993,6 +1027,8 @@ NET_API_STATUS NetUserGetLocalGroups(const char * server_name /* [in] */, WERROR werr; TALLOC_CTX *frame = talloc_stackframe(); + ZERO_STRUCT(r); + status = libnetapi_getctx(&ctx); if (status != 0) { TALLOC_FREE(frame); @@ -1045,6 +1081,8 @@ NET_API_STATUS NetUserModalsGet(const char * server_name /* [in] */, WERROR werr; TALLOC_CTX *frame = talloc_stackframe(); + ZERO_STRUCT(r); + status = libnetapi_getctx(&ctx); if (status != 0) { TALLOC_FREE(frame); @@ -1093,6 +1131,8 @@ NET_API_STATUS NetUserModalsSet(const char * server_name /* [in] */, WERROR werr; TALLOC_CTX *frame = talloc_stackframe(); + ZERO_STRUCT(r); + status = libnetapi_getctx(&ctx); if (status != 0) { TALLOC_FREE(frame); @@ -1145,6 +1185,8 @@ NET_API_STATUS NetQueryDisplayInformation(const char * server_name /* [in] [uniq WERROR werr; TALLOC_CTX *frame = talloc_stackframe(); + ZERO_STRUCT(r); + status = libnetapi_getctx(&ctx); if (status != 0) { TALLOC_FREE(frame); @@ -1197,6 +1239,8 @@ NET_API_STATUS NetGroupAdd(const char * server_name /* [in] */, WERROR werr; TALLOC_CTX *frame = talloc_stackframe(); + ZERO_STRUCT(r); + status = libnetapi_getctx(&ctx); if (status != 0) { TALLOC_FREE(frame); @@ -1244,6 +1288,8 @@ NET_API_STATUS NetGroupDel(const char * server_name /* [in] */, WERROR werr; TALLOC_CTX *frame = talloc_stackframe(); + ZERO_STRUCT(r); + status = libnetapi_getctx(&ctx); if (status != 0) { TALLOC_FREE(frame); @@ -1294,6 +1340,8 @@ NET_API_STATUS NetGroupEnum(const char * server_name /* [in] */, WERROR werr; TALLOC_CTX *frame = talloc_stackframe(); + ZERO_STRUCT(r); + status = libnetapi_getctx(&ctx); if (status != 0) { TALLOC_FREE(frame); @@ -1348,6 +1396,8 @@ NET_API_STATUS NetGroupSetInfo(const char * server_name /* [in] */, WERROR werr; TALLOC_CTX *frame = talloc_stackframe(); + ZERO_STRUCT(r); + status = libnetapi_getctx(&ctx); if (status != 0) { TALLOC_FREE(frame); @@ -1398,6 +1448,8 @@ NET_API_STATUS NetGroupGetInfo(const char * server_name /* [in] */, WERROR werr; TALLOC_CTX *frame = talloc_stackframe(); + ZERO_STRUCT(r); + status = libnetapi_getctx(&ctx); if (status != 0) { TALLOC_FREE(frame); @@ -1446,6 +1498,8 @@ NET_API_STATUS NetGroupAddUser(const char * server_name /* [in] */, WERROR werr; TALLOC_CTX *frame = talloc_stackframe(); + ZERO_STRUCT(r); + status = libnetapi_getctx(&ctx); if (status != 0) { TALLOC_FREE(frame); @@ -1493,6 +1547,8 @@ NET_API_STATUS NetGroupDelUser(const char * server_name /* [in] */, WERROR werr; TALLOC_CTX *frame = talloc_stackframe(); + ZERO_STRUCT(r); + status = libnetapi_getctx(&ctx); if (status != 0) { TALLOC_FREE(frame); @@ -1545,6 +1601,8 @@ NET_API_STATUS NetGroupGetUsers(const char * server_name /* [in] */, WERROR werr; TALLOC_CTX *frame = talloc_stackframe(); + ZERO_STRUCT(r); + status = libnetapi_getctx(&ctx); if (status != 0) { TALLOC_FREE(frame); @@ -1600,6 +1658,8 @@ NET_API_STATUS NetGroupSetUsers(const char * server_name /* [in] */, WERROR werr; TALLOC_CTX *frame = talloc_stackframe(); + ZERO_STRUCT(r); + status = libnetapi_getctx(&ctx); if (status != 0) { TALLOC_FREE(frame); @@ -1650,6 +1710,8 @@ NET_API_STATUS NetLocalGroupAdd(const char * server_name /* [in] */, WERROR werr; TALLOC_CTX *frame = talloc_stackframe(); + ZERO_STRUCT(r); + status = libnetapi_getctx(&ctx); if (status != 0) { TALLOC_FREE(frame); @@ -1697,6 +1759,8 @@ NET_API_STATUS NetLocalGroupDel(const char * server_name /* [in] */, WERROR werr; TALLOC_CTX *frame = talloc_stackframe(); + ZERO_STRUCT(r); + status = libnetapi_getctx(&ctx); if (status != 0) { TALLOC_FREE(frame); @@ -1744,6 +1808,8 @@ NET_API_STATUS NetLocalGroupGetInfo(const char * server_name /* [in] */, WERROR werr; TALLOC_CTX *frame = talloc_stackframe(); + ZERO_STRUCT(r); + status = libnetapi_getctx(&ctx); if (status != 0) { TALLOC_FREE(frame); @@ -1794,6 +1860,8 @@ NET_API_STATUS NetLocalGroupSetInfo(const char * server_name /* [in] */, WERROR werr; TALLOC_CTX *frame = talloc_stackframe(); + ZERO_STRUCT(r); + status = libnetapi_getctx(&ctx); if (status != 0) { TALLOC_FREE(frame); @@ -1847,6 +1915,8 @@ NET_API_STATUS NetLocalGroupEnum(const char * server_name /* [in] */, WERROR werr; TALLOC_CTX *frame = talloc_stackframe(); + ZERO_STRUCT(r); + status = libnetapi_getctx(&ctx); if (status != 0) { TALLOC_FREE(frame); @@ -1901,6 +1971,8 @@ NET_API_STATUS NetLocalGroupAddMembers(const char * server_name /* [in] */, WERROR werr; TALLOC_CTX *frame = talloc_stackframe(); + ZERO_STRUCT(r); + status = libnetapi_getctx(&ctx); if (status != 0) { TALLOC_FREE(frame); @@ -1952,6 +2024,8 @@ NET_API_STATUS NetLocalGroupDelMembers(const char * server_name /* [in] */, WERROR werr; TALLOC_CTX *frame = talloc_stackframe(); + ZERO_STRUCT(r); + status = libnetapi_getctx(&ctx); if (status != 0) { TALLOC_FREE(frame); @@ -2006,6 +2080,8 @@ NET_API_STATUS NetLocalGroupGetMembers(const char * server_name /* [in] */, WERROR werr; TALLOC_CTX *frame = talloc_stackframe(); + ZERO_STRUCT(r); + status = libnetapi_getctx(&ctx); if (status != 0) { TALLOC_FREE(frame); @@ -2061,6 +2137,8 @@ NET_API_STATUS NetLocalGroupSetMembers(const char * server_name /* [in] */, WERROR werr; TALLOC_CTX *frame = talloc_stackframe(); + ZERO_STRUCT(r); + status = libnetapi_getctx(&ctx); if (status != 0) { TALLOC_FREE(frame); @@ -2109,6 +2187,8 @@ NET_API_STATUS NetRemoteTOD(const char * server_name /* [in] */, WERROR werr; TALLOC_CTX *frame = talloc_stackframe(); + ZERO_STRUCT(r); + status = libnetapi_getctx(&ctx); if (status != 0) { TALLOC_FREE(frame); @@ -2156,6 +2236,8 @@ NET_API_STATUS NetShareAdd(const char * server_name /* [in] */, WERROR werr; TALLOC_CTX *frame = talloc_stackframe(); + ZERO_STRUCT(r); + status = libnetapi_getctx(&ctx); if (status != 0) { TALLOC_FREE(frame); @@ -2204,6 +2286,8 @@ NET_API_STATUS NetShareDel(const char * server_name /* [in] */, WERROR werr; TALLOC_CTX *frame = talloc_stackframe(); + ZERO_STRUCT(r); + status = libnetapi_getctx(&ctx); if (status != 0) { TALLOC_FREE(frame); @@ -2255,6 +2339,8 @@ NET_API_STATUS NetShareEnum(const char * server_name /* [in] */, WERROR werr; TALLOC_CTX *frame = talloc_stackframe(); + ZERO_STRUCT(r); + status = libnetapi_getctx(&ctx); if (status != 0) { TALLOC_FREE(frame); @@ -2308,6 +2394,8 @@ NET_API_STATUS NetShareGetInfo(const char * server_name /* [in] */, WERROR werr; TALLOC_CTX *frame = talloc_stackframe(); + ZERO_STRUCT(r); + status = libnetapi_getctx(&ctx); if (status != 0) { TALLOC_FREE(frame); @@ -2358,6 +2446,8 @@ NET_API_STATUS NetShareSetInfo(const char * server_name /* [in] */, WERROR werr; TALLOC_CTX *frame = talloc_stackframe(); + ZERO_STRUCT(r); + status = libnetapi_getctx(&ctx); if (status != 0) { TALLOC_FREE(frame); @@ -2406,6 +2496,8 @@ NET_API_STATUS NetFileClose(const char * server_name /* [in] */, WERROR werr; TALLOC_CTX *frame = talloc_stackframe(); + ZERO_STRUCT(r); + status = libnetapi_getctx(&ctx); if (status != 0) { TALLOC_FREE(frame); @@ -2453,6 +2545,8 @@ NET_API_STATUS NetFileGetInfo(const char * server_name /* [in] */, WERROR werr; TALLOC_CTX *frame = talloc_stackframe(); + ZERO_STRUCT(r); + status = libnetapi_getctx(&ctx); if (status != 0) { TALLOC_FREE(frame); @@ -2507,6 +2601,8 @@ NET_API_STATUS NetFileEnum(const char * server_name /* [in] */, WERROR werr; TALLOC_CTX *frame = talloc_stackframe(); + ZERO_STRUCT(r); + status = libnetapi_getctx(&ctx); if (status != 0) { TALLOC_FREE(frame); @@ -2563,6 +2659,8 @@ NET_API_STATUS NetShutdownInit(const char * server_name /* [in] */, WERROR werr; TALLOC_CTX *frame = talloc_stackframe(); + ZERO_STRUCT(r); + status = libnetapi_getctx(&ctx); if (status != 0) { TALLOC_FREE(frame); @@ -2610,6 +2708,8 @@ NET_API_STATUS NetShutdownAbort(const char * server_name /* [in] */) WERROR werr; TALLOC_CTX *frame = talloc_stackframe(); + ZERO_STRUCT(r); + status = libnetapi_getctx(&ctx); if (status != 0) { TALLOC_FREE(frame); @@ -2656,6 +2756,8 @@ NET_API_STATUS I_NetLogonControl(const char * server_name /* [in] */, WERROR werr; TALLOC_CTX *frame = talloc_stackframe(); + ZERO_STRUCT(r); + status = libnetapi_getctx(&ctx); if (status != 0) { TALLOC_FREE(frame); @@ -2697,7 +2799,7 @@ NET_API_STATUS I_NetLogonControl(const char * server_name /* [in] */, NET_API_STATUS I_NetLogonControl2(const char * server_name /* [in] */, uint32_t function_code /* [in] */, uint32_t query_level /* [in] */, - uint8_t *data /* [in] [ref] */, + uint8_t *data /* [in] [unique] */, uint8_t **buffer /* [out] [ref] */) { struct I_NetLogonControl2 r; @@ -2706,6 +2808,8 @@ NET_API_STATUS I_NetLogonControl2(const char * server_name /* [in] */, WERROR werr; TALLOC_CTX *frame = talloc_stackframe(); + ZERO_STRUCT(r); + status = libnetapi_getctx(&ctx); if (status != 0) { TALLOC_FREE(frame); diff --git a/source3/lib/netapi/libnetapi.h b/source3/lib/netapi/libnetapi.h index d23dcb8cbb3..27e4b5d2324 100644 --- a/source3/lib/netapi/libnetapi.h +++ b/source3/lib/netapi/libnetapi.h @@ -78,9 +78,9 @@ WERROR NetServerSetInfo_r(struct libnetapi_ctx *ctx, struct NetServerSetInfo *r); WERROR NetServerSetInfo_l(struct libnetapi_ctx *ctx, struct NetServerSetInfo *r); -NET_API_STATUS NetWkstaGetInfo(const char * wksta_name /* [in] [unique] */, - uint32_t level /* [in] */, - uint8_t **buffer /* [out] [ref] */); +NET_API_STATUS NetWkstaGetInfo(const char * server_name /* [in] [unique] */, + uint32_t level /* [in] */, + uint8_t **buffer /* [out] [ref] */); WERROR NetWkstaGetInfo_r(struct libnetapi_ctx *ctx, struct NetWkstaGetInfo *r); WERROR NetWkstaGetInfo_l(struct libnetapi_ctx *ctx, @@ -477,7 +477,7 @@ WERROR I_NetLogonControl_l(struct libnetapi_ctx *ctx, NET_API_STATUS I_NetLogonControl2(const char * server_name /* [in] */, uint32_t function_code /* [in] */, uint32_t query_level /* [in] */, - uint8_t *data /* [in] [ref] */, + uint8_t *data /* [in] [unique] */, uint8_t **buffer /* [out] [ref] */); WERROR I_NetLogonControl2_r(struct libnetapi_ctx *ctx, struct I_NetLogonControl2 *r); |