Add NetUserEnum to libnetapi.

Guenther

diff --git a/source/lib/netapi/libnetapi.c b/source/lib/netapi/libnetapi.c
index 7fd1e76ebd643aec4b558931c829c2c12af7585d..eeff7c5229b238495184ff7d5b3895d66d7299c5 100644 (file)
--- a/source/lib/netapi/libnetapi.c
+++ b/source/lib/netapi/libnetapi.c
@@ -529,3 +529,58 @@ NET_API_STATUS NetUserDel(const char * server_name /* [in] [unique] */,
        return r.out.result;
 }
 
+/****************************************************************
+ NetUserEnum
+****************************************************************/
+
+NET_API_STATUS NetUserEnum(const char * server_name /* [in] [unique] */,
+                          uint32_t level /* [in] */,
+                          uint32_t filter /* [in] */,
+                          uint8_t **buffer /* [out] [ref] */,
+                          uint32_t prefmaxlen /* [in] */,
+                          uint32_t *entries_read /* [out] [ref] */,
+                          uint32_t *total_entries /* [out] [ref] */,
+                          uint32_t *resume_handle /* [in,out] [ref] */)
+{
+       struct NetUserEnum r;
+       struct libnetapi_ctx *ctx = NULL;
+       NET_API_STATUS status;
+       WERROR werr;
+
+       status = libnetapi_getctx(&ctx);
+       if (status != 0) {
+               return status;
+       }
+
+       /* In parameters */
+       r.in.server_name = server_name;
+       r.in.level = level;
+       r.in.filter = filter;
+       r.in.prefmaxlen = prefmaxlen;
+       r.in.resume_handle = resume_handle;
+
+       /* Out parameters */
+       r.out.buffer = buffer;
+       r.out.entries_read = entries_read;
+       r.out.total_entries = total_entries;
+       r.out.resume_handle = resume_handle;
+
+       if (DEBUGLEVEL >= 10) {
+               NDR_PRINT_IN_DEBUG(NetUserEnum, &r);
+       }
+
+       if (LIBNETAPI_LOCAL_SERVER(server_name)) {
+               werr = NetUserEnum_l(ctx, &r);
+       } else {
+               werr = NetUserEnum_r(ctx, &r);
+       }
+
+       r.out.result = W_ERROR_V(werr);
+
+       if (DEBUGLEVEL >= 10) {
+               NDR_PRINT_OUT_DEBUG(NetUserEnum, &r);
+       }
+
+       return r.out.result;
+}
+

diff --git a/source/lib/netapi/libnetapi.h b/source/lib/netapi/libnetapi.h
index 9ab54811643564d4abd742917002240e53663275..5cd416529907a994031013297aeb50d395e07ddd 100644 (file)
--- a/source/lib/netapi/libnetapi.h
+++ b/source/lib/netapi/libnetapi.h
@@ -88,4 +88,16 @@ WERROR NetUserDel_r(struct libnetapi_ctx *ctx,
                    struct NetUserDel *r);
 WERROR NetUserDel_l(struct libnetapi_ctx *ctx,
                    struct NetUserDel *r);
+NET_API_STATUS NetUserEnum(const char * server_name /* [in] [unique] */,
+                          uint32_t level /* [in] */,
+                          uint32_t filter /* [in] */,
+                          uint8_t **buffer /* [out] [ref] */,
+                          uint32_t prefmaxlen /* [in] */,
+                          uint32_t *entries_read /* [out] [ref] */,
+                          uint32_t *total_entries /* [out] [ref] */,
+                          uint32_t *resume_handle /* [in,out] [ref] */);
+WERROR NetUserEnum_r(struct libnetapi_ctx *ctx,
+                    struct NetUserEnum *r);
+WERROR NetUserEnum_l(struct libnetapi_ctx *ctx,
+                    struct NetUserEnum *r);
 #endif /* __LIBNETAPI_LIBNETAPI__ */

diff --git a/source/lib/netapi/netapi.h b/source/lib/netapi/netapi.h
index 67919eeb012f11c2cf448479427104df056d6121..483973566f97bdb1e750c17a4a7333023df8c805 100644 (file)
--- a/source/lib/netapi/netapi.h
+++ b/source/lib/netapi/netapi.h
@@ -23,11 +23,12 @@
 /****************************************************************
  NET_API_STATUS
 ****************************************************************/
