*** empty log message ***

12 files changed, 35 insertions, 30 deletions

diff --git a/apps/drwho/BS_Server.cpp b/apps/drwho/BS_Server.cpp
index 361d1f3f6c3..03c3777de42 100644
--- a/apps/drwho/BS_Server.cpp
+++ b/apps/drwho/BS_Server.cpp
@@ -10,7 +10,7 @@
 
 BS_Server::BS_Server (const char *packet)
 {
-  char *buf_ptr = packet + MAXUSERIDNAMELEN;
+  const char *buf_ptr = packet + MAXUSERIDNAMELEN;
 
   this->count_ = atoi (packet);
   this->buffer_ = buf_ptr;
diff --git a/apps/drwho/Drwho_Node.h b/apps/drwho/Drwho_Node.h
index 8c8c40c46b8..c3c1418bbc8 100644
--- a/apps/drwho/Drwho_Node.h
+++ b/apps/drwho/Drwho_Node.h
@@ -40,9 +40,9 @@ public:
   const char *get_real_name (void);
   const char *set_real_name (const char *);
 
-  char *key_name1_;
-  char *key_name2_;
-  char *tty_name_;
+  const char *key_name1_;
+  const char *key_name2_;
+  const char *tty_name_;
   int idle_time_;
   int active_count_;
   int inactive_count_;
diff --git a/apps/drwho/PMC_All.cpp b/apps/drwho/PMC_All.cpp
index 21649299767..0f51adc9b4c 100644
--- a/apps/drwho/PMC_All.cpp
+++ b/apps/drwho/PMC_All.cpp
@@ -44,7 +44,7 @@ PMC_All::decode (char *packet, int &packet_length)
       ACE_DEBUG ((LM_DEBUG,
                   "\n"));
     }
