imported changes from older tree

diff --cc src/CacheManager.h
index db7a9108e1716012fb2dd1d2e1ec263846f5295f,34344a2ce581db2fde3b9b2e005756ebf06248bb..832d97a92bd475bb04c28b1162a2b348af1a976a
--- 1/src/CacheManager.h
--- 2/src/CacheManager.h
+++ b/src/CacheManager.h
@@@ -41,40 -41,37 +41,49 @@@
   \ingroup Components
   */
  
 -/**
 - \ingroup CacheManagerAPI
 - * A single menu item in the cache manager - an 'action'.
 - */
 -class CacheManagerAction
 -{
 +class CacheManagerAction {
 +public:    
 +     virtual void run(StoreEntry *sentry) = 0;
 +     char *action;
 +     char *desc;
 +     struct
 +     {
 +         unsigned int pw_req:1;
 +         unsigned int atomic:1;
 +     } flags;
 +     CacheManagerAction *next;
 +     virtual ~CacheManagerAction() { }
 +};
  
 +class CacheManagerActionLegacy : public CacheManagerAction {
  public:
 -    char *action;
 -    char *desc;
 -    OBJH *handler;
 -
 -    struct
 -    {
 -        unsigned int pw_req:1;
 -        unsigned int atomic:1;
 -    } flags;
 +     OBJH *handler;
 +     virtual void run (StoreEntry *sentry);
 +};
  
 -    CacheManagerAction *next;
 +class CacheManagerShutdownAction : public CacheManagerAction {
 +public:
 +     virtual void run (StoreEntry *sentry);
  };
  
 +/// \ingroup CacheManagerInternal
 +typedef struct
 +{
 +    StoreEntry *entry;
 +    char *action;
 +    char *user_name;
 +    char *passwd;
 +} cachemgrStateData;
  
+ /// \ingroup CacheManagerInternal
+ typedef struct
+ {
+     StoreEntry *entry;
+     char *action;
+     char *user_name;
+     char *passwd;
+ } cachemgrStateData;
+ 
  /**
   \ingroup CacheManagerAPI
   * a CacheManager - the menu system for interacting with squid.