Changeset 745 for trunk/server/source3/libsmb/clirap2.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/libsmb/clirap2.c (modified) (13 diffs)

trunk/server/source3/libsmb/clirap2.c

@@ -77 +77 @@
 
 #include "includes.h"
+#include "libsmb/libsmb.h"
+#include "../librpc/gen_ndr/rap.h"
+#include "../librpc/gen_ndr/svcctl.h"
+#include "libsmb/clirap.h"
 
 #define WORDSIZE 2
@@ -285 +289 @@
 ****************************************************************************/
 
-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;
@@ -321 +325 @@
 
         p = data;
-        PUTSTRINGF(p, grinfo->group_name, RAP_GROUPNAME_LEN);
+        PUTSTRINGF(p, (const char *)grinfo->group_name, RAP_GROUPNAME_LEN);
         PUTBYTE(p, 0); /* pad byte 0 */
         PUTSTRINGP(p, grinfo->comment, data, soffset);
@@ -831 +835 @@
 ****************************************************************************/
 
-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;
@@ -864 +868 @@
         PUTWORD(p, 0); /* pwencrypt */
         if(userinfo->passwrd)
-                PUTWORD(p,MIN(strlen(userinfo->passwrd), RAP_UPASSWD_LEN));
+                PUTWORD(p,MIN(strlen((const char *)userinfo->passwrd), RAP_UPASSWD_LEN));
         else
                 PUTWORD(p, 0); /* password length */
@@ -871 +875 @@
         memset(data, '\0', soffset);
 
-        PUTSTRINGF(p, userinfo->user_name, RAP_USERNAME_LEN);
+        PUTSTRINGF(p, (const char *)userinfo->user_name, RAP_USERNAME_LEN);
         PUTBYTE(p, 0); /* pad byte 0 */
-        PUTSTRINGF(p, userinfo->passwrd, RAP_UPASSWD_LEN);
+        PUTSTRINGF(p, (const char *)userinfo->passwrd, RAP_UPASSWD_LEN);
         PUTDWORD(p, 0); /* pw age - n.a. on user add */
         PUTWORD(p, userinfo->priv);
@@ -1334 +1338 @@
 ****************************************************************************/
 
-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;
@@ -1366 +1370 @@
 
         p = data;
-        PUTSTRINGF(p, sinfo->share_name, RAP_SHARENAME_LEN);
+        PUTSTRINGF(p, (const char *)sinfo->share_name, RAP_SHARENAME_LEN);
         PUTBYTE(p, 0); /* pad byte 0 */
 
@@ -1375 +1379 @@
         PUTWORD(p, sinfo->active_users);
         PUTSTRINGP(p, sinfo->path, data, soffset);
-        PUTSTRINGF(p, sinfo->password, RAP_SPASSWD_LEN);
+        PUTSTRINGF(p, (const char *)sinfo->password, RAP_SPASSWD_LEN);
         SCVAL(p,-1,0x0A); /* required 0x0A at end of password */
 
@@ -1900 +1904 @@
 int cli_NetPrintQEnum(struct cli_state *cli,
                 void (*qfn)(const char*,uint16,uint16,uint16,const char*,const char*,const char*,const char*,const char*,uint16,uint16),
-                void (*jfn)(uint16,const char*,const char*,const char*,const char*,uint16,uint16,const char*,uint_t,uint_t,const char*))
+                void (*jfn)(uint16,const char*,const char*,const char*,const char*,uint16,uint16,const char*,unsigned int,unsigned int,const char*))
 {
         char param[WORDSIZE                         /* api number    */
@@ -2076 +2080 @@
 int cli_NetPrintQGetInfo(struct cli_state *cli, const char *printer,
         void (*qfn)(const char*,uint16,uint16,uint16,const char*,const char*,const char*,const char*,const char*,uint16,uint16),
-        void (*jfn)(uint16,const char*,const char*,const char*,const char*,uint16,uint16,const char*,uint_t,uint_t,const char*))
+        void (*jfn)(uint16,const char*,const char*,const char*,const char*,uint16,uint16,const char*,unsigned int,unsigned int,const char*))
 {
         char param[WORDSIZE                         /* api number    */
@@ -2336 +2340 @@
 ****************************************************************************/
 
-int cli_NetSessionEnum(struct cli_state *cli, void (*fn)(char *, char *, uint16, uint16, uint16, uint_t, uint_t, uint_t, char *))
+int cli_NetSessionEnum(struct cli_state *cli, void (*fn)(char *, char *, uint16, uint16, uint16, unsigned int, unsigned int, unsigned int, char *))
 {
         char param[WORDSIZE                       /* api number    */
@@ -2436 +2440 @@
 
 int cli_NetSessionGetInfo(struct cli_state *cli, const char *workstation,
-                void (*fn)(const char *, const char *, uint16, uint16, uint16, uint_t, uint_t, uint_t, const char *))
+                void (*fn)(const char *, const char *, uint16, uint16, uint16, unsigned int, unsigned int, unsigned int, const char *))
 {
         char param[WORDSIZE                          /* api number    */