Expanded another abbreviation.

[stg.git] / include / stg / admin_conf.h

diff --git a/include/stg/admin_conf.h b/include/stg/admin_conf.h
index df6d9e22456f0f633a804c1311cf25fa7d7dff90..7fbf44408c72ea45807a8b8f5ae5c1d942df6f6e 100644 (file)
--- a/include/stg/admin_conf.h
+++ b/include/stg/admin_conf.h
@@ -7,9 +7,10 @@
 #ifndef ADMIN_CONF_H
 #define ADMIN_CONF_H
 
 #ifndef ADMIN_CONF_H
 #define ADMIN_CONF_H
 

-#include <string>
-

 #include "os_int.h"
 #include "os_int.h"

+#include "resetable.h"
+
+#include <string>

 
 #define ADM_LOGIN_LEN   (32)
 #define ADM_PASSWD_LEN  (32)
 
 #define ADM_LOGIN_LEN   (32)
 #define ADM_PASSWD_LEN  (32)


@@ -75,6 +76,30 @@ struct ADMIN_CONF
     std::string   password;
 };
 //-----------------------------------------------------------------------------
     std::string   password;
 };
 //-----------------------------------------------------------------------------

+struct ADMIN_CONF_RES
+{
+    ADMIN_CONF_RES() {}
+    ADMIN_CONF_RES(const ADMIN_CONF & conf)
+        : priv(conf.priv),
+          login(conf.login),
+          password(conf.password)
+    {}
+    ADMIN_CONF_RES(const ADMIN_CONF_RES & rhs)
+        : priv(rhs.priv),
+          login(rhs.login),
+          password(rhs.password)
+    {}
+    ADMIN_CONF_RES & operator=(const ADMIN_CONF_RES & rhs)
+    {
+        priv = rhs.priv;
+        login = rhs.login;
+        password = rhs.password;
+        return *this;
+    }
+    RESETABLE<PRIV> priv;
+    RESETABLE<std::string> login;
+    RESETABLE<std::string> password;
+};

 
 #include "admin_conf.inc.h"
 
 
 #include "admin_conf.inc.h"