r7490: Rename functions and prefices s/rpc_composite/libnet_rpc/

This makes more clear where the functions belong to. Also
the rule will be that lowercased function names are not
part of "official" libnet API (though it doesn't mean one
absolutely cannot use them).

rafal
(This used to be commit f6ef7b882acc6ee07422944a417a8d9013c9d8d2)

diff --git a/source4/include/structs.h b/source4/include/structs.h
index 5ec7509e76bac149f3cc04f51f111ec87edadd4b..ddc572982d79e79ce6f73e47a41e7ea2ff8c1b06 100644 (file)
--- a/source4/include/structs.h
+++ b/source4/include/structs.h
@@ -175,10 +175,10 @@ struct smb_composite_sesssetup;
 struct smb_composite_fetchfile;
 struct smb_composite_appendacl;
 struct smb_composite_fsinfo;
-struct rpc_composite_userinfo;
-struct rpc_composite_useradd;
-struct rpc_composite_userdel;
-struct rpc_composite_domain_open;
+struct libnet_rpc_userinfo;
+struct libnet_rpc_useradd;
+struct libnet_rpc_userdel;
+struct libnet_rpc_domain_open;
 
 struct nbt_name;
 struct nbt_name_packet;

diff --git a/source4/libnet/composite.h b/source4/libnet/composite.h
index b983117adc4391a9df573cabbebb6b3c17bed32e..89ad1c4446e438312448dffb5ad2262318b2ee3e 100644 (file)
--- a/source4/libnet/composite.h
+++ b/source4/libnet/composite.h
@@ -22,7 +22,7 @@
   composite function io definitions
 */
 
