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

trunk/server/source3/nmbd/nmbd_incomingdgrams.c

@@ -22 +22 @@
 
 #include "includes.h"
+#include "../librpc/gen_ndr/svcctl.h"
+#include "nmbd/nmbd.h"
+#include "smbprofile.h"
 
 extern bool found_lm_clients;
@@ -93 +96 @@
 *******************************************************************/
 
-void process_host_announce(struct subnet_record *subrec, struct packet_struct *p, char *buf)
+void process_host_announce(struct subnet_record *subrec, struct packet_struct *p, const char *buf)
 {
         struct dgram_packet *dgram = &p->packet.dgram;
@@ -193 +196 @@
 *******************************************************************/
 
-void process_workgroup_announce(struct subnet_record *subrec, struct packet_struct *p, char *buf)
+void process_workgroup_announce(struct subnet_record *subrec, struct packet_struct *p, const char *buf)
 {
         struct dgram_packet *dgram = &p->packet.dgram;
@@ -250 +253 @@
 *******************************************************************/
 
-void process_local_master_announce(struct subnet_record *subrec, struct packet_struct *p, char *buf)
+void process_local_master_announce(struct subnet_record *subrec, struct packet_struct *p, const char *buf)
 {
         struct dgram_packet *dgram = &p->packet.dgram;
@@ -365 +368 @@
 
 void process_master_browser_announce(struct subnet_record *subrec, 
-                                     struct packet_struct *p,char *buf)
+                                     struct packet_struct *p,const char *buf)
 {
         unstring local_master_name;
@@ -416 +419 @@
 *******************************************************************/
 
-void process_lm_host_announce(struct subnet_record *subrec, struct packet_struct *p, char *buf, int len)
+void process_lm_host_announce(struct subnet_record *subrec, struct packet_struct *p, const char *buf, int len)
 {
         struct dgram_packet *dgram = &p->packet.dgram;
@@ -429 +432 @@
         unstring source_name;
         fstring comment;
-        char *s = get_safe_str_ptr(buf,len,buf,9);
+        char *s = get_safe_str_ptr(buf,len,discard_const_p(char, buf),9);
 
         START_PROFILE(lm_host_announce);
@@ -639 +642 @@
 
 void process_get_backup_list_request(struct subnet_record *subrec,
-                                     struct packet_struct *p,char *buf)
+                                     struct packet_struct *p,const char *buf)
 {
         struct dgram_packet *dgram = &p->packet.dgram;
@@ -722 +725 @@
 
 void process_reset_browser(struct subnet_record *subrec,
-                                  struct packet_struct *p,char *buf)
+                                  struct packet_struct *p,const char *buf)
 {
         struct dgram_packet *dgram = &p->packet.dgram;
@@ -774 +777 @@
 ******************************************************************/
 
-void process_announce_request(struct subnet_record *subrec, struct packet_struct *p, char *buf)
+void process_announce_request(struct subnet_record *subrec, struct packet_struct *p, const char *buf)
 {
         struct dgram_packet *dgram = &p->packet.dgram;
@@ -815 +818 @@
 ******************************************************************/
 
-void process_lm_announce_request(struct subnet_record *subrec, struct packet_struct *p, char *buf, int len)
+void process_lm_announce_request(struct subnet_record *subrec, struct packet_struct *p, const char *buf, int len)
 {
         struct dgram_packet *dgram = &p->packet.dgram;