-  char 	*cp = packet;
+  char *cp = packet;
   int remote_users = 0;
 
   sscanf (cp,
@@ -53,14 +53,16 @@ PMC_All::decode (char *packet, int &packet_length)
 
   this->increment_total_users (remote_users);
 
-  for (cp = ACE::strend (cp); *cp != '\n'; cp++)
+  for (cp = (char *) ACE::strend (cp);
+       *cp != '\n';
+       cp++)
     {
       // Skip over the LOGIN_NAME. 
 
       char *login_name = cp;
-      char *real_name = cp = ACE::strend (cp);
+      char *real_name = cp = (char *) ACE::strend (cp);
 
-      for (cp = ACE::strend (cp); 
+      for (cp = (char *) ACE::strend (cp); 
 	   *(cp = this->handle_protocol_entries (cp, login_name, real_name)) != '\t';
            )
 	continue;
diff --git a/apps/drwho/PMC_Flo.cpp b/apps/drwho/PMC_Flo.cpp
index 5104d58a588..0010b69182f 100644
--- a/apps/drwho/PMC_Flo.cpp
+++ b/apps/drwho/PMC_Flo.cpp
@@ -80,13 +80,13 @@ PMC_Flo::decode (char *packet, int &packet_length)
 
   this->increment_total_users (remote_users);
 
-  for (cp = ACE::strend (cp);
+  for (cp = (char *) ACE::strend (cp);
        *cp != '\n';
        cp++)
     {
       char *login_name = cp;
 
-      for (cp = ACE::strend (cp);
+      for (cp = (char *) ACE::strend (cp);
            *(cp = this->handle_protocol_entries (cp, login_name)) != '\t'; 
 )
 	continue;
diff --git a/apps/drwho/PMC_Ruser.cpp b/apps/drwho/PMC_Ruser.cpp
index 90504525f07..886ea459001 100644
--- a/apps/drwho/PMC_Ruser.cpp
+++ b/apps/drwho/PMC_Ruser.cpp
@@ -54,13 +54,13 @@ PMC_Ruser::decode (char *packet, int &packet_length)
 
   this->increment_total_users (remote_users);
 
-  for (cp = ACE::strend (cp);
+  for (cp = (char *) ACE::strend (cp);
        *cp != '\n';
        cp++)
     {
       char *host_name = cp;
 
-      for (cp = ACE::strend (cp);
+      for (cp = (char *) ACE::strend (cp);
            *(cp = this->handle_protocol_entries (cp, host_name)) != '\t'; )
 	continue;
     }
@@ -108,7 +108,7 @@ PMC_Ruser::handle_protocol_entries (const char *cp,
 
   this->insert_protocol_info (protocol_record);
 
-  return ACE::strend (cp);
+  return (char *) ACE::strend (cp);
 }
 
 void
diff --git a/apps/drwho/PMC_Usr.cpp b/apps/drwho/PMC_Usr.cpp
index b45956712a2..7db1f72fedf 100644
--- a/apps/drwho/PMC_Usr.cpp
+++ b/apps/drwho/PMC_Usr.cpp
@@ -58,7 +58,7 @@ PMC_Usr::decode (char *packet, int &packet_length)
     {
       char *login_name = cp;
 
-      for (cp = ACE::strend (cp);
+      for (cp = (char *) ACE::strend (cp);
            *(cp = this->handle_protocol_entries (cp, login_name)) != '\t';
            )
 	continue;
diff --git a/apps/drwho/PMS_All.cpp b/apps/drwho/PMS_All.cpp
index de05c322ad1..1ed151e1292 100644
--- a/apps/drwho/PMS_All.cpp
+++ b/apps/drwho/PMS_All.cpp
@@ -77,11 +77,11 @@ PMS_All::insert_protocol_info (Protocol_Record &protocol_record)
 {
   Protocol_Record *frp = PM_Server::insert_protocol_info (protocol_record);
   passwd *pwent = getpwnam (frp->get_login ());
-  char *cp = ACE_OS::strchr (frp->set_real 
-                             (pwent == 0 
-                              ? frp->get_login () :
-                              ACE::strnew (pwent->pw_gecos)),
-                             ',');
+  char *cp = (char *) ACE_OS::strchr (frp->set_real 
+                                      (pwent == 0 
+                                       ? frp->get_login () :
+                                       ACE::strnew (pwent->pw_gecos)),
+                                      ',');
   if (cp != 0)
     *cp = '\0';
 
diff --git a/apps/drwho/PMS_Ruser.cpp b/apps/drwho/PMS_Ruser.cpp
index 9b85a18de5b..bda8f1c79fd 100644
--- a/apps/drwho/PMS_Ruser.cpp
+++ b/apps/drwho/PMS_Ruser.cpp
@@ -85,7 +85,8 @@ PMS_Ruser::insert_protocol_info (Protocol_Record &protocol_record)
   else
     {
       passwd *pwent = getpwnam (np->get_login_name ());
-      char *cp = ACE_OS::strchr (np->set_real_name (pwent == 0 
+      char *cp = 
+        (char *) ACE_OS::strchr (np->set_real_name (pwent == 0 
                                                     ? np->get_login_name () 
                                                     : ACE::strnew (pwent->pw_gecos)),
                                  ',');
diff --git a/apps/drwho/PM_Client.cpp b/apps/drwho/PM_Client.cpp
index c057a094905..52d85f79565 100644
--- a/apps/drwho/PM_Client.cpp
+++ b/apps/drwho/PM_Client.cpp
@@ -122,7 +122,7 @@ PM_Client::handle_protocol_entries (const char *cp,
   
   this->insert_protocol_info (protocol_record);
   
-  return ACE::strend (cp);
+  return (char *) ACE::strend (cp);
 }
 
 PM_Client::PM_Client (void)
diff --git a/apps/drwho/Protocol_Record.cpp b/apps/drwho/Protocol_Record.cpp
index 15b402b6e6b..602991f35a2 100644
--- a/apps/drwho/Protocol_Record.cpp
+++ b/apps/drwho/Protocol_Record.cpp
@@ -49,39 +49,39 @@ Protocol_Record::Protocol_Record (const char *kn1, Protocol_Record *next)
   this->next_ = next;
 }
 
-char *
+const char *
 Protocol_Record::get_login (void) 
 { 
   return this->key_name1_;
 }
 
-char *
+const char *
 Protocol_Record::set_login (const char *str)
 { 
   this->key_name1_ = str;
   return str;
 }
 
-char *
+const char *
 Protocol_Record::get_real (void) 
 { 
   return this->key_name2_;
 }
 
-char *
+const char *
 Protocol_Record::get_host (void)
 {
   return this->key_name1_;
 }
 
-char *
+const char *
 Protocol_Record::set_host (const char *str)
 { 
   this->key_name1_ = str;
   return str;
 }
 
-char *
+const char *
 Protocol_Record::set_real (const char *str)
 {
   this->key_name2_ = str;
diff --git a/apps/drwho/Protocol_Record.h b/apps/drwho/Protocol_Record.h
index 71e9d10c9bd..5cc97644585 100644
--- a/apps/drwho/Protocol_Record.h
+++ b/apps/drwho/Protocol_Record.h
@@ -39,8 +39,8 @@ public:
   Drwho_Node *get_drwho_list (void);
 
   static Drwho_Node drwho_node_;
-  char *key_name1_;
-  char *key_name2_;
+  const char *key_name1_;
+  const char *key_name2_;
   Drwho_Node *drwho_list_;
   Protocol_Record *next_;
   int is_active_;
diff --git a/apps/drwho/SM_Server.cpp b/apps/drwho/SM_Server.cpp
index 95fe8bb2b65..798ac904e76 100644
--- a/apps/drwho/SM_Server.cpp
+++ b/apps/drwho/SM_Server.cpp
@@ -39,8 +39,10 @@ SM_Server::demux (char *packet, int &packet_length)
       return -1;
     }
 
+  packet_lenght = SUBTRACT_PACKET_TYPE (packet_length);
+
   if (pm_server->decode (SKIP_PACKET_TYPE (packet),
-                         SUBTRACT_PACKET_TYPE (packet_length)) < 0)
+                         packet_length) < 0)
     return -1;
 
   if (pm_server->process () < 0)