-struct rpc_composite_userinfo {
+struct libnet_rpc_userinfo {
        struct {
                struct policy_handle domain_handle;
                const char *sid;
@@ -34,7 +34,7 @@ struct rpc_composite_userinfo {
 };
 
 
-struct rpc_composite_useradd {
+struct libnet_rpc_useradd {
        struct {
                struct policy_handle domain_handle;
                const char *username;
@@ -45,7 +45,7 @@ struct rpc_composite_useradd {
 };
 
 
-struct rpc_composite_userdel {
+struct libnet_rpc_userdel {
        struct {
                struct policy_handle domain_handle;
                const char *username;
@@ -56,7 +56,7 @@ struct rpc_composite_userdel {
 };
 
 
-struct rpc_composite_domain_open {
+struct libnet_rpc_domain_open {
        struct {
                const char *domain_name;
                uint32_t access_mask;

diff --git a/source4/libnet/domain.c b/source4/libnet/domain.c
index 802a3f12c0d76eafc4ef088b56814b4b1c441dad..eec2a31e3d9b8c8e50a0d26c91370245c5c080b0 100644 (file)
--- a/source4/libnet/domain.c
+++ b/source4/libnet/domain.c
@@ -19,7 +19,7 @@
 */
 
 /*
-  a composite function for getting user information via samr pipe
+  a composite function for domain handling
 */
 
 #include "includes.h"
@@ -142,9 +142,9 @@ static void domain_open_handler(struct rpc_request *req)
 }
 
 
-struct composite_context *rpc_composite_domain_open_send(struct dcerpc_pipe *p,
-                                                        struct rpc_composite_domain_open *io,
-                                                        void (*monitor)(struct monitor_msg*))
+struct composite_context *libnet_rpc_domain_open_send(struct dcerpc_pipe *p,
+                                                     struct libnet_rpc_domain_open *io,
+                                                     void (*monitor)(struct monitor_msg*))
 {
        struct composite_context *c;
        struct domain_open_state *s;
@@ -185,8 +185,8 @@ failure:
 }
 
 
-NTSTATUS rpc_composite_domain_open_recv(struct composite_context *c, TALLOC_CTX *mem_ctx,
-                                       struct rpc_composite_domain_open *io)
+NTSTATUS libnet_rpc_domain_open_recv(struct composite_context *c, TALLOC_CTX *mem_ctx,
+                                    struct libnet_rpc_domain_open *io)
 {
        NTSTATUS status;
        struct domain_open_state *s;
@@ -203,10 +203,10 @@ NTSTATUS rpc_composite_domain_open_recv(struct composite_context *c, TALLOC_CTX
 }
 
 
-NTSTATUS rpc_composite_domain_open(struct dcerpc_pipe *p,
-                                  TALLOC_CTX *mem_ctx,
-                                  struct rpc_composite_domain_open *io)
+NTSTATUS libnet_rpc_domain_open(struct dcerpc_pipe *p,
+                               TALLOC_CTX *mem_ctx,
+                               struct libnet_rpc_domain_open *io)
 {
-       struct composite_context *c = rpc_composite_domain_open_send(p, io, NULL);
-       return rpc_composite_domain_open_recv(c, mem_ctx, io);
+       struct composite_context *c = libnet_rpc_domain_open_send(p, io, NULL);
+       return libnet_rpc_domain_open_recv(c, mem_ctx, io);
 }

diff --git a/source4/libnet/libnet_user.c b/source4/libnet/libnet_user.c
index 23560ea7e647f56b0fc55dae61cfb05ccda113bb..6df3fd555d3c97d93c80e1c14e9a305a60583bfc 100644 (file)
--- a/source4/libnet/libnet_user.c
+++ b/source4/libnet/libnet_user.c
@@ -31,8 +31,8 @@ NTSTATUS libnet_CreateUser(struct libnet_context *ctx, TALLOC_CTX *mem_ctx, stru
        union libnet_rpc_connect cn;
        union libnet_find_pdc fp;
        struct dcerpc_pipe *pipe;
-       struct rpc_composite_domain_open dom_io;
-       struct rpc_composite_useradd user_io;
+       struct libnet_rpc_domain_open dom_io;
+       struct libnet_rpc_useradd user_io;
        
        /* find domain pdc */
        fp.generic.level             = LIBNET_FIND_PDC_GENERIC;
@@ -62,7 +62,7 @@ NTSTATUS libnet_CreateUser(struct libnet_context *ctx, TALLOC_CTX *mem_ctx, stru
        dom_io.in.domain_name   = r->in.domain_name;
        dom_io.in.access_mask   = SEC_FLAG_MAXIMUM_ALLOWED;
        
-       status = rpc_composite_domain_open(ctx->samr, mem_ctx, &dom_io);
+       status = libnet_rpc_domain_open(ctx->samr, mem_ctx, &dom_io);
        if (!NT_STATUS_IS_OK(status)) {
                r->out.error_string = talloc_asprintf(mem_ctx,
                                                      "Creating user account failed: %s\n",
@@ -76,7 +76,7 @@ NTSTATUS libnet_CreateUser(struct libnet_context *ctx, TALLOC_CTX *mem_ctx, stru
        user_io.in.username       = r->in.user_name;
        user_io.in.domain_handle  = dom_io.out.domain_handle;
 
-       status = rpc_composite_useradd(ctx->samr, mem_ctx, &user_io);
+       status = libnet_rpc_useradd(ctx->samr, mem_ctx, &user_io);
        if (!NT_STATUS_IS_OK(status)) {
                r->out.error_string = talloc_asprintf(mem_ctx,
                                                      "Creating user account failed: %s\n",

diff --git a/source4/libnet/userinfo.c b/source4/libnet/userinfo.c
index 4241c899b09bd89077481eb10b2087bd84c0c9b3..cb28f9a1157a0b79849db12e8844a63caa30e245 100644 (file)
--- a/source4/libnet/userinfo.c
+++ b/source4/libnet/userinfo.c
@@ -173,8 +173,8 @@ static void userinfo_handler(struct rpc_request *req)
  * @param p dce/rpc call pipe 
  * @param io arguments and results of the call
  */
-struct composite_context *rpc_composite_userinfo_send(struct dcerpc_pipe *p,
-                                                     struct rpc_composite_userinfo *io,
+struct composite_context *libnet_rpc_userinfo_send(struct dcerpc_pipe *p,
+                                                     struct libnet_rpc_userinfo *io,
                                                      void (*monitor)(struct monitor_msg*))
 {
        struct composite_context *c;
@@ -228,8 +228,8 @@ failure:
  * @return nt status code of execution
  */
 
-NTSTATUS rpc_composite_userinfo_recv(struct composite_context *c, TALLOC_CTX *mem_ctx,
-                                    struct rpc_composite_userinfo *io)
+NTSTATUS libnet_rpc_userinfo_recv(struct composite_context *c, TALLOC_CTX *mem_ctx,
+                                    struct libnet_rpc_userinfo *io)
 {
        NTSTATUS status;
        struct userinfo_state *s;
@@ -258,10 +258,10 @@ NTSTATUS rpc_composite_userinfo_recv(struct composite_context *c, TALLOC_CTX *me
  * @return nt status code of execution
  */
 
-NTSTATUS rpc_composite_userinfo(struct dcerpc_pipe *pipe,
+NTSTATUS libnet_rpc_userinfo(struct dcerpc_pipe *pipe,
                                TALLOC_CTX *mem_ctx,
-                               struct rpc_composite_userinfo *io)
+                               struct libnet_rpc_userinfo *io)
 {
-       struct composite_context *c = rpc_composite_userinfo_send(pipe, io, NULL);
-       return rpc_composite_userinfo_recv(c, mem_ctx, io);
+       struct composite_context *c = libnet_rpc_userinfo_send(pipe, io, NULL);
+       return libnet_rpc_userinfo_recv(c, mem_ctx, io);
 }

diff --git a/source4/libnet/userman.c b/source4/libnet/userman.c
index a6556e13ecc023e94f931004dc047a847bd1d5d7..8d2cc0de022730cdfd428376495c60a63dd77d5b 100644 (file)
--- a/source4/libnet/userman.c
+++ b/source4/libnet/userman.c
@@ -104,8 +104,8 @@ static void useradd_handler(struct rpc_request *req)
  * @param io arguments and results of the call
  */
 
-struct composite_context *rpc_composite_useradd_send(struct dcerpc_pipe *p,
-                                                    struct rpc_composite_useradd *io,
+struct composite_context *libnet_rpc_useradd_send(struct dcerpc_pipe *p,
+                                                    struct libnet_rpc_useradd *io,
                                                     void (*monitor)(struct monitor_msg*))
 {
        struct composite_context *c;
@@ -157,8 +157,8 @@ failure:
  * @return nt status code of execution
  */
 
-NTSTATUS rpc_composite_useradd_recv(struct composite_context *c, TALLOC_CTX *mem_ctx,
-                                   struct rpc_composite_useradd *io)
+NTSTATUS libnet_rpc_useradd_recv(struct composite_context *c, TALLOC_CTX *mem_ctx,
+                                   struct libnet_rpc_useradd *io)
 {
        NTSTATUS status;
        struct useradd_state *s;
@@ -185,12 +185,12 @@ NTSTATUS rpc_composite_useradd_recv(struct composite_context *c, TALLOC_CTX *mem
  * @return nt status code of execution
  */
 
-NTSTATUS rpc_composite_useradd(struct dcerpc_pipe *pipe,
+NTSTATUS libnet_rpc_useradd(struct dcerpc_pipe *pipe,
                               TALLOC_CTX *mem_ctx,
-                              struct rpc_composite_useradd *io)
+                              struct libnet_rpc_useradd *io)
 {
-       struct composite_context *c = rpc_composite_useradd_send(pipe, io, NULL);
-       return rpc_composite_useradd_recv(c, mem_ctx, io);
+       struct composite_context *c = libnet_rpc_useradd_send(pipe, io, NULL);
+       return libnet_rpc_useradd_recv(c, mem_ctx, io);
 }
 
 
@@ -327,8 +327,8 @@ static void userdel_handler(struct rpc_request *req)
  * @param io arguments and results of the call
  */
 
-struct composite_context *rpc_composite_userdel_send(struct dcerpc_pipe *p,
-                                                    struct rpc_composite_userdel *io)
+struct composite_context *libnet_rpc_userdel_send(struct dcerpc_pipe *p,
+                                                    struct libnet_rpc_userdel *io)
 {
        struct composite_context *c;
        struct userdel_state *s;
@@ -377,8 +377,8 @@ failure:
  * @return nt status code of execution
  */
 
-NTSTATUS rpc_composite_userdel_recv(struct composite_context *c, TALLOC_CTX *mem_ctx,
-                                   struct rpc_composite_userdel *io)
+NTSTATUS libnet_rpc_userdel_recv(struct composite_context *c, TALLOC_CTX *mem_ctx,
+                                   struct libnet_rpc_userdel *io)
 {
        NTSTATUS status;
        struct userdel_state *s;
@@ -404,10 +404,10 @@ NTSTATUS rpc_composite_userdel_recv(struct composite_context *c, TALLOC_CTX *mem
  * @return nt status code of execution
  */
 
-NTSTATUS rpc_composite_userdel(struct dcerpc_pipe *pipe,
+NTSTATUS libnet_rpc_userdel(struct dcerpc_pipe *pipe,
                               TALLOC_CTX *mem_ctx,
-                              struct rpc_composite_userdel *io)
+                              struct libnet_rpc_userdel *io)
 {
-       struct composite_context *c = rpc_composite_userdel_send(pipe, io);
-       return rpc_composite_userdel_recv(c, mem_ctx, io);
+       struct composite_context *c = libnet_rpc_userdel_send(pipe, io);
+       return libnet_rpc_userdel_recv(c, mem_ctx, io);
 }