Changeset 745 for trunk/server/source3/utils/net_rap.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/utils/net_rap.c (modified) (7 diffs)

trunk/server/source3/utils/net_rap.c

@@ -24 +24 @@
 
 #include "includes.h"
+#include "../librpc/gen_ndr/rap.h"
+#include "../librpc/gen_ndr/svcctl.h"
 #include "utils/net.h"
+#include "libsmb/libsmb.h"
+#include "libsmb/clirap.h"
 
 /* The following messages were for error checking that is not properly
@@ -227 +231 @@
         int ret;
 
-        RAP_SHARE_INFO_2 sinfo;
+        struct rap_share_info_2 sinfo;
         char *p;
         char *sharename;
@@ -246 +250 @@
         }
         *p = 0;
-        strlcpy(sinfo.share_name, sharename, sizeof(sinfo.share_name));
+        strlcpy((char *)sinfo.share_name, sharename, sizeof(sinfo.share_name));
         sinfo.reserved1 = '\0';
         sinfo.share_type = 0;
-        sinfo.comment = smb_xstrdup(c->opt_comment);
+        sinfo.comment = c->opt_comment ? smb_xstrdup(c->opt_comment) : "";
         sinfo.perms = 0;
         sinfo.maximum_users = c->opt_maxusers;
@@ -813 +817 @@
         struct cli_state *cli;
         int ret;
-        RAP_USER_INFO_1 userinfo;
+        struct rap_user_info_1 userinfo;
 
         if (argc == 0 || c->display_usage) {
@@ -822 +826 @@
                 return -1;
 
-        safe_strcpy(userinfo.user_name, argv[0], sizeof(userinfo.user_name)-1);
-        if (c->opt_flags == -1)
+        safe_strcpy((char *)userinfo.user_name, argv[0], sizeof(userinfo.user_name)-1);
+        if (c->opt_flags == 0)
                 c->opt_flags = 0x21;
 
@@ -957 +961 @@
         struct cli_state *cli;
         int ret;
-        RAP_GROUP_INFO_1 grinfo;
+        struct rap_group_info_1 grinfo;
 
         if (argc == 0 || c->display_usage) {
@@ -967 +971 @@
 
         /* BB check for length 21 or smaller explicitly ? BB */
-        safe_strcpy(grinfo.group_name, argv[0], sizeof(grinfo.group_name)-1);
+        safe_strcpy((char *)grinfo.group_name, argv[0], sizeof(grinfo.group_name)-1);
         grinfo.reserved1 = '\0';
         grinfo.comment = smb_xstrdup(c->opt_comment ? c->opt_comment : "");