diff options
| -rw-r--r-- | source3/include/proto.h | 9 | ||||
| -rw-r--r-- | source3/libsmb/clirap.c | 1 | ||||
| -rw-r--r-- | source3/libsmb/clirap2.c | 7 | ||||
| -rw-r--r-- | source3/smbd/lanman.c | 1 | ||||
| -rw-r--r-- | source3/utils/net_rap.c | 7 |
5 files changed, 16 insertions, 9 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index d4e7f39026..a27ef89d01 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -2850,9 +2850,12 @@ bool cli_qfileinfo_test(struct cli_state *cli, uint16_t fnum, int level, char ** NTSTATUS cli_qpathinfo_alt_name(struct cli_state *cli, const char *fname, fstring alt_name); /* The following definitions come from libsmb/clirap2.c */ +struct rap_group_info_1; +struct rap_user_info_1; +struct rap_share_info_2; int cli_NetGroupDelete(struct cli_state *cli, const char *group_name); -int cli_NetGroupAdd(struct cli_state *cli, RAP_GROUP_INFO_1 *grinfo); +int cli_NetGroupAdd(struct cli_state *cli, struct rap_group_info_1 *grinfo); int cli_RNetGroupEnum(struct cli_state *cli, void (*fn)(const char *, const char *, void *), void *state); int cli_RNetGroupEnum0(struct cli_state *cli, void (*fn)(const char *, void *), @@ -2862,7 +2865,7 @@ int cli_NetGroupAddUser(struct cli_state * cli, const char *group_name, const ch int cli_NetGroupGetUsers(struct cli_state * cli, const char *group_name, void (*fn)(const char *, void *), void *state ); int cli_NetUserGetGroups(struct cli_state * cli, const char *user_name, void (*fn)(const char *, void *), void *state ); int cli_NetUserDelete(struct cli_state *cli, const char * user_name ); -int cli_NetUserAdd(struct cli_state *cli, RAP_USER_INFO_1 * userinfo ); +int cli_NetUserAdd(struct cli_state *cli, struct rap_user_info_1 * userinfo ); int cli_RNetUserEnum(struct cli_state *cli, void (*fn)(const char *, const char *, const char *, const char *, void *), void *state); int cli_RNetUserEnum0(struct cli_state *cli, void (*fn)(const char *, void *), @@ -2873,7 +2876,7 @@ int cli_NetFileEnum(struct cli_state *cli, const char * user, const char * base_path, void (*fn)(const char *, const char *, uint16, uint16, uint32)); -int cli_NetShareAdd(struct cli_state *cli, RAP_SHARE_INFO_2 * sinfo ); +int cli_NetShareAdd(struct cli_state *cli, struct rap_share_info_2 * sinfo ); int cli_NetShareDelete(struct cli_state *cli, const char * share_name ); bool cli_get_pdc_name(struct cli_state *cli, const char *workgroup, char **pdc_name); bool cli_get_server_domain(struct cli_state *cli); diff --git a/source3/libsmb/clirap.c b/source3/libsmb/clirap.c index 55a783efd0..913c8d320a 100644 --- a/source3/libsmb/clirap.c +++ b/source3/libsmb/clirap.c @@ -21,6 +21,7 @@ #include "includes.h" #include "../libcli/auth/libcli_auth.h" +#include "../librpc/gen_ndr/rap.h" /**************************************************************************** Call a remote api diff --git a/source3/libsmb/clirap2.c b/source3/libsmb/clirap2.c index 763faa7ca1..98702f6394 100644 --- a/source3/libsmb/clirap2.c +++ b/source3/libsmb/clirap2.c @@ -76,6 +76,7 @@ /*****************************************************/ #include "includes.h" +#include "../librpc/gen_ndr/rap.h" #define WORDSIZE 2 #define DWORDSIZE 4 @@ -284,7 +285,7 @@ int cli_NetGroupDelete(struct cli_state *cli, const char *group_name) call a NetGroupAdd - add user group to remote server ****************************************************************************/ -int cli_NetGroupAdd(struct cli_state *cli, RAP_GROUP_INFO_1 *grinfo) +int cli_NetGroupAdd(struct cli_state *cli, struct rap_group_info_1 *grinfo) { char *rparam = NULL; char *rdata = NULL; @@ -830,7 +831,7 @@ int cli_NetUserDelete(struct cli_state *cli, const char * user_name ) Call a NetUserAdd - add user to remote server. ****************************************************************************/ -int cli_NetUserAdd(struct cli_state *cli, RAP_USER_INFO_1 * userinfo ) +int cli_NetUserAdd(struct cli_state *cli, struct rap_user_info_1 * userinfo ) { char *rparam = NULL; char *rdata = NULL; @@ -1333,7 +1334,7 @@ int cli_NetFileEnum(struct cli_state *cli, const char * user, Call a NetShareAdd - share/export directory on remote server. ****************************************************************************/ -int cli_NetShareAdd(struct cli_state *cli, RAP_SHARE_INFO_2 * sinfo ) +int cli_NetShareAdd(struct cli_state *cli, struct rap_share_info_2 * sinfo ) { char *rparam = NULL; char *rdata = NULL; diff --git a/source3/smbd/lanman.c b/source3/smbd/lanman.c index 11a2e7e6b0..300d9fb75f 100644 --- a/source3/smbd/lanman.c +++ b/source3/smbd/lanman.c @@ -31,6 +31,7 @@ #include "../librpc/gen_ndr/cli_spoolss.h" #include "../librpc/gen_ndr/srv_samr.h" #include "../librpc/gen_ndr/srv_spoolss.h" +#include "../librpc/gen_ndr/rap.h" #include "../lib/util/binsearch.h" #ifdef CHECK_TYPES diff --git a/source3/utils/net_rap.c b/source3/utils/net_rap.c index 078c7febc9..ce94e774e4 100644 --- a/source3/utils/net_rap.c +++ b/source3/utils/net_rap.c @@ -24,6 +24,7 @@ #include "includes.h" #include "utils/net.h" +#include "../librpc/gen_ndr/rap.h" /* The following messages were for error checking that is not properly reported at the moment. Which should be reinstated? */ @@ -226,7 +227,7 @@ static int rap_share_add(struct net_context *c, int argc, const char **argv) struct cli_state *cli; int ret; - RAP_SHARE_INFO_2 sinfo; + struct rap_share_info_2 sinfo; char *p; char *sharename; @@ -812,7 +813,7 @@ static int rap_user_add(struct net_context *c, int argc, const char **argv) { struct cli_state *cli; int ret; - RAP_USER_INFO_1 userinfo; + struct rap_user_info_1 userinfo; if (argc == 0 || c->display_usage) { return net_rap_user_usage(c, argc, argv); @@ -956,7 +957,7 @@ static int rap_group_add(struct net_context *c, int argc, const char **argv) { struct cli_state *cli; int ret; - RAP_GROUP_INFO_1 grinfo; + struct rap_group_info_1 grinfo; if (argc == 0 || c->display_usage) { return net_rap_group_usage(c, argc, argv); |