-
 typedef enum {
        NET_API_STATUS_SUCCESS = 0
 } NET_API_STATUS;
 
+#define ERROR_MORE_DATA        ( 234L )
+
 /****************************************************************
 ****************************************************************/
 
@@ -208,4 +209,17 @@ NET_API_STATUS NetUserAdd(const char * server_name /* [in] */,
 NET_API_STATUS NetUserDel(const char * server_name /* [in] */,
                          const char * user_name /* [in] */);
 
+/****************************************************************
+ NetUserEnum
+****************************************************************/
+
+NET_API_STATUS NetUserEnum(const char * server_name /* [in] */,
+                          uint32_t level /* [in] */,
+                          uint32_t filter /* [in] */,
+                          uint8_t **buffer /* [out] [ref] */,
+                          uint32_t prefmaxlen /* [in] */,
+                          uint32_t *entries_read /* [out] [ref] */,
+                          uint32_t *total_entries /* [out] [ref] */,
+                          uint32_t *resume_handle /* [in,out] [ref] */);
+
 #endif

diff --git a/source/lib/netapi/user.c b/source/lib/netapi/user.c
index f5bdc27fd88a4ca85643ad4b192a1b46a0c64faa..8dcc159c9eca3e0a031b10248c2123a895ad6477 100644 (file)
--- a/source/lib/netapi/user.c
+++ b/source/lib/netapi/user.c
@@ -546,3 +546,200 @@ WERROR NetUserDel_l(struct libnetapi_ctx *ctx,
 {
        return WERR_NOT_SUPPORTED;
 }
+
+/****************************************************************
+****************************************************************/
+
+static WERROR convert_samr_samarray_to_USER_INFO_buffer(TALLOC_CTX *mem_ctx,
+                                                       struct samr_SamArray *sam_array,
+                                                       uint32_t level,
+                                                       uint8_t **buffer)
+{
+       struct USER_INFO_0 *info0 = NULL;
+       int i;
+
+       switch (level) {
+               case 0:
+                       info0 = TALLOC_ZERO_ARRAY(mem_ctx, struct USER_INFO_0,
+                                                 sam_array->count);
+                       W_ERROR_HAVE_NO_MEMORY(info0);
+
+                       for (i=0; i<sam_array->count; i++) {
+                               info0[i].usri0_name = talloc_strdup(mem_ctx,
+                                       sam_array->entries[i].name.string);
+                               W_ERROR_HAVE_NO_MEMORY(info0[i].usri0_name);
+                       }
+
+                       *buffer = (uint8_t *)talloc_memdup(mem_ctx, info0,
+                               sizeof(struct USER_INFO_0) * sam_array->count);
+                       W_ERROR_HAVE_NO_MEMORY(*buffer);
+                       break;
+               default:
+                       return WERR_NOT_SUPPORTED;
+       }
+
+       return WERR_OK;
+}
+
+/****************************************************************
+****************************************************************/
+
+WERROR NetUserEnum_r(struct libnetapi_ctx *ctx,
+                    struct NetUserEnum *r)
+{
+       struct cli_state *cli = NULL;
+       struct rpc_pipe_client *pipe_cli = NULL;
+       struct policy_handle connect_handle;
+       struct dom_sid2 *domain_sid = NULL;
+       struct policy_handle domain_handle;
+       struct samr_SamArray *sam = NULL;
+       uint32_t num_entries = 0;
+       int i;
+       const char *domain_name = NULL;
+       bool domain_found = true;
+       uint32_t dom_resume_handle = 0;
+       struct lsa_String lsa_domain_name;
+
+       NTSTATUS status;
+       WERROR werr;
+
+       ZERO_STRUCT(connect_handle);
+       ZERO_STRUCT(domain_handle);
+
+       switch (r->in.level) {
+               case 0:
+                       break;
+               case 1:
+               case 2:
+               case 3:
+               case 10:
+               case 11:
+               case 20:
+               case 23:
+               default:
+                       return WERR_NOT_SUPPORTED;
+       }
+
+       status = cli_full_connection(&cli, NULL, r->in.server_name,
+                                    NULL, 0,
+                                    "IPC$", "IPC",
+                                    ctx->username,
+                                    ctx->workgroup,
+                                    ctx->password,
+                                    CLI_FULL_CONNECTION_USE_KERBEROS |
+                                    CLI_FULL_CONNECTION_FALLBACK_AFTER_KERBEROS,
+                                    Undefined, NULL);
+
+       if (!NT_STATUS_IS_OK(status)) {
+               werr = ntstatus_to_werror(status);
+               goto done;
+       }
+
+       pipe_cli = cli_rpc_pipe_open_noauth(cli, PI_SAMR, &status);
+       if (!pipe_cli) {
+               werr = ntstatus_to_werror(status);
+               goto done;
+       }
+
+       status = rpccli_try_samr_connects(pipe_cli, ctx,
+                                         SAMR_ACCESS_OPEN_DOMAIN |
+                                         SAMR_ACCESS_ENUM_DOMAINS,
+                                         &connect_handle);
+       if (!NT_STATUS_IS_OK(status)) {
+               werr = ntstatus_to_werror(status);
+               goto done;
+       }
+
+       status = rpccli_samr_EnumDomains(pipe_cli, ctx,
+                                        &connect_handle,
+                                        &dom_resume_handle,
+                                        &sam,
+                                        0xffffffff,
+                                        &num_entries);
+       if (!NT_STATUS_IS_OK(status)) {
+               werr = ntstatus_to_werror(status);
+               goto done;
+       }
+
+       for (i=0; i<num_entries; i++) {
+
+               domain_name = sam->entries[i].name.string;
+
+               if (strequal(domain_name, builtin_domain_name())) {
+                       continue;
+               }
+
+               domain_found = true;
+               break;
+       }
+
+       if (!domain_found) {
+               werr = WERR_NO_SUCH_DOMAIN;
+               goto done;
+       }
+
+       init_lsa_String(&lsa_domain_name, domain_name);
+
+       status = rpccli_samr_LookupDomain(pipe_cli, ctx,
+                                         &connect_handle,
+                                         &lsa_domain_name,
+                                         &domain_sid);
+       if (!NT_STATUS_IS_OK(status)) {
+               werr = ntstatus_to_werror(status);
+               goto done;
+       }
+
+       status = rpccli_samr_OpenDomain(pipe_cli,
+                                       ctx,
+                                       &connect_handle,
+                                       SAMR_DOMAIN_ACCESS_LOOKUP_INFO_2 |
+                                       SAMR_DOMAIN_ACCESS_ENUM_ACCOUNTS |
+                                       SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT,
+                                       domain_sid,
+                                       &domain_handle);
+       if (!NT_STATUS_IS_OK(status)) {
+               werr = ntstatus_to_werror(status);
+               goto done;
+       }
+
+       status = rpccli_samr_EnumDomainUsers(pipe_cli,
+                                            ctx,
+                                            &domain_handle,
+                                            r->in.resume_handle,
+                                            r->in.filter,
+                                            &sam,
+                                            r->in.prefmaxlen,
+                                            r->out.entries_read);
+       if (!NT_STATUS_IS_OK(status)) {
+               werr = ntstatus_to_werror(status);
+               goto done;
+       }
+
+       werr = convert_samr_samarray_to_USER_INFO_buffer(ctx, sam,
+                                                        r->in.level,
+                                                        r->out.buffer);
+
+ done:
+       if (is_valid_policy_hnd(&domain_handle)) {
+               rpccli_samr_Close(pipe_cli, ctx, &domain_handle);
+       }
+       if (is_valid_policy_hnd(&connect_handle)) {
+               rpccli_samr_Close(pipe_cli, ctx, &connect_handle);
+       }
+
+       if (cli) {
+               cli_shutdown(cli);
+       }
+
+       return werr;
+}
+
+/****************************************************************
+****************************************************************/
+
+WERROR NetUserEnum_l(struct libnetapi_ctx *ctx,
+                    struct NetUserEnum *r)
+{
+       return WERR_NOT_SUPPORTED;
+}
+